From fcf88305cc8fc198f3c0b372557a4eaffe316a4f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 15:01:00 -0400
Subject: [PATCH 001/857] Split a few libraries into multiple outputs

---
 pkgs/applications/audio/flac/default.nix       | 17 +++++++++++++++++
 pkgs/development/libraries/libogg/default.nix  | 17 ++++++++++++++++-
 .../libraries/libsndfile/default.nix           | 17 +++++++++++++++++
 .../libraries/libvorbis/default.nix            | 18 +++++++++++++++++-
 4 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index fa201d20c3fba..3f00d6b834ed4 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -18,6 +18,23 @@ stdenv.mkDerivation rec {
       })
     ];
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
+  configureFlags = [ "--bindir=$(bin)/bin" "--includedir=$(dev)/include" "--mandir=$(bin)/share/man" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig m4datadir=$(dev)/share/aclocal" ];
+
+  postInstall =
+    ''
+      if [ -e $out/share/doc ]; then
+        mkdir -p $doc/share/doc
+        mv $out/share/doc/* $doc/share/doc
+        rmdir $out/share/doc
+      fi
+    ''; # */
+
   meta = {
     homepage = http://flac.sourceforge.net;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index e407b75c8bbe3..0b5e4e8174151 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libogg-1.3.0";
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/ogg/${name}.tar.xz";
     sha256 = "0jy79ffkl34vycnwfsj4svqsdg1lwy2l1rr49y8r4d44kh12a5r3";
@@ -10,6 +10,21 @@ stdenv.mkDerivation rec {
 
   buildNativeInputs = [ xz ];
 
+  outputs = [ "dev" "doc" "out" ];
+
+  configureFlags = [ "--includedir=$(dev)/include" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig" ];
+
+  postInstall =
+    ''
+      mkdir -p $doc/share/doc
+      mv $out/share/doc/* $doc/share/doc
+
+      mkdir -p $dev/nix-support
+      echo $out > $dev/nix-support/propagated-build-native-inputs
+    ''; # */
+
   meta = {
     homepage = http://xiph.org/ogg/;
   };
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index d9b4afbf0ff84..3a9153120be15 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -10,6 +10,23 @@ stdenv.mkDerivation rec {
 
   buildInputs = [pkgconfig flac libogg libvorbis];
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
+  configureFlags = [ "--bindir=$(bin)/bin" "--includedir=$(dev)/include" "--mandir=$(bin)/share/man" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig m4datadir=$(dev)/share/aclocal" ];
+
+  postInstall =
+    ''
+      if [ -e $out/share/doc ]; then
+        mkdir -p $doc/share/doc
+        mv $out/share/doc/* $doc/share/doc
+        rmdir $out/share/doc
+      fi
+    ''; # */
+
   meta = {
     description = "Libsndfile, a C library for reading and writing files containing sampled sound";
 
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index efb210d657629..945bba3d4ea17 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libvorbis-1.3.3";
-  
+
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/vorbis/${name}.tar.xz";
     sha256 = "1gby6hapz9njx4l9g0pndyk4q83z5fgrgc30mfwfgx7bllspsk43";
@@ -11,6 +11,22 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ xz ];
   propagatedBuildInputs = [ libogg ];
 
+  outputs = [ "dev" "out" "doc" ];
+
+  configureFlags = [ "--includedir=$(dev)/include" ];
+
+  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig" ];
+
+  postInstall =
+    ''
+      mkdir -p $doc/share/doc
+      mv $out/share/doc/* $doc/share/doc
+
+      mkdir -p "$dev/nix-support"
+      echo "$propagatedBuildNativeInputs $out" > "$dev/nix-support/propagated-build-native-inputs"
+      propagatedBuildNativeInputs=
+    ''; # */
+
   meta = {
     homepage = http://xiph.org/vorbis/;
   };

From b96ab17658b1aec5654cc88f8e67adb544900c82 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 15:42:22 -0400
Subject: [PATCH 002/857] Abstract common multiple output handling into a
 function

---
 pkgs/applications/audio/flac/default.nix      | 17 +-------
 pkgs/build-support/multiple-outputs.nix       | 39 +++++++++++++++++++
 pkgs/development/libraries/libogg/default.nix | 17 +-------
 .../libraries/libsndfile/default.nix          | 19 ++-------
 .../libraries/libvorbis/default.nix           | 18 +--------
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 50 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/build-support/multiple-outputs.nix

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 3f00d6b834ed4..21025b27b2498 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, libogg }:
+{ stdenv, fetchurl, multipleOutputs, libogg }:
 
-stdenv.mkDerivation rec {
+multipleOutputs rec {
   name = "flac-1.2.1";
 
   src = fetchurl {
@@ -22,19 +22,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "bin" "doc" ];
 
-  configureFlags = [ "--bindir=$(bin)/bin" "--includedir=$(dev)/include" "--mandir=$(bin)/share/man" ];
-
-  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig m4datadir=$(dev)/share/aclocal" ];
-
-  postInstall =
-    ''
-      if [ -e $out/share/doc ]; then
-        mkdir -p $doc/share/doc
-        mv $out/share/doc/* $doc/share/doc
-        rmdir $out/share/doc
-      fi
-    ''; # */
-
   meta = {
     homepage = http://flac.sourceforge.net;
     description = "Library and tools for encoding and decoding the FLAC lossless audio file format";
diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
new file mode 100644
index 0000000000000..5b1dc96dfb026
--- /dev/null
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -0,0 +1,39 @@
+{ stdenv }:
+
+with stdenv.lib;
+
+{ outputs, ... } @ args:
+
+stdenv.mkDerivation (args // {
+
+  configureFlags =
+    optionals (elem "bin" outputs)
+      [ "--bindir=$(bin)/bin" "--mandir=$(bin)/share/man" ]
+    ++ optional (elem "dev" outputs)
+      "--includedir=$(dev)/include";
+
+  installFlags =
+    optionals (elem "dev" outputs)
+      [ "pkgconfigdir=$(dev)/lib/pkgconfig" "m4datadir=$(dev)/share/aclocal" ];
+
+  postInstall =
+    ''
+      if [ -n "$doc" -a -e $out/share/doc ]; then
+        mkdir -p $doc/share/doc
+        mv $out/share/doc/* $doc/share/doc
+        rmdir $out/share/doc
+        rmdir --ignore-fail-on-non-empty $out/share
+      fi
+
+      if [ -n "$dev" ]; then
+        mkdir -p "$dev/nix-support"
+        if [ -n "$propagatedBuildInputs" ]; then
+          echo "$propagatedBuildInputs" > "$dev/nix-support/propagated-build-inputs"
+          propagatedBuildInputs=
+        fi
+        echo "$propagatedBuildNativeInputs $out" > "$dev/nix-support/propagated-build-native-inputs"
+        propagatedBuildNativeInputs=
+      fi
+    ''; # */
+
+})
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 0b5e4e8174151..d3e7ba43b31c7 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, xz }:
+{ stdenv, fetchurl, multipleOutputs, xz }:
 
-stdenv.mkDerivation rec {
+multipleOutputs rec {
   name = "libogg-1.3.0";
 
   src = fetchurl {
@@ -12,19 +12,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "doc" "out" ];
 
-  configureFlags = [ "--includedir=$(dev)/include" ];
-
-  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig" ];
-
-  postInstall =
-    ''
-      mkdir -p $doc/share/doc
-      mv $out/share/doc/* $doc/share/doc
-
-      mkdir -p $dev/nix-support
-      echo $out > $dev/nix-support/propagated-build-native-inputs
-    ''; # */
-
   meta = {
     homepage = http://xiph.org/ogg/;
   };
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 3a9153120be15..166e02668f04e 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,6 +1,6 @@
-{stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
+{ stdenv, fetchurl, multipleOutputs, flac, libogg, libvorbis, pkgconfig }:
 
-stdenv.mkDerivation rec {
+multipleOutputs rec {
   name = "libsndfile-1.0.23";
 
   src = fetchurl {
@@ -8,25 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0k9x4804gfh9d9zd4rm1v2izm8l716rzk4d6jlrjcf45b5sw7jal";
   };
 
-  buildInputs = [pkgconfig flac libogg libvorbis];
+  buildInputs = [ pkgconfig flac libogg libvorbis ];
 
   enableParallelBuilding = true;
 
   outputs = [ "dev" "out" "bin" "doc" ];
 
-  configureFlags = [ "--bindir=$(bin)/bin" "--includedir=$(dev)/include" "--mandir=$(bin)/share/man" ];
-
-  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig m4datadir=$(dev)/share/aclocal" ];
-
-  postInstall =
-    ''
-      if [ -e $out/share/doc ]; then
-        mkdir -p $doc/share/doc
-        mv $out/share/doc/* $doc/share/doc
-        rmdir $out/share/doc
-      fi
-    ''; # */
-
   meta = {
     description = "Libsndfile, a C library for reading and writing files containing sampled sound";
 
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 945bba3d4ea17..dac0583723543 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, libogg, xz }:
+{ stdenv, fetchurl, multipleOutputs, libogg, xz }:
 
-stdenv.mkDerivation rec {
+multipleOutputs rec {
   name = "libvorbis-1.3.3";
 
   src = fetchurl {
@@ -13,20 +13,6 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "doc" ];
 
-  configureFlags = [ "--includedir=$(dev)/include" ];
-
-  installFlags = [ "pkgconfigdir=$(dev)/lib/pkgconfig" ];
-
-  postInstall =
-    ''
-      mkdir -p $doc/share/doc
-      mv $out/share/doc/* $doc/share/doc
-
-      mkdir -p "$dev/nix-support"
-      echo "$propagatedBuildNativeInputs $out" > "$dev/nix-support/propagated-build-native-inputs"
-      propagatedBuildNativeInputs=
-    ''; # */
-
   meta = {
     homepage = http://xiph.org/vorbis/;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ee6dc66b2d61..53e83ca5798f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -327,6 +327,8 @@ let
     inherit stdenv perl cpio contents ubootChooser;
   };
 
+  multipleOutputs = import ../build-support/multiple-outputs.nix { inherit (pkgs) stdenv; };
+
   makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh;
 
   makeModulesClosure = {kernel, rootModules, allowMissing ? false}:

From 53661fda0bd95f61ce2abc6ce0da02ac2d72d9f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 23 Aug 2012 16:21:45 -0400
Subject: [PATCH 003/857] Strip/patchelf the bin output

---
 pkgs/build-support/multiple-outputs.nix              | 6 ++++++
 pkgs/development/libraries/libsamplerate/default.nix | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index 5b1dc96dfb026..5608c5619d119 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -34,6 +34,12 @@ stdenv.mkDerivation (args // {
         echo "$propagatedBuildNativeInputs $out" > "$dev/nix-support/propagated-build-native-inputs"
         propagatedBuildNativeInputs=
       fi
+
+      if [ -n "$bin" ]; then
+        prefix="$bin" stripDirs "bin sbin" "${stripDebugFlags:--S}"
+        prefix="$bin" patchELF
+        patchShebangs "$bin"
+      fi
     ''; # */
 
 })
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 17f06e46711ca..851a2fcca48e6 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, fftw, libsndfile }:
+{ stdenv, fetchurl, multipleOutputs, pkgconfig, fftw, libsndfile }:
 
-stdenv.mkDerivation rec {
+multipleOutputs rec {
   name = "libsamplerate-0.1.7";
 
   src = fetchurl {
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
   #--disable-fftw          disable usage of FFTW
   #--disable-cpu-clip      disable tricky cpu specific clipper
 
+  outputs = [ "dev" "bin" "out" ];
+
   meta = {
     description = "Sample Rate Converter for audio";
     homepage = http://www.mega-nerd.com/SRC/index.html;

From 681d659ee46e1048a61ec14d3def81445a5b2c9b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Aug 2012 17:29:26 -0400
Subject: [PATCH 004/857] libsamplerate: Drop dependency on fftw

It's only used for examples/tests, so not much point in depending on
it.
---
 pkgs/development/libraries/libsamplerate/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 851a2fcca48e6..7aeafeee66ace 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, multipleOutputs, pkgconfig, fftw, libsndfile }:
+{ stdenv, fetchurl, multipleOutputs, pkgconfig, libsndfile }:
 
 multipleOutputs rec {
   name = "libsamplerate-0.1.7";
@@ -9,7 +9,7 @@ multipleOutputs rec {
   };
 
   buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ fftw libsndfile ];
+  propagatedBuildInputs = [ libsndfile ];
 
   # maybe interesting configure flags:
   #--disable-fftw          disable usage of FFTW

From 3a35ba350f0153f4f7bb4eb006078c38b5ca94ec Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Aug 2012 20:43:48 -0400
Subject: [PATCH 005/857] Turn multipleOutputs into a stdenv adaptation

This way we can merge it into stdenv.mkDerivation later without having
to modify any package expressions (except the overrides in
all-packages.nix).
---
 pkgs/applications/audio/flac/default.nix      |  4 ++--
 pkgs/development/libraries/libogg/default.nix |  4 ++--
 .../libraries/libsamplerate/default.nix       |  4 ++--
 .../libraries/libsndfile/default.nix          |  4 ++--
 .../libraries/libvorbis/default.nix           |  4 ++--
 pkgs/top-level/all-packages.nix               | 24 ++++++++++++++-----
 6 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index 21025b27b2498..dedd3e0139a8f 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, multipleOutputs, libogg }:
+{ stdenv, fetchurl, libogg }:
 
-multipleOutputs rec {
+stdenv.mkDerivation rec {
   name = "flac-1.2.1";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index d3e7ba43b31c7..e7e9f71eb6be4 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, multipleOutputs, xz }:
+{ stdenv, fetchurl, xz }:
 
-multipleOutputs rec {
+stdenv.mkDerivation rec {
   name = "libogg-1.3.0";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libsamplerate/default.nix b/pkgs/development/libraries/libsamplerate/default.nix
index 7aeafeee66ace..0e2f042104d30 100644
--- a/pkgs/development/libraries/libsamplerate/default.nix
+++ b/pkgs/development/libraries/libsamplerate/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, multipleOutputs, pkgconfig, libsndfile }:
+{ stdenv, fetchurl, pkgconfig, libsndfile }:
 
-multipleOutputs rec {
+stdenv.mkDerivation rec {
   name = "libsamplerate-0.1.7";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 166e02668f04e..7140843a45364 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, multipleOutputs, flac, libogg, libvorbis, pkgconfig }:
+{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
 
-multipleOutputs rec {
+stdenv.mkDerivation rec {
   name = "libsndfile-1.0.23";
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index dac0583723543..0a54adcada42c 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, multipleOutputs, libogg, xz }:
+{ stdenv, fetchurl, libogg, xz }:
 
-multipleOutputs rec {
+stdenv.mkDerivation rec {
   name = "libvorbis-1.3.3";
 
   src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53e83ca5798f7..deb9c626d5d35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -327,7 +327,9 @@ let
     inherit stdenv perl cpio contents ubootChooser;
   };
 
-  multipleOutputs = import ../build-support/multiple-outputs.nix { inherit (pkgs) stdenv; };
+  stdenvMulti = stdenv // {
+    mkDerivation = import ../build-support/multiple-outputs.nix { inherit (pkgs) stdenv; };
+  };
 
   makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh;
 
@@ -4133,7 +4135,9 @@ let
 
   libQGLViewer = callPackage ../development/libraries/libqglviewer { };
 
-  libsamplerate = callPackage ../development/libraries/libsamplerate { };
+  libsamplerate = callPackage ../development/libraries/libsamplerate {
+    stdenv = stdenvMulti;
+  };
 
   libspectre = callPackage ../development/libraries/libspectre { };
 
@@ -4226,7 +4230,9 @@ let
 
   libofx = callPackage ../development/libraries/libofx { };
 
-  libogg = callPackage ../development/libraries/libogg { };
+  libogg = callPackage ../development/libraries/libogg {
+    stdenv = stdenvMulti;
+  };
 
   liboggz = callPackage ../development/libraries/liboggz { };
 
@@ -4267,7 +4273,9 @@ let
   # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
   libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
 
-  libsndfile = callPackage ../development/libraries/libsndfile { };
+  libsndfile = callPackage ../development/libraries/libsndfile {
+    stdenv = stdenvMulti;
+  };
 
   libsoup = callPackage ../development/libraries/libsoup { };
 
@@ -4330,7 +4338,9 @@ let
 
   libvterm = callPackage ../development/libraries/libvterm { };
 
-  libvorbis = callPackage ../development/libraries/libvorbis { };
+  libvorbis = callPackage ../development/libraries/libvorbis {
+    stdenv = stdenvMulti;
+  };
 
   libwebp = callPackage ../development/libraries/libwebp { };
 
@@ -6860,7 +6870,9 @@ let
 
   firefox13Wrapper = lowPrio (wrapFirefox { browser = firefox13Pkgs.firefox; });
 
-  flac = callPackage ../applications/audio/flac { };
+  flac = callPackage ../applications/audio/flac {
+    stdenv = stdenvMulti;
+  };
 
   flashplayer = flashplayer11;
 

From 28ad91098da44ec9841fea5943bef330c7911d92 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Aug 2012 21:23:42 -0400
Subject: [PATCH 006/857] libtool: Separate libltdl from the main package

Some packages have a runtime dependency on libltdl, but shouldn't
depend on the rest of libtool (which in turn depends on binutils and
other stdenv tools).  For example, splitting off libltdl cuts about 35
MiB from the closure of PulseAudio.
---
 pkgs/build-support/multiple-outputs.nix       | 22 ++++++++++++-------
 .../tools/misc/libtool/libtool2.nix           | 16 ++++++--------
 pkgs/top-level/all-packages.nix               |  4 +++-
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index 5608c5619d119..a4a53733fa058 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -9,12 +9,16 @@ stdenv.mkDerivation (args // {
   configureFlags =
     optionals (elem "bin" outputs)
       [ "--bindir=$(bin)/bin" "--mandir=$(bin)/share/man" ]
+    ++ optionals (elem "lib" outputs)
+      [ "--libdir=$(lib)/lib" ]
     ++ optional (elem "dev" outputs)
-      "--includedir=$(dev)/include";
+      "--includedir=$(dev)/include"
+    ++ args.configureFlags or [];
 
   installFlags =
     optionals (elem "dev" outputs)
-      [ "pkgconfigdir=$(dev)/lib/pkgconfig" "m4datadir=$(dev)/share/aclocal" ];
+      [ "pkgconfigdir=$(dev)/lib/pkgconfig" "m4datadir=$(dev)/share/aclocal" "aclocaldir=$(dev)/share/aclocal" ]
+    ++ args.installFlags or [];
 
   postInstall =
     ''
@@ -31,15 +35,17 @@ stdenv.mkDerivation (args // {
           echo "$propagatedBuildInputs" > "$dev/nix-support/propagated-build-inputs"
           propagatedBuildInputs=
         fi
-        echo "$propagatedBuildNativeInputs $out" > "$dev/nix-support/propagated-build-native-inputs"
+        echo "$out $lib $propagatedBuildNativeInputs" > "$dev/nix-support/propagated-build-native-inputs"
         propagatedBuildNativeInputs=
+      elif [ -n "$out" ]; then
+        propagatedBuildNativeInputs="$lib $propagatedBuildNativeInputs"
       fi
 
-      if [ -n "$bin" ]; then
-        prefix="$bin" stripDirs "bin sbin" "${stripDebugFlags:--S}"
-        prefix="$bin" patchELF
-        patchShebangs "$bin"
-      fi
+      for i in $bin $lib; do
+        prefix="$i" stripDirs "lib lib64 libexec bin sbin" "${stripDebugFlags:--S}"
+        prefix="$i" patchELF
+        patchShebangs "$i"
+      done
     ''; # */
 
 })
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index 403381af48514..544434634a53b 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, m4, perl, lzma }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libtool-2.4.2";
 
   src = fetchurl {
@@ -10,6 +10,8 @@ stdenv.mkDerivation (rec {
 
   buildNativeInputs = [ lzma m4 perl ];
 
+  outputs = [ "out" "lib" ];
+
   # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
   # "fixed" path in generated files!
   dontPatchShebangs = true;
@@ -18,6 +20,10 @@ stdenv.mkDerivation (rec {
   # leads to the failure of a number of tests.
   doCheck = false;
 
+  # Don't run the native `strip' when cross-compiling.  This breaks at least
+  # with `.a' files for MinGW.
+  dontStrip = stdenv ? cross;
+
   meta = {
     description = "GNU Libtool, a generic library support script";
 
@@ -38,11 +44,3 @@ stdenv.mkDerivation (rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
-
-//
-
-# Don't run the native `strip' when cross-compiling.  This breaks at least
-# with `.a' files for MinGW.
-(if (stdenv ? cross)
- then { dontStrip = true; }
- else { }))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index deb9c626d5d35..7f8e0f0816df5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3111,7 +3111,9 @@ let
 
   libtool_1_5 = callPackage ../development/tools/misc/libtool { };
 
-  libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
+  libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix {
+    stdenv = stdenvMulti;
+  };
 
   lsof = callPackage ../development/tools/misc/lsof { };
 

From 7369c443a87788f9afc944b8c21b506b21dd9792 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Aug 2012 22:24:49 -0400
Subject: [PATCH 007/857] openssl: Separate manpages

---
 pkgs/development/libraries/openssl/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 575b57eb87270..60e59c2b159eb 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -29,7 +29,7 @@ let
         ]
 
     ++ stdenv.lib.optional stdenv.isDarwin ./darwin-arch.patch;
-  
+
 in
 
 stdenv.mkDerivation {
@@ -45,6 +45,9 @@ stdenv.mkDerivation {
 
   patches = patchesCross false;
 
+  # TODO: separate lib and bin.
+  outputs = [ "out" "man" ];
+
   buildNativeInputs = [ perl ];
 
   # On x86_64-darwin, "./config" misdetects the system as
@@ -54,7 +57,7 @@ stdenv.mkDerivation {
 
   configureFlags = "shared --libdir=lib";
 
-  makeFlags = "MANDIR=$(out)/share/man";
+  makeFlags = "MANDIR=$(man)/share/man";
 
   postInstall =
     ''

From 21b7946878e4154d90d40a539858b6dc9c88a3ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Aug 2012 23:14:45 -0400
Subject: [PATCH 008/857] Split some more packages

---
 pkgs/build-support/multiple-outputs.nix      | 14 ++++++++++----
 pkgs/development/libraries/acl/default.nix   |  2 ++
 pkgs/development/libraries/attr/default.nix  |  2 ++
 pkgs/development/libraries/speex/default.nix | 11 +++++++++--
 pkgs/top-level/all-packages.nix              | 12 +++++++++---
 5 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index a4a53733fa058..2a582e681e9a5 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -13,15 +13,19 @@ stdenv.mkDerivation (args // {
       [ "--libdir=$(lib)/lib" ]
     ++ optional (elem "dev" outputs)
       "--includedir=$(dev)/include"
-    ++ args.configureFlags or [];
+    ++ [ (toString args.configureFlags or []) ];
 
   installFlags =
     optionals (elem "dev" outputs)
       [ "pkgconfigdir=$(dev)/lib/pkgconfig" "m4datadir=$(dev)/share/aclocal" "aclocaldir=$(dev)/share/aclocal" ]
-    ++ args.installFlags or [];
+    ++ [ (toString args.installFlags or []) ];
 
-  postInstall =
+  #postPhases = [ "fixupOutputsPhase" ] ++ args.postPhases or [];
+
+  preFixup =
     ''
+      runHook preFixupOutputs
+
       if [ -n "$doc" -a -e $out/share/doc ]; then
         mkdir -p $doc/share/doc
         mv $out/share/doc/* $doc/share/doc
@@ -42,10 +46,12 @@ stdenv.mkDerivation (args // {
       fi
 
       for i in $bin $lib; do
-        prefix="$i" stripDirs "lib lib64 libexec bin sbin" "${stripDebugFlags:--S}"
+        prefix="$i" stripDirs "lib lib64 libexec bin sbin" "''${stripDebugFlags:--S}"
         prefix="$i" patchELF
         patchShebangs "$i"
       done
+
+      runHook postFixupOutputs
     ''; # */
 
 })
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 3ccb569198000..5b8174eaca547 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "09aj30m49ivycl3irram8c3givc0crivjm3ymw0nhfaxrwhlb186";
   };
 
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   buildNativeInputs = [ gettext ];
   buildInputs = [ attr ];
 
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index adc530863068a..235410320674d 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "07qf6kb2zk512az481bbnsk9jycn477xpva1a726n5pzlzf9pmnw";
   };
 
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   buildNativeInputs = [ gettext ];
 
   configureFlags = "MAKE=make MSGFMT=msgfmt MSGMERGE=msgmerge XGETTEXT=xgettext ECHO=echo SED=sed AWK=gawk";
diff --git a/pkgs/development/libraries/speex/default.nix b/pkgs/development/libraries/speex/default.nix
index 93a01a3d2bcba..6aceef78eea2f 100644
--- a/pkgs/development/libraries/speex/default.nix
+++ b/pkgs/development/libraries/speex/default.nix
@@ -2,11 +2,18 @@
 
 stdenv.mkDerivation rec {
   name = "speex-1.2rc1";
-  
+
   src = fetchurl {
     url = "http://downloads.us.xiph.org/releases/speex/${name}.tar.gz";
     sha256 = "19mpkhbz3s08snvndn0h1dk2j139max6b0rr86nnsjmxazf30brl";
   };
-  
+
   buildInputs = [ libogg ];
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
+  meta = {
+    homepage = http://www.speex.org/;
+    description = "A audio compression codec designed for speech";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f8e0f0816df5..1ce10d7101b07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3234,7 +3234,9 @@ let
 
   aalib = callPackage ../development/libraries/aalib { };
 
-  acl = callPackage ../development/libraries/acl { };
+  acl = callPackage ../development/libraries/acl {
+    stdenv = stdenvMulti;
+  };
 
   adns = callPackage ../development/libraries/adns { };
 
@@ -3271,7 +3273,9 @@ let
 
   attica = callPackage ../development/libraries/attica { };
 
-  attr = callPackage ../development/libraries/attr { };
+  attr = callPackage ../development/libraries/attr {
+    stdenv = stdenvMulti;
+  };
 
   aqbanking = callPackage ../development/libraries/aqbanking { };
 
@@ -4783,7 +4787,9 @@ let
 
   speech_tools = callPackage ../development/libraries/speech-tools {};
 
-  speex = callPackage ../development/libraries/speex { };
+  speex = callPackage ../development/libraries/speex {
+    stdenv = stdenvMulti;
+  };
 
   sphinxbase = callPackage ../development/libraries/sphinxbase { };
 

From 283164779b9671517cfa9155abf57492129c95ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 24 Aug 2012 23:42:33 -0400
Subject: [PATCH 009/857] openssl: Separate programs

---
 pkgs/development/libraries/openssl/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 60e59c2b159eb..bb78f5264b3bf 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -45,8 +45,8 @@ stdenv.mkDerivation {
 
   patches = patchesCross false;
 
-  # TODO: separate lib and bin.
-  outputs = [ "out" "man" ];
+  # TODO: separate lib.
+  outputs = [ "out" "man" "bin" ];
 
   buildNativeInputs = [ perl ];
 
@@ -66,6 +66,11 @@ stdenv.mkDerivation {
       if [ -n "$(echo $out/lib/*.so)" ]; then
           rm $out/lib/*.a
       fi
+
+      mkdir -p $bin
+      mv $out/bin $bin/
+
+      rm -rf $out/ssl/misc
     ''; # */
 
   crossAttrs = {

From c642f848389418bfab6b4de811364d0fe6cae005 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Aug 2012 21:19:26 -0400
Subject: [PATCH 010/857] stdenvMulti: Set the configure/install flags in the
 pre-hook

Flags like $(dev)/include don't always get expanded, e.g. leading to
incorrect pkgconfig files.  So set them in the pre-hook.
---
 pkgs/build-support/multiple-outputs.nix | 40 ++++++++++++++-----------
 1 file changed, 22 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index 2a582e681e9a5..ab7b65dd11305 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -6,30 +6,34 @@ with stdenv.lib;
 
 stdenv.mkDerivation (args // {
 
-  configureFlags =
-    optionals (elem "bin" outputs)
-      [ "--bindir=$(bin)/bin" "--mandir=$(bin)/share/man" ]
-    ++ optionals (elem "lib" outputs)
-      [ "--libdir=$(lib)/lib" ]
-    ++ optional (elem "dev" outputs)
-      "--includedir=$(dev)/include"
-    ++ [ (toString args.configureFlags or []) ];
-
-  installFlags =
-    optionals (elem "dev" outputs)
-      [ "pkgconfigdir=$(dev)/lib/pkgconfig" "m4datadir=$(dev)/share/aclocal" "aclocaldir=$(dev)/share/aclocal" ]
-    ++ [ (toString args.installFlags or []) ];
-
   #postPhases = [ "fixupOutputsPhase" ] ++ args.postPhases or [];
 
+  preHook =
+    ''
+      ${optionalString (elem "bin" outputs) ''
+        configureFlags="--bindir=$bin/bin --mandir=$bin/share/man $configureFlags"
+      ''}
+      ${optionalString (elem "lib" outputs) ''
+        configureFlags="--libdir=$lib/lib $configureFlags"
+      ''}
+      ${optionalString (elem "dev" outputs) ''
+        configureFlags="--includedir=$dev/include $configureFlags"
+        installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags"
+      ''}
+    '';
+
   preFixup =
     ''
       runHook preFixupOutputs
 
-      if [ -n "$doc" -a -e $out/share/doc ]; then
-        mkdir -p $doc/share/doc
-        mv $out/share/doc/* $doc/share/doc
-        rmdir $out/share/doc
+      if [ -n "$doc" ]; then
+        for i in share/doc share/gtk-doc; do
+          if [ -e $out/$i ]; then
+            mkdir -p $doc/$i
+            mv $out/$i/* $doc/$i/
+            rmdir $out/$i
+          fi
+        done
         rmdir --ignore-fail-on-non-empty $out/share
       fi
 

From 3d32657782a2971e29823027f01a2333166d834f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 25 Aug 2012 21:20:39 -0400
Subject: [PATCH 011/857] Split glib

In particular, moving the bin subdirectory to a separate output
ensures that the library proper no longer depends on Python and Perl.

The closure of PulseAudio is now down from 325 MiB to 155 MiB.
---
 pkgs/development/libraries/glib/2.30.x.nix | 11 +++++------
 pkgs/top-level/all-packages.nix            |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix
index 72baf0154d9f6..444259ef274a8 100644
--- a/pkgs/development/libraries/glib/2.30.x.nix
+++ b/pkgs/development/libraries/glib/2.30.x.nix
@@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
   };
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = [ pcre ]
-    ++ (if libiconvOrNull != null
-        then [ libiconvOrNull ]
-        else []);
+  buildInputs = [ pcre ] ++ stdenv.lib.optional (libiconvOrNull != null) libiconvOrNull;
 
   buildNativeInputs = [ perl pkgconfig gettext python ];
 
@@ -33,8 +34,6 @@ stdenv.mkDerivation rec {
 
   passthru.gioModuleDir = "lib/gio/modules";
 
-  postInstall = ''rm -rvf $out/share/gtk-doc'';
-
   meta = {
     description = "GLib, a C library of programming buildings blocks";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ce10d7101b07..4f63949580cc5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3791,7 +3791,9 @@ let
       gtkmm;
   };
 
-  glib = callPackage ../development/libraries/glib/2.30.x.nix { };
+  glib = callPackage ../development/libraries/glib/2.30.x.nix {
+    stdenv = stdenvMulti;
+  };
 
   glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
 

From 61129e1ee9a37d75f2f26c8eb5de1c984766a461 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 26 Aug 2012 22:53:19 -0400
Subject: [PATCH 012/857] Split some GTK/X11-related packages

The closure of the Pan newsreader is now down from 344 MiB to 195 MiB.
---
 pkgs/build-support/multiple-outputs.nix       |  7 ++--
 pkgs/development/libraries/atk/2.2.x.nix      |  6 ++--
 pkgs/development/libraries/cairo/default.nix  | 11 +++---
 .../libraries/freetype/default.nix            | 24 +++++++------
 .../libraries/gdk-pixbuf/2.24.x.nix           |  6 ++--
 pkgs/development/libraries/gmime/default.nix  |  6 ++--
 pkgs/development/libraries/gtk+/2.24.x.nix    |  8 ++---
 .../development/libraries/libtiff/default.nix |  8 +++--
 pkgs/development/libraries/pango/1.29.x.nix   |  6 ++--
 pkgs/misc/cups/default.nix                    |  5 ++-
 pkgs/os-specific/linux/util-linux/default.nix |  2 ++
 pkgs/servers/x11/xorg/builder.sh              |  6 +---
 pkgs/servers/x11/xorg/default.nix             | 36 ++++++++++++-------
 pkgs/top-level/all-packages.nix               | 36 ++++++++++++++-----
 14 files changed, 107 insertions(+), 60 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index ab7b65dd11305..79bd3fd80d417 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -2,13 +2,16 @@
 
 with stdenv.lib;
 
-{ outputs, ... } @ args:
+{ outputs ? [ "out" ], ... } @ args:
 
 stdenv.mkDerivation (args // {
 
   #postPhases = [ "fixupOutputsPhase" ] ++ args.postPhases or [];
 
   preHook =
+    optionalString (elem "man" outputs) ''
+      configureFlags="--mandir=$man/share/man $configureFlags"
+    '' +
     ''
       ${optionalString (elem "bin" outputs) ''
         configureFlags="--bindir=$bin/bin --mandir=$bin/share/man $configureFlags"
@@ -43,7 +46,7 @@ stdenv.mkDerivation (args // {
           echo "$propagatedBuildInputs" > "$dev/nix-support/propagated-build-inputs"
           propagatedBuildInputs=
         fi
-        echo "$out $lib $propagatedBuildNativeInputs" > "$dev/nix-support/propagated-build-native-inputs"
+        echo "$out $lib $bin $propagatedBuildNativeInputs" > "$dev/nix-support/propagated-build-native-inputs"
         propagatedBuildNativeInputs=
       elif [ -n "$out" ]; then
         propagatedBuildNativeInputs="$lib $propagatedBuildNativeInputs"
diff --git a/pkgs/development/libraries/atk/2.2.x.nix b/pkgs/development/libraries/atk/2.2.x.nix
index d0f7e10979532..715d8eb1ee239 100644
--- a/pkgs/development/libraries/atk/2.2.x.nix
+++ b/pkgs/development/libraries/atk/2.2.x.nix
@@ -8,12 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "17bkqg89l9hxbkgc76cxlin1bwczk7m6ikbccx677lrxh3kz08lb";
   };
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "doc" ];
+
   buildNativeInputs = [ pkgconfig perl ];
 
   propagatedBuildInputs = [ glib ];
 
-  postInstall = "rm -rf $out/share/gtk-doc";
-
   meta = {
     description = "ATK, the accessibility toolkit";
 
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index fe3fe1e251ca9..34c8b929f55aa 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -14,12 +14,16 @@ assert xcbSupport -> libxcb != null && xcbutil != null;
 
 stdenv.mkDerivation rec {
   name = "cairo-1.10.2";
-  
+
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
     sha1 = "ccce5ae03f99c505db97c286a0c9a90a926d3c6e";
   };
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   buildInputs =
     [ pkgconfig x11 fontconfig xlibs.libXrender ]
     ++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
@@ -32,7 +36,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optional gobjectSupport glib ++
     stdenv.lib.optional postscriptSupport zlib ++
     stdenv.lib.optional pngSupport libpng;
-    
+
   configureFlags =
     [ "--enable-tee" ]
     ++ stdenv.lib.optional xcbSupport "--enable-xcb"
@@ -45,9 +49,6 @@ stdenv.mkDerivation rec {
         -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
   '';
 
-  # The default `--disable-gtk-doc' is ignored.
-  postInstall = "rm -rf $out/share/gtk-doc";
-
   meta = {
     description = "A 2D graphics library with support for multiple output devices";
 
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index e53a3c297ff14..8d4e769060a03 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -5,15 +5,20 @@
   useEncumberedCode ? false
 }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "freetype-2.4.4";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/freetype/${name}.tar.bz2";
     sha256 = "1vqg93473j6jma1bxms7mczk32j8is0g9inkcmmmqdsdvk3q30jb";
   };
 
-  configureFlags = "--disable-static";
+  outputs = [ "dev" "out" ];
+
+  configureFlags = "--disable-static --bindir=$(dev)/bin";
+
+  # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
+  buildInputs = stdenv.lib.optional (stdenv.system == "i686-freebsd") gnumake;
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString useEncumberedCode
     "-DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1";
@@ -21,16 +26,15 @@ stdenv.mkDerivation (rec {
   # The asm for armel is written with the 'asm' keyword.
   CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
 
+  postInstall =
+    ''
+      mkdir $dev/lib
+      mv $out/lib/pkgconfig $dev/lib/
+    '';
+
   meta = {
     description = "A font rendering engine";
     homepage = http://www.freetype.org/;
     license = "GPLv2+"; # or the FreeType License (BSD + advertising clause)
   };
 }
-
-//
-
-# FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-(if stdenv.system == "i686-freebsd"
- then { buildInputs = [ gnumake ]; }
- else {}))
diff --git a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
index 5c0860196d396..80cc3f36f0063 100644
--- a/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/2.24.x.nix
@@ -9,6 +9,10 @@ stdenv.mkDerivation {
     sha256 = "1qdywh1r75lalb7z6s9pm6pmqx82chrrxqb8cdqi629nvc03yyns";
   };
 
+  outputs = [ "dev" "out" "bin" "doc" ];
+
+  enableParallelBuilding = true;
+
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
   buildInputs = [ libX11 ];
 
@@ -18,8 +22,6 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-libjasper --with-x11";
 
-  postInstall = "rm -rf $out/share/gtk-doc";
-
   meta = {
     description = "A library for image loading and manipulation";
 
diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 02145d08c2895..693a8b883404a 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "gmime-2.4.24";
-  
+
   src = fetchurl {
     url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz";
     sha256 = "2f538d68e215f075d16575a6da9acb87983db9e2df0d7d403858048881a0dd15";
   };
-  
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   buildInputs = [ pkgconfig glib zlib ];
 
   meta = {
diff --git a/pkgs/development/libraries/gtk+/2.24.x.nix b/pkgs/development/libraries/gtk+/2.24.x.nix
index 12b270d637b09..4b32c80df780e 100644
--- a/pkgs/development/libraries/gtk+/2.24.x.nix
+++ b/pkgs/development/libraries/gtk+/2.24.x.nix
@@ -21,10 +21,12 @@ stdenv.mkDerivation {
       ./old-icons.patch
     ];
 
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   enableParallelBuilding = true;
-  
+
   buildNativeInputs = [ perl pkgconfig ];
-  
+
   propagatedBuildInputs =
     [ xlibs.xlibs glib atk pango gdk_pixbuf cairo
       xlibs.libXrandr xlibs.libXrender xlibs.libXcomposite xlibs.libXi
@@ -34,8 +36,6 @@ stdenv.mkDerivation {
 
   configureFlags = "--with-xinput=yes";
 
-  postInstall = "rm -rf $out/share/gtk-doc";
-  
   meta = {
     description = "A multi-platform toolkit for creating graphical user interfaces";
 
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index d170c2fd23147..0657dc303698e 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "libtiff-3.9.4";
-  
+
   src = fetchurl {
     urls =
       [ ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz
@@ -10,7 +10,11 @@ stdenv.mkDerivation {
       ];
     sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7";
   };
-  
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
+  enableParallelBuilding = true;
+
   propagatedBuildInputs = [ zlib libjpeg ];
 
   meta = {
diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix
index 6c5d0f4cebcc2..af46998114c24 100644
--- a/pkgs/development/libraries/pango/1.29.x.nix
+++ b/pkgs/development/libraries/pango/1.29.x.nix
@@ -8,14 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
   };
 
+  enableParallelBuilding = true;
+
+  outputs = [ "dev" "out" "bin" "doc" ];
+
   buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;
 
   buildNativeInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ x11 glib cairo libpng ];
 
-  postInstall = "rm -rf $out/share/gtk-doc";
-
   meta = {
     description = "A library for laying out and rendering of text, with an emphasis on internationalization";
 
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index bf4e4d1d7e51b..9ba33b07b38d7 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
 , dbus, libusb, acl }:
 
-let
-  version = "1.5.2";
-in
+let version = "1.5.2"; in
+
 stdenv.mkDerivation {
   name = "cups-${version}";
 
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index ae5727568f2d7..75a117961f0ec 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1q5vjcvw4f067c63vj2n3xggvk5prm11571x6vnqiav47vdbqvni";
   };
 
+  outputs = [ "dev" "out" "bin" ];
+
   patches = [ ./linux-specific-header.patch ];
 
   crossAttrs = {
diff --git a/pkgs/servers/x11/xorg/builder.sh b/pkgs/servers/x11/xorg/builder.sh
index bb776a5051bd0..156f4e79e422f 100644
--- a/pkgs/servers/x11/xorg/builder.sh
+++ b/pkgs/servers/x11/xorg/builder.sh
@@ -9,7 +9,7 @@ postInstall() {
     if test -n "$origPostInstall"; then eval "$origPostInstall"; fi
 
     local r p requires
-    requires=$(grep "Requires:" $out/lib/pkgconfig/*.pc | \
+    requires=$(grep "Requires:" ${dev:-$out}/lib/pkgconfig/*.pc | \
         sed "s/Requires://" | sed "s/,/ /g")
 
     echo "propagating requisites $requires"
@@ -31,10 +31,6 @@ postInstall() {
             done
         fi
     done
-
-    mkdir -p "$out/nix-support"
-    echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-    echo "$propagatedBuildNativeInputs" > "$out/nix-support/propagated-build-native-inputs"
 }
 
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4fbc6fbdfda8f..3edc583254349 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -577,13 +577,14 @@ let
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
   })) // {inherit windowswmproto libX11 libXext xextproto ;};
     
-  libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
+  libX11 = (stdenvMulti.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
     name = "libX11-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/lib/libX11-1.4.1.tar.bz2;
       sha256 = "1qiwyqaf9vfn52nwp7nxlbixld3r9jyzsarnkwk0ynk4k3vy1x3h";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
   })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
     
@@ -597,13 +598,14 @@ let
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
   })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
     
-  libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
+  libXau = (stdenvMulti.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
     name = "libXau-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXau-1.0.6.tar.bz2;
       sha256 = "1z3h07wj2kg2hnzj4gd9pc3rkj4n0mfw6f9skg9w1hfwzrgl317f";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
@@ -617,13 +619,14 @@ let
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
   })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
     
-  libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
+  libXcomposite = (stdenvMulti.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
     name = "libXcomposite-0.4.3";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXcomposite-0.4.3.tar.bz2;
       sha256 = "1b8sniijb85v4my6v30ma9yqnwl4hkclci9l1hqxnipfyhl4sa9j";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
   })) // {inherit compositeproto libX11 libXfixes xproto ;};
     
@@ -647,33 +650,36 @@ let
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
   })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
     
-  libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
+  libXdmcp = (stdenvMulti.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
     name = "libXdmcp-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXdmcp-1.1.0.tar.bz2;
       sha256 = "0wh0q4ih9p3nsxsjjj9a3d03nhiyjggpl7gbavdzsfia36iyk85q";
     };
+    outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
     
-  libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
+  libXext = (stdenvMulti.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
     name = "libXext-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXext-1.2.0.tar.bz2;
       sha256 = "1xvgvrbg9lc812zi44hsyr461hiiwy05alckq847ki213qhkxvaa";
     };
+    outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig libX11 xextproto xproto ];
   })) // {inherit libX11 xextproto xproto ;};
     
-  libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
+  libXfixes = (stdenvMulti.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
     name = "libXfixes-4.0.5";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXfixes-4.0.5.tar.bz2;
       sha256 = "0x4drdxrslxf4vgcfyba0f0fbxg98c8x5dfrl7azakhf8qhd0v1f";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
   })) // {inherit fixesproto libX11 xextproto xproto ;};
     
@@ -687,33 +693,36 @@ let
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
     
-  libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
+  libXft = (stdenvMulti.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
     name = "libXft-2.2.0";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXft-2.2.0.tar.bz2;
       sha256 = "1cprbz7xnxkb7axblw8sdaw9ibkngmz60d0ypk1drhd0dpjmls68";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fontconfig freetype xproto libXrender ];
   })) // {inherit fontconfig freetype xproto libXrender ;};
     
-  libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
+  libXi = (stdenvMulti.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
     name = "libXi-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/lib/libXi-1.4.1.tar.bz2;
       sha256 = "19i92if8anv5pg2mwyy93jcllk1mgxx5gchi8zkjlk7r604ir7sr";
     };
+    outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto xproto ];
   })) // {inherit inputproto libX11 libXext xextproto xproto ;};
     
-  libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
+  libXinerama = (stdenvMulti.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
     name = "libXinerama-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXinerama-1.1.1.tar.bz2;
       sha256 = "17vpsscracg1hza0avrczm9fc7xx3229qhicy101mw6cx2hb9qmv";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
   })) // {inherit libX11 libXext xextproto xineramaproto ;};
     
@@ -747,23 +756,25 @@ let
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
   })) // {inherit libX11 libXext xextproto xproto libXt ;};
     
-  libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
+  libXrandr = (stdenvMulti.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
     name = "libXrandr-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXrandr-1.3.1.tar.bz2;
       sha256 = "0qf6aywqk2mgd5hw0nr24xxp5k015aa11sax5yycn14wch4agfv2";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
   })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
     
-  libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
+  libXrender = (stdenvMulti.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
     name = "libXrender-0.9.6";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libXrender-0.9.6.tar.bz2;
       sha256 = "0s567qgys8m6782lbrpvpscm8fkk2jm2717g7s3hm7hhcgib2n3z";
     };
+    outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig renderproto libX11 xproto ];
   })) // {inherit renderproto libX11 xproto ;};
     
@@ -887,13 +898,14 @@ let
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
     
-  libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
+  libxcb = (stdenvMulti.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
     name = "libxcb-1.7";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.6/src/everything/libxcb-1.7.tar.bz2;
       sha256 = "1pr40wa3i1f0iwx83c8alcycy9sfzd2y1qlc63kr8q56w8sxqxp7";
     };
+    outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
     
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f63949580cc5..34bdb2ba54218 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3516,7 +3516,9 @@ let
 
   freeglut = callPackage ../development/libraries/freeglut { };
 
-  freetype = callPackage ../development/libraries/freetype { };
+  freetype = callPackage ../development/libraries/freetype {
+    stdenv = stdenvMulti;
+  };
 
   fribidi = callPackage ../development/libraries/fribidi { };
 
@@ -3681,7 +3683,9 @@ let
 
   glpk = callPackage ../development/libraries/glpk { };
 
-  gmime = callPackage ../development/libraries/gmime { };
+  gmime = callPackage ../development/libraries/gmime {
+    stdenv = stdenvMulti;
+  };
 
   gmm = callPackage ../development/libraries/gmm { };
 
@@ -3799,19 +3803,29 @@ let
 
   glib_networking = callPackage ../development/libraries/glib-networking {};
 
-  atk = callPackage ../development/libraries/atk/2.2.x.nix { };
+  atk = callPackage ../development/libraries/atk/2.2.x.nix {
+    stdenv = stdenvMulti;
+  };
 
   atkmm = callPackage ../development/libraries/atkmm/2.22.x.nix { };
 
-  cairo = callPackage ../development/libraries/cairo { };
+  cairo = callPackage ../development/libraries/cairo {
+    stdenv = stdenvMulti;
+  };
 
-  pango = callPackage ../development/libraries/pango/1.29.x.nix { };
+  pango = callPackage ../development/libraries/pango/1.29.x.nix {
+    stdenv = stdenvMulti;
+  };
 
   pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix { };
 
-  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix { };
+  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf/2.24.x.nix {
+    stdenv = stdenvMulti;
+  };
 
-  gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix { };
+  gtk2 = callPackage ../development/libraries/gtk+/2.24.x.nix {
+    stdenv = stdenvMulti;
+  };
 
   gtk = pkgs.gtk2;
 
@@ -4297,7 +4311,9 @@ let
 
   libtheora = callPackage ../development/libraries/libtheora { };
 
-  libtiff = callPackage ../development/libraries/libtiff { };
+  libtiff = callPackage ../development/libraries/libtiff {
+    stdenv = stdenvMulti;
+  };
 
   libtiger = callPackage ../development/libraries/libtiger { };
 
@@ -5432,7 +5448,7 @@ let
   xinetd = callPackage ../servers/xinetd { };
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
-    inherit fetchurl fetchsvn stdenv pkgconfig freetype fontconfig
+    inherit fetchurl fetchsvn stdenv stdenvMulti pkgconfig freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa
       xkeyboard_config dbus libuuid openssl gperf m4
       autoconf libtool xmlto asciidoc udev flex bison python;
@@ -6174,10 +6190,12 @@ let
   utillinux = lowPrio (callPackage ../os-specific/linux/util-linux {
     ncurses = null;
     perl = null;
+    stdenv = stdenvMulti;
   });
 
   utillinuxCurses = utillinux.override {
     inherit ncurses perl;
+    stdenv = stdenvMulti;
   };
 
   v4l_utils = callPackage ../os-specific/linux/v4l-utils {

From a5fb18473e4178221e6a7a2264308678bd8234e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 12:39:32 +0200
Subject: [PATCH 013/857] openssl: Fix removal of the ssl/misc scripts

This drops the dependency of $out on Perl.
---
 pkgs/development/libraries/openssl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 7aabceacd9664..148856cc7d72e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -77,7 +77,7 @@ stdenv.mkDerivation {
       mkdir -p $bin
       mv $out/bin $bin/
 
-      rm -rf $out/ssl/misc
+      rm -rf $out/etc/ssl/misc
     ''; # */
 
   crossAttrs = {

From 32d02132c2d12b6ac75b61d001c7b48241fe2d2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 13:26:27 +0200
Subject: [PATCH 014/857] libxcb: Put docs/manpages in separate outputs

---
 pkgs/servers/x11/xorg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index cb7ecf9ed16be..1d8ff6d19a841 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -905,7 +905,7 @@ let
       url = mirror://xorg/individual/xcb/libxcb-1.9.tar.bz2;
       sha256 = "15icn78x610dvvgnji6b3pyn8nd88lz68hq0w73pcadf78mycmw8";
     };
-    outputs = [ "dev" "out" "doc" ];
+    outputs = [ "dev" "out" "doc" "man" ];
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
     

From 1a0e87b19fd8bc720d5505ffc171e3941aaa9dd4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 13:26:46 +0200
Subject: [PATCH 015/857] pam: Split off the PAM modules

Clients of PAM can find the modules via /etc/pam.d.
---
 pkgs/os-specific/linux/pam/default.nix | 9 +++++++++
 pkgs/top-level/all-packages.nix        | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 43300425c004a..5545b5c16d694 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -8,10 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "1hlz2kqvbjisvwyicdincq7nz897b9rrafyzccwzqiqg53b8gf5s";
   };
 
+  outputs = [ "out" "doc" "man" "modules" ];
+
   nativeBuildInputs = [ flex ];
 
   buildInputs = [ cracklib ];
 
+  enableParallelBuilding = true;
+
   crossAttrs = {
     propagatedBuildInputs = [ flex.crossDrv cracklib.crossDrv ];
     preConfigure = preConfigure + ''
@@ -30,6 +34,11 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mv -v $out/sbin/unix_chkpwd{,.orig}
     ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
+
+    rm -rf $out/etc
+
+    mkdir -p $modules/lib
+    mv $out/lib/security $modules/lib/
   '';
 
   preConfigure = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85a95e3ba880b..e6d6f3901ecba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6393,7 +6393,9 @@ let
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
 
-  pam = callPackage ../os-specific/linux/pam { };
+  pam = callPackage ../os-specific/linux/pam {
+    stdenv = stdenvMulti;
+  };
 
   # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
 

From cb3fc2c9022d8763e709d4918a3f9f2676c99e58 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 13:41:33 +0200
Subject: [PATCH 016/857] libjpeg, jasper: Split into multiple outputs

---
 pkgs/development/libraries/jasper/default.nix  | 6 +++++-
 pkgs/development/libraries/libjpeg/default.nix | 8 +++++---
 pkgs/top-level/all-packages.nix                | 8 ++++++--
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 4046c05f79e52..f6777dc3bb9c4 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -12,7 +12,11 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libjpeg ];
 
   configureFlags = "--enable-shared";
-  
+
+  outputs = [ "dev" "out" "man" "bin" ];
+
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.ece.uvic.ca/~mdadams/jasper/;
     description = "JasPer JPEG2000 Library";
diff --git a/pkgs/development/libraries/libjpeg/default.nix b/pkgs/development/libraries/libjpeg/default.nix
index 63d698dda18f9..166f399dc2512 100644
--- a/pkgs/development/libraries/libjpeg/default.nix
+++ b/pkgs/development/libraries/libjpeg/default.nix
@@ -1,13 +1,15 @@
-{ stdenv, fetchurl }: 
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "libjpeg-8d";
-  
+
   src = fetchurl {
     url = http://www.ijg.org/files/jpegsrc.v8d.tar.gz;
     sha256 = "1cz0dy05mgxqdgjf52p54yxpyy95rgl30cnazdrfmw7hfca9n0h0";
   };
-  
+
+  outputs = [ "dev" "out" "man" "bin" ];
+
   meta = {
     homepage = http://www.ijg.org/;
     description = "A library that implements the JPEG image file format";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6d6f3901ecba..4b3d47a9ed57d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4217,7 +4217,9 @@ let
     inherit mesa SDL SDL_image SDL_mixer;
   };
 
-  jasper = callPackage ../development/libraries/jasper { };
+  jasper = callPackage ../development/libraries/jasper {
+    stdenv = stdenvMulti;
+  };
 
   jama = callPackage ../development/libraries/jama { };
 
@@ -4513,7 +4515,9 @@ let
 
   libiptcdata = callPackage ../development/libraries/libiptcdata { };
 
-  libjpeg = callPackage ../development/libraries/libjpeg { };
+  libjpeg = callPackage ../development/libraries/libjpeg {
+    stdenv = stdenvMulti;
+  };
 
   libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
 

From 39dc112bc13126cd0ff28a5e83d158bdd7c0e4e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 13:54:16 +0200
Subject: [PATCH 017/857] multiple-outputs.nix: Allow not setting configure
 flags

Not everything is Autoconf...
---
 pkgs/build-support/multiple-outputs.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index 5d9dab76968a5..e72bc7fd3dbf5 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -2,28 +2,28 @@
 
 with stdenv.lib;
 
-{ outputs ? [ "out" ], ... } @ args:
+{ outputs ? [ "out" ], setOutputConfigureFlags ? true, ... } @ args:
 
 stdenv.mkDerivation (args // {
 
   #postPhases = [ "fixupOutputsPhase" ] ++ args.postPhases or [];
 
   preHook =
-    optionalString (elem "man" outputs) ''
-      configureFlags="--mandir=$man/share/man $configureFlags"
-    '' +
-    ''
-      ${optionalString (elem "bin" outputs) ''
+    if setOutputConfigureFlags then
+      optionalString (elem "man" outputs) ''
+        configureFlags="--mandir=$man/share/man $configureFlags"
+      '' +
+      optionalString (elem "bin" outputs) ''
         configureFlags="--bindir=$bin/bin --mandir=$bin/share/man $configureFlags"
-      ''}
-      ${optionalString (elem "lib" outputs) ''
+      '' +
+      optionalString (elem "lib" outputs) ''
         configureFlags="--libdir=$lib/lib $configureFlags"
-      ''}
-      ${optionalString (elem "dev" outputs) ''
+      '' +
+      optionalString (elem "dev" outputs) ''
         configureFlags="--includedir=$dev/include $configureFlags"
         installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags"
-      ''}
-    '';
+      ''
+    else null;
 
   preFixup =
     ''

From 2c9fa335218e34a12fdb92d58f58975fd83e5b60 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 14:28:49 +0200
Subject: [PATCH 018/857] openssl: Split header files from the libraries

---
 pkgs/development/libraries/openssl/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                | 1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 148856cc7d72e..8ba7e41425b89 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -46,8 +46,9 @@ stdenv.mkDerivation {
 
   patches = patchesCross false;
 
-  # TODO: separate lib.
-  outputs = [ "out" "man" "bin" ];
+  outputs = [ "dev" "out" "man" "bin" ];
+
+  setOutputConfigureFlags = false;
 
   buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
@@ -78,6 +79,9 @@ stdenv.mkDerivation {
       mv $out/bin $bin/
 
       rm -rf $out/etc/ssl/misc
+
+      mkdir $dev
+      mv $out/include $dev/
     ''; # */
 
   crossAttrs = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4b3d47a9ed57d..b1993376fc409 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4941,6 +4941,7 @@ let
   openscenegraph = callPackage ../development/libraries/openscenegraph {};
 
   openssl = callPackage ../development/libraries/openssl {
+    stdenv = stdenvMulti;
     fetchurl = fetchurlBoot;
     cryptodevHeaders = linuxPackages.cryptodev.override {
       fetchurl = fetchurlBoot;

From 5787ac63649e4e3f11b70f44fa66c7b304956c86 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 14:52:36 +0200
Subject: [PATCH 019/857] cups: Split into multiple outputs

However, splitting off the client library from the server-side stuff
still remains to be done.
---
 pkgs/misc/cups/default.nix      | 9 +++++++++
 pkgs/top-level/all-packages.nix | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 6cc13aa3013a0..d479e6e697185 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation {
     md5 = "de3006e5cf1ee78a9c6145ce62c4e982";
   };
 
+  # FIXME: Split off the cups client library.
+  outputs = [ "dev" "out" "doc" "man" ];
+
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
     ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus acl ] ;
 
@@ -38,6 +41,12 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
+  postInstall =
+    ''
+      mkdir $dev/bin
+      mv $out/bin/cups-config $dev/bin/
+    '';
+
   meta = {
     homepage = "http://www.cups.org/";
     description = "A standards-based printing system for UNIX";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1993376fc409..153504507c2e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9185,7 +9185,9 @@ let
 
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 
-  cups = callPackage ../misc/cups { };
+  cups = callPackage ../misc/cups {
+    stdenv = stdenvMulti;
+  };
 
   cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };
 

From afebababacee7b75f7a13e3438d8583936569ba9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 15:28:30 +0200
Subject: [PATCH 020/857] pcre: Split into multiple outputs

---
 pkgs/development/libraries/pcre/default.nix | 8 ++++++++
 pkgs/stdenv/linux/default.nix               | 4 ++--
 pkgs/top-level/all-packages.nix             | 1 +
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index e59c249348a82..d7d13c6de4c91 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c";
   };
 
+  outputs = [ "dev" "out" "bin" "doc" "man" ];
+
   # The compiler on Darwin crashes with an internal error while building the
   # C++ interface. Disabling optimizations on that platform remedies the
   # problem. In case we ever update the Darwin GCC version, the exception for
@@ -19,6 +21,12 @@ stdenv.mkDerivation rec {
 
   doCheck = !stdenv.isCygwin;                   # XXX: test failure on Cygwin
 
+  postInstall =
+    ''
+      mkdir $dev/bin
+      mv $bin/bin/pcre-config $dev/bin/
+    '';
+
   meta = {
     homepage = "http://www.pcre.org/";
     description = "A library for Perl Compatible Regular Expressions";
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 84af23a263cd1..44f5ff6ab309b 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -286,7 +286,7 @@ rec {
     extraAttrs = {
       inherit (stdenvLinuxBoot3Pkgs) glibc;
       inherit platform bootstrapTools;
-      shellPackage = stdenvLinuxBoot4Pkgs.bash; 
+      shellPackage = stdenvLinuxBoot4Pkgs.bash;
     };
 
     overrides = pkgs: {
@@ -295,7 +295,7 @@ rec {
       inherit (stdenvLinuxBoot4Pkgs)
         gzip bzip2 xz bash coreutils diffutils findutils gawk
         gnumake gnused gnutar gnugrep gnupatch patchelf
-        attr acl;
+        attr acl pcre;
     };
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 153504507c2e0..d9475684a25e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4960,6 +4960,7 @@ let
   };
 
   pcre = callPackage ../development/libraries/pcre {
+    stdenv = stdenvMulti;
     unicodeSupport = config.pcre.unicode or true;
   };
 

From baba3cbb0af2df51921abe4f329af4ab133654b2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 15:50:21 +0200
Subject: [PATCH 021/857] Remove tabs

---
 .../libraries/glibc/2.17/builder.sh           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.17/builder.sh b/pkgs/development/libraries/glibc/2.17/builder.sh
index e68e13f9beca2..b01977a33dec4 100644
--- a/pkgs/development/libraries/glibc/2.17/builder.sh
+++ b/pkgs/development/libraries/glibc/2.17/builder.sh
@@ -19,7 +19,7 @@ postInstall() {
     if test -n "$installLocales"; then
         make -j${NIX_BUILD_CORES:-1} -l${NIX_BUILD_CORES:-1} localedata/install-locales
     fi
-    
+
     test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
 
     # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been
@@ -27,19 +27,19 @@ postInstall() {
     if test -z "$hurdHeaders"; then
         # Include the Linux kernel headers in Glibc, except the `scsi'
         # subdirectory, which Glibc provides itself.
-	(cd $out/include && \
-	 ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
+        (cd $out/include && \
+         ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
     fi
 
     if test -f "$out/lib/libhurduser.so"; then
-	# libc.so, libhurduser.so, and libmachuser.so depend on each
-	# other, so add them to libc.so (a RUNPATH on libc.so.0.3
-	# would be ignored by the cross-linker.)
-	echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..."
-	sed -i "$out/lib/libc.so" \
-	    -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g"
+        # libc.so, libhurduser.so, and libmachuser.so depend on each
+        # other, so add them to libc.so (a RUNPATH on libc.so.0.3
+        # would be ignored by the cross-linker.)
+        echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..."
+        sed -i "$out/lib/libc.so" \
+            -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g"
     fi
-	
+
     # Fix for NIXOS-54 (ldd not working on x86_64).  Make a symlink
     # "lib64" to "lib".
     if test -n "$is64bit"; then

From b9049bff6dae594faf5dff17b21587532693848b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 18:02:07 +0200
Subject: [PATCH 022/857] perl: Split off the manpages (7 MiB)

---
 pkgs/build-support/multiple-outputs.nix       | 31 ++++++++++++++++---
 .../interpreters/perl/5.16/default.nix        |  6 +++-
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index e72bc7fd3dbf5..edf24a12511ef 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (args // {
         configureFlags="--mandir=$man/share/man $configureFlags"
       '' +
       optionalString (elem "bin" outputs) ''
-        configureFlags="--bindir=$bin/bin --mandir=$bin/share/man $configureFlags"
+        configureFlags="--bindir=$bin/bin --sbindir=$bin/sbin --mandir=$bin/share/man $configureFlags"
       '' +
       optionalString (elem "lib" outputs) ''
         configureFlags="--libdir=$lib/lib $configureFlags"
@@ -52,10 +52,31 @@ stdenv.mkDerivation (args // {
         propagatedNativeBuildInputs="$lib $propagatedNativeBuildsInputs"
       fi
 
-      for i in $bin $lib; do
-        prefix="$i" stripDirs "lib lib64 libexec bin sbin" "''${stripDebugFlags:--S}"
-        prefix="$i" patchELF
-        patchShebangs "$i"
+      for i in $bin $lib $man $static; do
+        if [ -z "$dontStrip" ]; then
+          prefix="$i" stripDirs "lib lib64 libexec bin sbin" "''${stripDebugFlags:--S}"
+        fi
+        if [ "$havePatchELF" = 1 -a -z "$dontPatchELF" ]; then
+          prefix="$i" patchELF
+        fi
+        if [ -z "$dontPatchShebangs" ]; then
+          patchShebangs "$i"
+        fi
+
+        # Cut&paste...
+        if [ -z "$dontGzipMan" ]; then
+            GLOBIGNORE=.:..:*.gz:*.bz2
+            for f in $i/share/man/*/* $i/share/man/*/*/*; do
+                if [ -f $f ]; then
+                    if gzip -c $f > $f.gz; then
+                        rm $f
+                    else
+                        rm $f.gz
+                    fi
+                fi
+            done
+            unset GLOBIGNORE
+        fi
       done
 
       runHook postFixupOutputs
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 288de63b4ae8d..f53641c4137a4 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
     sha256 = "03nh8bqnjsdd5izjv3n2yfcxw4ck0llwww36jpbjbjgixwpqpy4f";
   };
 
+  outputs = [ "out" "man" ];
+
+  setOutputConfigureFlags = false;
+
   patches =
     [ # Do not look in /usr etc. for dependencies.
       ./no-sys-dirs.patch
@@ -44,7 +48,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     ''
-      configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
+      configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$man/share/man/man1 -Dman3dir=$man/share/man/man3"
 
       ${stdenv.lib.optionalString stdenv.isArm ''
         configureFlagsArray=(-Dldflags="-lm -lrt")
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d9475684a25e0..cc7477950f6e0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2969,6 +2969,7 @@ let
   perl514 = callPackage ../development/interpreters/perl/5.14 { };
 
   perl516 = callPackage ../development/interpreters/perl/5.16 {
+    stdenv = stdenvMulti;
     fetchurl = fetchurlBoot;
   };
 

From d8231a66ebb199fd5a1876ee0a9b3e3bf64dafc0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 18:39:23 +0200
Subject: [PATCH 023/857] glibc: Split into multiple outputs

This reduces the size of closures a lot by getting rid of Glibc's
header files, static libraries and utilities.  For instance, the
closure of GNU Hello went from 41 MiB to 22 MiB.

TODO: We may want to merge back in parts of Glibc that we previously
split off (such as the info files).
---
 pkgs/build-support/gcc-wrapper/builder.sh       |  5 +++--
 pkgs/build-support/gcc-wrapper/default.nix      |  2 ++
 pkgs/build-support/gcc-wrapper/setup-hook.sh    |  2 +-
 .../development/libraries/glibc/2.17/builder.sh | 17 +++++++++++++++--
 .../libraries/glibc/2.17/default.nix            |  4 +++-
 pkgs/development/libraries/libelf/default.nix   | 16 ++++++----------
 pkgs/stdenv/linux/default.nix                   |  2 +-
 pkgs/top-level/all-packages.nix                 |  1 +
 8 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index ed7ad0a50b735..c15fd1da9c034 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -24,7 +24,7 @@ if test -z "$nativeLibc"; then
     # compile, because it uses "#include_next <limits.h>" to find the
     # limits.h file in ../includes-fixed. To remedy the problem,
     # another -idirafter is necessary to add that directory again.
-    echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
+    echo "-B$libc/lib/ -idirafter $libc_dev/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
 
     echo "-L$libc/lib" > $out/nix-support/libc-ldflags
 
@@ -85,6 +85,7 @@ doSubstitute() {
         -e "s^@binutils@^$binutils^g" \
         -e "s^@coreutils@^$coreutils^g" \
         -e "s^@libc@^$libc^g" \
+        -e "s^@libc_bin@^$libc_bin^g" \
         -e "s^@ld@^$ldPath/ld^g" \
         < "$src" > "$dst" 
 }
@@ -191,5 +192,5 @@ cp -p $utils $out/nix-support/utils.sh
 # tools like gcov, the manpages, etc. as well (including for binutils
 # and Glibc).
 if test -z "$nativeTools"; then
-    echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages
+    echo $gcc $binutils $libc $libc_bin > $out/nix-support/propagated-user-env-packages
 fi
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 992c0f9af371a..82167cddf2e36 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation {
   
   inherit nativeTools nativeLibc nativePrefix gcc;
   libc = if nativeLibc then null else libc;
+  libc_dev = if nativeLibc then null else libc.dev or libc;
+  libc_bin = if nativeLibc then null else libc.bin or libc;
   binutils = if nativeTools then null else binutils;
   # The wrapper scripts use 'cat', so we may need coreutils
   coreutils = if nativeTools then null else coreutils;
diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh
index 513ab8053a7e9..26a722bac9bb2 100644
--- a/pkgs/build-support/gcc-wrapper/setup-hook.sh
+++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh
@@ -25,7 +25,7 @@ if test -n "@binutils@"; then
 fi
 
 if test -n "@libc@"; then
-    addToSearchPath PATH @libc@/bin
+    addToSearchPath PATH @libc_bin@/bin
 fi
 
 if test -n "@coreutils@"; then
diff --git a/pkgs/development/libraries/glibc/2.17/builder.sh b/pkgs/development/libraries/glibc/2.17/builder.sh
index b01977a33dec4..f9e491868ef33 100644
--- a/pkgs/development/libraries/glibc/2.17/builder.sh
+++ b/pkgs/development/libraries/glibc/2.17/builder.sh
@@ -12,8 +12,10 @@ postConfigure() {
 
     export NIX_DONT_SET_RPATH=1
     unset CFLAGS
-}
 
+    # Apparently --bindir is not respected.
+    makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
+}
 
 postInstall() {
     if test -n "$installLocales"; then
@@ -27,7 +29,7 @@ postInstall() {
     if test -z "$hurdHeaders"; then
         # Include the Linux kernel headers in Glibc, except the `scsi'
         # subdirectory, which Glibc provides itself.
-        (cd $out/include && \
+        (cd $dev/include && \
          ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
     fi
 
@@ -49,6 +51,17 @@ postInstall() {
     # This file, that should not remain in the glibc derivation,
     # may have not been created during the preInstall
     rm -f $out/lib/libgcc_s.so.1
+
+    # Put libraries for static linking in a separate output.  Note
+    # that libc_nonshared.a and libpthread_nonshared.a are required
+    # for dynamically-linked applications.
+    mkdir -p $static/lib
+    mv $out/lib/*.a $static/lib
+    mv $static/lib/lib*_nonshared.a $out/lib
+
+    # Work around a Nix bug: hard links across outputs cause a build failure.
+    cp $bin/bin/getconf $bin/bin/getconf_
+    mv $bin/bin/getconf_ $bin/bin/getconf
 }
 
 genericBuild
diff --git a/pkgs/development/libraries/glibc/2.17/default.nix b/pkgs/development/libraries/glibc/2.17/default.nix
index b6d91c932db8b..da2ddc7a7971a 100644
--- a/pkgs/development/libraries/glibc/2.17/default.nix
+++ b/pkgs/development/libraries/glibc/2.17/default.nix
@@ -23,6 +23,8 @@ in
 
     builder = ./builder.sh;
 
+    outputs = [ "out" "dev" "bin" "static" ];
+
     # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
     # any program we run, because the gcc will have been placed at a new
     # store path than that determined when built (as a source for the
@@ -93,7 +95,7 @@ in
 
       # To avoid a dependency on the build system 'bash'.
       preFixup = ''
-        rm $out/bin/{ldd,tzselect,catchsegv,xtrace}
+        rm $bin/bin/{ldd,tzselect,catchsegv,xtrace}
       '';
     }
    else {}))
diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix
index 40eb2a10faf53..b37bf593c033d 100644
--- a/pkgs/development/libraries/libelf/default.nix
+++ b/pkgs/development/libraries/libelf/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, gettext }:
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libelf-0.8.13";
 
   src = fetchurl {
@@ -10,6 +10,11 @@ stdenv.mkDerivation (rec {
 
   doCheck = true;
 
+  # Libelf's custom NLS macros fail to determine the catalog file extension on
+  # Darwin, so disable NLS for now.
+  # FIXME: Eventually make Gettext a build input on all platforms.
+  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-nls";
+
   meta = {
     description = "Libelf, an ELF object file access library";
 
@@ -21,12 +26,3 @@ stdenv.mkDerivation (rec {
     maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
-
-//
-
-# Libelf's custom NLS macros fail to determine the catalog file extension on
-# Darwin, so disable NLS for now.
-# FIXME: Eventually make Gettext a build input on all platforms.
-(if stdenv.isDarwin
- then { configureFlags = [ "--disable-nls" ]; }
- else { }))
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 44f5ff6ab309b..a20adb6aba2f7 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -7,7 +7,7 @@
 # The function defaults are for easy testing.
 { system ? builtins.currentSystem
 , allPackages ? import ../../top-level/all-packages.nix
-, platform ? null, config }:
+, platform ? null, config ? {} }:
 
 rec {
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cc7477950f6e0..0bbb81745a46b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3902,6 +3902,7 @@ let
       }));
 
   glibc217 = callPackage ../development/libraries/glibc/2.17 {
+    stdenv = stdenvMulti;
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
     machHeaders = null;

From 85bdb463708b93453dac9baac88171649d91ce88 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 21:00:13 +0200
Subject: [PATCH 024/857] gcc: Fix building against the split Glibc

---
 pkgs/development/compilers/gcc/4.6/builder.sh  | 5 ++---
 pkgs/development/compilers/gcc/4.6/default.nix | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh
index bdf15be5a996d..e3f185296a058 100644
--- a/pkgs/development/compilers/gcc/4.6/builder.sh
+++ b/pkgs/development/compilers/gcc/4.6/builder.sh
@@ -29,7 +29,7 @@ if test "$noSysDirs" = "1"; then
         # Use *real* header files, otherwise a limits.h is generated
         # that does not include Glibc's limits.h (notably missing
         # SSIZE_MAX, which breaks the build).
-        export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
+        export NIX_FIXINC_DUMMY=$libc_dev/include
 
         # The path to the Glibc binaries such as `crti.o'.
         glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"
@@ -170,9 +170,8 @@ preConfigure() {
         # Patch the configure script so it finds glibc headers.  It's
         # important for example in order not to get libssp built,
         # because its functionality is in glibc already.
-        glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
         sed -i \
-            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
+            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$libc_dev/include", \
             gcc/configure
     fi
 
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 6713dd12b3cdb..af6e9ab0ee191 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -175,7 +175,7 @@ let version = "4.6.3";
       "-stage-final";
     crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
+    bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
 
 in
 
@@ -187,13 +187,15 @@ stdenv.mkDerivation ({
 
   builder = ./builder.sh;
 
-  src = (import ./sources.nix) {
+  srcs = (import ./sources.nix) {
     inherit fetchurl optional version;
     inherit langC langCC langFortran langJava langAda langGo;
   };
 
   inherit patches enableMultilib;
 
+  libc_dev = stdenv.gcc.libc_dev;
+
   postPatch =
     if (stdenv.isGNU
         || (libcCross != null                  # e.g., building `gcc.crossDrv'

From 42c2be4c30b275a91f6be49755bb1bbe9bd98a0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 11 Jun 2013 21:55:37 +0200
Subject: [PATCH 025/857] gcc: Get rid of a unnecessary reference to glibc-dev

---
 pkgs/development/compilers/gcc/4.6/builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh
index e3f185296a058..19dfb9c1bae67 100644
--- a/pkgs/development/compilers/gcc/4.6/builder.sh
+++ b/pkgs/development/compilers/gcc/4.6/builder.sh
@@ -224,7 +224,7 @@ postInstall() {
     done
 
     # Get rid of some "fixed" header files
-    rm -rf $out/lib/gcc/*/*/include/root
+    rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux}
 
     # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
     for i in $out/bin/*-gcc*; do

From c3cbe0452a8ce4d909a8325a5abaa404a21f53f5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 14:59:39 +0200
Subject: [PATCH 026/857] patchelf: Enable "make check"

---
 pkgs/development/tools/misc/patchelf/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 857aa1cabcf95..65edd1a518710 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "fc7e7fa95f282fc37a591a802629e0e1ed07bc2a8bf162228d9a69dd76127c01";
   };
 
+  doCheck = true;
+
   meta = {
     homepage = http://nixos.org/patchelf.html;
     license = "GPL";

From 2cfeca153cd9418d91c301e182caee1d3f6262e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 16:10:54 +0200
Subject: [PATCH 027/857] openssl, cups: Fix stripping libraries

---
 pkgs/development/libraries/openssl/default.nix | 12 ++++--------
 pkgs/misc/cups/default.nix                     |  2 ++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 8ba7e41425b89..6a3beee80de4b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -82,6 +82,10 @@ stdenv.mkDerivation {
 
       mkdir $dev
       mv $out/include $dev/
+
+      # OpenSSL installs readonly files, which otherwise we can't strip.
+      # FIXME: Can remove this after the next stdenv merge.
+      chmod -R +w $out
     ''; # */
 
   crossAttrs = {
@@ -92,14 +96,6 @@ stdenv.mkDerivation {
       export configureFlags="--libdir=lib --cross-compile-prefix=${stdenv.cross.config}- shared ${opensslCrossSystem}"
     '';
 
-    postInstall = ''
-      # Openssl installs readonly files, which otherwise we can't strip.
-      # This could at some stdenv hash change be put out of crossAttrs, too
-      chmod -R +w $out
-
-      # Remove references to perl, to avoid depending on it at runtime
-      rm $out/bin/c_rehash $out/ssl/misc/CA.pl $out/ssl/misc/tsget
-    '';
     configureScript = "./Configure";
   };
 
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index d479e6e697185..be442fd22a614 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -45,6 +45,8 @@ stdenv.mkDerivation {
     ''
       mkdir $dev/bin
       mv $out/bin/cups-config $dev/bin/
+
+      chmod -R +w $out
     '';
 
   meta = {

From dbe432e6f4502fc7b4e290d1b3356083bd93b099 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 16:11:14 +0200
Subject: [PATCH 028/857] gcc: Put runtime libraries in a separate output

GCC provides a number of libraries that are used by programs built by
GCC, in particular libgcc_s.so and libstdc++.so.  This caused programs
that used these libraries to have a runtime dependency on all of GCC
(~77 MiB).  Now they only depend on the "lib" output of GCC (~1.6
MiB).

With this and previous multiple-output improvements, closure sizes are
reduced a lot:

hello:       41 MiB -> 22 MiB
patchelf:   118 MiB -> 23 MiB
pan:        364 MiB -> 90 MiB
---
 pkgs/build-support/gcc-wrapper/builder.sh      |  4 ++--
 pkgs/build-support/gcc-wrapper/default.nix     |  1 +
 pkgs/development/compilers/gcc/4.6/builder.sh  | 18 ++++++++++++------
 pkgs/development/compilers/gcc/4.6/default.nix |  4 ++++
 pkgs/stdenv/linux/default.nix                  |  6 +++---
 pkgs/top-level/all-packages.nix                |  1 +
 6 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper/builder.sh b/pkgs/build-support/gcc-wrapper/builder.sh
index c15fd1da9c034..b499aa612f8c5 100644
--- a/pkgs/build-support/gcc-wrapper/builder.sh
+++ b/pkgs/build-support/gcc-wrapper/builder.sh
@@ -39,9 +39,9 @@ if test -n "$nativeTools"; then
     ldPath="$nativePrefix/bin"
 else
     if test -e "$gcc/lib64"; then
-        gccLDFlags="$gccLDFlags -L$gcc/lib64"
+        gccLDFlags="$gccLDFlags -L$gcc_lib/lib64"
     fi
-    gccLDFlags="$gccLDFlags -L$gcc/lib"
+    gccLDFlags="$gccLDFlags -L$gcc_lib/lib"
     if [ -n "$langVhdl" ]; then
         gccLDFlags="$gccLDFlags -L$zlib/lib"
     fi
diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix
index 82167cddf2e36..d4ba45b26f4a3 100644
--- a/pkgs/build-support/gcc-wrapper/default.nix
+++ b/pkgs/build-support/gcc-wrapper/default.nix
@@ -40,6 +40,7 @@ stdenv.mkDerivation {
   addFlags = ./add-flags;
   
   inherit nativeTools nativeLibc nativePrefix gcc;
+  gcc_lib = gcc.lib or gcc;
   libc = if nativeLibc then null else libc;
   libc_dev = if nativeLibc then null else libc.dev or libc;
   libc_bin = if nativeLibc then null else libc.bin or libc;
diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh
index 19dfb9c1bae67..e207b21f4a8c5 100644
--- a/pkgs/development/compilers/gcc/4.6/builder.sh
+++ b/pkgs/development/compilers/gcc/4.6/builder.sh
@@ -8,9 +8,10 @@ mkdir $NIX_FIXINC_DUMMY
 if test "$staticCompiler" = "1"; then
     EXTRA_LDFLAGS="-static"
 else
-    EXTRA_LDFLAGS=""
+    EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib"
 fi
 
+
 # GCC interprets empty paths as ".", which we don't want.
 if test -z "$CPATH"; then unset CPATH; fi
 if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi
@@ -33,7 +34,7 @@ if test "$noSysDirs" = "1"; then
 
         # The path to the Glibc binaries such as `crti.o'.
         glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"
-        
+
     else
         # Hack: support impure environments.
         extraFlags="-isystem /usr/include"
@@ -50,10 +51,10 @@ if test "$noSysDirs" = "1"; then
     # bootstrap compiler are optimized and (optionally) contain
     # debugging information (info "(gccinstall) Building").
     if test -n "$dontStrip"; then
-	extraFlags="-O2 -g $extraFlags"
+        extraFlags="-O2 -g $extraFlags"
     else
-	# Don't pass `-g' at all; this saves space while building.
-	extraFlags="-O2 $extraFlags"
+        # Don't pass `-g' at all; this saves space while building.
+        extraFlags="-O2 $extraFlags"
     fi
 
     EXTRA_FLAGS="$extraFlags"
@@ -205,6 +206,10 @@ preInstall() {
 
 
 postInstall() {
+    # Move runtime libraries to $lib.
+    mkdir -p $lib/lib
+    mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $lib/lib/
+
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
     find $out/include -name "*.gch" -exec rm -rf {} \; -prune
@@ -213,9 +218,10 @@ postInstall() {
     # previous gcc.
     rm -rf $out/libexec/gcc/*/*/install-tools
     rm -rf $out/lib/gcc/*/*/install-tools
-    
+
     # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
     rm -rf $out/bin/gccbug
+
     # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
     for i in $out/libexec/gcc/*/*/*; do
         if PREV_RPATH=`patchelf --print-rpath $i`; then
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index af6e9ab0ee191..476ddaa84091d 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -192,6 +192,10 @@ stdenv.mkDerivation ({
     inherit langC langCC langFortran langJava langAda langGo;
   };
 
+  outputs = [ "out" "lib" ];
+
+  setOutputConfigureFlags = false;
+
   inherit patches enableMultilib;
 
   libc_dev = stdenv.gcc.libc_dev;
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index a20adb6aba2f7..8714afa0358cf 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -193,9 +193,9 @@ rec {
   stdenvLinuxGlibc = stdenvLinuxBoot2Pkgs.glibc;
 
 
-  # 6) Construct a third stdenv identical to the 2nd, except that
-  #    this one uses the Glibc built in step 3.  It still uses
-  #    the recent binutils and rest of the bootstrap tools, including GCC.
+  # 6) Construct a third stdenv identical to the 2nd, except that this
+  #    one uses the Glibc built in step 3.  It still uses the recent
+  #    binutils and the rest of the bootstrap tools, including GCC.
   stdenvLinuxBoot3 = stdenvBootFun {
     gcc = wrapGCC {
       binutils = stdenvLinuxBoot1Pkgs.binutils;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bbb81745a46b..1896bbcb13637 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2254,6 +2254,7 @@ let
   }));
 
   gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
+    stdenv = stdenvMulti;
     inherit noSysDirs;
 
     # bootstrapping a profiled compiler does not work in the sheevaplug:

From cc8db5709731eb4a253574356506805bdbf6be65 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 17:12:30 +0200
Subject: [PATCH 029/857] util-linux: Install all binaries in $bin

---
 pkgs/os-specific/linux/util-linux/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 8b9a87d0e6f5f..84cb42693f13a 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -31,6 +31,8 @@ stdenv.mkDerivation rec {
     ${if ncurses == null then "--without-ncurses" else ""}
   '';
 
+  makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
+
   buildInputs =
     [ zlib pam ]
     ++ stdenv.lib.optional (ncurses != null) ncurses

From a4a2b88f292bc7bf8cd7ed65c3842ec301b17ab1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 17:12:44 +0200
Subject: [PATCH 030/857] systemd: Use the right path to util-linux binaries

---
 pkgs/os-specific/linux/systemd/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2482f808cac87..2a34600529dc6 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -52,11 +52,11 @@ stdenv.mkDerivation rec {
       for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.m4.in src/journal/cat.c; do
         test -e $i
         substituteInPlace $i \
-          --replace /bin/mount ${utillinux}/bin/mount \
-          --replace /bin/umount ${utillinux}/bin/umount \
-          --replace /sbin/swapon ${utillinux}/sbin/swapon \
-          --replace /sbin/swapoff ${utillinux}/sbin/swapoff \
-          --replace /sbin/fsck ${utillinux}/sbin/fsck \
+          --replace /bin/mount ${utillinux.bin}/bin/mount \
+          --replace /bin/umount ${utillinux.bin}/bin/umount \
+          --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \
+          --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \
+          --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
           --replace /bin/echo ${coreutils}/bin/echo \
           --replace /bin/cat ${coreutils}/bin/cat \
           --replace /sbin/sulogin ${sysvtools}/sbin/sulogin

From 8a1d96ec4d7177a1a68a9d68fa4f37781d791370 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 17:16:51 +0200
Subject: [PATCH 031/857] Put info files in the man output

---
 pkgs/build-support/multiple-outputs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
index edf24a12511ef..016558c1e7399 100644
--- a/pkgs/build-support/multiple-outputs.nix
+++ b/pkgs/build-support/multiple-outputs.nix
@@ -11,10 +11,10 @@ stdenv.mkDerivation (args // {
   preHook =
     if setOutputConfigureFlags then
       optionalString (elem "man" outputs) ''
-        configureFlags="--mandir=$man/share/man $configureFlags"
+        configureFlags="--mandir=$man/share/man --infodir=$man/share/info $configureFlags"
       '' +
       optionalString (elem "bin" outputs) ''
-        configureFlags="--bindir=$bin/bin --sbindir=$bin/sbin --mandir=$bin/share/man $configureFlags"
+        configureFlags="--bindir=$bin/bin --sbindir=$bin/sbin --mandir=$bin/share/man --infodir=$man/share/info $configureFlags"
       '' +
       optionalString (elem "lib" outputs) ''
         configureFlags="--libdir=$lib/lib $configureFlags"

From f9523bf1e859fc595d4f2800696786df8ea20ee4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 12 Jun 2013 21:03:21 +0200
Subject: [PATCH 032/857] gcc: Put *.la files in $lib/lib as well

Otherwise libtool gets confused.
---
 pkgs/development/compilers/gcc/4.6/builder.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh
index e207b21f4a8c5..6aa0ae440c8b4 100644
--- a/pkgs/development/compilers/gcc/4.6/builder.sh
+++ b/pkgs/development/compilers/gcc/4.6/builder.sh
@@ -208,7 +208,11 @@ preInstall() {
 postInstall() {
     # Move runtime libraries to $lib.
     mkdir -p $lib/lib
-    mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $lib/lib/
+    ln -s lib $lib/lib64
+    mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $out/lib/*.la $lib/lib/
+    for i in $lib/lib/*.la; do
+        substituteInPlace $i --replace $out $lib
+    done
 
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.

From edff23e5916561898e09414cc8787fc639327f50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Jun 2013 11:32:55 +0200
Subject: [PATCH 033/857] apr: Split into multiple outputs

This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
---
 pkgs/development/libraries/apr-util/default.nix |  4 +++-
 pkgs/development/libraries/apr/default.nix      | 16 ++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  4 +++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 5f6291127e93c..de5c64a06a168 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -19,11 +19,13 @@ stdenv.mkDerivation rec {
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
     --with-crypto
-    ${stdenv.lib.optionalString sslSupport "--with-openssl=${openssl}"}
+    ${stdenv.lib.optionalString sslSupport "--with-openssl"}
     ${stdenv.lib.optionalString bdbSupport "--with-berkeley-db=${db4}"}
     ${stdenv.lib.optionalString ldapSupport "--with-ldap"}
   '';
 
+  buildInputs = stdenv.lib.optional sslSupport openssl;
+
   propagatedBuildInputs = stdenv.lib.optional ldapSupport openldap;
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 07a565596bbcb..0a83741635e8b 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
 
   patches = optionals stdenv.isDarwin [ ./darwin_fix_configure.patch ];
 
+  outputs = [ "dev" "out" ];
+
+  preConfigure =
+    ''
+      configureFlagsArray+=("--with-installbuilddir=$dev/share/build")
+    '';
+
   configureFlags =
     # Don't use accept4 because it's only supported on Linux >= 2.6.28.
     [ "apr_cv_accept4=no" ]
@@ -21,6 +28,15 @@ stdenv.mkDerivation rec {
     # Based on ftp://sourceware.org/pub/cygwin/release/libapr1/libapr1-1.3.8-2-src.tar.bz2
     ++ stdenv.lib.optional (stdenv.system == "i686-cygwin") "ac_cv_header_windows_h=no";
 
+  enableParallelBuilding = true;
+
+  postInstall =
+    ''
+      mkdir $dev/bin $dev/lib
+      mv $out/bin/apr-1-config $dev/bin
+      mv $out/lib/pkgconfig $dev/lib
+    '';
+
   meta = {
     homepage = http://apr.apache.org/;
     description = "The Apache Portable Runtime library";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1896bbcb13637..5ef4d6761ea8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3544,7 +3544,9 @@ let
 
   amrwb = callPackage ../development/libraries/amrwb { };
 
-  apr = callPackage ../development/libraries/apr { };
+  apr = callPackage ../development/libraries/apr {
+    stdenv = stdenvMulti;
+  };
 
   aprutil = callPackage ../development/libraries/apr-util {
     bdbSupport = true;

From cc61d31902d67b94333f53a5ab5772330bbc21cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Jun 2013 11:57:17 +0200
Subject: [PATCH 034/857] apache-httpd: Use multiple outputs

---
 pkgs/servers/http/apache-httpd/2.2.nix | 14 ++++++++++++--
 pkgs/top-level/all-packages.nix        |  1 +
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index ba0bde6335841..a904cae56b197 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha1 = "f73bce14832ec40c1aae68f4f8c367cab2266241";
   };
 
+  outputs = [ "dev" "out" "doc" ];
+
   buildInputs = [perl apr aprutil pcre] ++
     stdenv.lib.optional sslSupport openssl;
 
@@ -42,11 +44,19 @@ stdenv.mkDerivation rec {
     --with-mpm=${mpm}
   '';
 
+  preConfigure =
+    ''
+      makeFlagsArray+=("installbuilddir=$dev/share/build")
+    '';
+
   enableParallelBuilding = true;
 
+  stripDebugList = "lib modules bin";
+
   postInstall = ''
-    echo "removing manual"
-    rm -rf $out/manual
+    mkdir -p $doc/share/doc/httpd
+    mv $out/manual $doc/share/doc/httpd
+    mkdir -p $out/share # FIXME, hack
   '';
 
   passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ef4d6761ea8e..86c5c63a0ccb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5621,6 +5621,7 @@ let
   apacheHttpd = pkgs.apacheHttpd_2_2;
 
   apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
+    stdenv = stdenvMulti;
     sslSupport = true;
   };
 

From 15bd0f4beb1eb6e609bd365893289d3a163a4ef2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Jun 2013 13:34:55 +0200
Subject: [PATCH 035/857] systemd: Put libudev in a separate output

This way, packages that need libudev (like Mesa) don't pull in all of
systemd as a runtime dependency.
---
 pkgs/os-specific/linux/systemd/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  7 +++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index e7184aa27b961..05257aa3e0a9a 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "07gvn3rpski8sh1nz16npjf2bvj0spsjdwc5px9685g2pi6kxcb1";
   };
 
+  outputs = [ "out" "man" "libudev" ];
+
   patches =
     [ ./0001-Make-systemctl-daemon-reexec-do-the-right-thing-on-N.patch
       ./0002-Ignore-duplicate-paths-in-systemctl-start.patch
@@ -65,6 +67,8 @@ stdenv.mkDerivation rec {
 
       substituteInPlace src/journal/catalog.c \
         --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
+
+      export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib"
     '';
 
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
@@ -114,6 +118,20 @@ stdenv.mkDerivation rec {
       done
 
       rm -rf $out/etc/rpm
+
+      # Move libudev to a separate output.
+      mkdir -p $libudev/lib/pkgconfig $libudev/include
+      mv $out/lib/libudev* $libudev/lib/
+      mv $out/lib/pkgconfig/libudev*.pc $libudev/lib/pkgconfig/
+      mv $out/include/libudev.h $libudev/include/
+
+      for i in $libudev/lib/*.la $libudev/lib/pkgconfig/*.pc; do
+        substituteInPlace $i --replace $out $libudev
+      done
+
+      # FIXME: move into stdenv
+      prefix="$libudev" patchELF
+      prefix="$libudev" stripDirs "lib" "''${stripDebugFlags:--S}"
     ''; # */
 
   enableParallelBuilding = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da5334935202b..ad02fbf77ae90 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6637,7 +6637,9 @@ let
 
   sysstat = callPackage ../os-specific/linux/sysstat { };
 
-  systemd = callPackage ../os-specific/linux/systemd { };
+  systemd = callPackage ../os-specific/linux/systemd {
+    stdenv = stdenvMulti;
+  };
 
   sysvinit = callPackage ../os-specific/linux/sysvinit { };
 
@@ -6679,7 +6681,8 @@ let
   });
 
   udev145 = callPackage ../os-specific/linux/udev/145.nix { };
-  udev = pkgs.systemd;
+
+  udev = pkgs.systemd.libudev;
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
   udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };

From b2ef0fe15587c18667b9101408e081c4643975ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Jun 2013 14:26:36 +0200
Subject: [PATCH 036/857] mesa: Don't propagate build inputs

It's generally undesirable because it causes unnecessary runtime
dependencies.
---
 pkgs/development/libraries/mesa/default.nix | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index de130d465c2e2..537f4dc615550 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -81,17 +81,13 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig python makedepend file flex bison ];
 
-  propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]
-  ++
-  stdenv.lib.optionals stdenv.isLinux [libdrm]
-  ;
-  buildInputs = with xorg; [
-    autoconf automake libtool intltool expat libxml2Python llvm
-    libXfixes glproto dri2proto libX11 libXext libxcb libXt
-    libffi wayland
-  ] ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
-  ++ stdenv.lib.optional stdenv.isLinux [udev]
-  ;
+  buildInputs = with xorg;
+    [ autoconf automake libtool intltool expat libxml2Python llvm
+      libXfixes glproto dri2proto libX11 libXext libxcb libXt libXdamage libXxf86vm 
+      libffi wayland
+    ]
+    ++ stdenv.lib.optionals enableExtraFeatures [ /*libXvMC*/ libvdpau ]
+    ++ stdenv.lib.optional stdenv.isLinux [ libdrm udev ];
 
   enableParallelBuilding = true;
   doCheck = true;

From cab211de88a977aff9f84528f9629473b3660c53 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Jun 2013 14:27:12 +0200
Subject: [PATCH 037/857] xorg: Split some more packages

---
 pkgs/servers/x11/xorg/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 18a24100851c7..1cf16ffa7dcdb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -632,23 +632,25 @@ let
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
   })) // {inherit compositeproto libX11 libXfixes xproto ;};
 
-  libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
+  libXcursor = (stdenvMulti.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
     name = "libXcursor-1.1.14";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2;
       sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
   })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
-  libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
+  libXdamage = (stdenvMulti.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
     name = "libXdamage-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/X11R7.7/src/everything/libXdamage-1.1.3.tar.bz2;
       sha256 = "1a678bwap74sqczbr2z4y4fvbr35km3inkm8bi1igjyk4v46jqdw";
     };
+    outputs = [ "dev" "out" ];
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
   })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
@@ -850,13 +852,14 @@ let
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
   })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
-  libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
+  libXxf86vm = (stdenvMulti.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
     name = "libXxf86vm-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
       url = mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2;
       sha256 = "1f1pxj018nk7ybxv58jmn5y8gm2288p4q3l2dng9n1p25v1qcpns";
     };
+    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
   })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 

From bb990d8ad7958861276335d51f40c184874b8a1a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Jun 2013 14:46:53 +0200
Subject: [PATCH 038/857] libjpeg-turbo: Split

---
 pkgs/development/libraries/libjpeg-turbo/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index a4aa1cf44b411..e745aaefcf4ca 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "0d0jwdmj3h89bxdxlwrys2mw18mqcj4rzgb5l2ndpah8zj600mr6";
   };
 
+  outputs = [ "dev" "out" "doc" "bin" ];
+
   buildInputs = [ nasm ];
 
+  enableParallelBuilding = true;
+
   doCheck = true;
   checkTarget = "test";
 

From 9555f3ba068f2deeb433ac7989775f8e2c3494a1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 26 Jun 2013 15:00:51 +0200
Subject: [PATCH 039/857] Fix Hydra evaluation

---
 pkgs/top-level/release-small.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 7743f4d0d27c2..3d69fc25ee09f 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -9,7 +9,7 @@
      nixpkgs "{outPath = ./}" .... release.nix
 
    Hydra can be installed with "nix-env -i hydra".  */
-with (import ./release-lib.nix);
+with import ./release-lib.nix { supportedSystems = [ "x86_64-linux" ]; };
 
 {
 

From 10de0529b40016b1532522080a7c1071fab04281 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Aug 2013 17:10:39 +0200
Subject: [PATCH 040/857] Oops

---
 pkgs/misc/cups/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 92207bd46bc70..471fbcdc46452 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb, acl }:
+, dbus, libusb1, acl }:
 
 let version = "1.5.4"; in
 

From b002fd9cf39733a0b8c11e6f7f866570df76ce08 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 15 Jun 2013 08:08:50 +0200
Subject: [PATCH 041/857] module_init_tools: fix "insmod.static cannot find
 -lc" :multiple-outputs:

---
 pkgs/os-specific/linux/module-init-tools/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
index 240150b09ddb2..66bd2dc30aaf7 100644
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation {
     })
   ];
 
+  buildInputs = [ stdenv.glibc.dev stdenv.glibc.static ];
+
   SGML_CATALOG_FILES = "${docbook_sgml_dtd_41}/sgml/dtd/docbook-4.1/docbook.cat";
 
   patches = [ ./module-dir.patch ./docbook2man.patch ];

From 1f7ddbdb82ad98b11408e47c0fe8225223b85c5c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 15 Jun 2013 18:41:16 +0200
Subject: [PATCH 042/857] glibc-locales: setup prefix-path differently
 :multiple-outputs:

---
 pkgs/development/libraries/glibc/2.17/locales.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/2.17/locales.nix b/pkgs/development/libraries/glibc/2.17/locales.nix
index b7eae50ca385c..a0d3d6dbee418 100644
--- a/pkgs/development/libraries/glibc/2.17/locales.nix
+++ b/pkgs/development/libraries/glibc/2.17/locales.nix
@@ -25,7 +25,7 @@ in
     # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
     buildPhase =
       ''
-        mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale"
+        mkdir -p $TMPDIR/"${stdenv.gcc.libc}/lib/locale"
 
         # Hack to allow building of the locales (needed since glibc-2.12)
         sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \

From 73688ec63b91014ca01bb2a1ec7886cc560fb4d1 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 15 Jun 2013 19:36:16 +0200
Subject: [PATCH 043/857] glib doesn't produce doc output (check later)

---
 pkgs/development/libraries/glib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 1c08bef1413d6..ded7174a30660 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "bin" ];
 
   # configure script looks for d-bus but it is only needed for tests
   buildInputs = [ libelf ] ++ libintlOrEmpty;

From 13cae540c838adbc0df331349d25c62a5cd77ce4 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 15 Jun 2013 07:46:44 +0200
Subject: [PATCH 044/857] perl/ssleay: fix openssl prefix This is quite ugly,
 but I found no other way.

:multiple-outputs:
---
 pkgs/top-level/perl-packages.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f7d316a751480..c26c6f6fbc79f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5231,8 +5231,14 @@ rec {
       sha256 = "1fkpdlpg99rdq2vlm6bgmqc8iazhcrfzvbpwxnn20k0viwpy7v28";
     };
     buildInputs = [ pkgs.openssl ];
-    OPENSSL_PREFIX = pkgs.openssl;
     doCheck = false; # Test performs network access.
+    preConfigure = ''
+      mkdir openssl
+      ln -s ${pkgs.openssl.out}/lib openssl
+      ln -s ${pkgs.openssl.bin}/bin openssl
+      ln -s ${pkgs.openssl.dev}/include openssl
+      export OPENSSL_PREFIX=$(realpath openssl)
+    '';
     meta = {
       description = "Perl extension for using OpenSSL";
       license = "SSLeay";

From 4b6d254ed76df1224aab55c7095676445edf1e2a Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 15 Jun 2013 23:59:48 +0200
Subject: [PATCH 045/857] nodejs: explicitly put openssl in buildInputs

the linker won't find it otherwise :multiple-outputs:
---
 pkgs/development/web/nodejs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index 6660cccc6fbff..0c51ca22b64a4 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -42,9 +42,9 @@ in stdenv.mkDerivation {
     (cd tools/gyp; patch -Np1 -i ${../../python-modules/gyp/no-darwin-cflags.patch})
   '' else null;
 
-  buildInputs = [ python ]
+  buildInputs = [ python openssl ]
     ++ (optional stdenv.isLinux utillinux)
-    ++ optionals stdenv.isDarwin [ pkgconfig openssl dtrace ];
+    ++ optionals stdenv.isDarwin [ pkgconfig dtrace ];
   setupHook = ./setup-hook.sh;
 
   meta = {

From 34bd1110b17752cb7015d46fd9d55248ab303680 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 16 Jun 2013 00:35:36 +0200
Subject: [PATCH 046/857] ppp: fix purity patch on :multiple-outputs:

---
 pkgs/tools/networking/ppp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 6f6f2a0da554e..8f1cf29e51952 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     [ ( substituteAll {
         src = ./nix-purity.patch;
         inherit libpcap;
-        glibc = stdenv.gcc.libc;
+        glibc = stdenv.gcc.libc.dev;
       })
       ./nonpriv.patch
     ];

From e930c3a660dad491630dd9e970f21f6041637cee Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 16 Jun 2013 01:31:34 +0200
Subject: [PATCH 047/857] texlive: fix dependency on libX11 (perhaps fix
 libX11?)

---
 pkgs/tools/typesetting/tex/texlive/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index aac8da784b3d6..fc987d3946ab3 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -84,7 +84,7 @@ rec {
  '') ["minInit" "defEnsureDir" "doUnpack" "doMakeInstall"];
 
   buildInputs = [
-    zlib bzip2 ncurses libpng flex bison libX11 libICE
+    zlib bzip2 ncurses libpng flex bison libX11.out libICE
     xproto freetype t1lib gd libXaw icu ghostscript ed
     libXt libXpm libXmu libXext xextproto perl libSM
     ruby expat curl libjpeg python fontconfig xz

From 32d823d3d0b1b06765d288fb7da8402956052509 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 21 Aug 2013 17:44:43 +0200
Subject: [PATCH 048/857] Revert "glib doesn't produce doc output (check
 later)"

This reverts commit 73688ec63b91014ca01bb2a1ec7886cc560fb4d1 since
glib does have doc output.
---
 pkgs/development/libraries/glib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ded7174a30660..1c08bef1413d6 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     sha256 = "090bw5par3dfy5m6dhq393pmy92zpw3d7rgbzqjc14jfg637bqvx";
   };
 
-  outputs = [ "dev" "out" "bin" ];
+  outputs = [ "dev" "out" "bin" "doc" ];
 
   # configure script looks for d-bus but it is only needed for tests
   buildInputs = [ libelf ] ++ libintlOrEmpty;

From 6ced9298c75b3f06350ab9a14109238ca3d1447f Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Thu, 22 Aug 2013 08:24:13 +0200
Subject: [PATCH 049/857] cups: keep versioning in all-packages.nix, as it is
 in master

---
 pkgs/misc/cups/default.nix      | 4 ++--
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 471fbcdc46452..922c59f37c047 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl
-, dbus, libusb1, acl }:
+, dbus, libusb, acl }:
 
 let version = "1.5.4"; in
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   # FIXME: Split off the cups client library.
   outputs = [ "dev" "out" "doc" "man" ];
 
-  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb1 ]
+  buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ]
     ++ stdenv.lib.optionals stdenv.isLinux [ pam dbus.libs acl ] ;
 
   propagatedBuildInputs = [ openssl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1ad8731a7c1f1..d8ea5a963bbda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9630,6 +9630,7 @@ let
 
   cups = callPackage ../misc/cups {
     stdenv = stdenvMulti;
+    libusb = libusb1;
   };
 
   cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { };

From 423705080e0233e0e1411373423bc7ac27953a3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 11:50:44 +0200
Subject: [PATCH 050/857] Integrate multiple output support into stdenv's
 setup.sh

Also, apply certain fixup actions (such as stripping) to all outputs
rather than just $out.  This is done in the new function fixupPrefix.
---
 pkgs/stdenv/generic/setup.sh | 108 +++++++++++++++++++++++++++--------
 1 file changed, 84 insertions(+), 24 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a474b6a8eaf12..9800e1fc28f9d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -576,6 +576,32 @@ configurePhase() {
     fi
 
     if [ -z "$dontAddPrefix" ]; then
+        local _man="$man"
+
+        # Put programs in the "bin" output.
+        if [ -n "$bin" ]; then
+            configureFlags="--bindir=$bin/bin --sbindir=$bin/sbin $configureFlags"
+            _man="${_man:-$bin}"
+        fi
+
+        # Put man and info pages in the "man" output if it exists,
+        # otherwise in the "bin" output.
+        if [ -n "$_man" ]; then
+            configureFlags="--mandir=$_man/share/man --infodir=$_man/share/info $configureFlags"
+        fi
+
+        # Put libraries in the "lib" output.
+        if [ -n "$lib" ]; then
+            configureFlags="--libdir=$lib/lib $configureFlags"
+        fi
+
+        # Put development stuff (headers, pkg-config files, etc.) in
+        # the "dev" output.
+        if [ -n "$dev" ]; then
+            configureFlags="--includedir=$dev/include $configureFlags"
+            installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags"
+        fi
+
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
@@ -687,7 +713,63 @@ installPhase() {
 fixupPhase() {
     runHook preFixup
 
-    # Put man/doc/info under $out/share.
+    # Move $out/share{doc,gtk-doc} to the "doc" output, if defined.
+    if [ -n "$doc" -a "${autoMoveDocs-1}" ]; then
+        for i in share/doc share/gtk-doc; do
+            if [ -e $out/$i ]; then
+                mkdir -p $doc/$i
+                mv $out/$i/* $doc/$i/
+                rmdir $out/$i
+            fi
+        done
+        [ -d $out/share ] && rmdir --ignore-fail-on-non-empty $out/share
+    fi
+
+    # Apply fixup to each output.
+    local output
+    for output in $outputs; do
+        fixupPrefix ${!output}
+    done
+
+    # If we have a "dev" output, propagate the other default outputs
+    # from it.  That way, including a "dev" output in buildInputs also
+    # gets you the other outputs.
+    if [ -n "$dev" ]; then
+        propagatedNativeBuildInputs="$(echo $out $lib $bin $propagatedNativeBuildInputs)"
+    fi
+
+    # Write the propagated build inputs to "dev" if it exists, "out"
+    # otherwise.
+    local _dev="${dev:-$out}"
+
+    if [ -n "$propagatedBuildInputs" ]; then
+        mkdir -p "$_dev/nix-support"
+        echo "$propagatedBuildInputs" > "$_dev/nix-support/propagated-build-inputs"
+    fi
+
+    if [ -n "$propagatedNativeBuildInputs" ]; then
+        mkdir -p "$_dev/nix-support"
+        echo "$propagatedNativeBuildInputs" > "$_dev/nix-support/propagated-native-build-inputs"
+    fi
+
+    if [ -n "$propagatedUserEnvPkgs" ]; then
+        mkdir -p "$out/nix-support"
+        echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
+    fi
+
+    if [ -n "$setupHook" ]; then
+        mkdir -p "$out/nix-support"
+        substituteAll "$setupHook" "$out/nix-support/setup-hook"
+    fi
+
+    runHook postFixup
+}
+
+
+fixupPrefix() {
+    local prefix="$1"
+
+    # Put man/doc/info under share/.
     forceShare=${forceShare:=man doc info}
     if [ -n "$forceShare" ]; then
         for d in $forceShare; do
@@ -708,7 +790,7 @@ fixupPhase() {
 
     if [ -z "$dontGzipMan" ]; then
         GLOBIGNORE=.:..:*.gz:*.bz2
-        for f in $out/share/man/*/* $out/share/man/*/*/*; do
+        for f in $prefix/share/man/*/* $prefix/share/man/*/*/*; do
             if [ -f $f ]; then
                 if gzip -c $f > $f.gz; then
                     rm $f
@@ -740,28 +822,6 @@ fixupPhase() {
     if [ -z "$dontPatchShebangs" ]; then
         patchShebangs "$prefix"
     fi
-
-    if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
-    fi
-
-    if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs"
-    fi
-
-    if [ -n "$propagatedUserEnvPkgs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
-    fi
-
-    if [ -n "$setupHook" ]; then
-        mkdir -p "$out/nix-support"
-        substituteAll "$setupHook" "$out/nix-support/setup-hook"
-    fi
-
-    runHook postFixup
 }
 
 

From bfa20c96ccae60a8b1c1f622cc85fbfe66b2b33f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 11:55:29 +0200
Subject: [PATCH 051/857] Put setup hooks in the dev output if it exists

---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 9800e1fc28f9d..cee63ae8fa88b 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -758,8 +758,8 @@ fixupPhase() {
     fi
 
     if [ -n "$setupHook" ]; then
-        mkdir -p "$out/nix-support"
-        substituteAll "$setupHook" "$out/nix-support/setup-hook"
+        mkdir -p "$_dev/nix-support"
+        substituteAll "$setupHook" "$_dev/nix-support/setup-hook"
     fi
 
     runHook postFixup

From b40a562c9c0b7898aab393d50c51a16769bb1f68 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 16:18:45 +0200
Subject: [PATCH 052/857] Provide a function "stripDir" to strip a single
 directory tree

---
 pkgs/stdenv/generic/setup.sh | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index cee63ae8fa88b..331ec8dc5dcdd 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -275,23 +275,28 @@ export NIX_BUILD_CORES
 # Misc. helper functions.
 
 
-stripDirs() {
-    local dirs="$1"
+stripDir() {
+    local dir="$1"
     local stripFlags="$2"
-    local dirsNew=
 
-    for d in ${dirs}; do
+    if [ -e "$dir" ]; then
+        header "stripping (with flags $stripFlags) in $dir"
+        find "$dir" -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
+        stopNest
+    fi
+}
+
+
+stripDirs() {
+    local prefix="$1"
+    local subdirs="$2"
+    local stripFlags="$3"
+
+    for d in $subdirs; do
         if [ -d "$prefix/$d" ]; then
-            dirsNew="${dirsNew} $prefix/$d "
+            stripDir "$prefix/$d" "$stripFlags"
         fi
     done
-    dirs=${dirsNew}
-
-    if [ -n "${dirs}" ]; then
-        header "stripping (with flags $stripFlags) in $dirs"
-        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
-        stopNest
-    fi
 }
 
 
@@ -806,12 +811,12 @@ fixupPrefix() {
     if [ -z "$dontStrip" ]; then
         stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
         if [ -n "$stripDebugList" ]; then
-            stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
+            stripDirs "$prefix" "$stripDebugList" "${stripDebugFlags:--S}"
         fi
 
         stripAllList=${stripAllList:-}
         if [ -n "$stripAllList" ]; then
-            stripDirs "$stripAllList" "${stripAllFlags:--s}"
+            stripDirs "$prefix" "$stripAllList" "${stripAllFlags:--s}"
         fi
     fi
 

From ae6af5c03c79cd8f707d61e0b33c60fa3713c907 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 16:19:16 +0200
Subject: [PATCH 053/857] fixupPrefix: Ignore missing outputs

---
 pkgs/stdenv/generic/setup.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 331ec8dc5dcdd..deb18ed932130 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -774,6 +774,8 @@ fixupPhase() {
 fixupPrefix() {
     local prefix="$1"
 
+    if ! [ -d "$prefix" ]; then return; fi
+
     # Put man/doc/info under share/.
     forceShare=${forceShare:=man doc info}
     if [ -n "$forceShare" ]; then

From 1d11c1dc48a3849f447350681ebba9d8cb97b979 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 16:19:28 +0200
Subject: [PATCH 054/857] fixupPrefix: Make the prefix writable first

This ensures that strip and other commands work correctly (since
sometimes the install phase will make the installed files read-only).
---
 pkgs/stdenv/generic/setup.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index deb18ed932130..27c1d37df25f8 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -776,6 +776,9 @@ fixupPrefix() {
 
     if ! [ -d "$prefix" ]; then return; fi
 
+    # Make sure everything is writable so "strip" et al. work.
+    chmod -R u+w "$prefix"
+
     # Put man/doc/info under share/.
     forceShare=${forceShare:=man doc info}
     if [ -n "$forceShare" ]; then

From 0c8372d9c7374eafc035718749d81b8e8317f62e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 16:54:26 +0200
Subject: [PATCH 055/857] Respect the setOutputConfigureFlags attribute

If this attribute is set to true (default), then setup.sh will add
configure flags for multiple output support, such as --includedir.
---
 pkgs/stdenv/generic/setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 27c1d37df25f8..0c1e3e7368008 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -580,7 +580,7 @@ configurePhase() {
         done
     fi
 
-    if [ -z "$dontAddPrefix" ]; then
+    if [ -n "${setOutputConfigureFlags-1}" ]; then
         local _man="$man"
 
         # Put programs in the "bin" output.
@@ -606,7 +606,9 @@ configurePhase() {
             configureFlags="--includedir=$dev/include $configureFlags"
             installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags"
         fi
+    fi
 
+    if [ -z "$dontAddPrefix" ]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 

From 719f100491711d39fb805f5a7c410a84753f6e14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 18:02:19 +0200
Subject: [PATCH 056/857] Don't assume that there is an "out" output

---
 pkgs/stdenv/generic/setup.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 0c1e3e7368008..c2475d06013e0 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -236,11 +236,11 @@ export TZ=UTC
 # for instance if we just want to perform a test build/install to a
 # temporary location and write a build report to $out.
 if [ -z "$prefix" ]; then
-    prefix="$out";
+    prefix="$out"
 fi
 
 if [ "$useTempPrefix" = 1 ]; then
-    prefix="$NIX_BUILD_TOP/tmp_prefix";
+    prefix="$NIX_BUILD_TOP/tmp_prefix"
 fi
 
 
@@ -608,7 +608,7 @@ configurePhase() {
         fi
     fi
 
-    if [ -z "$dontAddPrefix" ]; then
+    if [ -z "$dontAddPrefix" -a -n "$prefix" ]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
@@ -702,7 +702,9 @@ patchShebangs() {
 installPhase() {
     runHook preInstall
 
-    mkdir -p "$prefix"
+    if [ -n "$prefix" ]; then
+        mkdir -p "$prefix"
+    fi
 
     installTargets=${installTargets:-install}
     echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
@@ -721,7 +723,7 @@ fixupPhase() {
     runHook preFixup
 
     # Move $out/share{doc,gtk-doc} to the "doc" output, if defined.
-    if [ -n "$doc" -a "${autoMoveDocs-1}" ]; then
+    if [ -n "$doc" -a -n "$out" -a "${autoMoveDocs-1}" ]; then
         for i in share/doc share/gtk-doc; do
             if [ -e $out/$i ]; then
                 mkdir -p $doc/$i

From 45a74943b1d039a672cc2cae65393d4073a52ad1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 18:07:16 +0200
Subject: [PATCH 057/857] patchELF: Accept a directory argument

---
 pkgs/stdenv/generic/setup.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index c2475d06013e0..672d8dce9970b 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -666,14 +666,15 @@ checkPhase() {
 
 patchELF() {
     # Patch all ELF executables and shared libraries.
-    header "patching ELF executables and libraries"
-    if [ -e "$prefix" ]; then
-        find "$prefix" \( \
+    local dir="$1"
+    if [ -e "$dir" ]; then
+        header "patching ELF executables and libraries in $dir"
+        find "$dir" \( \
             \( -type f -a -name "*.so*" \) -o \
             \( -type f -a -perm +0100 \) \
             \) -print -exec patchelf --shrink-rpath {} \;
+        stopNest
     fi
-    stopNest
 }
 
 
@@ -682,8 +683,8 @@ patchShebangs() {
     # specified  directory tree to paths found in $PATH.  E.g.,
     # /bin/sh will be rewritten to /nix/store/<hash>-some-bash/bin/sh.
     # Interpreters that are already in the store are left untouched.
-    header "patching script interpreter paths"
     local dir="$1"
+    header "patching script interpreter paths in $dir"
     local f
     for f in $(find "$dir" -type f -perm +0100); do
         local oldPath=$(sed -ne '1 s,^#![ ]*\([^ ]*\).*$,\1,p' "$f")

From 39ca48fb9a800542889dbd85c84c24ecd4bb294f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 18:08:11 +0200
Subject: [PATCH 058/857] Remove redundant "building /nix/store/..." message

Nix already says that, so no need to repeat it.
---
 pkgs/stdenv/generic/setup.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 672d8dce9970b..57f2d6081a165 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -888,8 +888,6 @@ showPhaseHeader() {
 
 
 genericBuild() {
-    header "building $out"
-
     if [ -n "$buildCommand" ]; then
         eval "$buildCommand"
         return
@@ -933,8 +931,6 @@ genericBuild() {
 
         stopNest
     done
-
-    stopNest
 }
 
 

From f851584ea6016d089ddc7124c2e20d6f37cb4534 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 22 Aug 2013 21:13:55 +0200
Subject: [PATCH 059/857] fixupPhase: Handle the case where "outputs" is not
 set

---
 pkgs/stdenv/generic/setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 57f2d6081a165..30ca0e125a385 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -737,7 +737,7 @@ fixupPhase() {
 
     # Apply fixup to each output.
     local output
-    for output in $outputs; do
+    for output in ${outputs:-out}; do
         fixupPrefix ${!output}
     done
 

From 4a3ababb7415d219c41dd6445582611663da1677 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Aug 2013 09:54:18 +0200
Subject: [PATCH 060/857] libdrm: Use multiple outputs

---
 pkgs/development/libraries/libdrm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index e411e599dc54c..20de41af68bb8 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1qbnpi64hyqzd650hj6jki1d50pzypdhj3rw9m3whwbqly110rz0";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libpthreadstubs libpciaccess ]
     ++ stdenv.lib.optional stdenv.isLinux udev;

From c64a1332ec5f8eef9c443701900d367e4587919e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Aug 2013 09:54:38 +0200
Subject: [PATCH 061/857] libpng: Use multiple outputs

---
 pkgs/development/libraries/libpng/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index c537ce55cf27c..f40028f89c0d0 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -9,7 +9,7 @@ let whenPatched = stdenv.lib.optionalString apngSupport;
       sha256 = "0fy7p197ilr9phwqqk9h91s1mc28r6gj0w2ilrw5liagi71z75j1";
     };
 
-in stdenv.mkDerivation (rec {
+in stdenv.mkDerivation rec {
   name = "libpng" + whenPatched "-apng" + "-${version}";
 
   src = fetchurl {
@@ -17,6 +17,14 @@ in stdenv.mkDerivation (rec {
     sha256 = "1pljkqjqgyz8c32w8fipd9f0v2gcyhah2ypp0h7ya1r1q85sk5qw";
   };
 
+  outputs = [ "dev" "out" "man" ];
+
+  preConfigure = "export bin=$dev";
+
+  postPatch = stdenv.lib.optionalString apngSupport ''
+    gunzip < ${patch_src} | patch -Np1
+  '';
+
   propagatedBuildInputs = [ zlib ];
 
   doCheck = true;
@@ -29,10 +37,4 @@ in stdenv.mkDerivation (rec {
     license = "free-non-copyleft"; # http://www.libpng.org/pub/png/src/libpng-LICENSE.txt
     platforms = stdenv.lib.platforms.all;
   };
-} // stdenv.lib.optionalAttrs apngSupport {
-
-  postPatch = ''
-    gunzip < ${patch_src} | patch -Np1
-  '';
-
-})
+}
\ No newline at end of file

From 7c8518c194af83d9245b259984fea45e39f05e41 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 23 Aug 2013 09:55:51 +0200
Subject: [PATCH 062/857] Cleanup

---
 .../tools/build-managers/cmake/default.nix    |   2 +-
 pkgs/misc/cups/default.nix                    |   2 -
 pkgs/os-specific/linux/libcap/default.nix     |   6 +-
 pkgs/os-specific/linux/systemd/default.nix    |   4 -
 pkgs/servers/x11/xorg/default.nix             |  30 ++---
 pkgs/top-level/all-packages.nix               | 106 ++++--------------
 6 files changed, 43 insertions(+), 107 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index d66149a950961..640aa6c2d67df 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     ++ optional useQt4 qt4;
 
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-  
+
   configureFlags =
     "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
     + stdenv.lib.optionalString useQt4 " --qt-gui";
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 922c59f37c047..db6acb4cd0d7e 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -45,8 +45,6 @@ stdenv.mkDerivation {
     ''
       mkdir $dev/bin
       mv $out/bin/cups-config $dev/bin/
-
-      chmod -R +w $out
     '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 92f15c1ade3dc..e82214df634aa 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -5,12 +5,14 @@ assert stdenv.isLinux;
 stdenv.mkDerivation rec {
   name = "libcap-${version}";
   version = "2.22";
-  
+
   src = fetchurl {
     url = "mirror://gentoo/distfiles/${name}.tar.bz2";
     sha256 = "03q50j6bg65cc501q87qh328ncav1i8qw2bjig99vxmmfx4bvsvk";
   };
-  
+
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ perl ];
   propagatedBuildInputs = [ attr ];
 
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 05257aa3e0a9a..4f0157e48ca58 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -128,10 +128,6 @@ stdenv.mkDerivation rec {
       for i in $libudev/lib/*.la $libudev/lib/pkgconfig/*.pc; do
         substituteInPlace $i --replace $out $libudev
       done
-
-      # FIXME: move into stdenv
-      prefix="$libudev" patchELF
-      prefix="$libudev" stripDirs "lib" "''${stripDebugFlags:--S}"
     ''; # */
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1cf16ffa7dcdb..d3cb02f704ef5 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -579,7 +579,7 @@ let
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
   })) // {inherit windowswmproto libX11 libXext xextproto ;};
 
-  libX11 = (stdenvMulti.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
+  libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
     name = "libX11-1.6.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -600,7 +600,7 @@ let
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
   })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
-  libXau = (stdenvMulti.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
+  libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
     name = "libXau-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -621,7 +621,7 @@ let
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
   })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
-  libXcomposite = (stdenvMulti.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
+  libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
     name = "libXcomposite-0.4.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -632,7 +632,7 @@ let
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
   })) // {inherit compositeproto libX11 libXfixes xproto ;};
 
-  libXcursor = (stdenvMulti.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
+  libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
     name = "libXcursor-1.1.14";
     builder = ./builder.sh;
     src = fetchurl {
@@ -643,7 +643,7 @@ let
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
   })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
-  libXdamage = (stdenvMulti.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
+  libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
     name = "libXdamage-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -654,7 +654,7 @@ let
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
   })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
-  libXdmcp = (stdenvMulti.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
+  libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
     name = "libXdmcp-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -665,7 +665,7 @@ let
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
 
-  libXext = (stdenvMulti.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
+  libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
     name = "libXext-1.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -676,7 +676,7 @@ let
     buildInputs = [pkgconfig libX11 xextproto xproto ];
   })) // {inherit libX11 xextproto xproto ;};
 
-  libXfixes = (stdenvMulti.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
+  libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
     name = "libXfixes-5.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -697,7 +697,7 @@ let
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
-  libXft = (stdenvMulti.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
+  libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
     name = "libXft-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -708,7 +708,7 @@ let
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
   })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
-  libXi = (stdenvMulti.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
+  libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
     name = "libXi-1.7.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -719,7 +719,7 @@ let
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
   })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
-  libXinerama = (stdenvMulti.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
+  libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
     name = "libXinerama-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -760,7 +760,7 @@ let
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
   })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXrandr = (stdenvMulti.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
+  libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
     name = "libXrandr-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -771,7 +771,7 @@ let
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
   })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
-  libXrender = (stdenvMulti.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
+  libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
     name = "libXrender-0.9.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -852,7 +852,7 @@ let
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
   })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
-  libXxf86vm = (stdenvMulti.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
+  libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
     name = "libXxf86vm-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -903,7 +903,7 @@ let
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
 
-  libxcb = (stdenvMulti.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
+  libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
     name = "libxcb-1.9.1";
     builder = ./builder.sh;
     src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8ea5a963bbda..24e91593695e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -346,10 +346,6 @@ let
       inherit stdenv perl cpio contents ubootChooser compressor;
     };
 
-  stdenvMulti = stdenv // {
-    mkDerivation = import ../build-support/multiple-outputs.nix { inherit (pkgs) stdenv; };
-  };
-
   makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
 
   makeModulesClosure = { kernel, rootModules, allowMissing ? false }:
@@ -2353,7 +2349,6 @@ let
   }));
 
   gcc46_real = lowPrio (wrapGCC (callPackage ../development/compilers/gcc/4.6 {
-    stdenv = stdenvMulti;
     inherit noSysDirs;
 
     # bootstrapping a profiled compiler does not work in the sheevaplug:
@@ -3112,7 +3107,6 @@ let
   perl514 = callPackage ../development/interpreters/perl/5.14 { };
 
   perl516 = callPackage ../development/interpreters/perl/5.16 {
-    stdenv = stdenvMulti;
     fetchurl = fetchurlBoot;
   };
 
@@ -3564,9 +3558,7 @@ let
 
   libtool_1_5 = callPackage ../development/tools/misc/libtool { };
 
-  libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix {
-    stdenv = stdenvMulti;
-  };
+  libtool_2 = callPackage ../development/tools/misc/libtool/libtool2.nix { };
 
   lsof = callPackage ../development/tools/misc/lsof { };
 
@@ -3723,9 +3715,7 @@ let
 
   aalib = callPackage ../development/libraries/aalib { };
 
-  acl = callPackage ../development/libraries/acl {
-    stdenv = stdenvMulti;
-  };
+  acl = callPackage ../development/libraries/acl { };
 
   activemq = callPackage ../development/libraries/apache-activemq { };
 
@@ -3742,9 +3732,7 @@ let
 
   amrwb = callPackage ../development/libraries/amrwb { };
 
-  apr = callPackage ../development/libraries/apr {
-    stdenv = stdenvMulti;
-  };
+  apr = callPackage ../development/libraries/apr { };
 
   aprutil = callPackage ../development/libraries/apr-util {
     bdbSupport = true;
@@ -3766,9 +3754,7 @@ let
 
   attica = callPackage ../development/libraries/attica { };
 
-  attr = callPackage ../development/libraries/attr {
-    stdenv = stdenvMulti;
-  };
+  attr = callPackage ../development/libraries/attr { };
 
   aqbanking = callPackage ../development/libraries/aqbanking { };
 
@@ -4026,9 +4012,7 @@ let
   freeglut = if stdenv.isDarwin then darwinX11AndOpenGL else
     callPackage ../development/libraries/freeglut { };
 
-  freetype = callPackage ../development/libraries/freetype {
-    stdenv = stdenvMulti;
-  };
+  freetype = callPackage ../development/libraries/freetype { };
 
   fribidi = callPackage ../development/libraries/fribidi { };
 
@@ -4108,7 +4092,6 @@ let
       }));
 
   glibc = callPackage ../development/libraries/glibc/2.17 {
-    stdenv = stdenvMulti;
     kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
     machHeaders = null;
@@ -4184,9 +4167,7 @@ let
     libpng = libpng12;
   };
 
-  gmime = callPackage ../development/libraries/gmime {
-    stdenv = stdenvMulti;
-  };
+  gmime = callPackage ../development/libraries/gmime { };
 
   gmm = callPackage ../development/libraries/gmm { };
 
@@ -4296,25 +4277,20 @@ let
   };
 
   glib = callPackage ../development/libraries/glib {
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenvMulti;
+    stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv;
   };
 
   glibmm = callPackage ../development/libraries/glibmm { };
 
   glib_networking = callPackage ../development/libraries/glib-networking {};
 
-  atk = callPackage ../development/libraries/atk {
-    stdenv = stdenvMulti;
-  };
+  atk = callPackage ../development/libraries/atk { };
 
   atkmm = callPackage ../development/libraries/atkmm { };
 
   pixman = callPackage ../development/libraries/pixman { };
 
   cairo = callPackage ../development/libraries/cairo {
-    stdenv = stdenvMulti;
     glSupport = config.cairo.gl or (stdenv.isLinux &&
       !stdenv.isArm && !stdenv.isMips);
   };
@@ -4323,9 +4299,7 @@ let
 
   cairomm = callPackage ../development/libraries/cairomm { };
 
-  pango = callPackage ../development/libraries/pango {
-    stdenv = stdenvMulti;
-  };
+  pango = callPackage ../development/libraries/pango { };
 
   pangomm = callPackage ../development/libraries/pangomm/2.28.x.nix {
     cairo = cairo_1_12_2;
@@ -4333,12 +4307,9 @@ let
 
   pangox_compat = callPackage ../development/libraries/pangox-compat { };
 
-  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf {
-    stdenv = stdenvMulti;
-  };
+  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
 
   gtk2 = callPackage ../development/libraries/gtk+/2.x.nix {
-    stdenv = stdenvMulti;
     cupsSupport = config.gtk2.cups or stdenv.isLinux;
   };
 
@@ -4451,9 +4422,7 @@ let
     inherit mesa SDL SDL_image SDL_mixer;
   };
 
-  jasper = callPackage ../development/libraries/jasper {
-    stdenv = stdenvMulti;
-  };
+  jasper = callPackage ../development/libraries/jasper { };
 
   jama = callPackage ../development/libraries/jama { };
 
@@ -4589,7 +4558,6 @@ let
   libdnet = callPackage ../development/libraries/libdnet { };
 
   libdrm = callPackage ../development/libraries/libdrm {
-    inherit fetchurl stdenv pkgconfig;
     inherit (xorg) libpthreadstubs;
   };
 
@@ -4724,9 +4692,7 @@ let
   librem = callPackage ../development/libraries/librem {};
 
   libsamplerate = callPackage ../development/libraries/libsamplerate {
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenvMulti;
+    stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv;
   };
 
   libspectre = callPackage ../development/libraries/libspectre { };
@@ -4759,13 +4725,9 @@ let
 
   libiptcdata = callPackage ../development/libraries/libiptcdata { };
 
-  libjpeg_original = callPackage ../development/libraries/libjpeg {
-    stdenv = stdenvMulti;
-  };
+  libjpeg_original = callPackage ../development/libraries/libjpeg { };
 
-  libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo {
-    stdenv = stdenvMulti;
-  };
+  libjpeg_turbo = callPackage ../development/libraries/libjpeg-turbo { };
 
   libjpeg = if stdenv.isLinux then libjpeg_turbo else libjpeg_original; # some problems, both on FreeBSD and Darwin
 
@@ -4840,9 +4802,7 @@ let
 
   libofx = callPackage ../development/libraries/libofx { };
 
-  libogg = callPackage ../development/libraries/libogg {
-    stdenv = stdenvMulti;
-  };
+  libogg = callPackage ../development/libraries/libogg { };
 
   liboggz = callPackage ../development/libraries/liboggz { };
 
@@ -4895,9 +4855,7 @@ let
   libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
 
   libsndfile = callPackage ../development/libraries/libsndfile {
-    stdenv = if stdenv.isDarwin
-      then overrideGCC stdenv gccApple
-      else stdenvMulti;
+    stdenv = if stdenv.isDarwin then overrideGCC stdenv gccApple else stdenv;
   };
 
   libsoup = callPackage ../development/libraries/libsoup { };
@@ -4916,9 +4874,7 @@ let
 
   libtheora = callPackage ../development/libraries/libtheora { };
 
-  libtiff = callPackage ../development/libraries/libtiff {
-    stdenv = stdenvMulti;
-  };
+  libtiff = callPackage ../development/libraries/libtiff { };
 
   libtiger = callPackage ../development/libraries/libtiger { };
 
@@ -4985,9 +4941,7 @@ let
 
   libvterm = callPackage ../development/libraries/libvterm { };
 
-  libvorbis = callPackage ../development/libraries/libvorbis {
-    stdenv = stdenvMulti;
-  };
+  libvorbis = callPackage ../development/libraries/libvorbis { };
 
   libwebp = callPackage ../development/libraries/libwebp { };
 
@@ -5243,7 +5197,6 @@ let
   openscenegraph = callPackage ../development/libraries/openscenegraph {};
 
   openssl = callPackage ../development/libraries/openssl {
-    stdenv = stdenvMulti;
     fetchurl = fetchurlBoot;
     cryptodevHeaders = linuxPackages.cryptodev.override {
       fetchurl = fetchurlBoot;
@@ -5264,7 +5217,6 @@ let
   };
 
   pcre = callPackage ../development/libraries/pcre {
-    stdenv = stdenvMulti;
     unicodeSupport = config.pcre.unicode or true;
   };
 
@@ -5479,9 +5431,7 @@ let
 
   speech_tools = callPackage ../development/libraries/speech-tools {};
 
-  speex = callPackage ../development/libraries/speex {
-    stdenv = stdenvMulti;
-  };
+  speex = callPackage ../development/libraries/speex { };
 
   sphinxbase = callPackage ../development/libraries/sphinxbase { };
 
@@ -5952,7 +5902,6 @@ let
   apacheHttpd = pkgs.apacheHttpd_2_2;
 
   apacheHttpd_2_2 = callPackage ../servers/http/apache-httpd/2.2.nix {
-    stdenv = stdenvMulti;
     sslSupport = true;
   };
 
@@ -6214,7 +6163,7 @@ let
   xinetd = callPackage ../servers/xinetd { };
 
   xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix {
-    inherit fetchurl fetchgit stdenv stdenvMulti pkgconfig intltool freetype fontconfig
+    inherit fetchurl fetchgit stdenv pkgconfig intltool freetype fontconfig
       libxslt expat libdrm libpng zlib perl mesa_drivers
       xkeyboard_config dbus libuuid openssl gperf m4
       autoconf libtool xmlto asciidoc udev flex bison python mtdev pixman;
@@ -6725,9 +6674,7 @@ let
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
 
-  pam = callPackage ../os-specific/linux/pam {
-    stdenv = stdenvMulti;
-  };
+  pam = callPackage ../os-specific/linux/pam { };
 
   # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )
 
@@ -6812,9 +6759,7 @@ let
 
   sysstat = callPackage ../os-specific/linux/sysstat { };
 
-  systemd = callPackage ../os-specific/linux/systemd {
-    stdenv = stdenvMulti;
-  };
+  systemd = callPackage ../os-specific/linux/systemd { };
 
   sysvinit = callPackage ../os-specific/linux/sysvinit { };
 
@@ -6874,12 +6819,10 @@ let
   utillinux = lowPrio (callPackage ../os-specific/linux/util-linux {
     ncurses = null;
     perl = null;
-    stdenv = stdenvMulti;
   });
 
   utillinuxCurses = utillinux.override {
     inherit ncurses perl;
-    stdenv = stdenvMulti;
   };
 
   v4l_utils = callPackage ../os-specific/linux/v4l-utils {
@@ -7632,9 +7575,7 @@ let
 
   firefoxWrapper = wrapFirefox { browser = firefoxPkgs.firefox; };
 
-  flac = callPackage ../applications/audio/flac {
-    stdenv = stdenvMulti;
-  };
+  flac = callPackage ../applications/audio/flac { };
 
   flashplayer = callPackage ../applications/networking/browsers/mozilla-plugins/flashplayer-11 {
     debug = config.flashplayer.debug or false;
@@ -9629,7 +9570,6 @@ let
   auctex = callPackage ../tools/typesetting/tex/auctex { };
 
   cups = callPackage ../misc/cups {
-    stdenv = stdenvMulti;
     libusb = libusb1;
   };
 

From 5a7f19a02b1c52adc3f077529f54eed315165712 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 12:04:07 +0200
Subject: [PATCH 063/857] perl: Remove dependencies in $out on glibc-dev and
 $man

---
 pkgs/development/interpreters/perl/5.16/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index 752f0d49885b7..dc8bc34665de7 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "1dpd9lhc4723wmsn4dsn4m320qlqgyw28bvcbhnfqp2nl3f0ikv9";
   };
 
+  # TODO: Add a "dev" output containing the header files.
   outputs = [ "out" "man" ];
 
   setOutputConfigureFlags = false;
@@ -61,6 +62,17 @@ stdenv.mkDerivation rec {
       substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
     '';
 
+  postInstall =
+    ''
+      # Remove dependency between "out" and "man" outputs.
+      rm $out/lib/perl5/*/*/.packlist
+
+      # Remove dependencies on glibc.dev and coreutils.
+      substituteInPlace $out/lib/perl5/*/*/Config_heavy.pl \
+        --replace ${stdenv.glibc.dev or "/blabla"} /no-such-path \
+        --replace $man /no-such-path
+    ''; # */
+
   setupHook = ./setup-hook.sh;
 
   passthru.libPrefix = "lib/perl5/site_perl";

From 977a1df79a70a699718d90f1c086eec7c3ad9f00 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 12:04:19 +0200
Subject: [PATCH 064/857] boehm-gc: Split into multiple outputs

---
 pkgs/development/libraries/boehm-gc/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix
index 3b2670d988ae0..d243541994124 100644
--- a/pkgs/development/libraries/boehm-gc/default.nix
+++ b/pkgs/development/libraries/boehm-gc/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr";
   };
 
+  outputs = [ "dev" "out" "doc" ];
+
   configureFlags = "--enable-cplusplus";
 
   doCheck = true;
@@ -15,6 +17,12 @@ stdenv.mkDerivation rec {
   # Don't run the native `strip' when cross-compiling.
   dontStrip = stdenv ? cross;
 
+  postInstall =
+    ''
+      mkdir -p $out/share/doc
+      mv $out/share/gc $out/share/doc/gc
+    '';
+
   meta = {
     description = "The Boehm-Demers-Weiser conservative garbage collector for C and C++";
 

From a7b1aa429e2629703de5dbb604796152951921fa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 12:04:56 +0200
Subject: [PATCH 065/857] Perl generic builder: Put man pages in a separate
 output

---
 pkgs/development/perl-modules/generic/builder.sh  |  7 +++++++
 pkgs/development/perl-modules/generic/default.nix | 10 ++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index 7c51bf1b59179..d657a6ccc988e 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -28,6 +28,13 @@ preConfigure() {
     perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags
 }
 
+preFixup() {
+    if [ -n "$man" ]; then
+        mkdir -p $man/share
+        if [ -d $out/man ]; then mv $out/man $man/share/; fi
+    fi
+}
+
 postFixup() {
     # If a user installs a Perl package, she probably also wants its
     # dependencies in the user environment (since Perl modules don't
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index 96094ab4e5388..121581d83979c 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -1,13 +1,15 @@
 perl:
 
-{ buildInputs ? [], ... } @ attrs:
+{ buildInputs ? [], name, ... } @ attrs:
 
 perl.stdenv.mkDerivation (
   {
+    outputs = [ "out" "man" ];
+
     doCheck = true;
-    
+
     checkTarget = "test";
-    
+
     # Prevent CPAN downloads.
     PERL_AUTOINSTALL = "--skipdeps";
 
@@ -20,7 +22,7 @@ perl.stdenv.mkDerivation (
   attrs
   //
   {
-    name = "perl-" + attrs.name;
+    name = "perl-" + name;
     builder = ./builder.sh;
     buildInputs = buildInputs ++ [ perl ];
   }

From 2d405ed4d54ba4d924b5146cea4a39ae65343d59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 26 Aug 2013 12:05:16 +0200
Subject: [PATCH 066/857] xz: Split into multiple outputs

---
 pkgs/tools/compression/xz/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 26c1597f2aa86..52e0c61d3c1c7 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "14nf55b47335aakswqk0kqv1qsh4269rnb757dmkkbd1sdhb1naw";
   };
 
+  outputs = [ "out" "dev" "man" "doc" ];
+
   doCheck = true;
 
   meta = {

From 8c8197dfb3f22c62da68454790d9b0ab6b991c9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Aug 2014 16:14:37 +0200
Subject: [PATCH 067/857] xorg: stop using the new nix syntax

Partial revert of 5ea8497933da0dbee5fa5a31c97843e2c6baac17.
---
 pkgs/servers/x11/xorg/default.nix             | 849 +++++++++---------
 .../x11/xorg/generate-expr-from-tarballs.pl   |   9 +-
 2 files changed, 424 insertions(+), 434 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 519ea6a2f7a1b..81988e45db07d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,18 +3,13 @@ args: with args;
 
 let
 
-  mkDerivation = name: attrs:
-    let newAttrs = (overrides."${name}" or (x: x)) attrs;
-        stdenv = newAttrs.stdenv or args.stdenv;
-    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
-
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
 
   inherit pixman;
 
-  applewmproto = (mkDerivation "applewmproto" {
+  applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
     name = "applewmproto-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -22,9 +17,9 @@ let
       sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  bdftopcf = (mkDerivation "bdftopcf" {
+  bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) {
     name = "bdftopcf-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -32,9 +27,9 @@ let
       sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga";
     };
     buildInputs = [pkgconfig libXfont ];
-  }) // {inherit libXfont ;};
+  })) // {inherit libXfont ;};
 
-  bigreqsproto = (mkDerivation "bigreqsproto" {
+  bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) {
     name = "bigreqsproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -42,9 +37,9 @@ let
       sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  compositeproto = (mkDerivation "compositeproto" {
+  compositeproto = (stdenv.mkDerivation ((if overrides ? compositeproto then overrides.compositeproto else x: x) {
     name = "compositeproto-0.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -52,9 +47,9 @@ let
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  damageproto = (mkDerivation "damageproto" {
+  damageproto = (stdenv.mkDerivation ((if overrides ? damageproto then overrides.damageproto else x: x) {
     name = "damageproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -62,9 +57,9 @@ let
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dmxproto = (mkDerivation "dmxproto" {
+  dmxproto = (stdenv.mkDerivation ((if overrides ? dmxproto then overrides.dmxproto else x: x) {
     name = "dmxproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -72,9 +67,9 @@ let
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dri2proto = (mkDerivation "dri2proto" {
+  dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) {
     name = "dri2proto-2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -82,9 +77,9 @@ let
       sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dri3proto = (mkDerivation "dri3proto" {
+  dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) {
     name = "dri3proto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -92,9 +87,9 @@ let
       sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  encodings = (mkDerivation "encodings" {
+  encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) {
     name = "encodings-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -102,9 +97,9 @@ let
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fixesproto = (mkDerivation "fixesproto" {
+  fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) {
     name = "fixesproto-5.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -112,9 +107,9 @@ let
       sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
     };
     buildInputs = [pkgconfig xextproto ];
-  }) // {inherit xextproto ;};
+  })) // {inherit xextproto ;};
 
-  fontadobe100dpi = (mkDerivation "fontadobe100dpi" {
+  fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) {
     name = "font-adobe-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -122,9 +117,9 @@ let
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobe75dpi = (mkDerivation "fontadobe75dpi" {
+  fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) {
     name = "font-adobe-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -132,9 +127,9 @@ let
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
+  fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) {
     name = "font-adobe-utopia-100dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -142,9 +137,9 @@ let
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
+  fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) {
     name = "font-adobe-utopia-75dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -152,9 +147,9 @@ let
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
+  fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) {
     name = "font-adobe-utopia-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -162,9 +157,9 @@ let
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontalias = (mkDerivation "fontalias" {
+  fontalias = (stdenv.mkDerivation ((if overrides ? fontalias then overrides.fontalias else x: x) {
     name = "font-alias-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -172,9 +167,9 @@ let
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontarabicmisc = (mkDerivation "fontarabicmisc" {
+  fontarabicmisc = (stdenv.mkDerivation ((if overrides ? fontarabicmisc then overrides.fontarabicmisc else x: x) {
     name = "font-arabic-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -182,9 +177,9 @@ let
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbh100dpi = (mkDerivation "fontbh100dpi" {
+  fontbh100dpi = (stdenv.mkDerivation ((if overrides ? fontbh100dpi then overrides.fontbh100dpi else x: x) {
     name = "font-bh-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -192,9 +187,9 @@ let
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbh75dpi = (mkDerivation "fontbh75dpi" {
+  fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) {
     name = "font-bh-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -202,9 +197,9 @@ let
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" {
+  fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) {
     name = "font-bh-lucidatypewriter-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -212,9 +207,9 @@ let
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" {
+  fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) {
     name = "font-bh-lucidatypewriter-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -222,9 +217,9 @@ let
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhttf = (mkDerivation "fontbhttf" {
+  fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) {
     name = "font-bh-ttf-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -232,9 +227,9 @@ let
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontbhtype1 = (mkDerivation "fontbhtype1" {
+  fontbhtype1 = (stdenv.mkDerivation ((if overrides ? fontbhtype1 then overrides.fontbhtype1 else x: x) {
     name = "font-bh-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -242,9 +237,9 @@ let
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" {
+  fontbitstream100dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream100dpi then overrides.fontbitstream100dpi else x: x) {
     name = "font-bitstream-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -252,9 +247,9 @@ let
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" {
+  fontbitstream75dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream75dpi then overrides.fontbitstream75dpi else x: x) {
     name = "font-bitstream-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -262,9 +257,9 @@ let
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" {
+  fontbitstreamtype1 = (stdenv.mkDerivation ((if overrides ? fontbitstreamtype1 then overrides.fontbitstreamtype1 else x: x) {
     name = "font-bitstream-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -272,9 +267,9 @@ let
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" {
+  fontcronyxcyrillic = (stdenv.mkDerivation ((if overrides ? fontcronyxcyrillic then overrides.fontcronyxcyrillic else x: x) {
     name = "font-cronyx-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -282,9 +277,9 @@ let
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontcursormisc = (mkDerivation "fontcursormisc" {
+  fontcursormisc = (stdenv.mkDerivation ((if overrides ? fontcursormisc then overrides.fontcursormisc else x: x) {
     name = "font-cursor-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -292,9 +287,9 @@ let
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontdaewoomisc = (mkDerivation "fontdaewoomisc" {
+  fontdaewoomisc = (stdenv.mkDerivation ((if overrides ? fontdaewoomisc then overrides.fontdaewoomisc else x: x) {
     name = "font-daewoo-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -302,9 +297,9 @@ let
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontdecmisc = (mkDerivation "fontdecmisc" {
+  fontdecmisc = (stdenv.mkDerivation ((if overrides ? fontdecmisc then overrides.fontdecmisc else x: x) {
     name = "font-dec-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -312,9 +307,9 @@ let
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontibmtype1 = (mkDerivation "fontibmtype1" {
+  fontibmtype1 = (stdenv.mkDerivation ((if overrides ? fontibmtype1 then overrides.fontibmtype1 else x: x) {
     name = "font-ibm-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -322,9 +317,9 @@ let
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontisasmisc = (mkDerivation "fontisasmisc" {
+  fontisasmisc = (stdenv.mkDerivation ((if overrides ? fontisasmisc then overrides.fontisasmisc else x: x) {
     name = "font-isas-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -332,9 +327,9 @@ let
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontjismisc = (mkDerivation "fontjismisc" {
+  fontjismisc = (stdenv.mkDerivation ((if overrides ? fontjismisc then overrides.fontjismisc else x: x) {
     name = "font-jis-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -342,9 +337,9 @@ let
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmicromisc = (mkDerivation "fontmicromisc" {
+  fontmicromisc = (stdenv.mkDerivation ((if overrides ? fontmicromisc then overrides.fontmicromisc else x: x) {
     name = "font-micro-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -352,9 +347,9 @@ let
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmisccyrillic = (mkDerivation "fontmisccyrillic" {
+  fontmisccyrillic = (stdenv.mkDerivation ((if overrides ? fontmisccyrillic then overrides.fontmisccyrillic else x: x) {
     name = "font-misc-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -362,9 +357,9 @@ let
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmiscethiopic = (mkDerivation "fontmiscethiopic" {
+  fontmiscethiopic = (stdenv.mkDerivation ((if overrides ? fontmiscethiopic then overrides.fontmiscethiopic else x: x) {
     name = "font-misc-ethiopic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -372,9 +367,9 @@ let
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmeltho = (mkDerivation "fontmiscmeltho" {
+  fontmiscmeltho = (stdenv.mkDerivation ((if overrides ? fontmiscmeltho then overrides.fontmiscmeltho else x: x) {
     name = "font-misc-meltho-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -382,9 +377,9 @@ let
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmisc = (mkDerivation "fontmiscmisc" {
+  fontmiscmisc = (stdenv.mkDerivation ((if overrides ? fontmiscmisc then overrides.fontmiscmisc else x: x) {
     name = "font-misc-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -392,9 +387,9 @@ let
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontmuttmisc = (mkDerivation "fontmuttmisc" {
+  fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) {
     name = "font-mutt-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -402,9 +397,9 @@ let
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontschumachermisc = (mkDerivation "fontschumachermisc" {
+  fontschumachermisc = (stdenv.mkDerivation ((if overrides ? fontschumachermisc then overrides.fontschumachermisc else x: x) {
     name = "font-schumacher-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -412,9 +407,9 @@ let
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
+  fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) {
     name = "font-screen-cyrillic-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -422,9 +417,9 @@ let
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontsonymisc = (mkDerivation "fontsonymisc" {
+  fontsonymisc = (stdenv.mkDerivation ((if overrides ? fontsonymisc then overrides.fontsonymisc else x: x) {
     name = "font-sony-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -432,9 +427,9 @@ let
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontsproto = (mkDerivation "fontsproto" {
+  fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
     name = "fontsproto-2.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -442,9 +437,9 @@ let
       sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontsunmisc = (mkDerivation "fontsunmisc" {
+  fontsunmisc = (stdenv.mkDerivation ((if overrides ? fontsunmisc then overrides.fontsunmisc else x: x) {
     name = "font-sun-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -452,9 +447,9 @@ let
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontutil = (mkDerivation "fontutil" {
+  fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) {
     name = "font-util-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -462,9 +457,9 @@ let
       sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" {
+  fontwinitzkicyrillic = (stdenv.mkDerivation ((if overrides ? fontwinitzkicyrillic then overrides.fontwinitzkicyrillic else x: x) {
     name = "font-winitzki-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -472,9 +467,9 @@ let
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontxfree86type1 = (mkDerivation "fontxfree86type1" {
+  fontxfree86type1 = (stdenv.mkDerivation ((if overrides ? fontxfree86type1 then overrides.fontxfree86type1 else x: x) {
     name = "font-xfree86-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -482,9 +477,9 @@ let
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  gccmakedep = (mkDerivation "gccmakedep" {
+  gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) {
     name = "gccmakedep-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -492,9 +487,9 @@ let
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  glamoregl = (mkDerivation "glamoregl" {
+  glamoregl = (stdenv.mkDerivation ((if overrides ? glamoregl then overrides.glamoregl else x: x) {
     name = "glamor-egl-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -502,9 +497,9 @@ let
       sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
     };
     buildInputs = [pkgconfig dri2proto xorgserver ];
-  }) // {inherit dri2proto xorgserver ;};
+  })) // {inherit dri2proto xorgserver ;};
 
-  glproto = (mkDerivation "glproto" {
+  glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) {
     name = "glproto-1.4.17";
     builder = ./builder.sh;
     src = fetchurl {
@@ -512,9 +507,9 @@ let
       sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  iceauth = (mkDerivation "iceauth" {
+  iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) {
     name = "iceauth-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -522,9 +517,9 @@ let
       sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx";
     };
     buildInputs = [pkgconfig libICE xproto ];
-  }) // {inherit libICE xproto ;};
+  })) // {inherit libICE xproto ;};
 
-  imake = (mkDerivation "imake" {
+  imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
     name = "imake-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -532,9 +527,9 @@ let
       sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  inputproto = (mkDerivation "inputproto" {
+  inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
     name = "inputproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -542,9 +537,9 @@ let
       sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  kbproto = (mkDerivation "kbproto" {
+  kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) {
     name = "kbproto-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -552,9 +547,9 @@ let
       sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  libAppleWM = (mkDerivation "libAppleWM" {
+  libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) {
     name = "libAppleWM-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -562,9 +557,9 @@ let
       sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
-  }) // {inherit applewmproto libX11 libXext xextproto ;};
+  })) // {inherit applewmproto libX11 libXext xextproto ;};
 
-  libFS = (mkDerivation "libFS" {
+  libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) {
     name = "libFS-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -572,9 +567,9 @@ let
       sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
-  }) // {inherit fontsproto xproto xtrans ;};
+  })) // {inherit fontsproto xproto xtrans ;};
 
-  libICE = (mkDerivation "libICE" {
+  libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
     name = "libICE-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -582,9 +577,9 @@ let
       sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
-  }) // {inherit xproto xtrans ;};
+  })) // {inherit xproto xtrans ;};
 
-  libSM = (mkDerivation "libSM" {
+  libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) {
     name = "libSM-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -592,9 +587,9 @@ let
       sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
-  }) // {inherit libICE libuuid xproto xtrans ;};
+  })) // {inherit libICE libuuid xproto xtrans ;};
 
-  libWindowsWM = (mkDerivation "libWindowsWM" {
+  libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) {
     name = "libWindowsWM-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -602,9 +597,9 @@ let
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
-  }) // {inherit windowswmproto libX11 libXext xextproto ;};
+  })) // {inherit windowswmproto libX11 libXext xextproto ;};
 
-  libX11 = (mkDerivation "libX11" {
+  libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
     name = "libX11-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -613,9 +608,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
-  }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
+  })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
 
-  libXScrnSaver = (mkDerivation "libXScrnSaver" {
+  libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) {
     name = "libXScrnSaver-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -623,9 +618,9 @@ let
       sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
-  }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
+  })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
-  libXau = (mkDerivation "libXau" {
+  libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
     name = "libXau-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -634,9 +629,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  libXaw = (mkDerivation "libXaw" {
+  libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) {
     name = "libXaw-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
@@ -644,9 +639,9 @@ let
       sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
-  }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
-  libXcomposite = (mkDerivation "libXcomposite" {
+  libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
     name = "libXcomposite-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -655,9 +650,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
-  }) // {inherit compositeproto libX11 libXfixes xproto ;};
+  })) // {inherit compositeproto libX11 libXfixes xproto ;};
 
-  libXcursor = (mkDerivation "libXcursor" {
+  libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
     name = "libXcursor-1.1.14";
     builder = ./builder.sh;
     src = fetchurl {
@@ -666,9 +661,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
-  }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
+  })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
-  libXdamage = (mkDerivation "libXdamage" {
+  libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
     name = "libXdamage-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -677,9 +672,9 @@ let
     };
     outputs = [ "dev" "out" ];
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
-  }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
+  })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
-  libXdmcp = (mkDerivation "libXdmcp" {
+  libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
     name = "libXdmcp-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -688,9 +683,9 @@ let
     };
     outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  libXext = (mkDerivation "libXext" {
+  libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
     name = "libXext-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -699,9 +694,9 @@ let
     };
     outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig libX11 xextproto xproto ];
-  }) // {inherit libX11 xextproto xproto ;};
+  })) // {inherit libX11 xextproto xproto ;};
 
-  libXfixes = (mkDerivation "libXfixes" {
+  libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
     name = "libXfixes-5.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -710,9 +705,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
-  }) // {inherit fixesproto libX11 xextproto xproto ;};
+  })) // {inherit fixesproto libX11 xextproto xproto ;};
 
-  libXfont = (mkDerivation "libXfont" {
+  libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
     name = "libXfont-1.4.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -720,9 +715,9 @@ let
       sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
-  }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
+  })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
-  libXft = (mkDerivation "libXft" {
+  libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
     name = "libXft-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -731,9 +726,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
-  }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
+  })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
-  libXi = (mkDerivation "libXi" {
+  libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
     name = "libXi-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -742,9 +737,9 @@ let
     };
     outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
-  }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
+  })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
-  libXinerama = (mkDerivation "libXinerama" {
+  libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
     name = "libXinerama-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -753,9 +748,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
-  }) // {inherit libX11 libXext xextproto xineramaproto ;};
+  })) // {inherit libX11 libXext xextproto xineramaproto ;};
 
-  libXmu = (mkDerivation "libXmu" {
+  libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) {
     name = "libXmu-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -763,9 +758,9 @@ let
       sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  }) // {inherit libX11 libXext xextproto xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXp = (mkDerivation "libXp" {
+  libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) {
     name = "libXp-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -773,9 +768,9 @@ let
       sha256 = "1dfh5w8sjz5b5fl6dl4y63ckq99snslz7bir8zq2rg8ax6syabwm";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
-  }) // {inherit printproto libX11 libXau libXext xextproto ;};
+  })) // {inherit printproto libX11 libXau libXext xextproto ;};
 
-  libXpm = (mkDerivation "libXpm" {
+  libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) {
     name = "libXpm-3.5.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -783,9 +778,9 @@ let
       sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  }) // {inherit libX11 libXext xextproto xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXrandr = (mkDerivation "libXrandr" {
+  libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
     name = "libXrandr-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -794,9 +789,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
-  }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
+  })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
-  libXrender = (mkDerivation "libXrender" {
+  libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
     name = "libXrender-0.9.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -805,9 +800,9 @@ let
     };
     outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig renderproto libX11 xproto ];
-  }) // {inherit renderproto libX11 xproto ;};
+  })) // {inherit renderproto libX11 xproto ;};
 
-  libXres = (mkDerivation "libXres" {
+  libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) {
     name = "libXres-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -815,9 +810,9 @@ let
       sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
-  }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
+  })) // {inherit resourceproto libX11 libXext xextproto xproto ;};
 
-  libXt = (mkDerivation "libXt" {
+  libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) {
     name = "libXt-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -825,9 +820,9 @@ let
       sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
-  }) // {inherit libICE kbproto libSM libX11 xproto ;};
+  })) // {inherit libICE kbproto libSM libX11 xproto ;};
 
-  libXtst = (mkDerivation "libXtst" {
+  libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) {
     name = "libXtst-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -835,9 +830,9 @@ let
       sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
-  }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
+  })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
 
-  libXv = (mkDerivation "libXv" {
+  libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) {
     name = "libXv-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -845,9 +840,9 @@ let
       sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
-  }) // {inherit videoproto libX11 libXext xextproto xproto ;};
+  })) // {inherit videoproto libX11 libXext xextproto xproto ;};
 
-  libXvMC = (mkDerivation "libXvMC" {
+  libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) {
     name = "libXvMC-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -855,9 +850,9 @@ let
       sha256 = "015jk3bxfmj6zaw99x282f9npi8qqaw34yg186frags3z8g406jy";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
-  }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
+  })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
 
-  libXxf86dga = (mkDerivation "libXxf86dga" {
+  libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) {
     name = "libXxf86dga-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -865,9 +860,9 @@ let
       sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
 
-  libXxf86misc = (mkDerivation "libXxf86misc" {
+  libXxf86misc = (stdenv.mkDerivation ((if overrides ? libXxf86misc then overrides.libXxf86misc else x: x) {
     name = "libXxf86misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -875,9 +870,9 @@ let
       sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
-  libXxf86vm = (mkDerivation "libXxf86vm" {
+  libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
     name = "libXxf86vm-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -886,9 +881,9 @@ let
     };
     outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 
-  libdmx = (mkDerivation "libdmx" {
+  libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) {
     name = "libdmx-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -896,9 +891,9 @@ let
       sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
-  }) // {inherit dmxproto libX11 libXext xextproto ;};
+  })) // {inherit dmxproto libX11 libXext xextproto ;};
 
-  libfontenc = (mkDerivation "libfontenc" {
+  libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) {
     name = "libfontenc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -906,9 +901,9 @@ let
       sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959";
     };
     buildInputs = [pkgconfig xproto zlib ];
-  }) // {inherit xproto zlib ;};
+  })) // {inherit xproto zlib ;};
 
-  libpciaccess = (mkDerivation "libpciaccess" {
+  libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
     name = "libpciaccess-0.13.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -916,9 +911,9 @@ let
       sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb";
     };
     buildInputs = [pkgconfig zlib ];
-  }) // {inherit zlib ;};
+  })) // {inherit zlib ;};
 
-  libpthreadstubs = (mkDerivation "libpthreadstubs" {
+  libpthreadstubs = (stdenv.mkDerivation ((if overrides ? libpthreadstubs then overrides.libpthreadstubs else x: x) {
     name = "libpthread-stubs-0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -926,9 +921,9 @@ let
       sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  libxcb = (mkDerivation "libxcb" {
+  libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
     name = "libxcb-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -937,9 +932,9 @@ let
     };
     outputs = [ "dev" "out" "doc" "man" ];
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
-  }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
+  })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
-  libxkbfile = (mkDerivation "libxkbfile" {
+  libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) {
     name = "libxkbfile-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -947,9 +942,9 @@ let
       sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
-  }) // {inherit kbproto libX11 ;};
+  })) // {inherit kbproto libX11 ;};
 
-  libxshmfence = (mkDerivation "libxshmfence" {
+  libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) {
     name = "libxshmfence-1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -957,9 +952,9 @@ let
       sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  lndir = (mkDerivation "lndir" {
+  lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) {
     name = "lndir-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -967,9 +962,9 @@ let
       sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  luit = (mkDerivation "luit" {
+  luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) {
     name = "luit-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -977,9 +972,9 @@ let
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
     buildInputs = [pkgconfig libfontenc ];
-  }) // {inherit libfontenc ;};
+  })) // {inherit libfontenc ;};
 
-  makedepend = (mkDerivation "makedepend" {
+  makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
     name = "makedepend-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -987,9 +982,9 @@ let
       sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  mkfontdir = (mkDerivation "mkfontdir" {
+  mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) {
     name = "mkfontdir-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -997,9 +992,9 @@ let
       sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  mkfontscale = (mkDerivation "mkfontscale" {
+  mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) {
     name = "mkfontscale-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1007,9 +1002,9 @@ let
       sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
-  }) // {inherit libfontenc freetype xproto zlib ;};
+  })) // {inherit libfontenc freetype xproto zlib ;};
 
-  presentproto = (mkDerivation "presentproto" {
+  presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) {
     name = "presentproto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1017,9 +1012,9 @@ let
       sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  printproto = (mkDerivation "printproto" {
+  printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
     name = "printproto-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1027,9 +1022,9 @@ let
       sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j";
     };
     buildInputs = [pkgconfig libXau ];
-  }) // {inherit libXau ;};
+  })) // {inherit libXau ;};
 
-  randrproto = (mkDerivation "randrproto" {
+  randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) {
     name = "randrproto-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1037,9 +1032,9 @@ let
       sha256 = "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  recordproto = (mkDerivation "recordproto" {
+  recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) {
     name = "recordproto-1.14.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1047,9 +1042,9 @@ let
       sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  renderproto = (mkDerivation "renderproto" {
+  renderproto = (stdenv.mkDerivation ((if overrides ? renderproto then overrides.renderproto else x: x) {
     name = "renderproto-0.11.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1057,9 +1052,9 @@ let
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  resourceproto = (mkDerivation "resourceproto" {
+  resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) {
     name = "resourceproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1067,9 +1062,9 @@ let
       sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  scrnsaverproto = (mkDerivation "scrnsaverproto" {
+  scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) {
     name = "scrnsaverproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1077,9 +1072,9 @@ let
       sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  sessreg = (mkDerivation "sessreg" {
+  sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) {
     name = "sessreg-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1087,9 +1082,9 @@ let
       sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  setxkbmap = (mkDerivation "setxkbmap" {
+  setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) {
     name = "setxkbmap-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1097,9 +1092,9 @@ let
       sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  smproxy = (mkDerivation "smproxy" {
+  smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) {
     name = "smproxy-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1107,9 +1102,9 @@ let
       sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67";
     };
     buildInputs = [pkgconfig libICE libSM libXmu libXt ];
-  }) // {inherit libICE libSM libXmu libXt ;};
+  })) // {inherit libICE libSM libXmu libXt ;};
 
-  twm = (mkDerivation "twm" {
+  twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) {
     name = "twm-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1117,9 +1112,9 @@ let
       sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
-  }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
+  })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
-  utilmacros = (mkDerivation "utilmacros" {
+  utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
     name = "util-macros-1.19.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1127,9 +1122,9 @@ let
       sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  videoproto = (mkDerivation "videoproto" {
+  videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) {
     name = "videoproto-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1137,9 +1132,9 @@ let
       sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  windowswmproto = (mkDerivation "windowswmproto" {
+  windowswmproto = (stdenv.mkDerivation ((if overrides ? windowswmproto then overrides.windowswmproto else x: x) {
     name = "windowswmproto-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1147,9 +1142,9 @@ let
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  x11perf = (mkDerivation "x11perf" {
+  x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) {
     name = "x11perf-1.5.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1157,9 +1152,9 @@ let
       sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
-  }) // {inherit libX11 libXext libXft libXmu libXrender ;};
+  })) // {inherit libX11 libXext libXft libXmu libXrender ;};
 
-  xauth = (mkDerivation "xauth" {
+  xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
     name = "xauth-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1167,9 +1162,9 @@ let
       sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
-  }) // {inherit libX11 libXau libXext libXmu xproto ;};
+  })) // {inherit libX11 libXau libXext libXmu xproto ;};
 
-  xbacklight = (mkDerivation "xbacklight" {
+  xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) {
     name = "xbacklight-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1177,9 +1172,9 @@ let
       sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
-  }) // {inherit libxcb xcbutil ;};
+  })) // {inherit libxcb xcbutil ;};
 
-  xbitmaps = (mkDerivation "xbitmaps" {
+  xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) {
     name = "xbitmaps-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1187,9 +1182,9 @@ let
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xcbproto = (mkDerivation "xcbproto" {
+  xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
     name = "xcb-proto-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1197,9 +1192,9 @@ let
       sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l";
     };
     buildInputs = [pkgconfig python ];
-  }) // {inherit python ;};
+  })) // {inherit python ;};
 
-  xcbutil = (mkDerivation "xcbutil" {
+  xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
     name = "xcb-util-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1207,9 +1202,9 @@ let
       sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilimage = (mkDerivation "xcbutilimage" {
+  xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) {
     name = "xcb-util-image-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1217,9 +1212,9 @@ let
       sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
-  }) // {inherit gperf m4 libxcb xcbutil xproto ;};
+  })) // {inherit gperf m4 libxcb xcbutil xproto ;};
 
-  xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" {
+  xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) {
     name = "xcb-util-keysyms-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1227,9 +1222,9 @@ let
       sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" {
+  xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
     name = "xcb-util-renderutil-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1237,9 +1232,9 @@ let
       sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilwm = (mkDerivation "xcbutilwm" {
+  xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
     name = "xcb-util-wm-0.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1247,9 +1242,9 @@ let
       sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xclock = (mkDerivation "xclock" {
+  xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
     name = "xclock-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1257,9 +1252,9 @@ let
       sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
     };
     buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
-  }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
+  })) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
 
-  xcmiscproto = (mkDerivation "xcmiscproto" {
+  xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
     name = "xcmiscproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1267,9 +1262,9 @@ let
       sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xcmsdb = (mkDerivation "xcmsdb" {
+  xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) {
     name = "xcmsdb-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1277,9 +1272,9 @@ let
       sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74";
     };
     buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
+  })) // {inherit libX11 ;};
 
-  xcursorgen = (mkDerivation "xcursorgen" {
+  xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
     name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1287,9 +1282,9 @@ let
       sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
-  }) // {inherit libpng libX11 libXcursor ;};
+  })) // {inherit libpng libX11 libXcursor ;};
 
-  xcursorthemes = (mkDerivation "xcursorthemes" {
+  xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) {
     name = "xcursor-themes-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1297,9 +1292,9 @@ let
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     buildInputs = [pkgconfig libXcursor ];
-  }) // {inherit libXcursor ;};
+  })) // {inherit libXcursor ;};
 
-  xdm = (mkDerivation "xdm" {
+  xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) {
     name = "xdm-1.1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1307,9 +1302,9 @@ let
       sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
     };
     buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
-  }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
+  })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
-  xdpyinfo = (mkDerivation "xdpyinfo" {
+  xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
     name = "xdpyinfo-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1317,9 +1312,9 @@ let
       sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf";
     };
     buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+  })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
-  xdriinfo = (mkDerivation "xdriinfo" {
+  xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
     name = "xdriinfo-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1327,9 +1322,9 @@ let
       sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim";
     };
     buildInputs = [pkgconfig glproto libX11 ];
-  }) // {inherit glproto libX11 ;};
+  })) // {inherit glproto libX11 ;};
 
-  xev = (mkDerivation "xev" {
+  xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) {
     name = "xev-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1337,9 +1332,9 @@ let
       sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
-  }) // {inherit libX11 xproto libXrandr ;};
+  })) // {inherit libX11 xproto libXrandr ;};
 
-  xextproto = (mkDerivation "xextproto" {
+  xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
     name = "xextproto-7.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1347,9 +1342,9 @@ let
       sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xeyes = (mkDerivation "xeyes" {
+  xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) {
     name = "xeyes-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1357,9 +1352,9 @@ let
       sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ];
-  }) // {inherit libX11 libXext libXmu libXrender libXt ;};
+  })) // {inherit libX11 libXext libXmu libXrender libXt ;};
 
-  xf86bigfontproto = (mkDerivation "xf86bigfontproto" {
+  xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) {
     name = "xf86bigfontproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1367,9 +1362,9 @@ let
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86dgaproto = (mkDerivation "xf86dgaproto" {
+  xf86dgaproto = (stdenv.mkDerivation ((if overrides ? xf86dgaproto then overrides.xf86dgaproto else x: x) {
     name = "xf86dgaproto-2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1377,9 +1372,9 @@ let
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86driproto = (mkDerivation "xf86driproto" {
+  xf86driproto = (stdenv.mkDerivation ((if overrides ? xf86driproto then overrides.xf86driproto else x: x) {
     name = "xf86driproto-2.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1387,9 +1382,9 @@ let
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86inputevdev = (mkDerivation "xf86inputevdev" {
+  xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
     name = "xf86-input-evdev-2.8.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1397,9 +1392,9 @@ let
       sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
-  }) // {inherit inputproto udev xorgserver xproto ;};
+  })) // {inherit inputproto udev xorgserver xproto ;};
 
-  xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
+  xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
     name = "xf86-input-joystick-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1407,9 +1402,9 @@ let
       sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
     };
     buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
-  }) // {inherit inputproto kbproto xorgserver xproto ;};
+  })) // {inherit inputproto kbproto xorgserver xproto ;};
 
-  xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
+  xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
     name = "xf86-input-keyboard-1.8.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1417,9 +1412,9 @@ let
       sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  }) // {inherit inputproto xorgserver xproto ;};
+  })) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputmouse = (mkDerivation "xf86inputmouse" {
+  xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
     name = "xf86-input-mouse-1.9.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1427,9 +1422,9 @@ let
       sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  }) // {inherit inputproto xorgserver xproto ;};
+  })) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
+  xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
     name = "xf86-input-synaptics-1.7.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1437,9 +1432,9 @@ let
       sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
-  }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
+  })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
 
-  xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
+  xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) {
     name = "xf86-input-vmmouse-13.0.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1447,9 +1442,9 @@ let
       sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
+  })) // {inherit inputproto randrproto xorgserver xproto ;};
 
-  xf86inputvoid = (mkDerivation "xf86inputvoid" {
+  xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) {
     name = "xf86-input-void-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1457,9 +1452,9 @@ let
       sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  }) // {inherit xorgserver xproto ;};
+  })) // {inherit xorgserver xproto ;};
 
-  xf86miscproto = (mkDerivation "xf86miscproto" {
+  xf86miscproto = (stdenv.mkDerivation ((if overrides ? xf86miscproto then overrides.xf86miscproto else x: x) {
     name = "xf86miscproto-0.9.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1467,9 +1462,9 @@ let
       sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86videoark = (mkDerivation "xf86videoark" {
+  xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) {
     name = "xf86-video-ark-0.7.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1477,9 +1472,9 @@ let
       sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
 
-  xf86videoast = (mkDerivation "xf86videoast" {
+  xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) {
     name = "xf86-video-ast-0.98.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1487,9 +1482,9 @@ let
       sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoati = (mkDerivation "xf86videoati" {
+  xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
     name = "xf86-video-ati-7.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1497,9 +1492,9 @@ let
       sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videocirrus = (mkDerivation "xf86videocirrus" {
+  xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) {
     name = "xf86-video-cirrus-1.5.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1507,9 +1502,9 @@ let
       sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videodummy = (mkDerivation "xf86videodummy" {
+  xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) {
     name = "xf86-video-dummy-0.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1517,9 +1512,9 @@ let
       sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videofbdev = (mkDerivation "xf86videofbdev" {
+  xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) {
     name = "xf86-video-fbdev-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1527,9 +1522,9 @@ let
       sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videogeode = (mkDerivation "xf86videogeode" {
+  xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
     name = "xf86-video-geode-2.11.16";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1537,9 +1532,9 @@ let
       sha256 = "19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoglide = (mkDerivation "xf86videoglide" {
+  xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
     name = "xf86-video-glide-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1547,9 +1542,9 @@ let
       sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
-  }) // {inherit xextproto xorgserver xproto ;};
+  })) // {inherit xextproto xorgserver xproto ;};
 
-  xf86videoglint = (mkDerivation "xf86videoglint" {
+  xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) {
     name = "xf86-video-glint-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1557,9 +1552,9 @@ let
       sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videoi128 = (mkDerivation "xf86videoi128" {
+  xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) {
     name = "xf86-video-i128-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1567,9 +1562,9 @@ let
       sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videointel = (mkDerivation "xf86videointel" {
+  xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
     name = "xf86-video-intel-2.21.15";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1577,9 +1572,9 @@ let
       sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
     };
     buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
-  }) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
+  })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
 
-  xf86videomach64 = (mkDerivation "xf86videomach64" {
+  xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.9.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1587,9 +1582,9 @@ let
       sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomga = (mkDerivation "xf86videomga" {
+  xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
     name = "xf86-video-mga-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1597,9 +1592,9 @@ let
       sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomodesetting = (mkDerivation "xf86videomodesetting" {
+  xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
     name = "xf86-video-modesetting-0.9.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1607,9 +1602,9 @@ let
       sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
 
-  xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
+  xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
     name = "xf86-video-neomagic-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1617,9 +1612,9 @@ let
       sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess xorgserver xproto ;};
 
-  xf86videonewport = (mkDerivation "xf86videonewport" {
+  xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) {
     name = "xf86-video-newport-0.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1627,9 +1622,9 @@ let
       sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videonouveau = (mkDerivation "xf86videonouveau" {
+  xf86videonouveau = (stdenv.mkDerivation ((if overrides ? xf86videonouveau then overrides.xf86videonouveau else x: x) {
     name = "xf86-video-nouveau-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1637,9 +1632,9 @@ let
       sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videonv = (mkDerivation "xf86videonv" {
+  xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) {
     name = "xf86-video-nv-2.1.20";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1647,9 +1642,9 @@ let
       sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
+  xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) {
     name = "xf86-video-openchrome-0.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1657,9 +1652,9 @@ let
       sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
-  }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
+  })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
-  xf86videor128 = (mkDerivation "xf86videor128" {
+  xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
     name = "xf86-video-r128-6.9.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1667,9 +1662,9 @@ let
       sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
-  xf86videosavage = (mkDerivation "xf86videosavage" {
+  xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
     name = "xf86-video-savage-2.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1677,9 +1672,9 @@ let
       sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
+  xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) {
     name = "xf86-video-siliconmotion-1.7.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1687,9 +1682,9 @@ let
       sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
-  xf86videosis = (mkDerivation "xf86videosis" {
+  xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) {
     name = "xf86-video-sis-0.10.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1697,9 +1692,9 @@ let
       sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
-  xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
+  xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) {
     name = "xf86-video-suncg6-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1707,9 +1702,9 @@ let
       sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
 
-  xf86videosunffb = (mkDerivation "xf86videosunffb" {
+  xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) {
     name = "xf86-video-sunffb-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1717,9 +1712,9 @@ let
       sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videotdfx = (mkDerivation "xf86videotdfx" {
+  xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) {
     name = "xf86-video-tdfx-1.4.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1727,9 +1722,9 @@ let
       sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videotga = (mkDerivation "xf86videotga" {
+  xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) {
     name = "xf86-video-tga-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1737,9 +1732,9 @@ let
       sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videotrident = (mkDerivation "xf86videotrident" {
+  xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) {
     name = "xf86-video-trident-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1747,9 +1742,9 @@ let
       sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videov4l = (mkDerivation "xf86videov4l" {
+  xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) {
     name = "xf86-video-v4l-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1757,9 +1752,9 @@ let
       sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
-  }) // {inherit randrproto videoproto xorgserver xproto ;};
+  })) // {inherit randrproto videoproto xorgserver xproto ;};
 
-  xf86videovesa = (mkDerivation "xf86videovesa" {
+  xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) {
     name = "xf86-video-vesa-2.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1767,9 +1762,9 @@ let
       sha256 = "1y5fsg0c4bgmh1cfsbnaaf388fppyy02i7mcy9vax78flkjpb2yf";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videovmware = (mkDerivation "xf86videovmware" {
+  xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
     name = "xf86-video-vmware-13.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1777,9 +1772,9 @@ let
       sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
 
-  xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
+  xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
     name = "xf86-video-voodoo-1.2.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1787,9 +1782,9 @@ let
       sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videowsfb = (mkDerivation "xf86videowsfb" {
+  xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) {
     name = "xf86-video-wsfb-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1797,9 +1792,9 @@ let
       sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  }) // {inherit xorgserver xproto ;};
+  })) // {inherit xorgserver xproto ;};
 
-  xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" {
+  xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) {
     name = "xf86vidmodeproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1807,9 +1802,9 @@ let
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xfs = (mkDerivation "xfs" {
+  xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
     name = "xfs-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1817,9 +1812,9 @@ let
       sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v";
     };
     buildInputs = [pkgconfig libXfont xproto xtrans ];
-  }) // {inherit libXfont xproto xtrans ;};
+  })) // {inherit libXfont xproto xtrans ;};
 
-  xgamma = (mkDerivation "xgamma" {
+  xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) {
     name = "xgamma-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1827,9 +1822,9 @@ let
       sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3";
     };
     buildInputs = [pkgconfig libX11 libXxf86vm ];
-  }) // {inherit libX11 libXxf86vm ;};
+  })) // {inherit libX11 libXxf86vm ;};
 
-  xhost = (mkDerivation "xhost" {
+  xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) {
     name = "xhost-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1837,9 +1832,9 @@ let
       sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
-  }) // {inherit libX11 libXau libXmu xproto ;};
+  })) // {inherit libX11 libXau libXmu xproto ;};
 
-  xineramaproto = (mkDerivation "xineramaproto" {
+  xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) {
     name = "xineramaproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1847,9 +1842,9 @@ let
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xinit = (mkDerivation "xinit" {
+  xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) {
     name = "xinit-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1857,9 +1852,9 @@ let
       sha256 = "1bq0mqy7y305g2rds1g5443f3d2kgxzafqhmiyabbmg3ws6qgckl";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xinput = (mkDerivation "xinput" {
+  xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
     name = "xinput-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1867,9 +1862,9 @@ let
       sha256 = "07w7zlpdhpwzzshg8q0y152cy3wl2fj7x1897glnp2la487jsqxp";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
-  }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
+  })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
 
-  xkbcomp = (mkDerivation "xkbcomp" {
+  xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) {
     name = "xkbcomp-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1877,9 +1872,9 @@ let
       sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
-  }) // {inherit libX11 libxkbfile xproto ;};
+  })) // {inherit libX11 libxkbfile xproto ;};
 
-  xkbevd = (mkDerivation "xkbevd" {
+  xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) {
     name = "xkbevd-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1887,9 +1882,9 @@ let
       sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  xkbprint = (mkDerivation "xkbprint" {
+  xkbprint = (stdenv.mkDerivation ((if overrides ? xkbprint then overrides.xkbprint else x: x) {
     name = "xkbprint-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1897,9 +1892,9 @@ let
       sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  xkbutils = (mkDerivation "xkbutils" {
+  xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) {
     name = "xkbutils-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1907,9 +1902,9 @@ let
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
-  }) // {inherit inputproto libX11 libXaw xproto libXt ;};
+  })) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
-  xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
+  xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
     name = "xkeyboard-config-2.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1917,9 +1912,9 @@ let
       sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xkill = (mkDerivation "xkill" {
+  xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
     name = "xkill-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1927,9 +1922,9 @@ let
       sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xlsatoms = (mkDerivation "xlsatoms" {
+  xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
     name = "xlsatoms-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1937,9 +1932,9 @@ let
       sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv";
     };
     buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+  })) // {inherit libxcb ;};
 
-  xlsclients = (mkDerivation "xlsclients" {
+  xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
     name = "xlsclients-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1947,9 +1942,9 @@ let
       sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
     };
     buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+  })) // {inherit libxcb ;};
 
-  xmessage = (mkDerivation "xmessage" {
+  xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
     name = "xmessage-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1957,9 +1952,9 @@ let
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
+  })) // {inherit libXaw libXt ;};
 
-  xmodmap = (mkDerivation "xmodmap" {
+  xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) {
     name = "xmodmap-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1967,9 +1962,9 @@ let
       sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xorgcffiles = (mkDerivation "xorgcffiles" {
+  xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
     name = "xorg-cf-files-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1977,9 +1972,9 @@ let
       sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xorgdocs = (mkDerivation "xorgdocs" {
+  xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) {
     name = "xorg-docs-1.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1987,9 +1982,9 @@ let
       sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xorgserver = (mkDerivation "xorgserver" {
+  xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
     name = "xorg-server-1.14.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1997,9 +1992,9 @@ let
       sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
-  }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
+  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
 
-  xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
+  xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
     name = "xorg-sgml-doctools-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2007,9 +2002,9 @@ let
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xpr = (mkDerivation "xpr" {
+  xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) {
     name = "xpr-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2017,9 +2012,9 @@ let
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xprop = (mkDerivation "xprop" {
+  xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) {
     name = "xprop-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2027,9 +2022,9 @@ let
       sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xproto = (mkDerivation "xproto" {
+  xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
     name = "xproto-7.0.26";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2037,9 +2032,9 @@ let
       sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xrandr = (mkDerivation "xrandr" {
+  xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
     name = "xrandr-1.4.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2047,9 +2042,9 @@ let
       sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
-  }) // {inherit libX11 xproto libXrandr libXrender ;};
+  })) // {inherit libX11 xproto libXrandr libXrender ;};
 
-  xrdb = (mkDerivation "xrdb" {
+  xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) {
     name = "xrdb-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2057,9 +2052,9 @@ let
       sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xrefresh = (mkDerivation "xrefresh" {
+  xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) {
     name = "xrefresh-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2067,9 +2062,9 @@ let
       sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xset = (mkDerivation "xset" {
+  xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) {
     name = "xset-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2077,9 +2072,9 @@ let
       sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
-  }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
+  })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
 
-  xsetroot = (mkDerivation "xsetroot" {
+  xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) {
     name = "xsetroot-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2087,9 +2082,9 @@ let
       sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
-  }) // {inherit libX11 xbitmaps libXcursor libXmu ;};
+  })) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
-  xtrans = (mkDerivation "xtrans" {
+  xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
     name = "xtrans-1.3.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2097,9 +2092,9 @@ let
       sha256 = "0fjq9xa37k1czkidj3c5sads51gibrjvrxz9ag3hh9fmxzilwk85";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xvinfo = (mkDerivation "xvinfo" {
+  xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) {
     name = "xvinfo-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2107,9 +2102,9 @@ let
       sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf";
     };
     buildInputs = [pkgconfig libX11 xproto libXv ];
-  }) // {inherit libX11 xproto libXv ;};
+  })) // {inherit libX11 xproto libXv ;};
 
-  xwd = (mkDerivation "xwd" {
+  xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) {
     name = "xwd-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2117,9 +2112,9 @@ let
       sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xwininfo = (mkDerivation "xwininfo" {
+  xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) {
     name = "xwininfo-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2127,9 +2122,9 @@ let
       sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
-  }) // {inherit libX11 libxcb xproto ;};
+  })) // {inherit libX11 libxcb xproto ;};
 
-  xwud = (mkDerivation "xwud" {
+  xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) {
     name = "xwud-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2137,6 +2132,6 @@ let
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
 }; in xorg
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9c6618d3b105d..04ee5f109611e 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -230,11 +230,6 @@
 
 let
 
-  mkDerivation = name: attrs:
-    let newAttrs = (overrides."\${name}" or (x: x)) attrs;
-        stdenv = newAttrs.stdenv or args.stdenv;
-    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
-
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
@@ -266,7 +261,7 @@
     $extraAttrs = "" unless defined $extraAttrs;
 
     print OUT <<EOF
-  $pkg = (mkDerivation "$pkg" {
+  $pkg = (stdenv.mkDerivation ((if overrides ? $pkg then overrides.$pkg else x: x) {
     name = "$pkgNames{$pkg}";
     builder = ./builder.sh;
     src = fetchurl {
@@ -274,7 +269,7 @@
       sha256 = "$pkgHashes{$pkg}";
     };
     buildInputs = [pkgconfig $inputs];$extraAttrs
-  }) // {inherit $inputs;};
+  })) // {inherit $inputs;};
 
 EOF
 }

From 6eb7e42b5b265c0726f742da7a9d04ee749f4d60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Aug 2014 17:02:39 +0200
Subject: [PATCH 068/857] merge fixup

---
 pkgs/development/libraries/glibc/2.19/builder.sh | 16 +++++++++++++++-
 .../development/libraries/glibc/2.19/locales.nix |  2 +-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc/2.19/builder.sh b/pkgs/development/libraries/glibc/2.19/builder.sh
index 3b077cbb3fd52..7db93dc3bcf6e 100644
--- a/pkgs/development/libraries/glibc/2.19/builder.sh
+++ b/pkgs/development/libraries/glibc/2.19/builder.sh
@@ -12,6 +12,9 @@ postConfigure() {
 
     export NIX_DONT_SET_RPATH=1
     unset CFLAGS
+
+    # Apparently --bindir is not respected.
+    makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
 }
 
 
@@ -27,7 +30,7 @@ postInstall() {
     if test -z "$hurdHeaders"; then
         # Include the Linux kernel headers in Glibc, except the `scsi'
         # subdirectory, which Glibc provides itself.
-        (cd $out/include && \
+        (cd $dev/include && \
          ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
     fi
 
@@ -52,6 +55,17 @@ postInstall() {
 
     # Get rid of more unnecessary stuff.
     rm -rf $out/var $out/sbin/sln
+
+    # Put libraries for static linking in a separate output.  Note
+    # that libc_nonshared.a and libpthread_nonshared.a are required
+    # for dynamically-linked applications.
+    mkdir -p $static/lib
+    mv $out/lib/*.a $static/lib
+    mv $static/lib/lib*_nonshared.a $out/lib
+
+    # Work around a Nix bug: hard links across outputs cause a build failure.
+    cp $bin/bin/getconf $bin/bin/getconf_
+    mv $bin/bin/getconf_ $bin/bin/getconf
 }
 
 genericBuild
diff --git a/pkgs/development/libraries/glibc/2.19/locales.nix b/pkgs/development/libraries/glibc/2.19/locales.nix
index 9f9fb86a396d7..08c791b413164 100644
--- a/pkgs/development/libraries/glibc/2.19/locales.nix
+++ b/pkgs/development/libraries/glibc/2.19/locales.nix
@@ -25,7 +25,7 @@ build null {
   # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
   buildPhase =
     ''
-      mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale"
+      mkdir -p $TMPDIR/"${stdenv.gcc.libc}/lib/locale"
 
       # Hack to allow building of the locales (needed since glibc-2.12)
       sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \

From a835b282fec0875bb2dc599866a806d282eb3809 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Aug 2014 18:42:33 +0200
Subject: [PATCH 069/857] another fixup: stripFlags

---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 25113bc91bb32..325a5cb9d13e8 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -283,7 +283,7 @@ stripDir() {
 
     if [ -e "$dir" ]; then
         header "stripping (with flags $stripFlags) in $dir"
-        find "$dir" -type f -print0 | xargs -0 ${xargsFlags:--r} strip $stripFlags || true
+        find "$dir" -type f -print0 | xargs -0 ${xargsFlags:--r} strip "$commonStripFlags" "$stripFlags" || true
         stopNest
     fi
 }
@@ -296,7 +296,7 @@ stripDirs() {
 
     for d in $subdirs; do
         if [ -d "$prefix/$d" ]; then
-            stripDir "$prefix/$d" "$commonStripFlags" "$stripFlags"
+            stripDir "$prefix/$d" "$stripFlags"
         fi
     done
 }

From 86a372683a0185eea5ce8359bcadb72f4782cad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 23 Aug 2014 16:14:37 +0200
Subject: [PATCH 070/857] xorg: stop using the new nix syntax

Partial revert of 5ea8497933da0dbee5fa5a31c97843e2c6baac17.

Conflicts:
	pkgs/servers/x11/xorg/default.nix
---
 pkgs/servers/x11/xorg/default.nix             | 866 +++++++++---------
 .../x11/xorg/generate-expr-from-tarballs.pl   |   9 +-
 2 files changed, 425 insertions(+), 450 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 806cbf01b8559..2f18a4e1020fb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,18 +3,13 @@ args: with args;
 
 let
 
-  mkDerivation = name: attrs:
-    let newAttrs = (overrides."${name}" or (x: x)) attrs;
-        stdenv = newAttrs.stdenv or args.stdenv;
-    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
-
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
 
   inherit pixman;
 
-  applewmproto = (mkDerivation "applewmproto" {
+  applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
     name = "applewmproto-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -22,9 +17,9 @@ let
       sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  bdftopcf = (mkDerivation "bdftopcf" {
+  bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) {
     name = "bdftopcf-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -32,9 +27,9 @@ let
       sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga";
     };
     buildInputs = [pkgconfig libXfont ];
-  }) // {inherit libXfont ;};
+  })) // {inherit libXfont ;};
 
-  bigreqsproto = (mkDerivation "bigreqsproto" {
+  bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) {
     name = "bigreqsproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -42,9 +37,9 @@ let
       sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  compositeproto = (mkDerivation "compositeproto" {
+  compositeproto = (stdenv.mkDerivation ((if overrides ? compositeproto then overrides.compositeproto else x: x) {
     name = "compositeproto-0.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -52,9 +47,9 @@ let
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  damageproto = (mkDerivation "damageproto" {
+  damageproto = (stdenv.mkDerivation ((if overrides ? damageproto then overrides.damageproto else x: x) {
     name = "damageproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -62,9 +57,9 @@ let
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dmxproto = (mkDerivation "dmxproto" {
+  dmxproto = (stdenv.mkDerivation ((if overrides ? dmxproto then overrides.dmxproto else x: x) {
     name = "dmxproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -72,9 +67,9 @@ let
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dri2proto = (mkDerivation "dri2proto" {
+  dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) {
     name = "dri2proto-2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -82,9 +77,9 @@ let
       sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  dri3proto = (mkDerivation "dri3proto" {
+  dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) {
     name = "dri3proto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -92,9 +87,9 @@ let
       sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  encodings = (mkDerivation "encodings" {
+  encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) {
     name = "encodings-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -102,9 +97,9 @@ let
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fixesproto = (mkDerivation "fixesproto" {
+  fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) {
     name = "fixesproto-5.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -112,9 +107,9 @@ let
       sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
     };
     buildInputs = [pkgconfig xextproto ];
-  }) // {inherit xextproto ;};
+  })) // {inherit xextproto ;};
 
-  fontadobe100dpi = (mkDerivation "fontadobe100dpi" {
+  fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) {
     name = "font-adobe-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -122,9 +117,9 @@ let
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobe75dpi = (mkDerivation "fontadobe75dpi" {
+  fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) {
     name = "font-adobe-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -132,9 +127,9 @@ let
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
+  fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) {
     name = "font-adobe-utopia-100dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -142,9 +137,9 @@ let
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
+  fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) {
     name = "font-adobe-utopia-75dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -152,9 +147,9 @@ let
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
+  fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) {
     name = "font-adobe-utopia-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -162,9 +157,9 @@ let
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontalias = (mkDerivation "fontalias" {
+  fontalias = (stdenv.mkDerivation ((if overrides ? fontalias then overrides.fontalias else x: x) {
     name = "font-alias-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -172,9 +167,9 @@ let
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontarabicmisc = (mkDerivation "fontarabicmisc" {
+  fontarabicmisc = (stdenv.mkDerivation ((if overrides ? fontarabicmisc then overrides.fontarabicmisc else x: x) {
     name = "font-arabic-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -182,9 +177,9 @@ let
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbh100dpi = (mkDerivation "fontbh100dpi" {
+  fontbh100dpi = (stdenv.mkDerivation ((if overrides ? fontbh100dpi then overrides.fontbh100dpi else x: x) {
     name = "font-bh-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -192,9 +187,9 @@ let
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbh75dpi = (mkDerivation "fontbh75dpi" {
+  fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) {
     name = "font-bh-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -202,9 +197,9 @@ let
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" {
+  fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) {
     name = "font-bh-lucidatypewriter-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -212,9 +207,9 @@ let
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" {
+  fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) {
     name = "font-bh-lucidatypewriter-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -222,9 +217,9 @@ let
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhttf = (mkDerivation "fontbhttf" {
+  fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) {
     name = "font-bh-ttf-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -232,9 +227,9 @@ let
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontbhtype1 = (mkDerivation "fontbhtype1" {
+  fontbhtype1 = (stdenv.mkDerivation ((if overrides ? fontbhtype1 then overrides.fontbhtype1 else x: x) {
     name = "font-bh-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -242,9 +237,9 @@ let
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" {
+  fontbitstream100dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream100dpi then overrides.fontbitstream100dpi else x: x) {
     name = "font-bitstream-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -252,9 +247,9 @@ let
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" {
+  fontbitstream75dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream75dpi then overrides.fontbitstream75dpi else x: x) {
     name = "font-bitstream-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -262,9 +257,9 @@ let
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" {
+  fontbitstreamtype1 = (stdenv.mkDerivation ((if overrides ? fontbitstreamtype1 then overrides.fontbitstreamtype1 else x: x) {
     name = "font-bitstream-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -272,9 +267,9 @@ let
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" {
+  fontcronyxcyrillic = (stdenv.mkDerivation ((if overrides ? fontcronyxcyrillic then overrides.fontcronyxcyrillic else x: x) {
     name = "font-cronyx-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -282,9 +277,9 @@ let
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontcursormisc = (mkDerivation "fontcursormisc" {
+  fontcursormisc = (stdenv.mkDerivation ((if overrides ? fontcursormisc then overrides.fontcursormisc else x: x) {
     name = "font-cursor-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -292,9 +287,9 @@ let
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontdaewoomisc = (mkDerivation "fontdaewoomisc" {
+  fontdaewoomisc = (stdenv.mkDerivation ((if overrides ? fontdaewoomisc then overrides.fontdaewoomisc else x: x) {
     name = "font-daewoo-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -302,9 +297,9 @@ let
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontdecmisc = (mkDerivation "fontdecmisc" {
+  fontdecmisc = (stdenv.mkDerivation ((if overrides ? fontdecmisc then overrides.fontdecmisc else x: x) {
     name = "font-dec-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -312,9 +307,9 @@ let
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontibmtype1 = (mkDerivation "fontibmtype1" {
+  fontibmtype1 = (stdenv.mkDerivation ((if overrides ? fontibmtype1 then overrides.fontibmtype1 else x: x) {
     name = "font-ibm-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -322,9 +317,9 @@ let
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontisasmisc = (mkDerivation "fontisasmisc" {
+  fontisasmisc = (stdenv.mkDerivation ((if overrides ? fontisasmisc then overrides.fontisasmisc else x: x) {
     name = "font-isas-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -332,9 +327,9 @@ let
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontjismisc = (mkDerivation "fontjismisc" {
+  fontjismisc = (stdenv.mkDerivation ((if overrides ? fontjismisc then overrides.fontjismisc else x: x) {
     name = "font-jis-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -342,9 +337,9 @@ let
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmicromisc = (mkDerivation "fontmicromisc" {
+  fontmicromisc = (stdenv.mkDerivation ((if overrides ? fontmicromisc then overrides.fontmicromisc else x: x) {
     name = "font-micro-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -352,9 +347,9 @@ let
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmisccyrillic = (mkDerivation "fontmisccyrillic" {
+  fontmisccyrillic = (stdenv.mkDerivation ((if overrides ? fontmisccyrillic then overrides.fontmisccyrillic else x: x) {
     name = "font-misc-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -362,9 +357,9 @@ let
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontmiscethiopic = (mkDerivation "fontmiscethiopic" {
+  fontmiscethiopic = (stdenv.mkDerivation ((if overrides ? fontmiscethiopic then overrides.fontmiscethiopic else x: x) {
     name = "font-misc-ethiopic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -372,9 +367,9 @@ let
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmeltho = (mkDerivation "fontmiscmeltho" {
+  fontmiscmeltho = (stdenv.mkDerivation ((if overrides ? fontmiscmeltho then overrides.fontmiscmeltho else x: x) {
     name = "font-misc-meltho-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -382,9 +377,9 @@ let
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmisc = (mkDerivation "fontmiscmisc" {
+  fontmiscmisc = (stdenv.mkDerivation ((if overrides ? fontmiscmisc then overrides.fontmiscmisc else x: x) {
     name = "font-misc-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -392,9 +387,9 @@ let
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontmuttmisc = (mkDerivation "fontmuttmisc" {
+  fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) {
     name = "font-mutt-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -402,9 +397,9 @@ let
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontschumachermisc = (mkDerivation "fontschumachermisc" {
+  fontschumachermisc = (stdenv.mkDerivation ((if overrides ? fontschumachermisc then overrides.fontschumachermisc else x: x) {
     name = "font-schumacher-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -412,9 +407,9 @@ let
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
+  fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) {
     name = "font-screen-cyrillic-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -422,9 +417,9 @@ let
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontsonymisc = (mkDerivation "fontsonymisc" {
+  fontsonymisc = (stdenv.mkDerivation ((if overrides ? fontsonymisc then overrides.fontsonymisc else x: x) {
     name = "font-sony-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -432,9 +427,9 @@ let
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontsproto = (mkDerivation "fontsproto" {
+  fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
     name = "fontsproto-2.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -442,9 +437,9 @@ let
       sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontsunmisc = (mkDerivation "fontsunmisc" {
+  fontsunmisc = (stdenv.mkDerivation ((if overrides ? fontsunmisc then overrides.fontsunmisc else x: x) {
     name = "font-sun-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -452,9 +447,9 @@ let
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontutil = (mkDerivation "fontutil" {
+  fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) {
     name = "font-util-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -462,9 +457,9 @@ let
       sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" {
+  fontwinitzkicyrillic = (stdenv.mkDerivation ((if overrides ? fontwinitzkicyrillic then overrides.fontwinitzkicyrillic else x: x) {
     name = "font-winitzki-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -472,9 +467,9 @@ let
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit bdftopcf mkfontdir ;};
+  })) // {inherit bdftopcf mkfontdir ;};
 
-  fontxfree86type1 = (mkDerivation "fontxfree86type1" {
+  fontxfree86type1 = (stdenv.mkDerivation ((if overrides ? fontxfree86type1 then overrides.fontxfree86type1 else x: x) {
     name = "font-xfree86-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -482,9 +477,9 @@ let
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  }) // {inherit mkfontdir mkfontscale ;};
+  })) // {inherit mkfontdir mkfontscale ;};
 
-  gccmakedep = (mkDerivation "gccmakedep" {
+  gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) {
     name = "gccmakedep-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -492,9 +487,9 @@ let
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  glamoregl = (mkDerivation "glamoregl" {
+  glamoregl = (stdenv.mkDerivation ((if overrides ? glamoregl then overrides.glamoregl else x: x) {
     name = "glamor-egl-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -502,9 +497,9 @@ let
       sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
     };
     buildInputs = [pkgconfig dri2proto xorgserver ];
-  }) // {inherit dri2proto xorgserver ;};
+  })) // {inherit dri2proto xorgserver ;};
 
-  glproto = (mkDerivation "glproto" {
+  glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) {
     name = "glproto-1.4.17";
     builder = ./builder.sh;
     src = fetchurl {
@@ -512,9 +507,9 @@ let
       sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  iceauth = (mkDerivation "iceauth" {
+  iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) {
     name = "iceauth-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -522,9 +517,9 @@ let
       sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx";
     };
     buildInputs = [pkgconfig libICE xproto ];
-  }) // {inherit libICE xproto ;};
+  })) // {inherit libICE xproto ;};
 
-  imake = (mkDerivation "imake" {
+  imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
     name = "imake-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -532,9 +527,9 @@ let
       sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  inputproto = (mkDerivation "inputproto" {
+  inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
     name = "inputproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -542,9 +537,9 @@ let
       sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  kbproto = (mkDerivation "kbproto" {
+  kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) {
     name = "kbproto-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -552,9 +547,9 @@ let
       sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  libAppleWM = (mkDerivation "libAppleWM" {
+  libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) {
     name = "libAppleWM-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -562,9 +557,9 @@ let
       sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
-  }) // {inherit applewmproto libX11 libXext xextproto ;};
+  })) // {inherit applewmproto libX11 libXext xextproto ;};
 
-  libFS = (mkDerivation "libFS" {
+  libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) {
     name = "libFS-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -572,9 +567,9 @@ let
       sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
-  }) // {inherit fontsproto xproto xtrans ;};
+  })) // {inherit fontsproto xproto xtrans ;};
 
-  libICE = (mkDerivation "libICE" {
+  libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
     name = "libICE-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -582,9 +577,9 @@ let
       sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
-  }) // {inherit xproto xtrans ;};
+  })) // {inherit xproto xtrans ;};
 
-  libSM = (mkDerivation "libSM" {
+  libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) {
     name = "libSM-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -592,9 +587,9 @@ let
       sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
-  }) // {inherit libICE libuuid xproto xtrans ;};
+  })) // {inherit libICE libuuid xproto xtrans ;};
 
-  libWindowsWM = (mkDerivation "libWindowsWM" {
+  libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) {
     name = "libWindowsWM-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -602,9 +597,9 @@ let
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
-  }) // {inherit windowswmproto libX11 libXext xextproto ;};
+  })) // {inherit windowswmproto libX11 libXext xextproto ;};
 
-  libX11 = (mkDerivation "libX11" {
+  libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
     name = "libX11-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -612,9 +607,9 @@ let
       sha256 = "05mx0s0vqzds3qjc1gmjr2s6x2ll37z4lfhgm7p2w7936zl2g81a";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
-  }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
+  })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
 
-  libXScrnSaver = (mkDerivation "libXScrnSaver" {
+  libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) {
     name = "libXScrnSaver-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -622,9 +617,9 @@ let
       sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
-  }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
+  })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
-  libXau = (mkDerivation "libXau" {
+  libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
     name = "libXau-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -632,9 +627,9 @@ let
       sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  libXaw = (mkDerivation "libXaw" {
+  libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) {
     name = "libXaw-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
@@ -642,9 +637,9 @@ let
       sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
-  }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
-  libXcomposite = (mkDerivation "libXcomposite" {
+  libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
     name = "libXcomposite-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -652,9 +647,9 @@ let
       sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
     };
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
-  }) // {inherit compositeproto libX11 libXfixes xproto ;};
+  })) // {inherit compositeproto libX11 libXfixes xproto ;};
 
-  libXcursor = (mkDerivation "libXcursor" {
+  libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
     name = "libXcursor-1.1.14";
     builder = ./builder.sh;
     src = fetchurl {
@@ -662,9 +657,9 @@ let
       sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
-  }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
+  })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
-  libXdamage = (mkDerivation "libXdamage" {
+  libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
     name = "libXdamage-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -672,9 +667,9 @@ let
       sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
-  }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
+  })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
-  libXdmcp = (mkDerivation "libXdmcp" {
+  libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
     name = "libXdmcp-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -682,9 +677,9 @@ let
       sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  libXext = (mkDerivation "libXext" {
+  libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
     name = "libXext-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -692,9 +687,9 @@ let
       sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
     };
     buildInputs = [pkgconfig libX11 xextproto xproto ];
-  }) // {inherit libX11 xextproto xproto ;};
+  })) // {inherit libX11 xextproto xproto ;};
 
-  libXfixes = (mkDerivation "libXfixes" {
+  libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
     name = "libXfixes-5.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -702,9 +697,9 @@ let
       sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3";
     };
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
-  }) // {inherit fixesproto libX11 xextproto xproto ;};
+  })) // {inherit fixesproto libX11 xextproto xproto ;};
 
-  libXfont = (mkDerivation "libXfont" {
+  libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
     name = "libXfont-1.4.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -712,9 +707,9 @@ let
       sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
-  }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
+  })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
-  libXft = (mkDerivation "libXft" {
+  libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
     name = "libXft-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -722,9 +717,9 @@ let
       sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
     };
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
-  }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
+  })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
-  libXi = (mkDerivation "libXi" {
+  libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
     name = "libXi-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -732,9 +727,9 @@ let
       sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
-  }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
+  })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
-  libXinerama = (mkDerivation "libXinerama" {
+  libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
     name = "libXinerama-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -742,9 +737,9 @@ let
       sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
-  }) // {inherit libX11 libXext xextproto xineramaproto ;};
+  })) // {inherit libX11 libXext xextproto xineramaproto ;};
 
-  libXmu = (mkDerivation "libXmu" {
+  libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) {
     name = "libXmu-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -752,9 +747,9 @@ let
       sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  }) // {inherit libX11 libXext xextproto xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXp = (mkDerivation "libXp" {
+  libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) {
     name = "libXp-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -762,9 +757,9 @@ let
       sha256 = "1dfh5w8sjz5b5fl6dl4y63ckq99snslz7bir8zq2rg8ax6syabwm";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
-  }) // {inherit printproto libX11 libXau libXext xextproto ;};
+  })) // {inherit printproto libX11 libXau libXext xextproto ;};
 
-  libXpm = (mkDerivation "libXpm" {
+  libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) {
     name = "libXpm-3.5.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -772,9 +767,9 @@ let
       sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  }) // {inherit libX11 libXext xextproto xproto libXt ;};
+  })) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXrandr = (mkDerivation "libXrandr" {
+  libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
     name = "libXrandr-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -782,9 +777,9 @@ let
       sha256 = "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
-  }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
+  })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
-  libXrender = (mkDerivation "libXrender" {
+  libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
     name = "libXrender-0.9.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -792,9 +787,9 @@ let
       sha256 = "0qpwyjhbpp734vnhca992pjh4w7ijslidkzx1pcwbbk000pv050x";
     };
     buildInputs = [pkgconfig renderproto libX11 xproto ];
-  }) // {inherit renderproto libX11 xproto ;};
+  })) // {inherit renderproto libX11 xproto ;};
 
-  libXres = (mkDerivation "libXres" {
+  libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) {
     name = "libXres-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -802,9 +797,9 @@ let
       sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
-  }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
+  })) // {inherit resourceproto libX11 libXext xextproto xproto ;};
 
-  libXt = (mkDerivation "libXt" {
+  libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) {
     name = "libXt-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -812,9 +807,9 @@ let
       sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
-  }) // {inherit libICE kbproto libSM libX11 xproto ;};
+  })) // {inherit libICE kbproto libSM libX11 xproto ;};
 
-  libXtst = (mkDerivation "libXtst" {
+  libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) {
     name = "libXtst-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -822,9 +817,9 @@ let
       sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
-  }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
+  })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
 
-  libXv = (mkDerivation "libXv" {
+  libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) {
     name = "libXv-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -832,9 +827,9 @@ let
       sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
-  }) // {inherit videoproto libX11 libXext xextproto xproto ;};
+  })) // {inherit videoproto libX11 libXext xextproto xproto ;};
 
-  libXvMC = (mkDerivation "libXvMC" {
+  libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) {
     name = "libXvMC-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -842,9 +837,9 @@ let
       sha256 = "015jk3bxfmj6zaw99x282f9npi8qqaw34yg186frags3z8g406jy";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
-  }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
+  })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
 
-  libXxf86dga = (mkDerivation "libXxf86dga" {
+  libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) {
     name = "libXxf86dga-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -852,9 +847,9 @@ let
       sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
 
-  libXxf86misc = (mkDerivation "libXxf86misc" {
+  libXxf86misc = (stdenv.mkDerivation ((if overrides ? libXxf86misc then overrides.libXxf86misc else x: x) {
     name = "libXxf86misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -862,9 +857,9 @@ let
       sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
-  libXxf86vm = (mkDerivation "libXxf86vm" {
+  libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
     name = "libXxf86vm-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -872,9 +867,9 @@ let
       sha256 = "1f1pxj018nk7ybxv58jmn5y8gm2288p4q3l2dng9n1p25v1qcpns";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
-  }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
+  })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 
-  libdmx = (mkDerivation "libdmx" {
+  libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) {
     name = "libdmx-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -882,9 +877,9 @@ let
       sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
-  }) // {inherit dmxproto libX11 libXext xextproto ;};
+  })) // {inherit dmxproto libX11 libXext xextproto ;};
 
-  libfontenc = (mkDerivation "libfontenc" {
+  libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) {
     name = "libfontenc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -892,9 +887,9 @@ let
       sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959";
     };
     buildInputs = [pkgconfig xproto zlib ];
-  }) // {inherit xproto zlib ;};
+  })) // {inherit xproto zlib ;};
 
-  libpciaccess = (mkDerivation "libpciaccess" {
+  libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
     name = "libpciaccess-0.13.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -902,9 +897,9 @@ let
       sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb";
     };
     buildInputs = [pkgconfig zlib ];
-  }) // {inherit zlib ;};
+  })) // {inherit zlib ;};
 
-  libpthreadstubs = (mkDerivation "libpthreadstubs" {
+  libpthreadstubs = (stdenv.mkDerivation ((if overrides ? libpthreadstubs then overrides.libpthreadstubs else x: x) {
     name = "libpthread-stubs-0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -912,9 +907,9 @@ let
       sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  libxcb = (mkDerivation "libxcb" {
+  libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
     name = "libxcb-1.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -922,9 +917,9 @@ let
       sha256 = "1dfmyb1zjx6n0zhr4y40mc1crlmj3bfjjhmn0f30ip9nnq2spncq";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
-  }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
+  })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
-  libxkbfile = (mkDerivation "libxkbfile" {
+  libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) {
     name = "libxkbfile-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -932,9 +927,9 @@ let
       sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
-  }) // {inherit kbproto libX11 ;};
+  })) // {inherit kbproto libX11 ;};
 
-  libxshmfence = (mkDerivation "libxshmfence" {
+  libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) {
     name = "libxshmfence-1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -942,9 +937,9 @@ let
       sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  lndir = (mkDerivation "lndir" {
+  lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) {
     name = "lndir-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -952,9 +947,9 @@ let
       sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  luit = (mkDerivation "luit" {
+  luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) {
     name = "luit-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -962,9 +957,9 @@ let
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
     buildInputs = [pkgconfig libfontenc ];
-  }) // {inherit libfontenc ;};
+  })) // {inherit libfontenc ;};
 
-  makedepend = (mkDerivation "makedepend" {
+  makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
     name = "makedepend-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -972,9 +967,9 @@ let
       sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  mkfontdir = (mkDerivation "mkfontdir" {
+  mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) {
     name = "mkfontdir-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -982,9 +977,9 @@ let
       sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  mkfontscale = (mkDerivation "mkfontscale" {
+  mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) {
     name = "mkfontscale-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -992,9 +987,9 @@ let
       sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
-  }) // {inherit libfontenc freetype xproto zlib ;};
+  })) // {inherit libfontenc freetype xproto zlib ;};
 
-  presentproto = (mkDerivation "presentproto" {
+  presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) {
     name = "presentproto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1002,9 +997,9 @@ let
       sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  printproto = (mkDerivation "printproto" {
+  printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
     name = "printproto-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1012,9 +1007,9 @@ let
       sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j";
     };
     buildInputs = [pkgconfig libXau ];
-  }) // {inherit libXau ;};
+  })) // {inherit libXau ;};
 
-  randrproto = (mkDerivation "randrproto" {
+  randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) {
     name = "randrproto-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1022,9 +1017,9 @@ let
       sha256 = "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  recordproto = (mkDerivation "recordproto" {
+  recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) {
     name = "recordproto-1.14.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1032,9 +1027,9 @@ let
       sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  renderproto = (mkDerivation "renderproto" {
+  renderproto = (stdenv.mkDerivation ((if overrides ? renderproto then overrides.renderproto else x: x) {
     name = "renderproto-0.11.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1042,9 +1037,9 @@ let
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  resourceproto = (mkDerivation "resourceproto" {
+  resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) {
     name = "resourceproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1052,9 +1047,9 @@ let
       sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  scrnsaverproto = (mkDerivation "scrnsaverproto" {
+  scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) {
     name = "scrnsaverproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1062,9 +1057,9 @@ let
       sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  sessreg = (mkDerivation "sessreg" {
+  sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) {
     name = "sessreg-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1072,9 +1067,9 @@ let
       sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf";
     };
     buildInputs = [pkgconfig xproto ];
-  }) // {inherit xproto ;};
+  })) // {inherit xproto ;};
 
-  setxkbmap = (mkDerivation "setxkbmap" {
+  setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) {
     name = "setxkbmap-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1082,9 +1077,9 @@ let
       sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  smproxy = (mkDerivation "smproxy" {
+  smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) {
     name = "smproxy-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1092,9 +1087,9 @@ let
       sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67";
     };
     buildInputs = [pkgconfig libICE libSM libXmu libXt ];
-  }) // {inherit libICE libSM libXmu libXt ;};
+  })) // {inherit libICE libSM libXmu libXt ;};
 
-  twm = (mkDerivation "twm" {
+  twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) {
     name = "twm-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1102,9 +1097,9 @@ let
       sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
-  }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
+  })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
-  utilmacros = (mkDerivation "utilmacros" {
+  utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
     name = "util-macros-1.19.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1112,9 +1107,9 @@ let
       sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  videoproto = (mkDerivation "videoproto" {
+  videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) {
     name = "videoproto-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1122,9 +1117,9 @@ let
       sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  windowswmproto = (mkDerivation "windowswmproto" {
+  windowswmproto = (stdenv.mkDerivation ((if overrides ? windowswmproto then overrides.windowswmproto else x: x) {
     name = "windowswmproto-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1132,9 +1127,9 @@ let
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  x11perf = (mkDerivation "x11perf" {
+  x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) {
     name = "x11perf-1.5.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1142,9 +1137,9 @@ let
       sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
-  }) // {inherit libX11 libXext libXft libXmu libXrender ;};
+  })) // {inherit libX11 libXext libXft libXmu libXrender ;};
 
-  xauth = (mkDerivation "xauth" {
+  xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
     name = "xauth-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1152,9 +1147,9 @@ let
       sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
-  }) // {inherit libX11 libXau libXext libXmu xproto ;};
+  })) // {inherit libX11 libXau libXext libXmu xproto ;};
 
-  xbacklight = (mkDerivation "xbacklight" {
+  xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) {
     name = "xbacklight-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1162,9 +1157,9 @@ let
       sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
-  }) // {inherit libxcb xcbutil ;};
+  })) // {inherit libxcb xcbutil ;};
 
-  xbitmaps = (mkDerivation "xbitmaps" {
+  xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) {
     name = "xbitmaps-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1172,9 +1167,9 @@ let
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xcbproto = (mkDerivation "xcbproto" {
+  xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
     name = "xcb-proto-1.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1182,9 +1177,9 @@ let
       sha256 = "01dgp802i4ic9wkmpa7g1wm50pp547d3b96jjz2hnxavhpfhvx3y";
     };
     buildInputs = [pkgconfig python ];
-  }) // {inherit python ;};
+  })) // {inherit python ;};
 
-  xcbutil = (mkDerivation "xcbutil" {
+  xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
     name = "xcb-util-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1192,9 +1187,9 @@ let
       sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilimage = (mkDerivation "xcbutilimage" {
+  xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) {
     name = "xcb-util-image-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1202,9 +1197,9 @@ let
       sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
-  }) // {inherit gperf m4 libxcb xcbutil xproto ;};
+  })) // {inherit gperf m4 libxcb xcbutil xproto ;};
 
-  xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" {
+  xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) {
     name = "xcb-util-keysyms-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1212,9 +1207,9 @@ let
       sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" {
+  xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
     name = "xcb-util-renderutil-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1222,9 +1217,9 @@ let
       sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilwm = (mkDerivation "xcbutilwm" {
+  xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
     name = "xcb-util-wm-0.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1232,9 +1227,9 @@ let
       sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  }) // {inherit gperf m4 libxcb xproto ;};
+  })) // {inherit gperf m4 libxcb xproto ;};
 
-  xclock = (mkDerivation "xclock" {
+  xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
     name = "xclock-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1242,9 +1237,9 @@ let
       sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
     };
     buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
-  }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
+  })) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
 
-  xcmiscproto = (mkDerivation "xcmiscproto" {
+  xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
     name = "xcmiscproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1252,9 +1247,9 @@ let
       sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xcmsdb = (mkDerivation "xcmsdb" {
+  xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) {
     name = "xcmsdb-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1262,9 +1257,9 @@ let
       sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74";
     };
     buildInputs = [pkgconfig libX11 ];
-  }) // {inherit libX11 ;};
+  })) // {inherit libX11 ;};
 
-  xcursorgen = (mkDerivation "xcursorgen" {
+  xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
     name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1272,9 +1267,9 @@ let
       sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
-  }) // {inherit libpng libX11 libXcursor ;};
+  })) // {inherit libpng libX11 libXcursor ;};
 
-  xcursorthemes = (mkDerivation "xcursorthemes" {
+  xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) {
     name = "xcursor-themes-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1282,9 +1277,9 @@ let
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     buildInputs = [pkgconfig libXcursor ];
-  }) // {inherit libXcursor ;};
+  })) // {inherit libXcursor ;};
 
-  xdm = (mkDerivation "xdm" {
+  xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) {
     name = "xdm-1.1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1292,9 +1287,9 @@ let
       sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
     };
     buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
-  }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
+  })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
-  xdpyinfo = (mkDerivation "xdpyinfo" {
+  xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
     name = "xdpyinfo-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1302,9 +1297,9 @@ let
       sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf";
     };
     buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+  })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
-  xdriinfo = (mkDerivation "xdriinfo" {
+  xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
     name = "xdriinfo-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1312,9 +1307,9 @@ let
       sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim";
     };
     buildInputs = [pkgconfig glproto libX11 ];
-  }) // {inherit glproto libX11 ;};
+  })) // {inherit glproto libX11 ;};
 
-  xev = (mkDerivation "xev" {
+  xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) {
     name = "xev-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1322,9 +1317,9 @@ let
       sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
-  }) // {inherit libX11 xproto libXrandr ;};
+  })) // {inherit libX11 xproto libXrandr ;};
 
-  xextproto = (mkDerivation "xextproto" {
+  xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
     name = "xextproto-7.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1332,9 +1327,9 @@ let
       sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xeyes = (mkDerivation "xeyes" {
+  xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) {
     name = "xeyes-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1342,9 +1337,9 @@ let
       sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ];
-  }) // {inherit libX11 libXext libXmu libXrender libXt ;};
+  })) // {inherit libX11 libXext libXmu libXrender libXt ;};
 
-  xf86bigfontproto = (mkDerivation "xf86bigfontproto" {
+  xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) {
     name = "xf86bigfontproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1352,9 +1347,9 @@ let
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86dgaproto = (mkDerivation "xf86dgaproto" {
+  xf86dgaproto = (stdenv.mkDerivation ((if overrides ? xf86dgaproto then overrides.xf86dgaproto else x: x) {
     name = "xf86dgaproto-2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1362,9 +1357,9 @@ let
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86driproto = (mkDerivation "xf86driproto" {
+  xf86driproto = (stdenv.mkDerivation ((if overrides ? xf86driproto then overrides.xf86driproto else x: x) {
     name = "xf86driproto-2.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1372,9 +1367,9 @@ let
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86inputevdev = (mkDerivation "xf86inputevdev" {
+  xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
     name = "xf86-input-evdev-2.8.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1382,9 +1377,9 @@ let
       sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
-  }) // {inherit inputproto udev xorgserver xproto ;};
+  })) // {inherit inputproto udev xorgserver xproto ;};
 
-  xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
+  xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
     name = "xf86-input-joystick-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1392,9 +1387,9 @@ let
       sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
     };
     buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
-  }) // {inherit inputproto kbproto xorgserver xproto ;};
+  })) // {inherit inputproto kbproto xorgserver xproto ;};
 
-  xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
+  xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
     name = "xf86-input-keyboard-1.8.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1402,9 +1397,9 @@ let
       sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  }) // {inherit inputproto xorgserver xproto ;};
+  })) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputmouse = (mkDerivation "xf86inputmouse" {
+  xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
     name = "xf86-input-mouse-1.9.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1412,9 +1407,9 @@ let
       sha256 = "12344w0cxac1ld54qqwynxwazbmmpvqh1mzcskmfkmakmr5iwq2x";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  }) // {inherit inputproto xorgserver xproto ;};
+  })) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
+  xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
     name = "xf86-input-synaptics-1.7.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1422,9 +1417,9 @@ let
       sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
-  }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
+  })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
 
-  xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
+  xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) {
     name = "xf86-input-vmmouse-13.0.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1432,9 +1427,9 @@ let
       sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  }) // {inherit inputproto randrproto xorgserver xproto ;};
+  })) // {inherit inputproto randrproto xorgserver xproto ;};
 
-  xf86inputvoid = (mkDerivation "xf86inputvoid" {
+  xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) {
     name = "xf86-input-void-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1442,9 +1437,9 @@ let
       sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  }) // {inherit xorgserver xproto ;};
+  })) // {inherit xorgserver xproto ;};
 
-  xf86miscproto = (mkDerivation "xf86miscproto" {
+  xf86miscproto = (stdenv.mkDerivation ((if overrides ? xf86miscproto then overrides.xf86miscproto else x: x) {
     name = "xf86miscproto-0.9.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1452,9 +1447,9 @@ let
       sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xf86videoark = (mkDerivation "xf86videoark" {
+  xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) {
     name = "xf86-video-ark-0.7.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1462,9 +1457,9 @@ let
       sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
 
-  xf86videoast = (mkDerivation "xf86videoast" {
+  xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) {
     name = "xf86-video-ast-0.98.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1472,9 +1467,9 @@ let
       sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoati = (mkDerivation "xf86videoati" {
+  xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
     name = "xf86-video-ati-7.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1482,9 +1477,9 @@ let
       sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videocirrus = (mkDerivation "xf86videocirrus" {
+  xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) {
     name = "xf86-video-cirrus-1.5.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1492,9 +1487,9 @@ let
       sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videodummy = (mkDerivation "xf86videodummy" {
+  xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) {
     name = "xf86-video-dummy-0.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1502,9 +1497,9 @@ let
       sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videofbdev = (mkDerivation "xf86videofbdev" {
+  xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) {
     name = "xf86-video-fbdev-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1512,9 +1507,9 @@ let
       sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videogeode = (mkDerivation "xf86videogeode" {
+  xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
     name = "xf86-video-geode-2.11.15";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1522,9 +1517,9 @@ let
       sha256 = "1w4ghr2a41kaw4g9na8ws5fjbmy8zkbxpxa21vmqc8mkjzb3pnq0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoglide = (mkDerivation "xf86videoglide" {
+  xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
     name = "xf86-video-glide-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1532,9 +1527,9 @@ let
       sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
-  }) // {inherit xextproto xorgserver xproto ;};
+  })) // {inherit xextproto xorgserver xproto ;};
 
-  xf86videoglint = (mkDerivation "xf86videoglint" {
+  xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) {
     name = "xf86-video-glint-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1542,9 +1537,9 @@ let
       sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videoi128 = (mkDerivation "xf86videoi128" {
+  xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) {
     name = "xf86-video-i128-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1552,9 +1547,9 @@ let
       sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videointel = (mkDerivation "xf86videointel" {
+  xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
     name = "xf86-video-intel-2.21.15";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1562,9 +1557,9 @@ let
       sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
     };
     buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
-  }) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
+  })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
 
-  xf86videomach64 = (mkDerivation "xf86videomach64" {
+  xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
     name = "xf86-video-mach64-6.9.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1572,9 +1567,9 @@ let
       sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomga = (mkDerivation "xf86videomga" {
+  xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
     name = "xf86-video-mga-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1582,9 +1577,9 @@ let
       sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomodesetting = (mkDerivation "xf86videomodesetting" {
+  xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
     name = "xf86-video-modesetting-0.9.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1592,9 +1587,9 @@ let
       sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
 
-  xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
+  xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
     name = "xf86-video-neomagic-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1602,9 +1597,9 @@ let
       sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess xorgserver xproto ;};
 
-  xf86videonewport = (mkDerivation "xf86videonewport" {
+  xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) {
     name = "xf86-video-newport-0.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1612,9 +1607,9 @@ let
       sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videonouveau = (mkDerivation "xf86videonouveau" {
+  xf86videonouveau = (stdenv.mkDerivation ((if overrides ? xf86videonouveau then overrides.xf86videonouveau else x: x) {
     name = "xf86-video-nouveau-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1622,9 +1617,9 @@ let
       sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videonv = (mkDerivation "xf86videonv" {
+  xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) {
     name = "xf86-video-nv-2.1.20";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1632,9 +1627,9 @@ let
       sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
+  xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) {
     name = "xf86-video-openchrome-0.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1642,9 +1637,9 @@ let
       sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
-  }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
+  })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
-  xf86videor128 = (mkDerivation "xf86videor128" {
+  xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
     name = "xf86-video-r128-6.9.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1652,9 +1647,9 @@ let
       sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
-  xf86videosavage = (mkDerivation "xf86videosavage" {
+  xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
     name = "xf86-video-savage-2.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1662,9 +1657,9 @@ let
       sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
+  xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) {
     name = "xf86-video-siliconmotion-1.7.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1672,9 +1667,9 @@ let
       sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
-  xf86videosis = (mkDerivation "xf86videosis" {
+  xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) {
     name = "xf86-video-sis-0.10.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1682,9 +1677,9 @@ let
       sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
-  xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
+  xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) {
     name = "xf86-video-suncg6-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1692,9 +1687,9 @@ let
       sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
 
-  xf86videosunffb = (mkDerivation "xf86videosunffb" {
+  xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) {
     name = "xf86-video-sunffb-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1702,9 +1697,9 @@ let
       sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videotdfx = (mkDerivation "xf86videotdfx" {
+  xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) {
     name = "xf86-video-tdfx-1.4.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1712,9 +1707,9 @@ let
       sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videotga = (mkDerivation "xf86videotga" {
+  xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) {
     name = "xf86-video-tga-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1722,9 +1717,9 @@ let
       sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videotrident = (mkDerivation "xf86videotrident" {
+  xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) {
     name = "xf86-video-trident-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1732,9 +1727,9 @@ let
       sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videov4l = (mkDerivation "xf86videov4l" {
+  xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) {
     name = "xf86-video-v4l-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1742,9 +1737,9 @@ let
       sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
-  }) // {inherit randrproto videoproto xorgserver xproto ;};
+  })) // {inherit randrproto videoproto xorgserver xproto ;};
 
-  xf86videovesa = (mkDerivation "xf86videovesa" {
+  xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) {
     name = "xf86-video-vesa-2.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1752,9 +1747,9 @@ let
       sha256 = "1y5fsg0c4bgmh1cfsbnaaf388fppyy02i7mcy9vax78flkjpb2yf";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videovmware = (mkDerivation "xf86videovmware" {
+  xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
     name = "xf86-video-vmware-13.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1762,9 +1757,9 @@ let
       sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
-  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
 
-  xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
+  xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
     name = "xf86-video-voodoo-1.2.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1772,9 +1767,9 @@ let
       sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
-  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
+  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videowsfb = (mkDerivation "xf86videowsfb" {
+  xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) {
     name = "xf86-video-wsfb-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1782,9 +1777,9 @@ let
       sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  }) // {inherit xorgserver xproto ;};
+  })) // {inherit xorgserver xproto ;};
 
-  xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" {
+  xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) {
     name = "xf86vidmodeproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1792,9 +1787,9 @@ let
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xfs = (mkDerivation "xfs" {
+  xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
     name = "xfs-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1802,9 +1797,9 @@ let
       sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v";
     };
     buildInputs = [pkgconfig libXfont xproto xtrans ];
-  }) // {inherit libXfont xproto xtrans ;};
+  })) // {inherit libXfont xproto xtrans ;};
 
-  xgamma = (mkDerivation "xgamma" {
+  xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) {
     name = "xgamma-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1812,9 +1807,9 @@ let
       sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3";
     };
     buildInputs = [pkgconfig libX11 libXxf86vm ];
-  }) // {inherit libX11 libXxf86vm ;};
+  })) // {inherit libX11 libXxf86vm ;};
 
-  xhost = (mkDerivation "xhost" {
+  xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) {
     name = "xhost-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1822,9 +1817,9 @@ let
       sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
-  }) // {inherit libX11 libXau libXmu xproto ;};
+  })) // {inherit libX11 libXau libXmu xproto ;};
 
-  xineramaproto = (mkDerivation "xineramaproto" {
+  xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) {
     name = "xineramaproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1832,9 +1827,9 @@ let
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xinit = (mkDerivation "xinit" {
+  xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) {
     name = "xinit-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1842,9 +1837,9 @@ let
       sha256 = "1bq0mqy7y305g2rds1g5443f3d2kgxzafqhmiyabbmg3ws6qgckl";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xinput = (mkDerivation "xinput" {
+  xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
     name = "xinput-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1852,9 +1847,9 @@ let
       sha256 = "07w7zlpdhpwzzshg8q0y152cy3wl2fj7x1897glnp2la487jsqxp";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
-  }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
+  })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
 
-  xkbcomp = (mkDerivation "xkbcomp" {
+  xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) {
     name = "xkbcomp-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1862,9 +1857,9 @@ let
       sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
-  }) // {inherit libX11 libxkbfile xproto ;};
+  })) // {inherit libX11 libxkbfile xproto ;};
 
-  xkbevd = (mkDerivation "xkbevd" {
+  xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) {
     name = "xkbevd-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1872,9 +1867,9 @@ let
       sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  xkbprint = (mkDerivation "xkbprint" {
+  xkbprint = (stdenv.mkDerivation ((if overrides ? xkbprint then overrides.xkbprint else x: x) {
     name = "xkbprint-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1882,9 +1877,9 @@ let
       sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  }) // {inherit libX11 libxkbfile ;};
+  })) // {inherit libX11 libxkbfile ;};
 
-  xkbutils = (mkDerivation "xkbutils" {
+  xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) {
     name = "xkbutils-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1892,9 +1887,9 @@ let
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
-  }) // {inherit inputproto libX11 libXaw xproto libXt ;};
+  })) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
-  xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
+  xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
     name = "xkeyboard-config-2.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1902,9 +1897,9 @@ let
       sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xkill = (mkDerivation "xkill" {
+  xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
     name = "xkill-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1912,9 +1907,9 @@ let
       sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xlsatoms = (mkDerivation "xlsatoms" {
+  xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
     name = "xlsatoms-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1922,9 +1917,9 @@ let
       sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv";
     };
     buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+  })) // {inherit libxcb ;};
 
-  xlsclients = (mkDerivation "xlsclients" {
+  xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
     name = "xlsclients-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1932,9 +1927,9 @@ let
       sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
     };
     buildInputs = [pkgconfig libxcb ];
-  }) // {inherit libxcb ;};
+  })) // {inherit libxcb ;};
 
-  xmessage = (mkDerivation "xmessage" {
+  xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
     name = "xmessage-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1942,9 +1937,9 @@ let
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     buildInputs = [pkgconfig libXaw libXt ];
-  }) // {inherit libXaw libXt ;};
+  })) // {inherit libXaw libXt ;};
 
-  xmodmap = (mkDerivation "xmodmap" {
+  xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) {
     name = "xmodmap-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1952,9 +1947,9 @@ let
       sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xorgcffiles = (mkDerivation "xorgcffiles" {
+  xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
     name = "xorg-cf-files-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1962,9 +1957,9 @@ let
       sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xorgdocs = (mkDerivation "xorgdocs" {
+  xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) {
     name = "xorg-docs-1.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1972,9 +1967,9 @@ let
       sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xorgserver = (mkDerivation "xorgserver" {
+  xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
     name = "xorg-server-1.14.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1982,24 +1977,9 @@ let
       sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
-  }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
-
-  # TODO:
-  # With the current state of ./generate-expr-from-tarballs.pl,
-  # this will get overwritten when next invoked.
-  # Could add a special case to ./generate-expr-from-tarballs.pl,
-  # or perhaps there's a cleaner solution.
-  #xquartz = (mkDerivation "xquartz" {
-  #  name = "xorg-server-1.14.6";
-  #  builder = ./builder.sh;
-  #  src = fetchurl {
-  #    url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
-  #    sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
-  #  };
-  #  buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
-  #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
-
-  xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
+  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
+
+  xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
     name = "xorg-sgml-doctools-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2007,9 +1987,9 @@ let
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xpr = (mkDerivation "xpr" {
+  xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) {
     name = "xpr-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2017,9 +1997,9 @@ let
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xprop = (mkDerivation "xprop" {
+  xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) {
     name = "xprop-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2027,9 +2007,9 @@ let
       sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xproto = (mkDerivation "xproto" {
+  xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
     name = "xproto-7.0.26";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2037,9 +2017,9 @@ let
       sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xrandr = (mkDerivation "xrandr" {
+  xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
     name = "xrandr-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2047,9 +2027,9 @@ let
       sha256 = "1g4hnj53wknsjwiqivyy3jl4qw7jwrpncz7d5p2z29zq5zlnxrxj";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
-  }) // {inherit libX11 xproto libXrandr libXrender ;};
+  })) // {inherit libX11 xproto libXrandr libXrender ;};
 
-  xrdb = (mkDerivation "xrdb" {
+  xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) {
     name = "xrdb-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2057,9 +2037,9 @@ let
       sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  }) // {inherit libX11 libXmu xproto ;};
+  })) // {inherit libX11 libXmu xproto ;};
 
-  xrefresh = (mkDerivation "xrefresh" {
+  xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) {
     name = "xrefresh-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2067,9 +2047,9 @@ let
       sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xset = (mkDerivation "xset" {
+  xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) {
     name = "xset-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2077,9 +2057,9 @@ let
       sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
-  }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
+  })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
 
-  xsetroot = (mkDerivation "xsetroot" {
+  xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) {
     name = "xsetroot-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2087,9 +2067,9 @@ let
       sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
-  }) // {inherit libX11 xbitmaps libXcursor libXmu ;};
+  })) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
-  xtrans = (mkDerivation "xtrans" {
+  xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
     name = "xtrans-1.3.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2097,9 +2077,9 @@ let
       sha256 = "0fjq9xa37k1czkidj3c5sads51gibrjvrxz9ag3hh9fmxzilwk85";
     };
     buildInputs = [pkgconfig ];
-  }) // {inherit ;};
+  })) // {inherit ;};
 
-  xvinfo = (mkDerivation "xvinfo" {
+  xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) {
     name = "xvinfo-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2107,9 +2087,9 @@ let
       sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf";
     };
     buildInputs = [pkgconfig libX11 xproto libXv ];
-  }) // {inherit libX11 xproto libXv ;};
+  })) // {inherit libX11 xproto libXv ;};
 
-  xwd = (mkDerivation "xwd" {
+  xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) {
     name = "xwd-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2117,9 +2097,9 @@ let
       sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
-  xwininfo = (mkDerivation "xwininfo" {
+  xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) {
     name = "xwininfo-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2127,9 +2107,9 @@ let
       sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
-  }) // {inherit libX11 libxcb xproto ;};
+  })) // {inherit libX11 libxcb xproto ;};
 
-  xwud = (mkDerivation "xwud" {
+  xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) {
     name = "xwud-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2137,6 +2117,6 @@ let
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  }) // {inherit libX11 xproto ;};
+  })) // {inherit libX11 xproto ;};
 
 }; in xorg
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9c6618d3b105d..04ee5f109611e 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -230,11 +230,6 @@
 
 let
 
-  mkDerivation = name: attrs:
-    let newAttrs = (overrides."\${name}" or (x: x)) attrs;
-        stdenv = newAttrs.stdenv or args.stdenv;
-    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
-
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
@@ -266,7 +261,7 @@
     $extraAttrs = "" unless defined $extraAttrs;
 
     print OUT <<EOF
-  $pkg = (mkDerivation "$pkg" {
+  $pkg = (stdenv.mkDerivation ((if overrides ? $pkg then overrides.$pkg else x: x) {
     name = "$pkgNames{$pkg}";
     builder = ./builder.sh;
     src = fetchurl {
@@ -274,7 +269,7 @@
       sha256 = "$pkgHashes{$pkg}";
     };
     buildInputs = [pkgconfig $inputs];$extraAttrs
-  }) // {inherit $inputs;};
+  })) // {inherit $inputs;};
 
 EOF
 }

From 4e72b61de9bdb0c1216632e743c04f5da592b3ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 Aug 2014 18:37:23 +0200
Subject: [PATCH 071/857] stdenv/setup.sh: add $propagateIntoInput

This is needed for multiple-output derivations,
where it is desirable to propagate deps and setup-hooks into $dev instead of $out.

Also drop an unused simple function which will not even make sense.
---
 pkgs/stdenv/generic/setup.sh | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index ea2ea947b505f..5da7f773732f4 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -144,11 +144,6 @@ ensureDir() {
 }
 
 
-installBin() {
-    mkdir -p $out/bin
-    cp "$@" $out/bin
-}
-
 
 ######################################################################
 # Initialisation.
@@ -264,7 +259,7 @@ for i in $crossPkgs; do
 done
 
 
-# Add the output as an rpath.
+# Add the output as an rpath. ToDo: multiple-output?
 if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
     export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
     if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
@@ -707,24 +702,27 @@ fixupPhase() {
         prefix=${!output} runHook fixupOutput
     done
 
+    # Multiple-output derivations mostly choose $dev instead of $out
+    local prOut="${propagateIntoOutput:-$out}"
+
     if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedBuildInputs" > "$out/nix-support/propagated-build-inputs"
+        mkdir -p "$prOut/nix-support"
+        echo "$propagatedBuildInputs" > "$prOut/nix-support/propagated-build-inputs"
     fi
 
     if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedNativeBuildInputs" > "$out/nix-support/propagated-native-build-inputs"
+        mkdir -p "$prOut/nix-support"
+        echo "$propagatedNativeBuildInputs" > "$prOut/nix-support/propagated-native-build-inputs"
     fi
 
     if [ -n "$propagatedUserEnvPkgs" ]; then
-        mkdir -p "$out/nix-support"
-        echo "$propagatedUserEnvPkgs" > "$out/nix-support/propagated-user-env-packages"
+        mkdir -p "$prOut/nix-support"
+        echo "$propagatedUserEnvPkgs" > "$prOut/nix-support/propagated-user-env-packages"
     fi
 
     if [ -n "$setupHook" ]; then
-        mkdir -p "$out/nix-support"
-        substituteAll "$setupHook" "$out/nix-support/setup-hook"
+        mkdir -p "$prOut/nix-support"
+        substituteAll "$setupHook" "$prOut/nix-support/setup-hook"
     fi
 
     runHook postFixup

From def75f028240ce2d38ec8e0707cc886c8b7596a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 24 Aug 2014 19:05:56 +0200
Subject: [PATCH 072/857] stdenv: add first iteration of the multiout hook

Now it should contain *all* information from stdenv/setup.sh of
the original mutiple-output branch.
However, the configurability of the output paths is much greater.
---
 .../setup-hooks/multiple-outputs.sh           | 51 +++++++++++++++++++
 pkgs/stdenv/generic/default.nix               |  6 +++
 pkgs/stdenv/generic/setup.sh                  | 21 ++++----
 3 files changed, 69 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/build-support/setup-hooks/multiple-outputs.sh

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
new file mode 100644
index 0000000000000..72cef7cf032da
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -0,0 +1,51 @@
+preConfigureHooks+=(_multioutConfig)
+
+# Assign the first nonempty string to variable named $1
+_assignFirst() {
+    local varName="$1"
+    shift
+    while [ $# -ge 0 ]; do
+        if [ -n "$1" ]; then eval "${varName}"="$1"; return; fi
+        shift
+    done
+    return 1 # none found
+}
+
+# Setup chains of sane default values with easy overridability.
+# The variables are global to be usable anywhere during the build.
+# ToDo: I was unable to get rid of the double-name redundancy (I hate bash eval ways)
+
+_assignFirst outputDev "$outputDev" "$dev" "$out"
+_assignFirst outputBin "$outputBin" "$bin" "$out"
+
+_assignFirst outputInclude "$outputInclude" "$outputDev"
+
+# so-libs are often among the main things to keep, and so go to $out
+_assignFirst outputLib "$outputLib" "$lib" "$out"
+
+_assignFirst outputDoc "$outputDoc" "$doc" "$out"
+# man and info pages are small and often useful to distribute with binaries
+_assignFirst outputMan "$outputMan" "$man" "$outputBin"
+_assignFirst outputInfo "$outputInfo" "$info" "$outputMan"
+
+# Add standard flags to put files into the desired outputs.
+_multioutConfig() {
+    if [ -n "${setOutputFlags-1}" ]; then
+        configureFlags="\
+            --bindir=$outputBin/bin --sbindir=$outputBin/sbin --libexecdir=$outputBin/libexec \
+            --includedir=$outputInclude/include --oldincludedir=$outputInclude/include \
+            --mandir=$outputMan/share/man --infodir=$outputInfo/share/info --docdir=$outputDoc/share/doc \
+            --libdir=$outputLib/lib \
+            $configureFlags"
+
+        installFlags="\
+            pkgconfigdir=$outputDev/lib/pkgconfig \
+            m4datadir=$outputDev/share/aclocal aclocaldir=$outputDev/share/aclocal \
+            $installFlags"
+    fi
+}
+
+# Add rpath prefixes to library paths, and avoid stdenv doing it for $out.
+_addRpathPrefix "$outputLib"
+NIX_NO_SELF_RPATH=1
+
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index ae308a0153667..29f9f49a9281b 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -206,6 +206,12 @@ let
       inherit overrides;
 
       inherit gcc;
+
+      # extra useful hooks, so we do not need to pass them as package arguments
+      hookLib = {
+        multiout = ../../build-support/setup-hooks/multiple-outputs.sh;
+        #ToDo: add also autoreconf = pkgs.autoreconfHook
+      };
     }
 
     # Propagate any extra attributes.  For instance, we use this to
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 5da7f773732f4..6291f4a367b78 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -259,16 +259,19 @@ for i in $crossPkgs; do
 done
 
 
-# Add the output as an rpath. ToDo: multiple-output?
-if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-    if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
-        export NIX_LDFLAGS="-rpath $out/lib64 $NIX_LDFLAGS"
-    fi
-    if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
-        export NIX_LDFLAGS="-rpath $out/lib32 $NIX_LDFLAGS"
+# Add $1/lib* into rpaths.
+_addRpathPrefix() {
+    if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
+        export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
+        if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
+            export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS"
+        fi
+        if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
+            export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS"
+        fi
     fi
-fi
+}
+_addRpathPrefix "$out"
 
 
 # Set the TZ (timezone) environment variable, otherwise commands like

From c96f4d7949dffe6dab0611b8839f9935d2517451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Aug 2014 10:29:54 +0200
Subject: [PATCH 073/857] gcc, glibc: merge changes from original
 multiple-output

Can't be done automatically because of file copies/moves.
---
 pkgs/development/compilers/gcc/4.8/builder.sh | 19 ++++++++++++++-----
 .../development/compilers/gcc/4.8/default.nix |  9 ++++++++-
 .../libraries/glibc/2.19/builder.sh           | 17 +++++++++++++++--
 .../libraries/glibc/2.19/default.nix          |  4 +++-
 .../libraries/glibc/2.19/locales.nix          |  2 +-
 5 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh
index 3d24d34a2f26a..1c0a09accbf34 100644
--- a/pkgs/development/compilers/gcc/4.8/builder.sh
+++ b/pkgs/development/compilers/gcc/4.8/builder.sh
@@ -8,9 +8,10 @@ mkdir $NIX_FIXINC_DUMMY
 if test "$staticCompiler" = "1"; then
     EXTRA_LDFLAGS="-static"
 else
-    EXTRA_LDFLAGS=""
+    EXTRA_LDFLAGS="-Wl,-rpath,$lib/lib"
 fi
 
+
 # GCC interprets empty paths as ".", which we don't want.
 if test -z "$CPATH"; then unset CPATH; fi
 if test -z "$LIBRARY_PATH"; then unset LIBRARY_PATH; fi
@@ -29,7 +30,7 @@ if test "$noSysDirs" = "1"; then
         # Use *real* header files, otherwise a limits.h is generated
         # that does not include Glibc's limits.h (notably missing
         # SSIZE_MAX, which breaks the build).
-        export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include
+        export NIX_FIXINC_DUMMY=$libc_dev/include
 
         # The path to the Glibc binaries such as `crti.o'.
         glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib"
@@ -171,9 +172,8 @@ preConfigure() {
         # Patch the configure script so it finds glibc headers.  It's
         # important for example in order not to get libssp built,
         # because its functionality is in glibc already.
-        glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include"
         sed -i \
-            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \
+            -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$libc_dev/include", \
             gcc/configure
     fi
 
@@ -210,6 +210,14 @@ preInstall() {
 
 
 postInstall() {
+    # Move runtime libraries to $lib.
+    mkdir -p $lib/lib
+    ln -s lib $lib/lib64
+    mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $out/lib/*.la $lib/lib/
+    for i in $lib/lib/*.la; do
+        substituteInPlace $i --replace $out $lib
+    done
+
     # Remove precompiled headers for now.  They are very big and
     # probably not very useful yet.
     find $out/include -name "*.gch" -exec rm -rf {} \; -prune
@@ -221,6 +229,7 @@ postInstall() {
 
     # More dependencies with the previous gcc or some libs (gccbug stores the build command line)
     rm -rf $out/bin/gccbug
+
     # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
     for i in $out/libexec/gcc/*/*/*; do
         if PREV_RPATH=`patchelf --print-rpath $i`; then
@@ -229,7 +238,7 @@ postInstall() {
     done
 
     # Get rid of some "fixed" header files
-    rm -rf $out/lib/gcc/*/*/include/root
+    rm -rfv $out/lib/gcc/*/*/include-fixed/{root,linux}
 
     # Replace hard links for i686-pc-linux-gnu-gcc etc. with symlinks.
     for i in $out/bin/*-gcc*; do
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 7985b445ae06a..205fa0750e6a9 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -195,7 +195,7 @@ let version = "4.8.3";
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
+    bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
 
 in
 
@@ -214,6 +214,13 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
+  outputs = [ "out" "lib" ];
+
+  setOutputConfigureFlags = false;
+
+
+  libc_dev = stdenv.gcc.libc_dev;
+
   postPatch =
     if (stdenv.isGNU
         || (libcCross != null                  # e.g., building `gcc.crossDrv'
diff --git a/pkgs/development/libraries/glibc/2.19/builder.sh b/pkgs/development/libraries/glibc/2.19/builder.sh
index 3b077cbb3fd52..043621766c552 100644
--- a/pkgs/development/libraries/glibc/2.19/builder.sh
+++ b/pkgs/development/libraries/glibc/2.19/builder.sh
@@ -12,8 +12,10 @@ postConfigure() {
 
     export NIX_DONT_SET_RPATH=1
     unset CFLAGS
-}
 
+    # Apparently --bindir is not respected.
+    makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
+}
 
 postInstall() {
     if test -n "$installLocales"; then
@@ -27,7 +29,7 @@ postInstall() {
     if test -z "$hurdHeaders"; then
         # Include the Linux kernel headers in Glibc, except the `scsi'
         # subdirectory, which Glibc provides itself.
-        (cd $out/include && \
+        (cd $dev/include && \
          ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
     fi
 
@@ -52,6 +54,17 @@ postInstall() {
 
     # Get rid of more unnecessary stuff.
     rm -rf $out/var $out/sbin/sln
+
+    # Put libraries for static linking in a separate output.  Note
+    # that libc_nonshared.a and libpthread_nonshared.a are required
+    # for dynamically-linked applications.
+    mkdir -p $static/lib
+    mv $out/lib/*.a $static/lib
+    mv $static/lib/lib*_nonshared.a $out/lib
+
+    # Work around a Nix bug: hard links across outputs cause a build failure.
+    cp $bin/bin/getconf $bin/bin/getconf_
+    mv $bin/bin/getconf_ $bin/bin/getconf
 }
 
 genericBuild
diff --git a/pkgs/development/libraries/glibc/2.19/default.nix b/pkgs/development/libraries/glibc/2.19/default.nix
index 52a94bd0a0d5a..ace043a250cc9 100644
--- a/pkgs/development/libraries/glibc/2.19/default.nix
+++ b/pkgs/development/libraries/glibc/2.19/default.nix
@@ -25,6 +25,8 @@ in
 
     builder = ./builder.sh;
 
+    outputs = [ "out" "dev" "bin" "static" ];
+
     # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
     # any program we run, because the gcc will have been placed at a new
     # store path than that determined when built (as a source for the
@@ -95,7 +97,7 @@ in
 
       # To avoid a dependency on the build system 'bash'.
       preFixup = ''
-        rm $out/bin/{ldd,tzselect,catchsegv,xtrace}
+        rm $bin/bin/{ldd,tzselect,catchsegv,xtrace}
       '';
     }
    else {}))
diff --git a/pkgs/development/libraries/glibc/2.19/locales.nix b/pkgs/development/libraries/glibc/2.19/locales.nix
index 9f9fb86a396d7..08c791b413164 100644
--- a/pkgs/development/libraries/glibc/2.19/locales.nix
+++ b/pkgs/development/libraries/glibc/2.19/locales.nix
@@ -25,7 +25,7 @@ build null {
   # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
   buildPhase =
     ''
-      mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale"
+      mkdir -p $TMPDIR/"${stdenv.gcc.libc}/lib/locale"
 
       # Hack to allow building of the locales (needed since glibc-2.12)
       sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \

From 3ec413ceced044131825c090f29a48768b562797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Aug 2014 15:30:46 +0200
Subject: [PATCH 074/857] WIP

---
 pkgs/build-support/setup-hooks/move-docs.sh   | 29 +-----------
 .../setup-hooks/multiple-outputs.sh           | 47 ++++++++++++++++++-
 .../development/compilers/gcc/4.6/default.nix |  2 +-
 .../development/compilers/gcc/4.8/default.nix |  2 +-
 .../interpreters/perl/5.16/default.nix        |  2 +
 .../libraries/glibc/2.19/common.nix           |  5 +-
 .../libraries/glibc/2.19/default.nix          |  2 -
 .../tools/misc/patchelf/default.nix           |  2 +-
 pkgs/development/tools/misc/texinfo/5.2.nix   |  2 +-
 pkgs/stdenv/generic/setup.sh                  | 36 +++++++-------
 pkgs/tools/compression/xz/default.nix         |  3 +-
 11 files changed, 76 insertions(+), 56 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/move-docs.sh b/pkgs/build-support/setup-hooks/move-docs.sh
index c819ee12a9c9b..ef31dcdce2747 100644
--- a/pkgs/build-support/setup-hooks/move-docs.sh
+++ b/pkgs/build-support/setup-hooks/move-docs.sh
@@ -2,7 +2,7 @@
 # $out/share/man to $man/share/man; and moves $out/share/doc to
 # $man/share/doc.
 
-preFixupHooks+=(_moveDocs)
+preFixupHooks+=(_moveToShare)
 
 _moveToShare() {
     forceShare=${forceShare:=man doc info}
@@ -21,30 +21,3 @@ _moveToShare() {
     done
 }
 
-_moveToOutput() {
-    local d="$1"
-    local dst="$2"
-    if [ -z "$dst" -a ! -e $dst/$d ]; then return; fi
-    local output
-    for output in $outputs; do
-        if [ "${!output}" = "$dst" ]; then continue; fi
-        if [ -d "${!output}/$d" ]; then
-            echo "moving ${!output}/$d to $dst/$d"
-            mkdir -p $dst/share
-            mv ${!output}/$d $dst/$d
-            break
-        fi
-    done
-}
-
-_moveDocs() {
-    _moveToShare
-    _moveToOutput share/man "$man"
-    _moveToOutput share/info "$info"
-    _moveToOutput share/doc "$doc"
-
-    # Remove empty share directory.
-    if [ -d "$out/share" ]; then
-        rmdir $out/share 2> /dev/null || true
-    fi
-}
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 72cef7cf032da..1589ecd37342f 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -1,4 +1,7 @@
 preConfigureHooks+=(_multioutConfig)
+preFixupHooks+=(_multioutDocs)
+postFixupHooks+=(_multioutPropagateDev)
+
 
 # Assign the first nonempty string to variable named $1
 _assignFirst() {
@@ -28,14 +31,17 @@ _assignFirst outputDoc "$outputDoc" "$doc" "$out"
 _assignFirst outputMan "$outputMan" "$man" "$outputBin"
 _assignFirst outputInfo "$outputInfo" "$info" "$outputMan"
 
+# put propagated*BuildInputs into $outputDev instead of $out
+propagateIntoOutput="$outputDev"
+
 # Add standard flags to put files into the desired outputs.
 _multioutConfig() {
     if [ -n "${setOutputFlags-1}" ]; then
         configureFlags="\
-            --bindir=$outputBin/bin --sbindir=$outputBin/sbin --libexecdir=$outputBin/libexec \
+            --bindir=$outputBin/bin --sbindir=$outputBin/sbin \
             --includedir=$outputInclude/include --oldincludedir=$outputInclude/include \
             --mandir=$outputMan/share/man --infodir=$outputInfo/share/info --docdir=$outputDoc/share/doc \
-            --libdir=$outputLib/lib \
+            --libdir=$outputLib/lib --libexecdir=$outputLib/libexec \
             $configureFlags"
 
         installFlags="\
@@ -49,3 +55,40 @@ _multioutConfig() {
 _addRpathPrefix "$outputLib"
 NIX_NO_SELF_RPATH=1
 
+_multioutDocs() {
+    _moveToOutput share/man "$outputMan"
+    _moveToOutput share/info "$outputInfo"
+    _moveToOutput share/doc "$outputDoc"
+
+    # Remove empty share directory.
+    if [ -d "$out/share" ]; then
+        rmdir "$out/share" 2> /dev/null || true
+    fi
+}
+_moveToOutput() {
+    local d="$1"
+    local dst="$2"
+    if [ -z "$dst" -a ! -e $dst/$d ]; then return; fi
+    local output
+    for output in $outputs; do
+        if [ "${!output}" = "$dst" ]; then continue; fi
+        if [ -d "${!output}/$d" ]; then
+            echo "moving ${!output}/$d to $dst/$d"
+            mkdir -p $dst/share
+            mv ${!output}/$d $dst/$d
+            break
+        fi
+    done
+}
+
+_multioutPropagateDev() {
+    if [ "$outputInclude" != "$outputDev" ]; then
+        mkdir -p "$outputDev"/nix-support
+        echo "$outputInclude" >> "$outputDev"/nix-support/propagated-build-inputs
+    fi
+    if [ "$outputLib" != "$outputDev" ]; then
+        mkdir -p "$outputDev"/nix-support
+        echo "$outputLib" >> "$outputDev"/nix-support/propagated-build-inputs
+    fi
+}
+
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 23a67d8d5333d..79aea01e17596 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -262,7 +262,7 @@ stdenv.mkDerivation ({
     ++ (optional (perl != null) perl)
     ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ gmp mpfr mpc libelf ]
+  buildInputs = [ stdenv.hookLib.multiout gmp mpfr mpc libelf ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (zlib != null) zlib)
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 205fa0750e6a9..7197aa22b1d36 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -282,7 +282,7 @@ stdenv.mkDerivation ({
     ++ (optional (perl != null) perl)
     ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ gmp mpfr mpc libelf ]
+  buildInputs = [ stdenv.hookLib.multiout gmp mpfr mpc libelf ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (isl != null) isl)
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index bc9a0f0f4ddd8..bf0f2b91482c6 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
 
   # TODO: Add a "dev" output containing the header files.
   outputs = [ "out" "man" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+  setOutputFlags = false;
 
   setOutputConfigureFlags = false;
 
diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
index cd1ba747d7c67..78f4131b76a16 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/pkgs/development/libraries/glibc/2.19/common.nix
@@ -106,7 +106,10 @@ stdenv.mkDerivation ({
 
   installFlags = [ "sysconfdir=$(out)/etc" ];
 
-  buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
+  outputs = [ "out" "dev" "bin" "static" ];
+
+  buildInputs = [ stdenv.hookLib.multiout ]
+    ++ stdenv.lib.optionals (cross != null) [ gccCross ]
     ++ stdenv.lib.optional (mig != null) mig
     ++ stdenv.lib.optionals withGd [ gd libpng ];
 
diff --git a/pkgs/development/libraries/glibc/2.19/default.nix b/pkgs/development/libraries/glibc/2.19/default.nix
index ace043a250cc9..6cfbcd47da91f 100644
--- a/pkgs/development/libraries/glibc/2.19/default.nix
+++ b/pkgs/development/libraries/glibc/2.19/default.nix
@@ -25,8 +25,6 @@ in
 
     builder = ./builder.sh;
 
-    outputs = [ "out" "dev" "bin" "static" ];
-
     # When building glibc from bootstrap-tools, we need libgcc_s at RPATH for
     # any program we run, because the gcc will have been placed at a new
     # store path than that determined when built (as a source for the
diff --git a/pkgs/development/tools/misc/patchelf/default.nix b/pkgs/development/tools/misc/patchelf/default.nix
index 1c1245a29c923..b3121ac7944d2 100644
--- a/pkgs/development/tools/misc/patchelf/default.nix
+++ b/pkgs/development/tools/misc/patchelf/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   setupHook = [ ./setup-hook.sh ];
 
-  doCheck = true;
+  #doCheck = true; # problems when loading libc.so.6
 
   meta = {
     homepage = http://nixos.org/patchelf.html;
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index 804e7a2527fef..dde979f532baf 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
   };
 
-  buildInputs = [ perl xz ]
+  buildInputs = [ perl xz.bin ]
     ++ stdenv.lib.optional interactive ncurses;
 
   preInstall = ''
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 6291f4a367b78..74dad2c895b0c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -144,6 +144,20 @@ ensureDir() {
 }
 
 
+# Add $1/lib* into rpaths.
+# The function is used in multiple-outputs.sh hook,
+# so it is defined here but tried after the hook.
+_addRpathPrefix() {
+    if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
+        export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
+        if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
+            export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS"
+        fi
+        if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
+            export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS"
+        fi
+    fi
+}
 
 ######################################################################
 # Initialisation.
@@ -259,18 +273,6 @@ for i in $crossPkgs; do
 done
 
 
-# Add $1/lib* into rpaths.
-_addRpathPrefix() {
-    if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
-        export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
-        if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
-            export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS"
-        fi
-        if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
-            export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS"
-        fi
-    fi
-}
 _addRpathPrefix "$out"
 
 
@@ -614,7 +616,7 @@ configurePhase() {
         done
     fi
 
-    if [ -z "$dontAddPrefix" ]; then
+    if [ -z "$dontAddPrefix" -a -n "$prefix" ]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
@@ -676,7 +678,9 @@ checkPhase() {
 installPhase() {
     runHook preInstall
 
-    mkdir -p "$prefix"
+    if [ -n "$prefix" ]; then
+        mkdir -p "$prefix"
+    fi
 
     installTargets=${installTargets:-install}
     echo "install flags: $installTargets $makeFlags ${makeFlagsArray[@]} $installFlags ${installFlagsArray[@]}"
@@ -780,8 +784,6 @@ showPhaseHeader() {
 
 
 genericBuild() {
-    header "building $out"
-
     if [ -n "$buildCommand" ]; then
         eval "$buildCommand"
         return
@@ -825,8 +827,6 @@ genericBuild() {
 
         stopNest
     done
-
-    stopNest
 }
 
 
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index c9b57bc466944..293d832345bd9 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1404i59bp6rzxya0br1q9njdv32z4sggyfrkjr7vq695hk94hv0n";
   };
 
-  outputs = [ "out" "dev" "man" "doc" ];
+  outputs = [ "dev" "out" "bin" "man" "doc" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
 
   doCheck = true;
 

From 4dccb224c584194e964b5fbef5fe2cee28c57803 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 Aug 2014 00:17:03 +0200
Subject: [PATCH 075/857] WIP2

---
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 13 +++++++------
 pkgs/development/compilers/gcc/4.6/default.nix     |  2 +-
 pkgs/development/compilers/gcc/4.8/default.nix     |  4 ++--
 pkgs/development/compilers/gcc/4.9/default.nix     |  2 +-
 pkgs/development/libraries/acl/default.nix         |  2 +-
 pkgs/development/libraries/attr/default.nix        |  1 +
 pkgs/development/libraries/gettext/default.nix     |  2 +-
 pkgs/development/libraries/glib/default.nix        |  5 ++---
 pkgs/development/libraries/openssl/default.nix     |  2 +-
 pkgs/development/libraries/pcre/default.nix        |  1 +
 pkgs/development/tools/misc/texinfo/5.2.nix        |  2 +-
 pkgs/stdenv/common-path.nix                        |  2 +-
 pkgs/stdenv/generic/default.nix                    |  2 +-
 pkgs/stdenv/linux/default.nix                      |  2 +-
 pkgs/tools/compression/gzip/default.nix            |  2 +-
 15 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 1589ecd37342f..ac83a7cca3d38 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -55,6 +55,7 @@ _multioutConfig() {
 _addRpathPrefix "$outputLib"
 NIX_NO_SELF_RPATH=1
 
+# Move documentation into the desired outputs.
 _multioutDocs() {
     _moveToOutput share/man "$outputMan"
     _moveToOutput share/info "$outputInfo"
@@ -82,13 +83,13 @@ _moveToOutput() {
 }
 
 _multioutPropagateDev() {
-    if [ "$outputInclude" != "$outputDev" ]; then
-        mkdir -p "$outputDev"/nix-support
-        echo "$outputInclude" >> "$outputDev"/nix-support/propagated-build-inputs
+    if [ "$outputInclude" != "$propagateIntoOutput" ]; then
+        mkdir -p "$propagateIntoOutput"/nix-support
+        echo -n " $outputInclude" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
     fi
-    if [ "$outputLib" != "$outputDev" ]; then
-        mkdir -p "$outputDev"/nix-support
-        echo "$outputLib" >> "$outputDev"/nix-support/propagated-build-inputs
+    if [ "$outputLib" != "$propagateIntoOutput" ]; then
+        mkdir -p "$propagateIntoOutput"/nix-support
+        echo -n " $outputLib" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
     fi
 }
 
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 79aea01e17596..5403b7c77a117 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -192,7 +192,7 @@ stdenv.mkDerivation ({
 
   outputs = [ "out" "lib" ];
 
-  setOutputConfigureFlags = false;
+  setOutputFlags = false;
 
   inherit patches enableMultilib;
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 7197aa22b1d36..e7f28bb4f0730 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -216,7 +216,7 @@ stdenv.mkDerivation ({
 
   outputs = [ "out" "lib" ];
 
-  setOutputConfigureFlags = false;
+  setOutputFlags = false;
 
 
   libc_dev = stdenv.gcc.libc_dev;
@@ -372,7 +372,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if (stdenv ? glibc && cross == null)
-      then " --with-native-system-header-dir=${stdenv.glibc}/include"
+      then " --with-native-system-header-dir=${stdenv.glibc.dev}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
     ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index f61e6b4445a0d..3254071f5eded 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -353,7 +353,7 @@ stdenv.mkDerivation ({
       )
     }
     ${if (stdenv ? glibc && cross == null)
-      then " --with-native-system-header-dir=${stdenv.glibc}/include"
+      then " --with-native-system-header-dir=${stdenv.glibc.dev}/include"
       else ""}
     ${if langAda then " --enable-libada" else ""}
     ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 4055708907b9f..70e4ef9b8107e 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" "bin" "doc" ];
 
   nativeBuildInputs = [ gettext ];
-  buildInputs = [ attr ];
+  buildInputs = [ stdenv.hookLib.multiout attr ];
 
   # Upstream use C++-style comments in C code. Remove them.
   # This comment breaks compilation if too strict gcc flags are used.
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index e4e9142b63285..25b6ffd56c659 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" "bin" "doc" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
 
   nativeBuildInputs = [ gettext ];
 
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 4d400a6ea7dab..d181bb67db4f4 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation (rec {
     fi
   '';
 
-  buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = [ xz xz.bin ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ec43d9f8c4bf3..55d80e5ccff8a 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -51,12 +51,11 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch;
 
-  outputs = [ "dev" "out" "bin" "doc" ];
-
+  outputs = [ "dev" "out" "bin" ]; # ToDo: docs?
 
   setupHook = ./setup-hook.sh;
 
-  buildInputs = [ libelf ]
+  buildInputs = [ stdenv.hookLib.multiout libelf ]
     ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
 
   nativeBuildInputs = [ pkgconfig gettext perl python ];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index cca5049c0d430..847e4f0ac9d9b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
 
   outputs = [ "dev" "out" "man" "bin" ];
 
-  setOutputConfigureFlags = false;
+  setOutputFlags = false; # ToDo: strange?
 
   buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
 
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 961a9e7b9ea6c..ae3f21367045b 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" "bin" "doc" "man" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
 
   # The compiler on Darwin crashes with an internal error while building the
   # C++ interface. Disabling optimizations on that platform remedies the
diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix
index dde979f532baf..9b7b6139a983b 100644
--- a/pkgs/development/tools/misc/texinfo/5.2.nix
+++ b/pkgs/development/tools/misc/texinfo/5.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, perl, xz, interactive ? false }:
+{ stdenv, fetchurl, xz, ncurses, perl, interactive ? false }:
 
 stdenv.mkDerivation rec {
   name = "texinfo-5.2";
diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix
index cff6fd0a3eed1..63c9f14b15c4d 100644
--- a/pkgs/stdenv/common-path.nix
+++ b/pkgs/stdenv/common-path.nix
@@ -11,5 +11,5 @@
   pkgs.gnumake
   pkgs.bash
   pkgs.patch
-  pkgs.xz
+  pkgs.xz.bin
 ]
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 29f9f49a9281b..118331feff6ff 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -209,7 +209,7 @@ let
 
       # extra useful hooks, so we do not need to pass them as package arguments
       hookLib = {
-        multiout = ../../build-support/setup-hooks/multiple-outputs.sh;
+        multiout = ../../build-support/setup-hooks/multiple-outputs.sh; #ToDo: propagated-native-build-inputs
         #ToDo: add also autoreconf = pkgs.autoreconfHook
       };
     }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index aa76cd671917b..a2a971589470b 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -230,7 +230,7 @@ rec {
       gcc = stdenvLinuxBoot3Pkgs.gcc.gcc;
       name = "";
     };
-    extraBuildInputs = [ stdenvLinuxBoot2Pkgs.patchelf stdenvLinuxBoot3Pkgs.xz ];
+    extraBuildInputs = [ stdenvLinuxBoot2Pkgs.patchelf stdenvLinuxBoot3Pkgs.xz.bin ];
     overrides = pkgs: {
       inherit (stdenvLinuxBoot1Pkgs) perl;
       inherit (stdenvLinuxBoot3Pkgs) gettext gnum4 gmp;
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index b7bf9c59f494f..2b051099b390a 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, less }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
   name = "gzip-1.6";

From fb59f27a4368b1436518f9f76c6e2e68f60b92a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 27 Aug 2014 01:14:09 +0200
Subject: [PATCH 076/857] WIP: getting good

---
 .../setup-hooks/compress-man-pages.sh         |   1 +
 .../setup-hooks/multiple-outputs.sh           | 125 +++++++++++-------
 .../libraries/freetype/default.nix            |  18 +--
 pkgs/development/libraries/glib/default.nix   |   6 +-
 pkgs/development/libraries/glib/setup-hook.sh |   2 +-
 pkgs/development/libraries/gmp/5.1.x.nix      |   8 +-
 pkgs/development/libraries/libffi/default.nix |   5 +-
 .../libraries/libjpeg-turbo/default.nix       |   4 +-
 pkgs/development/libraries/libpng/default.nix |  10 +-
 .../development/libraries/libtiff/default.nix |   5 +-
 .../libraries/libvorbis/default.nix           |   6 +-
 pkgs/development/libraries/mpfr/default.nix   |   4 +-
 .../development/libraries/openssl/default.nix |   6 +-
 pkgs/development/libraries/zlib/default.nix   |  11 +-
 .../tools/misc/binutils/default.nix           |   6 +-
 .../tools/misc/libtool/libtool2.nix           |   5 +-
 .../tools/misc/pkgconfig/default.nix          |  31 ++---
 pkgs/os-specific/linux/libcap/default.nix     |  13 +-
 pkgs/os-specific/linux/pam/default.nix        |   2 +-
 pkgs/servers/x11/xorg/default.nix             |  15 ---
 pkgs/servers/x11/xorg/overrides.nix           |  67 ++++++++--
 pkgs/shells/bash/default.nix                  |   6 +-
 pkgs/tools/archivers/gnutar/default.nix       |   5 +-
 pkgs/tools/compression/xz/default.nix         |   5 +-
 pkgs/tools/misc/coreutils/default.nix         |   3 +
 pkgs/tools/misc/findutils/default.nix         |   5 +-
 pkgs/tools/text/diffutils/default.nix         |   3 +
 pkgs/tools/text/gawk/default.nix              |  17 ++-
 pkgs/tools/text/gnugrep/default.nix           |   4 +-
 pkgs/tools/text/gnused/default.nix            |   5 +-
 pkgs/top-level/all-packages.nix               |   2 +-
 31 files changed, 259 insertions(+), 146 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/compress-man-pages.sh b/pkgs/build-support/setup-hooks/compress-man-pages.sh
index 1dd9788419b84..f1d9cf3a3696d 100644
--- a/pkgs/build-support/setup-hooks/compress-man-pages.sh
+++ b/pkgs/build-support/setup-hooks/compress-man-pages.sh
@@ -3,6 +3,7 @@ fixupOutputHooks+=('if [ -z "$dontGzipMan" ]; then compressManPages "$prefix"; f
 compressManPages() {
     local dir="$1"
 
+    if [ ! -d "$dir/share/man" ]; then return; fi
     echo "gzipping man pages in $dir"
 
     GLOBIGNORE=.:..:*.gz:*.bz2
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index ac83a7cca3d38..b3274c88cd7b2 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -1,14 +1,15 @@
 preConfigureHooks+=(_multioutConfig)
 preFixupHooks+=(_multioutDocs)
+preFixupHooks+=(_multioutDevs)
 postFixupHooks+=(_multioutPropagateDev)
 
 
-# Assign the first nonempty string to variable named $1
+# Assign the first string containing nonempty variable to the variable named $1
 _assignFirst() {
     local varName="$1"
     shift
-    while [ $# -ge 0 ]; do
-        if [ -n "$1" ]; then eval "${varName}"="$1"; return; fi
+    while [ $# -ge 1 ]; do
+        if [ -n "${!1}" ]; then eval "${varName}"="$1"; return; fi
         shift
     done
     return 1 # none found
@@ -18,78 +19,108 @@ _assignFirst() {
 # The variables are global to be usable anywhere during the build.
 # ToDo: I was unable to get rid of the double-name redundancy (I hate bash eval ways)
 
-_assignFirst outputDev "$outputDev" "$dev" "$out"
-_assignFirst outputBin "$outputBin" "$bin" "$out"
+# ToDo: easy way of overriding from withing mkDerivation attrset
+
+_assignFirst outputDev "$outputDev" "dev" "out"
+_assignFirst outputBin "$outputBin" "bin" "out"
 
 _assignFirst outputInclude "$outputInclude" "$outputDev"
 
 # so-libs are often among the main things to keep, and so go to $out
-_assignFirst outputLib "$outputLib" "$lib" "$out"
+_assignFirst outputLib "$outputLib" "lib" "out"
 
-_assignFirst outputDoc "$outputDoc" "$doc" "$out"
+_assignFirst outputDoc "$outputDoc" "doc" "out"
 # man and info pages are small and often useful to distribute with binaries
-_assignFirst outputMan "$outputMan" "$man" "$outputBin"
-_assignFirst outputInfo "$outputInfo" "$info" "$outputMan"
+_assignFirst outputMan "$outputMan" "man" "doc" "$outputBin"
+_assignFirst outputInfo "$outputInfo" "info" "doc" "$outputMan"
+
+# Make stdenv put propagated*BuildInputs into $outputDev instead of $out
+propagateIntoOutput="${!outputDev}"
 
-# put propagated*BuildInputs into $outputDev instead of $out
-propagateIntoOutput="$outputDev"
 
 # Add standard flags to put files into the desired outputs.
 _multioutConfig() {
-    if [ -n "${setOutputFlags-1}" ]; then
-        configureFlags="\
-            --bindir=$outputBin/bin --sbindir=$outputBin/sbin \
-            --includedir=$outputInclude/include --oldincludedir=$outputInclude/include \
-            --mandir=$outputMan/share/man --infodir=$outputInfo/share/info --docdir=$outputDoc/share/doc \
-            --libdir=$outputLib/lib --libexecdir=$outputLib/libexec \
-            $configureFlags"
-
-        installFlags="\
-            pkgconfigdir=$outputDev/lib/pkgconfig \
-            m4datadir=$outputDev/share/aclocal aclocaldir=$outputDev/share/aclocal \
-            $installFlags"
-    fi
+    if [ -z "${setOutputFlags-1}" ]; then return; fi;
+
+    configureFlags="\
+        --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \
+        --includedir=${!outputInclude}/include --oldincludedir=${!outputInclude}/include \
+        --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
+        --docdir=${!outputDoc}/share/doc \
+        --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
+        $configureFlags"
+
+    installFlags="\
+        pkgconfigdir=${!outputDev}/lib/pkgconfig \
+        m4datadir=${!outputDev}/share/aclocal aclocaldir=${!outputDev}/share/aclocal \
+        $installFlags"
 }
 
 # Add rpath prefixes to library paths, and avoid stdenv doing it for $out.
-_addRpathPrefix "$outputLib"
+_addRpathPrefix "${!outputLib}"
 NIX_NO_SELF_RPATH=1
 
-# Move documentation into the desired outputs.
+
+# Move subpaths that match pattern $1 from under any output/ to the $2 output/
+_moveToOutput() {
+    local patt="$1"
+    local dstOut="$2"
+    echo "XXX: m2o '$1' '$2'"
+    local output
+    for output in $outputs; do
+        echo "XXX: output='$output'"
+        if [ "${output}" = "$dstOut" ]; then continue; fi
+        local srcPath
+        for srcPath in ${!output}/$patt; do
+            if [ ! -e "$srcPath" ]; then continue; fi
+            local dstPath="$dstOut${srcPath#${!output}}"
+            echo "moving $srcPath to $dstPath"
+
+            if [ -d "$dstPath" ] && [ -d "$srcPath" ]
+            then # attempt directory merge
+                mv -t "$dstPath" "$srcPath"/*
+                rmdir "$srcPath"
+            else # usual move
+                mkdir -p $(readlink -m "$dstPath/..") # create the parent for $dstPath
+                mv "$srcPath" "$dstPath"
+            fi
+        done
+    done
+}
+
+# Move documentation to the desired outputs.
 _multioutDocs() {
-    _moveToOutput share/man "$outputMan"
-    _moveToOutput share/info "$outputInfo"
-    _moveToOutput share/doc "$outputDoc"
+    echo "Looking for documentation to move between outputs"
+    _moveToOutput share/man "${!outputMan}"
+    _moveToOutput share/info "${!outputInfo}"
+    _moveToOutput share/doc "${!outputDoc}"
 
     # Remove empty share directory.
     if [ -d "$out/share" ]; then
         rmdir "$out/share" 2> /dev/null || true
     fi
 }
-_moveToOutput() {
-    local d="$1"
-    local dst="$2"
-    if [ -z "$dst" -a ! -e $dst/$d ]; then return; fi
-    local output
-    for output in $outputs; do
-        if [ "${!output}" = "$dst" ]; then continue; fi
-        if [ -d "${!output}/$d" ]; then
-            echo "moving ${!output}/$d to $dst/$d"
-            mkdir -p $dst/share
-            mv ${!output}/$d $dst/$d
-            break
-        fi
-    done
+
+# Move development-only stuff to the desired outputs.
+_multioutDevs() {
+    if [ -z "${moveToDev-1}" ]; then return; fi;
+    echo "Looking for development-only stuff to move between outputs"
+    _moveToOutput include "${!outputInclude}"
+    _moveToOutput lib/pkgconfig "${!outputDev}"
+    _moveToOutput "lib/*.la" "${!outputDev}"
 }
 
+# Make ${!outputDev} propagate other outputs needed for development
+# Note: during the build, probably only the "native" development packages are useful.
+# With current cross-building setup, all packages are "native" if not cross-building.
 _multioutPropagateDev() {
-    if [ "$outputInclude" != "$propagateIntoOutput" ]; then
+    if [ "${!outputInclude}" != "$propagateIntoOutput" ]; then
         mkdir -p "$propagateIntoOutput"/nix-support
-        echo -n " $outputInclude" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
+        echo -n " ${!outputInclude}" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
     fi
-    if [ "$outputLib" != "$propagateIntoOutput" ]; then
+    if [ "${!outputLib}" != "$propagateIntoOutput" ]; then
         mkdir -p "$propagateIntoOutput"/nix-support
-        echo -n " $outputLib" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
+        echo -n " ${!outputLib}" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
     fi
 }
 
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 1df9e46c0f705..aa20a69978670 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -23,10 +23,6 @@ stdenv.mkDerivation rec {
     sha256 = "0pppcn73b5pwd7zdi9yfx16f5i93y18q7q4jmlkwmwrfsllqp160";
   };
 
-  outputs = [ "dev" "out" ];
-
-  configureFlags = "--disable-static --bindir=$(dev)/bin";
-
   patches = [ ./enable-validation.patch ] # from Gentoo
     ++ [
       (fetch_bohoomil "freetype-2.5.3-pkgconfig.patch" "1dpfdh8kmka3gzv14glz7l79i545zizah6wma937574v5z2iy3nn")
@@ -36,12 +32,16 @@ stdenv.mkDerivation rec {
       (fetch_bohoomil "infinality-2.5.3.patch" "0mxiybcb4wwbicrjiinh1b95rv543bh05sdqk1v0ipr3fxfrb47q")
     ;
 
+  outputs = [ "dev" "out" ];
+
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
   # dependence on harfbuzz is looser than the reverse dependence
-  buildInputs = [ pkgconfig which ]
+  buildInputs = [ stdenv.hookLib.multiout pkgconfig which ]
     # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
     ++ optional (!stdenv.isLinux) gnumake;
 
+  configureFlags = "--disable-static --bindir=$(dev)/bin";
+
   # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840
   NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
   # The asm for armel is written with the 'asm' keyword.
@@ -52,12 +52,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # compat hacks
-  postInstall = glib.flattenInclude + ''
-    ln -s . "$out"/include/freetype
-
-    mkdir $dev/lib
-    mv $out/lib/pkgconfig $dev/lib/
-    ln -s freetype2/freetype $dev/include/freetype
+  postFixup = glib.flattenInclude + ''
+    ln -s . "$dev"/include/freetype
   '';
 
   crossAttrs = {
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 55d80e5ccff8a..c38d34eb94ae8 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch;
 
-  outputs = [ "dev" "out" "bin" ]; # ToDo: docs?
+  #outputs = [ "dev" "out" "bin" ]; # ToDo: no idea what's wrong! docs? 
 
-  setupHook = ./setup-hook.sh;
+  #setupHook = ./setup-hook.sh;
 
-  buildInputs = [ stdenv.hookLib.multiout libelf ]
+  buildInputs = [ /*stdenv.hookLib.multiout*/ libelf ]
     ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
 
   nativeBuildInputs = [ pkgconfig gettext perl python ];
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index f173744e5ca63..35d7d9d8fbe99 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -14,4 +14,4 @@ glibPreFixupPhase() {
     addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
 }
 
-preFixupPhases="$preFixupPhases glibPreFixupPhase"
+preFixupPhases+=(glibPreFixupPhase)
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 9e28334804bd6..778b5144f291a 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -2,7 +2,7 @@
 
 with { inherit (stdenv.lib) optional; };
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "gmp-5.1.3";
 
   src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
@@ -10,6 +10,9 @@ stdenv.mkDerivation (rec {
     sha256 = "0q5i39pxrasgn9qdxzpfbwhh11ph80p57x6hf48m74261d97j83m";
   };
 
+  outputs = [ "out" "info" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+
   nativeBuildInputs = [ m4 ];
 
   configureFlags =
@@ -22,6 +25,7 @@ stdenv.mkDerivation (rec {
     ++ optional (cxx && stdenv.isDarwin) "CPPFLAGS=-fexceptions"
     ++ optional stdenv.is64bit "--with-pic"
     ;
+  dontDisableStatic = withStatic;
 
   doCheck = true;
 
@@ -58,6 +62,4 @@ stdenv.mkDerivation (rec {
     maintainers = [ maintainers.simons ];
   };
 }
-  // stdenv.lib.optionalAttrs withStatic { dontDisableStatic = true; }
-)
 
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index da5a080521c6d..f62dff58968f7 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optional (stdenv.needsPax) ./libffi-3.0.13-emutramp_pax_proc.patch;
 
-  buildInputs = stdenv.lib.optional doCheck dejagnu;
+  outputs = [ "dev" "out" "doc" ];
+
+  buildInputs = [ stdenv.hookLib.multiout ]
+    ++ stdenv.lib.optional doCheck dejagnu;
 
   configureFlags = [
     "--with-gcc-arch=generic" # no detection of -march= or -mtune=
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index f59c205af4fdf..a27d5af6f8dfb 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, nasm }:
+{ stdenv, fetchurl, nasm, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "libjpeg-turbo-1.3.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "doc" "bin" ];
 
-  buildInputs = [ nasm ];
+  buildInputs = [ stdenv.hookLib.multiout autoreconfHook nasm ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index c4aa41681a30d..7014c7686188d 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -18,17 +18,19 @@ in stdenv.mkDerivation rec {
     url = "mirror://sourceforge/libpng/libpng-${version}.tar.xz";
     inherit sha256;
   };
+  postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
 
   outputs = [ "dev" "out" "man" ];
-
-  preConfigure = "export bin=$dev";
-
-  postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
+  buildInputs = [ stdenv.hookLib.multiout ];
 
   propagatedBuildInputs = [ zlib ];
 
+  preConfigure = "export bin=$dev";
+
   doCheck = true;
 
+  postInstall = ''mv "$out/bin" "$dev/bin"'';
+
   passthru = { inherit zlib; };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index aa4ac0a792238..55db7692ffd1c 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
     sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" ];
-
   patchPhase = ''
     for p in ${patchDir}/*-{2013-4244,2012-4447,2012-4564,2013-1960,2013-1961,libjpeg-turbo}.patch; do
       patch -p1 < "$p"
@@ -34,6 +32,9 @@ stdenv.mkDerivation rec {
     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 = [ "dev" "out" "bin" "doc" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection)
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 5e883771b71af..6bdf10765deb9 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -11,11 +11,11 @@ stdenv.mkDerivation {
     sha256 = "0wpk87jnhngcl3nc5i39flkycx1sjzilx8jjx4zc4p8r55ylj19g";
   };
 
-  buildInputs = [ pkgconfig ];
+  outputs = [ "dev" "out" "doc" ];
 
-  propagatedBuildInputs = [ libogg ];
+  buildInputs = [ stdenv.hookLib.multiout pkgconfig ];
 
-  outputs = [ "dev" "out" "doc" ];
+  propagatedBuildInputs = [ libogg ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index e3fbaececb9b5..07ab3187f8cfa 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0sqvpfkzamxdr87anzakf9dhkfh15lfmm5bsqajk02h1mxh3zivr";
   };
 
-  buildInputs = [ gmp ];
+  outputs = [ "dev" "out" "doc" ];
+
+  buildInputs = [ stdenv.hookLib.multiout gmp ];
 
   configureFlags =
     /* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite:
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 847e4f0ac9d9b..babf49274607e 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -49,10 +49,10 @@ stdenv.mkDerivation {
   patches = patchesCross false;
 
   outputs = [ "dev" "out" "man" "bin" ];
+  setOutputFlags = false;
 
-  setOutputFlags = false; # ToDo: strange?
-
-  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+  buildInputs = [ stdenv.hookLib.multiout ]
+    ++ stdenv.lib.optional withCryptodev cryptodevHeaders;
 
   nativeBuildInputs = [ perl ];
 
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 0938e2a17a796..5f9a01208d84d 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -13,15 +13,22 @@ stdenv.mkDerivation rec {
     sha256 = "039agw5rqvqny92cpkrfn243x2gd4xn13hs3xi6isk55d2vqqr9n";
   };
 
-  configureFlags = if static then "" else "--shared";
+  outputs = [ "dev" "out" "static" "man" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+  setOutputFlags = false;
+
+  configureFlags = stdenv.lib.optional (!static) "--shared";
 
   preConfigure = ''
     if test -n "$crossConfig"; then
       export CC=$crossConfig-gcc
-      configureFlags=${if static then "" else "--shared"}
     fi
   '';
 
+  postInstall = ''
+    _moveToOutput lib/libz.a "$static"
+  '';
+
   # As zlib takes part in the stdenv building, we don't want references
   # to the bootstrap-tools libgcc (as uses to happen on arm/mips)
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (!stdenv.isDarwin) "-static-libgcc";
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 8d8fc5d464e89..30ea323908fa7 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -34,8 +34,10 @@ stdenv.mkDerivation rec {
     ./pt-pax-flags-20121023.patch
   ];
 
+  outputs = [ "dev" "out" "info" ];
+
   buildInputs =
-    [ zlib ]
+    [ stdenv.hookLib.multiout zlib ]
     ++ optional gold bison;
 
   inherit noSysDirs;
@@ -66,6 +68,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postFixup = "ln -s $out/bin $dev/bin"; # tools needed for development
+
   meta = {
     description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)";
 
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index 98d22dcf42b40..df52596c5a557 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -8,9 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0649qfpzkswgcj9vqkkr9rn4nlcx80faxpyqscy2k1x9c94f93dk";
   };
 
-  nativeBuildInputs = [ lzma m4 perl ];
-
   outputs = [ "out" "lib" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+
+  nativeBuildInputs = [ lzma m4 perl ];
 
   # Don't fixup "#! /bin/sh" in Libtool, otherwise it will use the
   # "fixed" path in generated files!
diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 2ce1fd7b6e4d1..4decdc424d5bd 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -1,22 +1,27 @@
-{stdenv, fetchurl, automake, vanilla ? false}:
+{ stdenv, fetchurl, automake, vanilla ? false }:
 
-stdenv.mkDerivation (rec {
+let
+  inherit (stdenv.lib) optional;
+in
+stdenv.mkDerivation rec {
   name = "pkg-config-0.28";
-  
+
   setupHook = ./setup-hook.sh;
-  
+
   src = fetchurl {
     url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz";
     sha256 = "0igqq5m204w71m11y0nipbdf5apx87hwfll6axs12hn4dqfb6vkb";
   };
+    # Process Requires.private properly, see
+    # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
+  patches = optional (!vanilla) ./requires-private.patch;
+
+  preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
+    ''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
 
   configureFlags = [ "--with-internal-glib" ];
 
-  patches = if vanilla then [] else [
-    # Process Requires.private properly, see
-    # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
-    ./requires-private.patch
-  ];
+  postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
 
   meta = {
     description = "A tool that allows packages to find out information about other packages";
@@ -24,9 +29,5 @@ stdenv.mkDerivation (rec {
     platforms = stdenv.lib.platforms.all;
   };
 
-} // (if stdenv.system == "mips64el-linux" then
-  {
-    preConfigure = ''
-      cp -v ${automake}/share/automake*/config.{sub,guess} .
-    '';
-  } else {}))
+}
+
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index e82214df634aa..1b5d617357bb7 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
 
   nativeBuildInputs = [ perl ];
   propagatedBuildInputs = [ attr ];
@@ -20,14 +21,10 @@ stdenv.mkDerivation rec {
 
   makeFlags = "lib=lib prefix=$(out)";
 
-  passthru = {
-    postinst = n : ''
-      mkdir -p $out/share/doc/${n}
-      cp ../License $out/share/doc/${n}/License
-    '';
-  };
-
-  postInstall = passthru.postinst name;
+  postInstall = ''
+    mkdir -p "$dev/share/doc/${name}"
+    cp ../License "$dev/share/doc/${name}/License"
+  '';
 
   meta = {
     description = "Library for working with POSIX capabilities";
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 8423ea6f12367..39596c7e03267 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ flex ];
 
-  buildInputs = [ cracklib ];
+  buildInputs = [ stdenv.hookLib.multiout cracklib ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 81988e45db07d..d03249387b71d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -606,7 +606,6 @@ let
       url = mirror://xorg/individual/lib/libX11-1.6.2.tar.bz2;
       sha256 = "05mx0s0vqzds3qjc1gmjr2s6x2ll37z4lfhgm7p2w7936zl2g81a";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
   })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
 
@@ -627,7 +626,6 @@ let
       url = mirror://xorg/individual/lib/libXau-1.0.8.tar.bz2;
       sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
 
@@ -648,7 +646,6 @@ let
       url = mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2;
       sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
   })) // {inherit compositeproto libX11 libXfixes xproto ;};
 
@@ -659,7 +656,6 @@ let
       url = mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2;
       sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
   })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
@@ -670,7 +666,6 @@ let
       url = mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2;
       sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
     };
-    outputs = [ "dev" "out" ];
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
   })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
@@ -681,7 +676,6 @@ let
       url = mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2;
       sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls";
     };
-    outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig xproto ];
   })) // {inherit xproto ;};
 
@@ -692,7 +686,6 @@ let
       url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2;
       sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
     };
-    outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig libX11 xextproto xproto ];
   })) // {inherit libX11 xextproto xproto ;};
 
@@ -703,7 +696,6 @@ let
       url = mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2;
       sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
   })) // {inherit fixesproto libX11 xextproto xproto ;};
 
@@ -724,7 +716,6 @@ let
       url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2;
       sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
   })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
@@ -735,7 +726,6 @@ let
       url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2;
       sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc";
     };
-    outputs = [ "dev" "out" "man" "doc" ];
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
   })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
@@ -746,7 +736,6 @@ let
       url = mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2;
       sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
   })) // {inherit libX11 libXext xextproto xineramaproto ;};
 
@@ -787,7 +776,6 @@ let
       url = mirror://xorg/individual/lib/libXrandr-1.4.2.tar.bz2;
       sha256 = "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
   })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
@@ -798,7 +786,6 @@ let
       url = mirror://xorg/individual/lib/libXrender-0.9.8.tar.bz2;
       sha256 = "0qpwyjhbpp734vnhca992pjh4w7ijslidkzx1pcwbbk000pv050x";
     };
-    outputs = [ "dev" "out" "doc" ];
     buildInputs = [pkgconfig renderproto libX11 xproto ];
   })) // {inherit renderproto libX11 xproto ;};
 
@@ -879,7 +866,6 @@ let
       url = mirror://xorg/individual/lib/libXxf86vm-1.1.3.tar.bz2;
       sha256 = "1f1pxj018nk7ybxv58jmn5y8gm2288p4q3l2dng9n1p25v1qcpns";
     };
-    outputs = [ "dev" "out" "man" ];
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
   })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 
@@ -930,7 +916,6 @@ let
       url = http://xcb.freedesktop.org/dist/libxcb-1.11.tar.bz2;
       sha256 = "1xqgc81krx14f2c8yl5chzg5g2l26mhm2rwffy8dx7jv0iq5sqq3";
     };
-    outputs = [ "dev" "out" "doc" "man" ];
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
   })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a81b1a4ac2259..e93e0348b8672 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -56,8 +56,9 @@ in
   };
 
   libxcb = attrs : attrs // {
-    nativeBuildInputs = [ args.python ];
+    nativeBuildInputs = [ stdenv.hookLib.multiout args.python ];
     configureFlags = "--enable-xkb";
+    outputs = [ "dev" "out" "doc" "man" ];
   };
 
   xcbproto = attrs : attrs // {
@@ -69,6 +70,8 @@ in
   };
 
   libX11 = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     postInstall =
       ''
@@ -77,6 +80,16 @@ in
       '';
   };
 
+  libXau = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+  };
+
+  libXdmcp = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+  };
+
   libXfont = attrs: attrs // {
     propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
     # prevents "misaligned_stack_error_entering_dyld_stub_binder"
@@ -87,14 +100,11 @@ in
 
 
   libXxf86vm = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
-  libXrandr = attrs: attrs // {
-    preConfigure = setMalloc0ReturnsNullCrossCompiling;
-    propagatedBuildInputs = [xorg.libXrender];
-  };
-
   # Propagate some build inputs because of header file dependencies.
   # Note: most of these are in Requires.private, so maybe builder.sh
   # should propagate them automatically.
@@ -114,6 +124,8 @@ in
   };
 
   libXcomposite = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     propagatedBuildInputs = [ xorg.libXfixes ];
   };
 
@@ -121,7 +133,19 @@ in
     propagatedBuildInputs = [ xorg.libXmu ];
   };
 
+  libXcursor = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+  };
+
+  libXdamage = attrs: attrs // {
+    outputs = [ "dev" "out" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+  };
+
   libXft = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     # the include files need ft2build.h, and Requires.private isn't enough for us
@@ -131,15 +155,42 @@ in
   };
 
   libXext = attrs: attrs // {
+    outputs = [ "dev" "out" "man" "doc" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
+  libXfixes = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+  };
+
+  libXi = attrs: attrs // {
+    outputs = [ "dev" "out" "man" "doc" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+  };
+
+  libXinerama = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+  };
+
+  libXrandr = attrs: attrs // {
+    outputs = [ "dev" "out" "man" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+    propagatedBuildInputs = [xorg.libXrender];
+  };
+
   libSM = attrs: attrs
     // { propagatedBuildInputs = [ xorg.libICE ]; };
 
-  libXrender = attrs: attrs
-    // { preConfigure = setMalloc0ReturnsNullCrossCompiling; };
+  libXrender = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ];
+    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
+    preConfigure = setMalloc0ReturnsNullCrossCompiling;
+  };
 
   libXvMC = attrs: attrs
     // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; };
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 6a6b8563a5550..2c545ae1c33c4 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -55,7 +55,11 @@ stdenv.mkDerivation rec {
   postInstall = ''
     # Add an `sh' -> `bash' symlink.
     ln -s bash "$out/bin/sh"
-  '';
+  ''
+    # most space is taken by locale data
+    + stdenv.lib.optionalString (!interactive) ''
+      rm -r "$out/share"
+    '';
 
   meta = {
     homepage = http://www.gnu.org/software/bash/;
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 87324ac80a246..140294d987d5d 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, acl }:
 
 stdenv.mkDerivation rec {
   name = "gnutar-${version}";
@@ -9,6 +9,9 @@ stdenv.mkDerivation rec {
     sha256 = "1iip0fk0wqhxb0jcwphz43r4fxkx1y7mznnhmlvr618jhp7b63wv";
   };
 
+  outputs = [ "out" "info" ];
+  buildInputs = [ stdenv.hookLib.multiout acl ];
+
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
   FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 293d832345bd9..aca5995c3baea 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -14,7 +14,10 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # In stdenv-linux, prevent a dependency on bootstrap-tools.
-  preHook = "unset CONFIG_SHELL";
+  # The preHook hack no longer worked, no idea why.
+  postFixup = ''
+    sed '1s:#!${stdenv.shell}:#!/usr/bin/env sh:' -i "$bin"/bin/*
+  '';
 
   meta = {
     homepage = http://tukaani.org/xz/;
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 8844fe9c57cc0..b3433ca83ec2a 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -20,8 +20,11 @@ let
 
     patches = [ ./help2man.patch ];
 
+    outputs = [ "out" "info" ];
+
     nativeBuildInputs = [ perl ];
     buildInputs = [ gmp ]
+      ++ [ stdenv.hookLib.multiout ]
       ++ optional aclSupport acl
       ++ optionals selinuxSupport [ libselinux libsepol ];
 
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index a6ea96b77db58..407470870a67f 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, coreutils}:
+{ stdenv, fetchurl, coreutils }:
 
 stdenv.mkDerivation rec {
   name = "findutils-4.4.2";
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./findutils-path.patch ./change_echo_path.patch ];
 
+  outputs = [ "out" "info" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+
   doCheck = true;
 
   crossAttrs = {
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index f8413b9a0d0f3..9275603bad4c5 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1761vymxbp4wb5rzjvabhdkskk95pghnn67464byvzb5mfl8jpm2";
   };
 
+  outputs = [ "out" "info" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+
   /* If no explicit coreutils is given, use the one from stdenv. */
   nativeBuildInputs = [ coreutils ];
 
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 8866888a73676..432d7b5871204 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,5 +1,8 @@
-{ stdenv, fetchurl, libsigsegv, readline, readlineSupport ? false }:
+{ stdenv, fetchurl, libsigsegv, readline, interactive ? false }:
 
+let
+  inherit (stdenv.lib) optional;
+in
 stdenv.mkDerivation rec {
   name = "gawk-4.1.0";
 
@@ -8,15 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "0hin2hswbbd6kd6i4zzvgciwpl5fba8d2s524z8y5qagyz3x010q";
   };
 
-  doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
+  # When we do build separate interactive version, it makes sense to always include docs.
+  #outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
 
   buildInputs = [ libsigsegv ]
-    ++ stdenv.lib.optional readlineSupport readline;
+    ++ optional (!interactive) stdenv.hookLib.multiout
+    ++ optional interactive readline;
 
   configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]
-    ++ stdenv.lib.optional readlineSupport "--with-readline=${readline}"
-      # only darwin where reported, seems OK on non-chrooted Fedora (don't rebuild stdenv)
-    ++ stdenv.lib.optional (!readlineSupport && stdenv.isDarwin) "--without-readline";
+    ++ [(if interactive then "--with-readline=${readline}" else "--without-readline")];
+
+  doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
 
   postInstall = "rm $out/bin/gawk-*";
 
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index 6e83bd357b271..e2a48085db966 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -10,7 +10,9 @@ stdenv.mkDerivation {
     sha256 = "1qbjb1l7f9blckc5pqy8jlf6482hpx4awn2acmhyf5mv9wfq03p7";
   };
 
-  buildInputs = [ pcre ]
+  #outputs = [ "out" "doc" ]; ToDo
+
+  buildInputs = [ stdenv.hookLib.multiout pcre ]
     ++ stdenv.lib.optional (libiconv != null) libiconv;
 
   patches = [ ./test-localeconv.patch ];
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index b1c5910029dd7..49ff76b85c20c 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
   name = "gnused-4.2.2";
@@ -8,6 +8,9 @@ stdenv.mkDerivation {
     sha256 = "f048d1838da284c8bc9753e4506b85a1e0cc1ea8999d36f6995bcb9460cddbd7";
   };
 
+  outputs = [ "out" "info" ];
+  buildInputs = [ stdenv.hookLib.multiout ];
+
   meta = {
     homepage = http://www.gnu.org/software/sed/;
     description = "GNU sed, a batch stream editor";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a81b1400f918..92fe64fab65fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2771,7 +2771,7 @@ let
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
+    profiledCompiler = false; #for now. with stdenv; (!isDarwin && (isi686 || isx86_64));
 
     # When building `gcc.crossDrv' (a "Canadian cross", with host == target
     # and host != build), `cross' must be null but the cross-libc must still

From a70180ba73553e66d4f5555d2b4d232b4990718b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 08:27:43 +0200
Subject: [PATCH 077/857] mutiout: make it builtin

---
 pkgs/development/compilers/gcc/4.6/default.nix   |  2 +-
 pkgs/development/compilers/gcc/4.8/default.nix   |  2 +-
 .../interpreters/perl/5.16/default.nix           |  2 +-
 pkgs/development/libraries/acl/default.nix       |  2 +-
 pkgs/development/libraries/attr/default.nix      |  1 -
 pkgs/development/libraries/freetype/default.nix  |  2 +-
 pkgs/development/libraries/glibc/2.19/common.nix |  2 +-
 pkgs/development/libraries/gmp/5.1.x.nix         |  1 -
 pkgs/development/libraries/libffi/default.nix    |  2 +-
 .../libraries/libjpeg-turbo/default.nix          |  2 +-
 pkgs/development/libraries/libpng/default.nix    |  1 -
 pkgs/development/libraries/libtiff/default.nix   |  1 -
 pkgs/development/libraries/libvorbis/default.nix |  2 +-
 pkgs/development/libraries/mpfr/default.nix      |  2 +-
 pkgs/development/libraries/openssl/default.nix   |  2 +-
 pkgs/development/libraries/pcre/default.nix      |  1 -
 pkgs/development/libraries/zlib/default.nix      |  1 -
 pkgs/development/tools/misc/binutils/default.nix |  2 +-
 pkgs/development/tools/misc/libtool/libtool2.nix |  1 -
 pkgs/os-specific/linux/libcap/default.nix        |  1 -
 pkgs/os-specific/linux/pam/default.nix           |  2 +-
 pkgs/servers/x11/xorg/overrides.nix              | 16 +---------------
 pkgs/stdenv/generic/default.nix                  |  7 +------
 pkgs/tools/archivers/gnutar/default.nix          |  2 +-
 pkgs/tools/compression/xz/default.nix            |  1 -
 pkgs/tools/misc/coreutils/default.nix            |  1 -
 pkgs/tools/misc/findutils/default.nix            |  1 -
 pkgs/tools/text/diffutils/default.nix            |  1 -
 pkgs/tools/text/gawk/default.nix                 |  1 -
 pkgs/tools/text/gnugrep/default.nix              |  2 +-
 pkgs/tools/text/gnused/default.nix               |  1 -
 31 files changed, 17 insertions(+), 50 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix
index 5403b7c77a117..a9ce5648789a3 100644
--- a/pkgs/development/compilers/gcc/4.6/default.nix
+++ b/pkgs/development/compilers/gcc/4.6/default.nix
@@ -262,7 +262,7 @@ stdenv.mkDerivation ({
     ++ (optional (perl != null) perl)
     ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ stdenv.hookLib.multiout gmp mpfr mpc libelf ]
+  buildInputs = [ gmp mpfr mpc libelf ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (zlib != null) zlib)
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index e7f28bb4f0730..fbd5f4332de1a 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -282,7 +282,7 @@ stdenv.mkDerivation ({
     ++ (optional (perl != null) perl)
     ++ (optional javaAwtGtk pkgconfig);
 
-  buildInputs = [ stdenv.hookLib.multiout gmp mpfr mpc libelf ]
+  buildInputs = [ gmp mpfr mpc libelf ]
     ++ (optional (ppl != null) ppl)
     ++ (optional (cloog != null) cloog)
     ++ (optional (isl != null) isl)
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index bf0f2b91482c6..45a11f01a399a 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   # TODO: Add a "dev" output containing the header files.
   outputs = [ "out" "man" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
+
   setOutputFlags = false;
 
   setOutputConfigureFlags = false;
diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index 70e4ef9b8107e..4055708907b9f 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" "bin" "doc" ];
 
   nativeBuildInputs = [ gettext ];
-  buildInputs = [ stdenv.hookLib.multiout attr ];
+  buildInputs = [ attr ];
 
   # Upstream use C++-style comments in C code. Remove them.
   # This comment breaks compilation if too strict gcc flags are used.
diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 25b6ffd56c659..e4e9142b63285 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" "bin" "doc" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   nativeBuildInputs = [ gettext ];
 
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index aa20a69978670..5647f3114549e 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
   # dependence on harfbuzz is looser than the reverse dependence
-  buildInputs = [ stdenv.hookLib.multiout pkgconfig which ]
+  buildInputs = [ pkgconfig which ]
     # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
     ++ optional (!stdenv.isLinux) gnumake;
 
diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/2.19/common.nix
index 78f4131b76a16..3611b9b4b3c94 100644
--- a/pkgs/development/libraries/glibc/2.19/common.nix
+++ b/pkgs/development/libraries/glibc/2.19/common.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation ({
 
   outputs = [ "out" "dev" "bin" "static" ];
 
-  buildInputs = [ stdenv.hookLib.multiout ]
+  buildInputs = [ ]
     ++ stdenv.lib.optionals (cross != null) [ gccCross ]
     ++ stdenv.lib.optional (mig != null) mig
     ++ stdenv.lib.optionals withGd [ gd libpng ];
diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix
index 778b5144f291a..79b29ee3f038a 100644
--- a/pkgs/development/libraries/gmp/5.1.x.nix
+++ b/pkgs/development/libraries/gmp/5.1.x.nix
@@ -11,7 +11,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "info" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   nativeBuildInputs = [ m4 ];
 
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index f62dff58968f7..daff1aa471c71 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "doc" ];
 
-  buildInputs = [ stdenv.hookLib.multiout ]
+  buildInputs = [ ]
     ++ stdenv.lib.optional doCheck dejagnu;
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index a27d5af6f8dfb..84732670eef5c 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "doc" "bin" ];
 
-  buildInputs = [ stdenv.hookLib.multiout autoreconfHook nasm ];
+  buildInputs = [ autoreconfHook nasm ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 7014c7686188d..0056212dfbb4c 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -21,7 +21,6 @@ in stdenv.mkDerivation rec {
   postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1";
 
   outputs = [ "dev" "out" "man" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   propagatedBuildInputs = [ zlib ];
 
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 55db7692ffd1c..681d3d97af59d 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
   ''; # ^ sh on darwin seems not to expand globs in redirects, and I don't want to rebuild all again elsewhere
 
   outputs = [ "dev" "out" "bin" "doc" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/libvorbis/default.nix b/pkgs/development/libraries/libvorbis/default.nix
index 6bdf10765deb9..940e5a5685c35 100644
--- a/pkgs/development/libraries/libvorbis/default.nix
+++ b/pkgs/development/libraries/libvorbis/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   outputs = [ "dev" "out" "doc" ];
 
-  buildInputs = [ stdenv.hookLib.multiout pkgconfig ];
+  buildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ libogg ];
 
diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix
index 07ab3187f8cfa..1d62dfff3c99d 100644
--- a/pkgs/development/libraries/mpfr/default.nix
+++ b/pkgs/development/libraries/mpfr/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "doc" ];
 
-  buildInputs = [ stdenv.hookLib.multiout gmp ];
+  buildInputs = [ gmp ];
 
   configureFlags =
     /* Work around a FreeBSD bug that otherwise leads to segfaults in the test suite:
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index babf49274607e..e2a5eec77dba9 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
   outputs = [ "dev" "out" "man" "bin" ];
   setOutputFlags = false;
 
-  buildInputs = [ stdenv.hookLib.multiout ]
+  buildInputs = [ ]
     ++ stdenv.lib.optional withCryptodev cryptodevHeaders;
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index ae3f21367045b..961a9e7b9ea6c 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" "bin" "doc" "man" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   # The compiler on Darwin crashes with an internal error while building the
   # C++ interface. Disabling optimizations on that platform remedies the
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 5f9a01208d84d..3db3ad449c15e 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" "static" "man" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
   setOutputFlags = false;
 
   configureFlags = stdenv.lib.optional (!static) "--shared";
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 30ea323908fa7..005b493836f1f 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" "info" ];
 
   buildInputs =
-    [ stdenv.hookLib.multiout zlib ]
+    [ zlib ]
     ++ optional gold bison;
 
   inherit noSysDirs;
diff --git a/pkgs/development/tools/misc/libtool/libtool2.nix b/pkgs/development/tools/misc/libtool/libtool2.nix
index df52596c5a557..924113ea54863 100644
--- a/pkgs/development/tools/misc/libtool/libtool2.nix
+++ b/pkgs/development/tools/misc/libtool/libtool2.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "lib" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   nativeBuildInputs = [ lzma m4 perl ];
 
diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 1b5d617357bb7..34d855da6f56b 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   nativeBuildInputs = [ perl ];
   propagatedBuildInputs = [ attr ];
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 39596c7e03267..8423ea6f12367 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ flex ];
 
-  buildInputs = [ stdenv.hookLib.multiout cracklib ];
+  buildInputs = [ cracklib ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index e93e0348b8672..879d2a06e420f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -56,7 +56,7 @@ in
   };
 
   libxcb = attrs : attrs // {
-    nativeBuildInputs = [ stdenv.hookLib.multiout args.python ];
+    nativeBuildInputs = [ args.python ];
     configureFlags = "--enable-xkb";
     outputs = [ "dev" "out" "doc" "man" ];
   };
@@ -71,7 +71,6 @@ in
 
   libX11 = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     postInstall =
       ''
@@ -82,12 +81,10 @@ in
 
   libXau = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
   };
 
   libXdmcp = attrs: attrs // {
     outputs = [ "dev" "out" "doc" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
   };
 
   libXfont = attrs: attrs // {
@@ -101,7 +98,6 @@ in
 
   libXxf86vm = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
@@ -125,7 +121,6 @@ in
 
   libXcomposite = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     propagatedBuildInputs = [ xorg.libXfixes ];
   };
 
@@ -135,17 +130,14 @@ in
 
   libXcursor = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
   };
 
   libXdamage = attrs: attrs // {
     outputs = [ "dev" "out" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
   };
 
   libXft = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     # the include files need ft2build.h, and Requires.private isn't enough for us
@@ -156,29 +148,24 @@ in
 
   libXext = attrs: attrs // {
     outputs = [ "dev" "out" "man" "doc" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
   libXfixes = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
   };
 
   libXi = attrs: attrs // {
     outputs = [ "dev" "out" "man" "doc" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
   };
 
   libXinerama = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
   };
 
   libXrandr = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     propagatedBuildInputs = [xorg.libXrender];
   };
@@ -188,7 +175,6 @@ in
 
   libXrender = attrs: attrs // {
     outputs = [ "dev" "out" "doc" ];
-    buildInputs = [ stdenv.hookLib.multiout ] ++ attrs.buildInputs;
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 118331feff6ff..789bfe87f6250 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -44,6 +44,7 @@ let
       ../../build-support/setup-hooks/compress-man-pages.sh
       ../../build-support/setup-hooks/strip.sh
       ../../build-support/setup-hooks/patch-shebangs.sh
+      ../../build-support/setup-hooks/multiple-outputs.sh
       gcc
     ];
 
@@ -206,12 +207,6 @@ let
       inherit overrides;
 
       inherit gcc;
-
-      # extra useful hooks, so we do not need to pass them as package arguments
-      hookLib = {
-        multiout = ../../build-support/setup-hooks/multiple-outputs.sh; #ToDo: propagated-native-build-inputs
-        #ToDo: add also autoreconf = pkgs.autoreconfHook
-      };
     }
 
     # Propagate any extra attributes.  For instance, we use this to
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 140294d987d5d..23d3f1dd28b4d 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "info" ];
-  buildInputs = [ stdenv.hookLib.multiout acl ];
+  buildInputs = [ acl ];
 
   # May have some issues with root compilation because the bootstrap tool
   # cannot be used as a login shell for now.
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index aca5995c3baea..5889bdd5093d9 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" "bin" "man" "doc" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   doCheck = true;
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index b3433ca83ec2a..47757e4659acc 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -24,7 +24,6 @@ let
 
     nativeBuildInputs = [ perl ];
     buildInputs = [ gmp ]
-      ++ [ stdenv.hookLib.multiout ]
       ++ optional aclSupport acl
       ++ optionals selinuxSupport [ libselinux libsepol ];
 
diff --git a/pkgs/tools/misc/findutils/default.nix b/pkgs/tools/misc/findutils/default.nix
index 407470870a67f..b3d1d4c9e7916 100644
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@@ -13,7 +13,6 @@ stdenv.mkDerivation rec {
   patches = [ ./findutils-path.patch ./change_echo_path.patch ];
 
   outputs = [ "out" "info" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   doCheck = true;
 
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 9275603bad4c5..680a75445ef08 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "out" "info" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   /* If no explicit coreutils is given, use the one from stdenv. */
   nativeBuildInputs = [ coreutils ];
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 432d7b5871204..f5fbf029aad04 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   #outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
 
   buildInputs = [ libsigsegv ]
-    ++ optional (!interactive) stdenv.hookLib.multiout
     ++ optional interactive readline;
 
   configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index e2a48085db966..d0c5b8dbd215e 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   #outputs = [ "out" "doc" ]; ToDo
 
-  buildInputs = [ stdenv.hookLib.multiout pcre ]
+  buildInputs = [ pcre ]
     ++ stdenv.lib.optional (libiconv != null) libiconv;
 
   patches = [ ./test-localeconv.patch ];
diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix
index 49ff76b85c20c..037c2f17a63ba 100644
--- a/pkgs/tools/text/gnused/default.nix
+++ b/pkgs/tools/text/gnused/default.nix
@@ -9,7 +9,6 @@ stdenv.mkDerivation {
   };
 
   outputs = [ "out" "info" ];
-  buildInputs = [ stdenv.hookLib.multiout ];
 
   meta = {
     homepage = http://www.gnu.org/software/sed/;

From 886da114ae92398421f880b9890001b38d15d599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 08:35:28 +0200
Subject: [PATCH 078/857] gawkInteractive: fix eval

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92fe64fab65fa..94f773f77d4cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1100,7 +1100,7 @@ let
   gawk = callPackage ../tools/text/gawk { };
 
   gawkInteractive = appendToName "interactive"
-    (gawk.override { readlineSupport = true; });
+    (gawk.override { interactive = true; });
 
   gbdfed = callPackage ../tools/misc/gbdfed {
     gtk = gtk2;

From 2f9219918357023484cde6268c50293b253a88c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 08:43:46 +0200
Subject: [PATCH 079/857] multiout: resolve general ToDos

---
 .../setup-hooks/multiple-outputs.sh           | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index b3274c88cd7b2..c84e0acd3c686 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -3,7 +3,6 @@ preFixupHooks+=(_multioutDocs)
 preFixupHooks+=(_multioutDevs)
 postFixupHooks+=(_multioutPropagateDev)
 
-
 # Assign the first string containing nonempty variable to the variable named $1
 _assignFirst() {
     local varName="$1"
@@ -14,25 +13,29 @@ _assignFirst() {
     done
     return 1 # none found
 }
+# Same as _assignFirst, but only if "$1" = ""
+_overrideFirst() {
+    if [ -z "${!1}" ]; then
+        _assignFirst "$@"
+    fi
+}
+
 
 # Setup chains of sane default values with easy overridability.
 # The variables are global to be usable anywhere during the build.
-# ToDo: I was unable to get rid of the double-name redundancy (I hate bash eval ways)
-
-# ToDo: easy way of overriding from withing mkDerivation attrset
 
-_assignFirst outputDev "$outputDev" "dev" "out"
-_assignFirst outputBin "$outputBin" "bin" "out"
+_overrideFirst outputDev "dev" "out"
+_overrideFirst outputBin "bin" "out"
 
-_assignFirst outputInclude "$outputInclude" "$outputDev"
+_overrideFirst outputInclude "$outputDev"
 
 # so-libs are often among the main things to keep, and so go to $out
-_assignFirst outputLib "$outputLib" "lib" "out"
+_overrideFirst outputLib "lib" "out"
 
-_assignFirst outputDoc "$outputDoc" "doc" "out"
+_overrideFirst outputDoc "doc" "out"
 # man and info pages are small and often useful to distribute with binaries
-_assignFirst outputMan "$outputMan" "man" "doc" "$outputBin"
-_assignFirst outputInfo "$outputInfo" "info" "doc" "$outputMan"
+_overrideFirst outputMan "man" "doc" "$outputBin"
+_overrideFirst outputInfo "info" "doc" "$outputMan"
 
 # Make stdenv put propagated*BuildInputs into $outputDev instead of $out
 propagateIntoOutput="${!outputDev}"

From 030af0a8035ba60f34d5b2020c9c020df769ecdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 15:48:17 +0200
Subject: [PATCH 080/857] fix .xz in stdenv bootstrap

Presumably needed due to the last staging merge.
There was some stdenv stage refactoring within, IIRC.
---
 pkgs/tools/compression/gzip/default.nix | 4 +++-
 pkgs/tools/misc/coreutils/default.nix   | 4 ++--
 pkgs/tools/text/diffutils/default.nix   | 4 ++--
 pkgs/tools/text/gawk/default.nix        | 6 +++---
 pkgs/tools/text/gnugrep/default.nix     | 4 ++--
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 2b051099b390a..53c71346fc144 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, xz }:
 
 stdenv.mkDerivation rec {
   name = "gzip-1.6";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  buildInputs = [ xz.bin ];
+
   # In stdenv-linux, prevent a dependency on bootstrap-tools.
   makeFlags = "SHELL=/bin/sh GREP=grep";
 
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 47757e4659acc..4dbaa02555c3e 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gmp ? null
+{ stdenv, fetchurl, perl, xz, gmp ? null
 , aclSupport ? false, acl ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
 }:
@@ -22,7 +22,7 @@ let
 
     outputs = [ "out" "info" ];
 
-    nativeBuildInputs = [ perl ];
+    nativeBuildInputs = [ perl xz.bin ];
     buildInputs = [ gmp ]
       ++ optional aclSupport acl
       ++ optionals selinuxSupport [ libselinux libsepol ];
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index 680a75445ef08..70a3bdeb7984e 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, coreutils ? null }:
+{ stdenv, fetchurl, xz, coreutils ? null }:
 
 stdenv.mkDerivation rec {
   name = "diffutils-3.3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "info" ];
 
   /* If no explicit coreutils is given, use the one from stdenv. */
-  nativeBuildInputs = [ coreutils ];
+  nativeBuildInputs = [ xz.bin coreutils ];
 
   meta = {
     homepage = http://www.gnu.org/software/diffutils/diffutils.html;
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index f5fbf029aad04..60cb8592589e0 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libsigsegv, readline, interactive ? false }:
+{ stdenv, fetchurl, xz, libsigsegv, readline, interactive ? false }:
 
 let
   inherit (stdenv.lib) optional;
@@ -12,9 +12,9 @@ stdenv.mkDerivation rec {
   };
 
   # When we do build separate interactive version, it makes sense to always include docs.
-  #outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
+  outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
 
-  buildInputs = [ libsigsegv ]
+  buildInputs = [ xz.bin libsigsegv ]
     ++ optional interactive readline;
 
   configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]
diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index d0c5b8dbd215e..2c5c54ddec785 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pcre, libiconv ? null }:
+{ stdenv, fetchurl, xz, pcre, libiconv ? null }:
 
 let version = "2.14"; in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   #outputs = [ "out" "doc" ]; ToDo
 
-  buildInputs = [ pcre ]
+  buildInputs = [ pcre xz.bin ]
     ++ stdenv.lib.optional (libiconv != null) libiconv;
 
   patches = [ ./test-localeconv.patch ];

From 38ba4eb6939f6ed13dfd8e8cddd2dcb1efd96745 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 15:53:24 +0200
Subject: [PATCH 081/857] multiple-outputs.sh: fixup when it's always sourced
 now

---
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index c84e0acd3c686..a73c1f059a260 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -1,3 +1,5 @@
+# The base package for automatic multiple-output splitting. Used in stdenv as well.
+
 preConfigureHooks+=(_multioutConfig)
 preFixupHooks+=(_multioutDocs)
 preFixupHooks+=(_multioutDevs)
@@ -43,7 +45,7 @@ propagateIntoOutput="${!outputDev}"
 
 # Add standard flags to put files into the desired outputs.
 _multioutConfig() {
-    if [ -z "${setOutputFlags-1}" ]; then return; fi;
+    if [ "$outputs" = "out" ] || [ -z "${setOutputFlags-1}" ]; then return; fi;
 
     configureFlags="\
         --bindir=${!outputBin}/bin --sbindir=${!outputBin}/sbin \
@@ -68,11 +70,9 @@ NIX_NO_SELF_RPATH=1
 _moveToOutput() {
     local patt="$1"
     local dstOut="$2"
-    echo "XXX: m2o '$1' '$2'"
     local output
     for output in $outputs; do
-        echo "XXX: output='$output'"
-        if [ "${output}" = "$dstOut" ]; then continue; fi
+        if [ "${!output}" = "$dstOut" ]; then continue; fi
         local srcPath
         for srcPath in ${!output}/$patt; do
             if [ ! -e "$srcPath" ]; then continue; fi
@@ -93,6 +93,7 @@ _moveToOutput() {
 
 # Move documentation to the desired outputs.
 _multioutDocs() {
+    if [ "$outputs" = "out" ]; then return; fi;
     echo "Looking for documentation to move between outputs"
     _moveToOutput share/man "${!outputMan}"
     _moveToOutput share/info "${!outputInfo}"
@@ -106,7 +107,7 @@ _multioutDocs() {
 
 # Move development-only stuff to the desired outputs.
 _multioutDevs() {
-    if [ -z "${moveToDev-1}" ]; then return; fi;
+    if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi;
     echo "Looking for development-only stuff to move between outputs"
     _moveToOutput include "${!outputInclude}"
     _moveToOutput lib/pkgconfig "${!outputDev}"
@@ -117,6 +118,8 @@ _multioutDevs() {
 # Note: during the build, probably only the "native" development packages are useful.
 # With current cross-building setup, all packages are "native" if not cross-building.
 _multioutPropagateDev() {
+    if [ "$outputs" = "out" ]; then return; fi;
+
     if [ "${!outputInclude}" != "$propagateIntoOutput" ]; then
         mkdir -p "$propagateIntoOutput"/nix-support
         echo -n " ${!outputInclude}" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs

From b8c7091335d77bfe72ce1c0d920b0bd816621fef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 15:54:07 +0200
Subject: [PATCH 082/857] gcc: fixup references. ToDo: port to gcc-4.9

---
 pkgs/development/compilers/gcc/4.8/builder.sh  | 15 +++++++++++----
 pkgs/development/compilers/gcc/4.8/default.nix |  5 ++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh
index 1c0a09accbf34..a839f94bbd2e2 100644
--- a/pkgs/development/compilers/gcc/4.8/builder.sh
+++ b/pkgs/development/compilers/gcc/4.8/builder.sh
@@ -231,10 +231,17 @@ postInstall() {
     rm -rf $out/bin/gccbug
 
     # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
-    for i in $out/libexec/gcc/*/*/*; do
-        if PREV_RPATH=`patchelf --print-rpath $i`; then
-            patchelf --set-rpath `echo $PREV_RPATH | sed 's,:[^:]*bootstrap-tools/lib,,'` $i
-        fi
+    for i in "$out"/libexec/gcc/*/*/*; do
+        PREV_RPATH=`patchelf --print-rpath "$i"`
+        NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'`
+        patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
+    done
+
+    # For some reason the libs retain RPATH to $out
+    for i in "$lib"/lib/{libtsan.so.0.0.0,libasan.so.0.0.0}; do
+        PREV_RPATH=`patchelf --print-rpath "$i"`
+        NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
+        patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
     done
 
     # Get rid of some "fixed" header files
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 91f60726666a7..bd69476aa5984 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -214,10 +214,9 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "lib" ];
-
+  outputs = [ "out" "lib" "doc" ];
   setOutputFlags = false;
-
+  NIX_NO_SELF_RPATH = true;
 
   libc_dev = stdenv.gcc.libc_dev;
 

From abbc93f78327747a7b8ed4984bd4be03349e8e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 19:11:52 +0200
Subject: [PATCH 083/857] WIP: getting better

---
 pkgs/development/libraries/glib/default.nix    |  2 +-
 pkgs/development/libraries/glib/setup-hook.sh  | 15 +++++++++++++++
 .../gobject-introspection/default.nix          |  4 ++--
 pkgs/development/libraries/jasper/default.nix  |  4 ++--
 .../tools/build-managers/cmake/default.nix     |  7 +++++--
 pkgs/os-specific/linux/systemd/default.nix     | 18 +++++++++++++-----
 pkgs/os-specific/linux/util-linux/default.nix  | 16 ++++++++++------
 pkgs/tools/filesystems/e2fsprogs/default.nix   | 13 ++++++++-----
 pkgs/top-level/all-packages.nix                |  4 ++--
 9 files changed, 58 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index c38d34eb94ae8..be1abfb0b15ce 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
 
   #outputs = [ "dev" "out" "bin" ]; # ToDo: no idea what's wrong! docs? 
 
-  #setupHook = ./setup-hook.sh;
+  setupHook = ./setup-hook.sh;
 
   buildInputs = [ /*stdenv.hookLib.multiout*/ libelf ]
     ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 35d7d9d8fbe99..91411e68dd215 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -15,3 +15,18 @@ glibPreFixupPhase() {
 }
 
 preFixupPhases+=(glibPreFixupPhase)
+
+
+preFixupHooks+=(_multioutGtkDocs)
+
+# Move documentation to the desired outputs.
+_multioutGtkDocs() {
+    if [ "$outputs" = "out" ]; then return; fi;
+    _moveToOutput share/gtk-doc "${!outputDoc}"
+
+    # Remove empty share directory.
+    if [ -d "$out/share" ]; then
+        rmdir "$out/share" 2> /dev/null || true
+    fi
+}
+
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 4b7ec1f41163f..5fdd88ff0b1df 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln";
   };
 
+  outputs = [ "dev" "out" "doc" ];
+
   buildInputs = [ flex bison glib pkgconfig python ]
     ++ libintlOrEmpty
     ++ stdenv.lib.optional stdenv.isDarwin otool;
@@ -25,8 +27,6 @@ stdenv.mkDerivation rec {
   # other dependencies).
   configureFlags = [ "--disable-tests" ];
 
-  postInstall = "rm -rf $out/share/gtk-doc";
-
   setupHook = ./setup-hook.sh;
 
   patches = [ ./absolute_shlib_path.patch ];
diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index f6777dc3bb9c4..c369a36eb9ac1 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, unzip, xlibs, libjpeg}:
+{ stdenv, fetchurl, autoreconfHook, unzip, xlibs, libjpeg }:
 
 stdenv.mkDerivation rec {
   name = "jasper-1.900.1";
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b";
   };
 
-  nativeBuildInputs = [unzip];
+  nativeBuildInputs = [ unzip autoreconfHook ];
   propagatedBuildInputs = [ libjpeg ];
 
   configureFlags = "--enable-shared";
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 951a19cde90cf..a81c3b1553438 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
+{ stdenv, fetchurl, fetchpatch, replace, pkgconfig, curl, expat, zlib, bzip2, libarchive
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
 }:
 
@@ -39,12 +39,15 @@ stdenv.mkDerivation rec {
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
 
-  buildInputs = [ curl expat zlib bzip2 libarchive ]
+  buildInputs = [ pkgconfig curl expat zlib bzip2 libarchive ]
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
   CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
 
+  # no idea why the auto-added NIX_LDFLAGS to the same path is not enough
+  NIX_CFLAGS_COMPILE = "-L${zlib.out}/lib";
+
   configureFlags =
     "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
     + stdenv.lib.optionalString useQt4 " --qt-gui";
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 9942218be6cfd..34fcf4fe595c2 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     sha256 = "1hpjcc42svrs06q3isjm3m5aphgkpfdylmvpnif71zh46ys0cab5";
   };
 
-  outputs = [ "out" "man" "libudev" ];
+  outputs = [ "dev" "out" "libudev" "doc" ];
 
   patches =
     [ # These are all changes between upstream and
@@ -34,6 +34,7 @@ stdenv.mkDerivation rec {
       autoreconfHook
     ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
 
+
   configureFlags =
     [ "--localstatedir=/var"
       "--sysconfdir=/etc"
@@ -102,6 +103,8 @@ stdenv.mkDerivation rec {
   # /var is mounted.
   makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin";
 
+  enableParallelBuilding = true;
+
   installFlags =
     [ "localstatedir=$(TMPDIR)/var"
       "sysconfdir=$(out)/etc"
@@ -112,9 +115,9 @@ stdenv.mkDerivation rec {
   # Get rid of configuration-specific data.
   postInstall =
     ''
-      mkdir -p $out/example/systemd
-      mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
-      mv $out/lib/systemd/{system,user} $out/example/systemd
+      mkdir -p $doc/example/systemd
+      mv $doc/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $doc/example
+      mv $doc/lib/systemd/{system,user} $doc/example/systemd
 
       rm -rf $out/etc/systemd/system
 
@@ -143,7 +146,12 @@ stdenv.mkDerivation rec {
       done
     ''; # */
 
-  enableParallelBuilding = true;
+  postPhases = "postPostFixup";
+
+  postPostFixup = ''
+    ls -l "$dev"/nix-support/
+    echo -n " $libudev" >> "$dev"/nix-support/propagated-*build-inputs
+  '';
 
   # The interface version prevents NixOS from switching to an
   # incompatible systemd at runtime.  (Switching across reboots is
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 03b4f2a894a52..7b4ac6d04d450 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
 
 stdenv.mkDerivation rec {
-  name = "util-linux-2.24.2";
+  name = "util-linux-2.25";
 
   src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.24/${name}.tar.xz";
-    sha256 = "1w0g8q5aj5pjdf8l52g0mxyvlk62f4dch51q9jm3hnqwgz0dchqj";
+    url = "http://www.kernel.org/pub/linux/utils/util-linux/v2.25/${name}.tar.xz";
+    sha256 = "02lqww6ck4p47wzc883zdjb1gnwm59hsay4hd5i55mfdv25mmfj7";
   };
 
-  outputs = [ "dev" "out" "bin" ];
+  outputs = [ "dev" "out" "bin" ]; # ToDo: problems with e2fsprogs
 
   crossAttrs = {
     # Work around use of `AC_RUN_IFELSE'.
@@ -37,13 +37,17 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (perl != null) perl;
 
   postInstall = ''
-    rm $out/bin/su # su should be supplied by the su package (shadow)
+    sed "s,$out$out,$out,g" -i "$dev"/lib/pkgconfig/*.pc
+    rm "$bin/bin/su" # su should be supplied by the su package (shadow)
   '';
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
     description = "A set of system utilities for Linux";
+    license = licenses.gpl2; # also contains parts under more permissive licenses
+    platforms = platforms.all;
   };
 }
+
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index dcbf7235e49c4..0e61e1474e886 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, pkgconfig, libuuid }:
+{ stdenv, fetchurl, autoreconfHook, gettext, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
-  name = "e2fsprogs-1.42.9";
+  name = "e2fsprogs-1.42.12";
 
   src = fetchurl {
     url = "mirror://sourceforge/e2fsprogs/${name}.tar.gz";
-    sha256 = "00i83w22sbyq849as9vmaf2xcx1d06npvriyv8m0z81gx43ar4ig";
+    sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71";
   };
 
-  buildInputs = [ pkgconfig libuuid ];
+  outputs = [ "dev" "out" "bin" "man" ];
+
+  buildInputs = [ pkgconfig /*libuuid*/ ];
 
   crossAttrs = {
     preConfigure = ''
@@ -17,7 +19,8 @@ stdenv.mkDerivation rec {
   };
 
   # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
-  configureFlags = "--enable-elf-shlibs --disable-libuuid --disable-libblkid --disable-uuidd --disable-fsck --enable-symlink-install";
+  # ToDo: failed with shared uuid and blkid
+  configureFlags = "--enable-elf-shlibs --disable-fsck --enable-symlink-install";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94f773f77d4cf..23df773d22916 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7221,7 +7221,7 @@ let
       });
     })
     else if stdenv.isLinux
-    then utillinux
+    then e2fsprogs
     else null;
 
   e3cfsprogs = callPackage ../os-specific/linux/e3cfsprogs { };
@@ -7808,7 +7808,7 @@ let
 
   udev145 = callPackage ../os-specific/linux/udev/145.nix { };
 
-  udev = pkgs.systemd.libudev;
+  udev = pkgs.systemd; # headers are not in the libudev output
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
   udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };

From d25cc03f214c35b4e84fe8bd411ea77d085f1243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 23:29:23 +0200
Subject: [PATCH 084/857] multi-out: auto-correct include dirs in *.pc

---
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index a73c1f059a260..3ab77683a41d4 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -112,6 +112,11 @@ _multioutDevs() {
     _moveToOutput include "${!outputInclude}"
     _moveToOutput lib/pkgconfig "${!outputDev}"
     _moveToOutput "lib/*.la" "${!outputDev}"
+
+    echo "Patching *.pc includedir to output ${!outputInclude}"
+    for f in "${!outputDev}"/lib/pkgconfig/*.pc; do
+        sed -i "/^includedir=/s,=\${prefix},=${!outputInclude}," "$f"
+    done
 }
 
 # Make ${!outputDev} propagate other outputs needed for development

From 381dcb1d98b804a01a663fd3ec2bca78f5afd516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 30 Aug 2014 23:30:31 +0200
Subject: [PATCH 085/857] various packages fixed

---
 pkgs/development/libraries/gdk-pixbuf/default.nix |  6 ++++++
 pkgs/development/libraries/libav/default.nix      | 10 +++++-----
 pkgs/development/libraries/libffi/default.nix     | 10 ++++++++--
 pkgs/development/libraries/mesa/default.nix       |  6 +++---
 .../tools/build-managers/cmake/default.nix        |  5 +----
 pkgs/os-specific/linux/systemd/default.nix        | 15 +++++++++++----
 pkgs/servers/http/apache-httpd/2.2.nix            |  4 ++--
 7 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index a72d7ad5e4013..fa1599562ca2b 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -32,6 +32,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # propagate the bin output
+  postPhases = "postPostFixup";
+  postPostFixup = ''
+    echo -n " $bin" >> "$dev"/nix-support/propagated-*build-inputs
+  '';
+
   meta = {
     description = "A library for image loading and manipulation";
     homepage = http://library.gnome.org/devel/gdk-pixbuf/;
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 2f9e1786473e7..2268290b9f7c5 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -10,7 +10,7 @@
 , vaapiSupport  ? false,  libva     ? null # ToDo: it has huge closure
 , vdpauSupport  ? true,   libvdpau  ? null
 , freetypeSupport ? true, freetype  ? null # it's small and almost everywhere
-, SDL # only for avplay in $tools, adds nontrivial closure to it
+, SDL # only for avplay in $bin, adds nontrivial closure to it
 , enableGPL ? true # ToDo: some additional default stuff may need GPL
 , enableUnfree ? faacSupport
 }:
@@ -77,12 +77,12 @@ let
 
     enableParallelBuilding = true;
 
-    outputs = [ "out" "tools" ];
+    outputs = [ "dev" "out" "bin" ];
 
     postInstall = ''
-      mkdir -p "$tools/bin"
-      mv "$out/bin/avplay" "$tools/bin"
-      cp -s "$out"/bin/* "$tools/bin/"
+      mkdir -p "$bin/bin"
+      mv "$out/bin/avplay" "$bin/bin"
+      cp -s "$out"/bin/* "$bin/bin/"
     '';
 
     doInstallCheck = false; # fails randomly
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index daff1aa471c71..69c8aab64505d 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -24,8 +24,14 @@ stdenv.mkDerivation rec {
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 
   postInstall =
-    # Install headers in the right place.
-    '' ln -s${if stdenv.isFreeBSD then "" else "r"}v "$out/lib/"libffi*/include "$out/include"
+    # Install headers and libs in the right places.
+    ''  mv "$out"/lib64/* "$out/lib"
+        rmdir "$out/lib64"
+        ln -s lib "$out/lib64"
+
+        mkdir -p "$dev/"
+        mv "$out/lib/${name}/include" "$dev/include"
+        rmdir "$out/lib/${name}"
     '';
 
   meta = {
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 54fd8d3810e3f..1458aedc0b133 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation {
     patch -R -p1 < ${./rtti.patch}
   '';
 
-  outputs = ["out" "drivers" "osmesa"];
+  outputs = [ "dev" "out" "drivers" "osmesa" ];
 
   configureFlags = [
     "--with-dri-driverdir=$(drivers)/lib/dri"
@@ -113,8 +113,8 @@ stdenv.mkDerivation {
   '' + optionalString enableExtraFeatures ''
       `#$out/lib/libXvMC*` \
       $out/lib/gbm $out/lib/libgbm* \
-      $out/lib/gallium-pipe \
   '' + ''
+      $out/lib/gallium-pipe \
       $out/lib/libdricore* \
       $out/lib/libgallium* \
       $out/lib/vdpau \
@@ -134,8 +134,8 @@ stdenv.mkDerivation {
     sed "/^libdir=/s,$out,$drivers," -i \
   '' + optionalString enableExtraFeatures ''
       `#$drivers/lib/libXvMC*.la` \
-      $drivers/lib/gallium-pipe/*.la \
   '' + ''
+      $drivers/lib/gallium-pipe/*.la \
       $drivers/lib/libgallium.la \
       $drivers/lib/vdpau/*.la \
       $drivers/lib/libdricore*.la
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index a81c3b1553438..e6f0e7affe95c 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -43,10 +43,7 @@ stdenv.mkDerivation rec {
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-
-  # no idea why the auto-added NIX_LDFLAGS to the same path is not enough
-  NIX_CFLAGS_COMPILE = "-L${zlib.out}/lib";
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" (buildInputs ++ [zlib.out]);
 
   configureFlags =
     "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 34fcf4fe595c2..1c6a065a94788 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gperf, libcap, dbus, kmod
-, xz, pam, acl, cryptsetup, libuuid, m4, utillinux
+, zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt, sysvtools, docbook_xsl
 , kexectools, libmicrohttpd, linuxHeaders
 , pythonPackages ? null, pythonSupport ? false
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig intltool gperf libcap kmod xz pam acl
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt docbook_xsl
-      libmicrohttpd linuxHeaders
+      libmicrohttpd linuxHeaders libffi
       autoreconfHook
     ] ++ stdenv.lib.optionals pythonSupport [pythonPackages.python pythonPackages.lxml];
 
@@ -146,10 +146,17 @@ stdenv.mkDerivation rec {
       done
     ''; # */
 
-  postPhases = "postPostFixup";
+  # some libs fail to link to liblzma and/or libffi
+  postFixup = let extraLibs = stdenv.lib.makeLibraryPath [ xz.out libffi.out zlib.out ];
+    in ''
+      for f in "$out"/lib/*.so.0.*; do
+        patchelf --set-rpath `patchelf --print-rpath "$f"`':${extraLibs}' "$f"
+      done
+    '';
 
+  # propagate the libudev output
+  postPhases = "postPostFixup";
   postPostFixup = ''
-    ls -l "$dev"/nix-support/
     echo -n " $libudev" >> "$dev"/nix-support/propagated-*build-inputs
   '';
 
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index bcbc5baf37b01..70a1b5a17d1df 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, perl, zlib
+{ stdenv, fetchurl, pkgconfig, openssl, perl, zlib
 , sslSupport, proxySupport ? true
 , apr, aprutil, pcre
 , ldapSupport ? true, openldap
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "doc" ];
 
-  buildInputs = [perl apr aprutil pcre] ++
+  buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++
     stdenv.lib.optional sslSupport openssl;
 
   # An apr-util header file includes an apr header file

From 4c3e6a46754f32c059484b25e35925a92a7c9574 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 31 Aug 2014 12:20:34 +0200
Subject: [PATCH 086/857] xorg: go back to using the new nix syntax

This reverts commit 86a372683a0185eea5ce8359bcadb72f4782cad9.
The original revert was just temporary.

Conflicts (auto-solved):
	pkgs/servers/x11/xorg/default.nix
---
 pkgs/servers/x11/xorg/default.nix             | 866 +++++++++---------
 .../x11/xorg/generate-expr-from-tarballs.pl   |   9 +-
 2 files changed, 450 insertions(+), 425 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index d03249387b71d..e8c9f2f8d3047 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,13 +3,18 @@ args: with args;
 
 let
 
+  mkDerivation = name: attrs:
+    let newAttrs = (overrides."${name}" or (x: x)) attrs;
+        stdenv = newAttrs.stdenv or args.stdenv;
+    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
+
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
 
   inherit pixman;
 
-  applewmproto = (stdenv.mkDerivation ((if overrides ? applewmproto then overrides.applewmproto else x: x) {
+  applewmproto = (mkDerivation "applewmproto" {
     name = "applewmproto-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -17,9 +22,9 @@ let
       sha256 = "1zi4p07mp6jmk030p4gmglwxcwp0lzs5mi31y1b4rp8lsqxdxizw";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  bdftopcf = (stdenv.mkDerivation ((if overrides ? bdftopcf then overrides.bdftopcf else x: x) {
+  bdftopcf = (mkDerivation "bdftopcf" {
     name = "bdftopcf-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -27,9 +32,9 @@ let
       sha256 = "1617zmgnx50n7vxlqyj84fl7vnk813jjqmi6jpigyz1xp9br1xga";
     };
     buildInputs = [pkgconfig libXfont ];
-  })) // {inherit libXfont ;};
+  }) // {inherit libXfont ;};
 
-  bigreqsproto = (stdenv.mkDerivation ((if overrides ? bigreqsproto then overrides.bigreqsproto else x: x) {
+  bigreqsproto = (mkDerivation "bigreqsproto" {
     name = "bigreqsproto-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -37,9 +42,9 @@ let
       sha256 = "07hvfm84scz8zjw14riiln2v4w03jlhp756ypwhq27g48jmic8a6";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  compositeproto = (stdenv.mkDerivation ((if overrides ? compositeproto then overrides.compositeproto else x: x) {
+  compositeproto = (mkDerivation "compositeproto" {
     name = "compositeproto-0.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -47,9 +52,9 @@ let
       sha256 = "1z0crmf669hirw4s7972mmp8xig80kfndja9h559haqbpvq5k4q4";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  damageproto = (stdenv.mkDerivation ((if overrides ? damageproto then overrides.damageproto else x: x) {
+  damageproto = (mkDerivation "damageproto" {
     name = "damageproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -57,9 +62,9 @@ let
       sha256 = "0nzwr5pv9hg7c21n995pdiv0zqhs91yz3r8rn3aska4ykcp12z2w";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  dmxproto = (stdenv.mkDerivation ((if overrides ? dmxproto then overrides.dmxproto else x: x) {
+  dmxproto = (mkDerivation "dmxproto" {
     name = "dmxproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -67,9 +72,9 @@ let
       sha256 = "02b5x9dkgajizm8dqyx2w6hmqx3v25l67mgf35nj6sz0lgk52877";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  dri2proto = (stdenv.mkDerivation ((if overrides ? dri2proto then overrides.dri2proto else x: x) {
+  dri2proto = (mkDerivation "dri2proto" {
     name = "dri2proto-2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -77,9 +82,9 @@ let
       sha256 = "015az1vfdqmil1yay5nlsmpf6cf7vcbpslxjb72cfkzlvrv59dgr";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  dri3proto = (stdenv.mkDerivation ((if overrides ? dri3proto then overrides.dri3proto else x: x) {
+  dri3proto = (mkDerivation "dri3proto" {
     name = "dri3proto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -87,9 +92,9 @@ let
       sha256 = "0x609xvnl8jky5m8jdklw4nymx3irkv32w99dfd8nl800bblkgh1";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  encodings = (stdenv.mkDerivation ((if overrides ? encodings then overrides.encodings else x: x) {
+  encodings = (mkDerivation "encodings" {
     name = "encodings-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -97,9 +102,9 @@ let
       sha256 = "0ffmaw80vmfwdgvdkp6495xgsqszb6s0iira5j0j6pd4i0lk3mnf";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  fixesproto = (stdenv.mkDerivation ((if overrides ? fixesproto then overrides.fixesproto else x: x) {
+  fixesproto = (mkDerivation "fixesproto" {
     name = "fixesproto-5.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -107,9 +112,9 @@ let
       sha256 = "1ki4wiq2iivx5g4w5ckzbjbap759kfqd72yg18m3zpbb4hqkybxs";
     };
     buildInputs = [pkgconfig xextproto ];
-  })) // {inherit xextproto ;};
+  }) // {inherit xextproto ;};
 
-  fontadobe100dpi = (stdenv.mkDerivation ((if overrides ? fontadobe100dpi then overrides.fontadobe100dpi else x: x) {
+  fontadobe100dpi = (mkDerivation "fontadobe100dpi" {
     name = "font-adobe-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -117,9 +122,9 @@ let
       sha256 = "0m60f5bd0caambrk8ksknb5dks7wzsg7g7xaf0j21jxmx8rq9h5j";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobe75dpi = (stdenv.mkDerivation ((if overrides ? fontadobe75dpi then overrides.fontadobe75dpi else x: x) {
+  fontadobe75dpi = (mkDerivation "fontadobe75dpi" {
     name = "font-adobe-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -127,9 +132,9 @@ let
       sha256 = "02advcv9lyxpvrjv8bjh1b797lzg6jvhipclz49z8r8y98g4l0n6";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia100dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia100dpi then overrides.fontadobeutopia100dpi else x: x) {
+  fontadobeutopia100dpi = (mkDerivation "fontadobeutopia100dpi" {
     name = "font-adobe-utopia-100dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -137,9 +142,9 @@ let
       sha256 = "19dd9znam1ah72jmdh7i6ny2ss2r6m21z9v0l43xvikw48zmwvyi";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopia75dpi = (stdenv.mkDerivation ((if overrides ? fontadobeutopia75dpi then overrides.fontadobeutopia75dpi else x: x) {
+  fontadobeutopia75dpi = (mkDerivation "fontadobeutopia75dpi" {
     name = "font-adobe-utopia-75dpi-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -147,9 +152,9 @@ let
       sha256 = "152wigpph5wvl4k9m3l4mchxxisgsnzlx033mn5iqrpkc6f72cl7";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontadobeutopiatype1 = (stdenv.mkDerivation ((if overrides ? fontadobeutopiatype1 then overrides.fontadobeutopiatype1 else x: x) {
+  fontadobeutopiatype1 = (mkDerivation "fontadobeutopiatype1" {
     name = "font-adobe-utopia-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -157,9 +162,9 @@ let
       sha256 = "0xw0pdnzj5jljsbbhakc6q9ha2qnca1jr81zk7w70yl9bw83b54p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  fontalias = (stdenv.mkDerivation ((if overrides ? fontalias then overrides.fontalias else x: x) {
+  fontalias = (mkDerivation "fontalias" {
     name = "font-alias-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -167,9 +172,9 @@ let
       sha256 = "16ic8wfwwr3jicaml7b5a0sk6plcgc1kg84w02881yhwmqm3nicb";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  fontarabicmisc = (stdenv.mkDerivation ((if overrides ? fontarabicmisc then overrides.fontarabicmisc else x: x) {
+  fontarabicmisc = (mkDerivation "fontarabicmisc" {
     name = "font-arabic-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -177,9 +182,9 @@ let
       sha256 = "1x246dfnxnmflzf0qzy62k8jdpkb6jkgspcjgbk8jcq9lw99npah";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontbh100dpi = (stdenv.mkDerivation ((if overrides ? fontbh100dpi then overrides.fontbh100dpi else x: x) {
+  fontbh100dpi = (mkDerivation "fontbh100dpi" {
     name = "font-bh-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -187,9 +192,9 @@ let
       sha256 = "10cl4gm38dw68jzln99ijix730y7cbx8np096gmpjjwff1i73h13";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbh75dpi = (stdenv.mkDerivation ((if overrides ? fontbh75dpi then overrides.fontbh75dpi else x: x) {
+  fontbh75dpi = (mkDerivation "fontbh75dpi" {
     name = "font-bh-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -197,9 +202,9 @@ let
       sha256 = "073jmhf0sr2j1l8da97pzsqj805f7mf9r2gy92j4diljmi8sm1il";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter100dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter100dpi then overrides.fontbhlucidatypewriter100dpi else x: x) {
+  fontbhlucidatypewriter100dpi = (mkDerivation "fontbhlucidatypewriter100dpi" {
     name = "font-bh-lucidatypewriter-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -207,9 +212,9 @@ let
       sha256 = "1fqzckxdzjv4802iad2fdrkpaxl4w0hhs9lxlkyraq2kq9ik7a32";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhlucidatypewriter75dpi = (stdenv.mkDerivation ((if overrides ? fontbhlucidatypewriter75dpi then overrides.fontbhlucidatypewriter75dpi else x: x) {
+  fontbhlucidatypewriter75dpi = (mkDerivation "fontbhlucidatypewriter75dpi" {
     name = "font-bh-lucidatypewriter-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -217,9 +222,9 @@ let
       sha256 = "0cfbxdp5m12cm7jsh3my0lym9328cgm7fa9faz2hqj05wbxnmhaa";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontbhttf = (stdenv.mkDerivation ((if overrides ? fontbhttf then overrides.fontbhttf else x: x) {
+  fontbhttf = (mkDerivation "fontbhttf" {
     name = "font-bh-ttf-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -227,9 +232,9 @@ let
       sha256 = "0pyjmc0ha288d4i4j0si4dh3ncf3jiwwjljvddrb0k8v4xiyljqv";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  fontbhtype1 = (stdenv.mkDerivation ((if overrides ? fontbhtype1 then overrides.fontbhtype1 else x: x) {
+  fontbhtype1 = (mkDerivation "fontbhtype1" {
     name = "font-bh-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -237,9 +242,9 @@ let
       sha256 = "1hb3iav089albp4sdgnlh50k47cdjif9p4axm0kkjvs8jyi5a53n";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  fontbitstream100dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream100dpi then overrides.fontbitstream100dpi else x: x) {
+  fontbitstream100dpi = (mkDerivation "fontbitstream100dpi" {
     name = "font-bitstream-100dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -247,9 +252,9 @@ let
       sha256 = "1kmn9jbck3vghz6rj3bhc3h0w6gh0qiaqm90cjkqsz1x9r2dgq7b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstream75dpi = (stdenv.mkDerivation ((if overrides ? fontbitstream75dpi then overrides.fontbitstream75dpi else x: x) {
+  fontbitstream75dpi = (mkDerivation "fontbitstream75dpi" {
     name = "font-bitstream-75dpi-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -257,9 +262,9 @@ let
       sha256 = "13plbifkvfvdfym6gjbgy9wx2xbdxi9hfrl1k22xayy02135wgxs";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontbitstreamtype1 = (stdenv.mkDerivation ((if overrides ? fontbitstreamtype1 then overrides.fontbitstreamtype1 else x: x) {
+  fontbitstreamtype1 = (mkDerivation "fontbitstreamtype1" {
     name = "font-bitstream-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -267,9 +272,9 @@ let
       sha256 = "1256z0jhcf5gbh1d03593qdwnag708rxqa032izmfb5dmmlhbsn6";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  fontcronyxcyrillic = (stdenv.mkDerivation ((if overrides ? fontcronyxcyrillic then overrides.fontcronyxcyrillic else x: x) {
+  fontcronyxcyrillic = (mkDerivation "fontcronyxcyrillic" {
     name = "font-cronyx-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -277,9 +282,9 @@ let
       sha256 = "0ai1v4n61k8j9x2a1knvfbl2xjxk3xxmqaq3p9vpqrspc69k31kf";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontcursormisc = (stdenv.mkDerivation ((if overrides ? fontcursormisc then overrides.fontcursormisc else x: x) {
+  fontcursormisc = (mkDerivation "fontcursormisc" {
     name = "font-cursor-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -287,9 +292,9 @@ let
       sha256 = "0dd6vfiagjc4zmvlskrbjz85jfqhf060cpys8j0y1qpcbsrkwdhp";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontdaewoomisc = (stdenv.mkDerivation ((if overrides ? fontdaewoomisc then overrides.fontdaewoomisc else x: x) {
+  fontdaewoomisc = (mkDerivation "fontdaewoomisc" {
     name = "font-daewoo-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -297,9 +302,9 @@ let
       sha256 = "1s2bbhizzgbbbn5wqs3vw53n619cclxksljvm759h9p1prqdwrdw";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontdecmisc = (stdenv.mkDerivation ((if overrides ? fontdecmisc then overrides.fontdecmisc else x: x) {
+  fontdecmisc = (mkDerivation "fontdecmisc" {
     name = "font-dec-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -307,9 +312,9 @@ let
       sha256 = "0yzza0l4zwyy7accr1s8ab7fjqkpwggqydbm2vc19scdby5xz7g1";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontibmtype1 = (stdenv.mkDerivation ((if overrides ? fontibmtype1 then overrides.fontibmtype1 else x: x) {
+  fontibmtype1 = (mkDerivation "fontibmtype1" {
     name = "font-ibm-type1-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -317,9 +322,9 @@ let
       sha256 = "1pyjll4adch3z5cg663s6vhi02k8m6488f0mrasg81ssvg9jinzx";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  fontisasmisc = (stdenv.mkDerivation ((if overrides ? fontisasmisc then overrides.fontisasmisc else x: x) {
+  fontisasmisc = (mkDerivation "fontisasmisc" {
     name = "font-isas-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -327,9 +332,9 @@ let
       sha256 = "0rx8q02rkx673a7skkpnvfkg28i8gmqzgf25s9yi0lar915sn92q";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontjismisc = (stdenv.mkDerivation ((if overrides ? fontjismisc then overrides.fontjismisc else x: x) {
+  fontjismisc = (mkDerivation "fontjismisc" {
     name = "font-jis-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -337,9 +342,9 @@ let
       sha256 = "0rdc3xdz12pnv951538q6wilx8mrdndpkphpbblszsv7nc8cw61b";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontmicromisc = (stdenv.mkDerivation ((if overrides ? fontmicromisc then overrides.fontmicromisc else x: x) {
+  fontmicromisc = (mkDerivation "fontmicromisc" {
     name = "font-micro-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -347,9 +352,9 @@ let
       sha256 = "1dldxlh54zq1yzfnrh83j5vm0k4ijprrs5yl18gm3n9j1z0q2cws";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontmisccyrillic = (stdenv.mkDerivation ((if overrides ? fontmisccyrillic then overrides.fontmisccyrillic else x: x) {
+  fontmisccyrillic = (mkDerivation "fontmisccyrillic" {
     name = "font-misc-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -357,9 +362,9 @@ let
       sha256 = "0q2ybxs8wvylvw95j6x9i800rismsmx4b587alwbfqiw6biy63z4";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontmiscethiopic = (stdenv.mkDerivation ((if overrides ? fontmiscethiopic then overrides.fontmiscethiopic else x: x) {
+  fontmiscethiopic = (mkDerivation "fontmiscethiopic" {
     name = "font-misc-ethiopic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -367,9 +372,9 @@ let
       sha256 = "19cq7iq0pfad0nc2v28n681fdq3fcw1l1hzaq0wpkgpx7bc1zjsk";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmeltho = (stdenv.mkDerivation ((if overrides ? fontmiscmeltho then overrides.fontmiscmeltho else x: x) {
+  fontmiscmeltho = (mkDerivation "fontmiscmeltho" {
     name = "font-misc-meltho-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -377,9 +382,9 @@ let
       sha256 = "148793fqwzrc3bmh2vlw5fdiwjc2n7vs25cic35gfp452czk489p";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  fontmiscmisc = (stdenv.mkDerivation ((if overrides ? fontmiscmisc then overrides.fontmiscmisc else x: x) {
+  fontmiscmisc = (mkDerivation "fontmiscmisc" {
     name = "font-misc-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -387,9 +392,9 @@ let
       sha256 = "150pq6n8n984fah34n3k133kggn9v0c5k07igv29sxp1wi07krxq";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontmuttmisc = (stdenv.mkDerivation ((if overrides ? fontmuttmisc then overrides.fontmuttmisc else x: x) {
+  fontmuttmisc = (mkDerivation "fontmuttmisc" {
     name = "font-mutt-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -397,9 +402,9 @@ let
       sha256 = "13qghgr1zzpv64m0p42195k1kc77pksiv059fdvijz1n6kdplpxx";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontschumachermisc = (stdenv.mkDerivation ((if overrides ? fontschumachermisc then overrides.fontschumachermisc else x: x) {
+  fontschumachermisc = (mkDerivation "fontschumachermisc" {
     name = "font-schumacher-misc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -407,9 +412,9 @@ let
       sha256 = "0nkym3n48b4v36y4s927bbkjnsmicajarnf6vlp7wxp0as304i74";
     };
     buildInputs = [pkgconfig bdftopcf fontutil mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
+  }) // {inherit bdftopcf fontutil mkfontdir mkfontscale ;};
 
-  fontscreencyrillic = (stdenv.mkDerivation ((if overrides ? fontscreencyrillic then overrides.fontscreencyrillic else x: x) {
+  fontscreencyrillic = (mkDerivation "fontscreencyrillic" {
     name = "font-screen-cyrillic-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -417,9 +422,9 @@ let
       sha256 = "0yayf1qlv7irf58nngddz2f1q04qkpr5jwp4aja2j5gyvzl32hl2";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontsonymisc = (stdenv.mkDerivation ((if overrides ? fontsonymisc then overrides.fontsonymisc else x: x) {
+  fontsonymisc = (mkDerivation "fontsonymisc" {
     name = "font-sony-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -427,9 +432,9 @@ let
       sha256 = "1xfgcx4gsgik5mkgkca31fj3w72jw9iw76qyrajrsz1lp8ka6hr0";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontsproto = (stdenv.mkDerivation ((if overrides ? fontsproto then overrides.fontsproto else x: x) {
+  fontsproto = (mkDerivation "fontsproto" {
     name = "fontsproto-2.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -437,9 +442,9 @@ let
       sha256 = "1ab8mbqxdwvdz4k5x4xb9c4n5w7i1xw276cbpk4z7a1nlpjrg746";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  fontsunmisc = (stdenv.mkDerivation ((if overrides ? fontsunmisc then overrides.fontsunmisc else x: x) {
+  fontsunmisc = (mkDerivation "fontsunmisc" {
     name = "font-sun-misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -447,9 +452,9 @@ let
       sha256 = "1q6jcqrffg9q5f5raivzwx9ffvf7r11g6g0b125na1bhpz5ly7s8";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontutil = (stdenv.mkDerivation ((if overrides ? fontutil then overrides.fontutil else x: x) {
+  fontutil = (mkDerivation "fontutil" {
     name = "font-util-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -457,9 +462,9 @@ let
       sha256 = "15cijajwhjzpy3ydc817zz8x5z4gbkyv3fps687jbq544mbfbafz";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  fontwinitzkicyrillic = (stdenv.mkDerivation ((if overrides ? fontwinitzkicyrillic then overrides.fontwinitzkicyrillic else x: x) {
+  fontwinitzkicyrillic = (mkDerivation "fontwinitzkicyrillic" {
     name = "font-winitzki-cyrillic-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -467,9 +472,9 @@ let
       sha256 = "181n1bgq8vxfxqicmy1jpm1hnr6gwn1kdhl6hr4frjigs1ikpldb";
     };
     buildInputs = [pkgconfig bdftopcf mkfontdir ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit bdftopcf mkfontdir ;};
+  }) // {inherit bdftopcf mkfontdir ;};
 
-  fontxfree86type1 = (stdenv.mkDerivation ((if overrides ? fontxfree86type1 then overrides.fontxfree86type1 else x: x) {
+  fontxfree86type1 = (mkDerivation "fontxfree86type1" {
     name = "font-xfree86-type1-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -477,9 +482,9 @@ let
       sha256 = "0jp3zc0qfdaqfkgzrb44vi9vi0a8ygb35wp082yz7rvvxhmg9sya";
     };
     buildInputs = [pkgconfig mkfontdir mkfontscale ]; configureFlags = "--with-fontrootdir=$(out)/lib/X11/fonts"; 
-  })) // {inherit mkfontdir mkfontscale ;};
+  }) // {inherit mkfontdir mkfontscale ;};
 
-  gccmakedep = (stdenv.mkDerivation ((if overrides ? gccmakedep then overrides.gccmakedep else x: x) {
+  gccmakedep = (mkDerivation "gccmakedep" {
     name = "gccmakedep-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -487,9 +492,9 @@ let
       sha256 = "1r1fpy5ni8chbgx7j5sz0008fpb6vbazpy1nifgdhgijyzqxqxdj";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  glamoregl = (stdenv.mkDerivation ((if overrides ? glamoregl then overrides.glamoregl else x: x) {
+  glamoregl = (mkDerivation "glamoregl" {
     name = "glamor-egl-0.6.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -497,9 +502,9 @@ let
       sha256 = "1jg5clihklb9drh1jd7nhhdsszla6nv7xmbvm8yvakh5wrb1nlv6";
     };
     buildInputs = [pkgconfig dri2proto xorgserver ];
-  })) // {inherit dri2proto xorgserver ;};
+  }) // {inherit dri2proto xorgserver ;};
 
-  glproto = (stdenv.mkDerivation ((if overrides ? glproto then overrides.glproto else x: x) {
+  glproto = (mkDerivation "glproto" {
     name = "glproto-1.4.17";
     builder = ./builder.sh;
     src = fetchurl {
@@ -507,9 +512,9 @@ let
       sha256 = "0h5ykmcddwid5qj6sbrszgkcypwn3mslvswxpgy2n2iixnyr9amd";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  iceauth = (stdenv.mkDerivation ((if overrides ? iceauth then overrides.iceauth else x: x) {
+  iceauth = (mkDerivation "iceauth" {
     name = "iceauth-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -517,9 +522,9 @@ let
       sha256 = "1x72y99dxf2fxnlyf0yrf9yzd8xzimxshy6l8mprwhrv6lvhi6dx";
     };
     buildInputs = [pkgconfig libICE xproto ];
-  })) // {inherit libICE xproto ;};
+  }) // {inherit libICE xproto ;};
 
-  imake = (stdenv.mkDerivation ((if overrides ? imake then overrides.imake else x: x) {
+  imake = (mkDerivation "imake" {
     name = "imake-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -527,9 +532,9 @@ let
       sha256 = "0zpk8p044jh14bis838shbf4100bjg7mccd7bq54glpsq552q339";
     };
     buildInputs = [pkgconfig xproto ];
-  })) // {inherit xproto ;};
+  }) // {inherit xproto ;};
 
-  inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
+  inputproto = (mkDerivation "inputproto" {
     name = "inputproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -537,9 +542,9 @@ let
       sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  kbproto = (stdenv.mkDerivation ((if overrides ? kbproto then overrides.kbproto else x: x) {
+  kbproto = (mkDerivation "kbproto" {
     name = "kbproto-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -547,9 +552,9 @@ let
       sha256 = "0yal11hhpiisy3w8wmacsdzzzcnc3xwnswxz8k7zri40xc5aqz03";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  libAppleWM = (stdenv.mkDerivation ((if overrides ? libAppleWM then overrides.libAppleWM else x: x) {
+  libAppleWM = (mkDerivation "libAppleWM" {
     name = "libAppleWM-1.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -557,9 +562,9 @@ let
       sha256 = "0r8x28n45q89x91mz8mv0zkkcxi8wazkac886fyvflhiv2y8ap2y";
     };
     buildInputs = [pkgconfig applewmproto libX11 libXext xextproto ];
-  })) // {inherit applewmproto libX11 libXext xextproto ;};
+  }) // {inherit applewmproto libX11 libXext xextproto ;};
 
-  libFS = (stdenv.mkDerivation ((if overrides ? libFS then overrides.libFS else x: x) {
+  libFS = (mkDerivation "libFS" {
     name = "libFS-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -567,9 +572,9 @@ let
       sha256 = "1mxfsvj9m3pn8cdkcn4kg190zp665mf4pv0083g6xykvsgxzq1wh";
     };
     buildInputs = [pkgconfig fontsproto xproto xtrans ];
-  })) // {inherit fontsproto xproto xtrans ;};
+  }) // {inherit fontsproto xproto xtrans ;};
 
-  libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
+  libICE = (mkDerivation "libICE" {
     name = "libICE-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -577,9 +582,9 @@ let
       sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
-  })) // {inherit xproto xtrans ;};
+  }) // {inherit xproto xtrans ;};
 
-  libSM = (stdenv.mkDerivation ((if overrides ? libSM then overrides.libSM else x: x) {
+  libSM = (mkDerivation "libSM" {
     name = "libSM-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -587,9 +592,9 @@ let
       sha256 = "1gc7wavgs435g9qkp9jw4lhmaiq6ip9llv49f054ad6ryp4sib0b";
     };
     buildInputs = [pkgconfig libICE libuuid xproto xtrans ];
-  })) // {inherit libICE libuuid xproto xtrans ;};
+  }) // {inherit libICE libuuid xproto xtrans ;};
 
-  libWindowsWM = (stdenv.mkDerivation ((if overrides ? libWindowsWM then overrides.libWindowsWM else x: x) {
+  libWindowsWM = (mkDerivation "libWindowsWM" {
     name = "libWindowsWM-1.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -597,9 +602,9 @@ let
       sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
     };
     buildInputs = [pkgconfig windowswmproto libX11 libXext xextproto ];
-  })) // {inherit windowswmproto libX11 libXext xextproto ;};
+  }) // {inherit windowswmproto libX11 libXext xextproto ;};
 
-  libX11 = (stdenv.mkDerivation ((if overrides ? libX11 then overrides.libX11 else x: x) {
+  libX11 = (mkDerivation "libX11" {
     name = "libX11-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -607,9 +612,9 @@ let
       sha256 = "05mx0s0vqzds3qjc1gmjr2s6x2ll37z4lfhgm7p2w7936zl2g81a";
     };
     buildInputs = [pkgconfig inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ];
-  })) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
+  }) // {inherit inputproto kbproto libxcb xextproto xf86bigfontproto xproto xtrans ;};
 
-  libXScrnSaver = (stdenv.mkDerivation ((if overrides ? libXScrnSaver then overrides.libXScrnSaver else x: x) {
+  libXScrnSaver = (mkDerivation "libXScrnSaver" {
     name = "libXScrnSaver-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -617,9 +622,9 @@ let
       sha256 = "07ff4r20nkkrj7h08f9fwamds9b3imj8jz5iz6y38zqw6jkyzwcg";
     };
     buildInputs = [pkgconfig scrnsaverproto libX11 libXext xextproto ];
-  })) // {inherit scrnsaverproto libX11 libXext xextproto ;};
+  }) // {inherit scrnsaverproto libX11 libXext xextproto ;};
 
-  libXau = (stdenv.mkDerivation ((if overrides ? libXau then overrides.libXau else x: x) {
+  libXau = (mkDerivation "libXau" {
     name = "libXau-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -627,9 +632,9 @@ let
       sha256 = "1wm4pv12f36cwzhldpp7vy3lhm3xdcnp4f184xkxsp7b18r7gm7x";
     };
     buildInputs = [pkgconfig xproto ];
-  })) // {inherit xproto ;};
+  }) // {inherit xproto ;};
 
-  libXaw = (stdenv.mkDerivation ((if overrides ? libXaw then overrides.libXaw else x: x) {
+  libXaw = (mkDerivation "libXaw" {
     name = "libXaw-1.0.12";
     builder = ./builder.sh;
     src = fetchurl {
@@ -637,9 +642,9 @@ let
       sha256 = "1xnv7jy86j9vhmw74frkzcraynqbw1p1s79jasargsgwfi433z4n";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto libXmu libXpm xproto libXt ];
-  })) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
+  }) // {inherit libX11 libXext xextproto libXmu libXpm xproto libXt ;};
 
-  libXcomposite = (stdenv.mkDerivation ((if overrides ? libXcomposite then overrides.libXcomposite else x: x) {
+  libXcomposite = (mkDerivation "libXcomposite" {
     name = "libXcomposite-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -647,9 +652,9 @@ let
       sha256 = "0y21nfpa5s8qmx0srdlilyndas3sgl0c6rc26d5fx2vx436m1qpd";
     };
     buildInputs = [pkgconfig compositeproto libX11 libXfixes xproto ];
-  })) // {inherit compositeproto libX11 libXfixes xproto ;};
+  }) // {inherit compositeproto libX11 libXfixes xproto ;};
 
-  libXcursor = (stdenv.mkDerivation ((if overrides ? libXcursor then overrides.libXcursor else x: x) {
+  libXcursor = (mkDerivation "libXcursor" {
     name = "libXcursor-1.1.14";
     builder = ./builder.sh;
     src = fetchurl {
@@ -657,9 +662,9 @@ let
       sha256 = "1prkdicl5y5yx32h1azh6gjfbijvjp415javv8dsakd13jrarilv";
     };
     buildInputs = [pkgconfig fixesproto libX11 libXfixes xproto libXrender ];
-  })) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
+  }) // {inherit fixesproto libX11 libXfixes xproto libXrender ;};
 
-  libXdamage = (stdenv.mkDerivation ((if overrides ? libXdamage then overrides.libXdamage else x: x) {
+  libXdamage = (mkDerivation "libXdamage" {
     name = "libXdamage-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -667,9 +672,9 @@ let
       sha256 = "1bamagq7g6s0d23l8rb3nppj8ifqj05f7z9bhbs4fdg8az3ffgvw";
     };
     buildInputs = [pkgconfig damageproto fixesproto libX11 xextproto libXfixes xproto ];
-  })) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
+  }) // {inherit damageproto fixesproto libX11 xextproto libXfixes xproto ;};
 
-  libXdmcp = (stdenv.mkDerivation ((if overrides ? libXdmcp then overrides.libXdmcp else x: x) {
+  libXdmcp = (mkDerivation "libXdmcp" {
     name = "libXdmcp-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -677,9 +682,9 @@ let
       sha256 = "13highx4xpgkiwykpcl7z2laslrjc4pzi4h617ny9p7r6116vkls";
     };
     buildInputs = [pkgconfig xproto ];
-  })) // {inherit xproto ;};
+  }) // {inherit xproto ;};
 
-  libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
+  libXext = (mkDerivation "libXext" {
     name = "libXext-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -687,9 +692,9 @@ let
       sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
     };
     buildInputs = [pkgconfig libX11 xextproto xproto ];
-  })) // {inherit libX11 xextproto xproto ;};
+  }) // {inherit libX11 xextproto xproto ;};
 
-  libXfixes = (stdenv.mkDerivation ((if overrides ? libXfixes then overrides.libXfixes else x: x) {
+  libXfixes = (mkDerivation "libXfixes" {
     name = "libXfixes-5.0.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -697,9 +702,9 @@ let
       sha256 = "0rs7qgzr6dpr62db7sd91c1b47hzhzfr010qwnpcm8sg122w1gk3";
     };
     buildInputs = [pkgconfig fixesproto libX11 xextproto xproto ];
-  })) // {inherit fixesproto libX11 xextproto xproto ;};
+  }) // {inherit fixesproto libX11 xextproto xproto ;};
 
-  libXfont = (stdenv.mkDerivation ((if overrides ? libXfont then overrides.libXfont else x: x) {
+  libXfont = (mkDerivation "libXfont" {
     name = "libXfont-1.4.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -707,9 +712,9 @@ let
       sha256 = "01fh2hnnaby8x6mv57x78nsqwhls70gwykldzd8b43vrpzzd8s2m";
     };
     buildInputs = [pkgconfig libfontenc fontsproto freetype xproto xtrans zlib ];
-  })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
+  }) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
-  libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
+  libXft = (mkDerivation "libXft" {
     name = "libXft-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -717,9 +722,9 @@ let
       sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
     };
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
-  })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
+  }) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
-  libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
+  libXi = (mkDerivation "libXi" {
     name = "libXi-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -727,9 +732,9 @@ let
       sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
-  })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
+  }) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
 
-  libXinerama = (stdenv.mkDerivation ((if overrides ? libXinerama then overrides.libXinerama else x: x) {
+  libXinerama = (mkDerivation "libXinerama" {
     name = "libXinerama-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -737,9 +742,9 @@ let
       sha256 = "1qlqfvzw45gdzk9xirgwlp2qgj0hbsyiqj8yh8zml2bk2ygnjibs";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xineramaproto ];
-  })) // {inherit libX11 libXext xextproto xineramaproto ;};
+  }) // {inherit libX11 libXext xextproto xineramaproto ;};
 
-  libXmu = (stdenv.mkDerivation ((if overrides ? libXmu then overrides.libXmu else x: x) {
+  libXmu = (mkDerivation "libXmu" {
     name = "libXmu-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -747,9 +752,9 @@ let
       sha256 = "02wx6jw7i0q5qwx87yf94fsn3h0xpz1k7dz1nkwfwm1j71ydqvkm";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  })) // {inherit libX11 libXext xextproto xproto libXt ;};
+  }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXp = (stdenv.mkDerivation ((if overrides ? libXp then overrides.libXp else x: x) {
+  libXp = (mkDerivation "libXp" {
     name = "libXp-1.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -757,9 +762,9 @@ let
       sha256 = "1dfh5w8sjz5b5fl6dl4y63ckq99snslz7bir8zq2rg8ax6syabwm";
     };
     buildInputs = [pkgconfig printproto libX11 libXau libXext xextproto ];
-  })) // {inherit printproto libX11 libXau libXext xextproto ;};
+  }) // {inherit printproto libX11 libXau libXext xextproto ;};
 
-  libXpm = (stdenv.mkDerivation ((if overrides ? libXpm then overrides.libXpm else x: x) {
+  libXpm = (mkDerivation "libXpm" {
     name = "libXpm-3.5.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -767,9 +772,9 @@ let
       sha256 = "07041q4k8m4nirzl7lrqn8by2zylx0xvh6n0za301qqs3njszgf5";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xproto libXt ];
-  })) // {inherit libX11 libXext xextproto xproto libXt ;};
+  }) // {inherit libX11 libXext xextproto xproto libXt ;};
 
-  libXrandr = (stdenv.mkDerivation ((if overrides ? libXrandr then overrides.libXrandr else x: x) {
+  libXrandr = (mkDerivation "libXrandr" {
     name = "libXrandr-1.4.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -777,9 +782,9 @@ let
       sha256 = "1b95p3l84ppv6j7dbbmg0zrz6k8xdwvnag1l6ajm3gk9qwdb79ya";
     };
     buildInputs = [pkgconfig randrproto renderproto libX11 libXext xextproto xproto libXrender ];
-  })) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
+  }) // {inherit randrproto renderproto libX11 libXext xextproto xproto libXrender ;};
 
-  libXrender = (stdenv.mkDerivation ((if overrides ? libXrender then overrides.libXrender else x: x) {
+  libXrender = (mkDerivation "libXrender" {
     name = "libXrender-0.9.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -787,9 +792,9 @@ let
       sha256 = "0qpwyjhbpp734vnhca992pjh4w7ijslidkzx1pcwbbk000pv050x";
     };
     buildInputs = [pkgconfig renderproto libX11 xproto ];
-  })) // {inherit renderproto libX11 xproto ;};
+  }) // {inherit renderproto libX11 xproto ;};
 
-  libXres = (stdenv.mkDerivation ((if overrides ? libXres then overrides.libXres else x: x) {
+  libXres = (mkDerivation "libXres" {
     name = "libXres-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -797,9 +802,9 @@ let
       sha256 = "1rd0bzn67cpb2qkc946gch2183r4bdjfhs6cpqbipy47m9a91296";
     };
     buildInputs = [pkgconfig resourceproto libX11 libXext xextproto xproto ];
-  })) // {inherit resourceproto libX11 libXext xextproto xproto ;};
+  }) // {inherit resourceproto libX11 libXext xextproto xproto ;};
 
-  libXt = (stdenv.mkDerivation ((if overrides ? libXt then overrides.libXt else x: x) {
+  libXt = (mkDerivation "libXt" {
     name = "libXt-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -807,9 +812,9 @@ let
       sha256 = "0myxwbx9ylam5x3ia5b5f4x8azcqdm420h9ad1r4hrgmi2lrffl4";
     };
     buildInputs = [pkgconfig libICE kbproto libSM libX11 xproto ];
-  })) // {inherit libICE kbproto libSM libX11 xproto ;};
+  }) // {inherit libICE kbproto libSM libX11 xproto ;};
 
-  libXtst = (stdenv.mkDerivation ((if overrides ? libXtst then overrides.libXtst else x: x) {
+  libXtst = (mkDerivation "libXtst" {
     name = "libXtst-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -817,9 +822,9 @@ let
       sha256 = "1ngn161nq679ffmbwl81i2hn75jjg5b3ffv6n4jilpvyazypy2pg";
     };
     buildInputs = [pkgconfig inputproto recordproto libX11 libXext xextproto libXi ];
-  })) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
+  }) // {inherit inputproto recordproto libX11 libXext xextproto libXi ;};
 
-  libXv = (stdenv.mkDerivation ((if overrides ? libXv then overrides.libXv else x: x) {
+  libXv = (mkDerivation "libXv" {
     name = "libXv-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -827,9 +832,9 @@ let
       sha256 = "09a5j6bisysiipd0nw6s352565bp0n6gbyhv5hp63s3cd3w95zjm";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto ];
-  })) // {inherit videoproto libX11 libXext xextproto xproto ;};
+  }) // {inherit videoproto libX11 libXext xextproto xproto ;};
 
-  libXvMC = (stdenv.mkDerivation ((if overrides ? libXvMC then overrides.libXvMC else x: x) {
+  libXvMC = (mkDerivation "libXvMC" {
     name = "libXvMC-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -837,9 +842,9 @@ let
       sha256 = "015jk3bxfmj6zaw99x282f9npi8qqaw34yg186frags3z8g406jy";
     };
     buildInputs = [pkgconfig videoproto libX11 libXext xextproto xproto libXv ];
-  })) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
+  }) // {inherit videoproto libX11 libXext xextproto xproto libXv ;};
 
-  libXxf86dga = (stdenv.mkDerivation ((if overrides ? libXxf86dga then overrides.libXxf86dga else x: x) {
+  libXxf86dga = (mkDerivation "libXxf86dga" {
     name = "libXxf86dga-1.1.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -847,9 +852,9 @@ let
       sha256 = "0zn7aqj8x0951d8zb2h2andldvwkzbsc4cs7q023g6nzq6vd9v4f";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86dgaproto xproto ];
-  })) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
+  }) // {inherit libX11 libXext xextproto xf86dgaproto xproto ;};
 
-  libXxf86misc = (stdenv.mkDerivation ((if overrides ? libXxf86misc then overrides.libXxf86misc else x: x) {
+  libXxf86misc = (mkDerivation "libXxf86misc" {
     name = "libXxf86misc-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -857,9 +862,9 @@ let
       sha256 = "0nvbq9y6k6m9hxdvg3crycqsnnxf1859wrisqcs37z9fhq044gsn";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86miscproto xproto ];
-  })) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
+  }) // {inherit libX11 libXext xextproto xf86miscproto xproto ;};
 
-  libXxf86vm = (stdenv.mkDerivation ((if overrides ? libXxf86vm then overrides.libXxf86vm else x: x) {
+  libXxf86vm = (mkDerivation "libXxf86vm" {
     name = "libXxf86vm-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -867,9 +872,9 @@ let
       sha256 = "1f1pxj018nk7ybxv58jmn5y8gm2288p4q3l2dng9n1p25v1qcpns";
     };
     buildInputs = [pkgconfig libX11 libXext xextproto xf86vidmodeproto xproto ];
-  })) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
+  }) // {inherit libX11 libXext xextproto xf86vidmodeproto xproto ;};
 
-  libdmx = (stdenv.mkDerivation ((if overrides ? libdmx then overrides.libdmx else x: x) {
+  libdmx = (mkDerivation "libdmx" {
     name = "libdmx-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -877,9 +882,9 @@ let
       sha256 = "00djlxas38kbsrglcmwmxfbmxjdchlbj95pqwjvdg8jn5rns6zf9";
     };
     buildInputs = [pkgconfig dmxproto libX11 libXext xextproto ];
-  })) // {inherit dmxproto libX11 libXext xextproto ;};
+  }) // {inherit dmxproto libX11 libXext xextproto ;};
 
-  libfontenc = (stdenv.mkDerivation ((if overrides ? libfontenc then overrides.libfontenc else x: x) {
+  libfontenc = (mkDerivation "libfontenc" {
     name = "libfontenc-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -887,9 +892,9 @@ let
       sha256 = "0qign0ivqk166l9yfd51gw9lbhgs718bcrmvc40yicjr6gnyz959";
     };
     buildInputs = [pkgconfig xproto zlib ];
-  })) // {inherit xproto zlib ;};
+  }) // {inherit xproto zlib ;};
 
-  libpciaccess = (stdenv.mkDerivation ((if overrides ? libpciaccess then overrides.libpciaccess else x: x) {
+  libpciaccess = (mkDerivation "libpciaccess" {
     name = "libpciaccess-0.13.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -897,9 +902,9 @@ let
       sha256 = "06fy43n3c450h7xqpn3094bnfn7ca1mrq3i856y8kyqa0lmqraxb";
     };
     buildInputs = [pkgconfig zlib ];
-  })) // {inherit zlib ;};
+  }) // {inherit zlib ;};
 
-  libpthreadstubs = (stdenv.mkDerivation ((if overrides ? libpthreadstubs then overrides.libpthreadstubs else x: x) {
+  libpthreadstubs = (mkDerivation "libpthreadstubs" {
     name = "libpthread-stubs-0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -907,9 +912,9 @@ let
       sha256 = "16bjv3in19l84hbri41iayvvg4ls9gv1ma0x0qlbmwy67i7dbdim";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  libxcb = (stdenv.mkDerivation ((if overrides ? libxcb then overrides.libxcb else x: x) {
+  libxcb = (mkDerivation "libxcb" {
     name = "libxcb-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -917,9 +922,9 @@ let
       sha256 = "1xqgc81krx14f2c8yl5chzg5g2l26mhm2rwffy8dx7jv0iq5sqq3";
     };
     buildInputs = [pkgconfig libxslt libpthreadstubs python libXau xcbproto libXdmcp ];
-  })) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
+  }) // {inherit libxslt libpthreadstubs python libXau xcbproto libXdmcp ;};
 
-  libxkbfile = (stdenv.mkDerivation ((if overrides ? libxkbfile then overrides.libxkbfile else x: x) {
+  libxkbfile = (mkDerivation "libxkbfile" {
     name = "libxkbfile-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -927,9 +932,9 @@ let
       sha256 = "0flg5arw6n3njagmsi4i4l0zl5bfx866a1h9ydc3bi1pqlclxaca";
     };
     buildInputs = [pkgconfig kbproto libX11 ];
-  })) // {inherit kbproto libX11 ;};
+  }) // {inherit kbproto libX11 ;};
 
-  libxshmfence = (stdenv.mkDerivation ((if overrides ? libxshmfence then overrides.libxshmfence else x: x) {
+  libxshmfence = (mkDerivation "libxshmfence" {
     name = "libxshmfence-1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -937,9 +942,9 @@ let
       sha256 = "1gnfb1z8sbbdc3xpz1zmm94lv7yvfh4kvip9s5pj37ya4llxphnv";
     };
     buildInputs = [pkgconfig xproto ];
-  })) // {inherit xproto ;};
+  }) // {inherit xproto ;};
 
-  lndir = (stdenv.mkDerivation ((if overrides ? lndir then overrides.lndir else x: x) {
+  lndir = (mkDerivation "lndir" {
     name = "lndir-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -947,9 +952,9 @@ let
       sha256 = "0pdngiy8zdhsiqx2am75yfcl36l7kd7d7nl0rss8shcdvsqgmx29";
     };
     buildInputs = [pkgconfig xproto ];
-  })) // {inherit xproto ;};
+  }) // {inherit xproto ;};
 
-  luit = (stdenv.mkDerivation ((if overrides ? luit then overrides.luit else x: x) {
+  luit = (mkDerivation "luit" {
     name = "luit-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -957,9 +962,9 @@ let
       sha256 = "0dn694mk56x6hdk6y9ylx4f128h5jcin278gnw2gb807rf3ygc1h";
     };
     buildInputs = [pkgconfig libfontenc ];
-  })) // {inherit libfontenc ;};
+  }) // {inherit libfontenc ;};
 
-  makedepend = (stdenv.mkDerivation ((if overrides ? makedepend then overrides.makedepend else x: x) {
+  makedepend = (mkDerivation "makedepend" {
     name = "makedepend-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -967,9 +972,9 @@ let
       sha256 = "09alw99r6y2bbd1dc786n3jfgv4j520apblyn7cw6jkjydshba7p";
     };
     buildInputs = [pkgconfig xproto ];
-  })) // {inherit xproto ;};
+  }) // {inherit xproto ;};
 
-  mkfontdir = (stdenv.mkDerivation ((if overrides ? mkfontdir then overrides.mkfontdir else x: x) {
+  mkfontdir = (mkDerivation "mkfontdir" {
     name = "mkfontdir-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -977,9 +982,9 @@ let
       sha256 = "0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  mkfontscale = (stdenv.mkDerivation ((if overrides ? mkfontscale then overrides.mkfontscale else x: x) {
+  mkfontscale = (mkDerivation "mkfontscale" {
     name = "mkfontscale-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -987,9 +992,9 @@ let
       sha256 = "0cdpn1ii2iw1vg2ga4w62acrh78gzgf0vza4g8wx5kkp4jcifh14";
     };
     buildInputs = [pkgconfig libfontenc freetype xproto zlib ];
-  })) // {inherit libfontenc freetype xproto zlib ;};
+  }) // {inherit libfontenc freetype xproto zlib ;};
 
-  presentproto = (stdenv.mkDerivation ((if overrides ? presentproto then overrides.presentproto else x: x) {
+  presentproto = (mkDerivation "presentproto" {
     name = "presentproto-1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -997,9 +1002,9 @@ let
       sha256 = "1kir51aqg9cwazs14ivcldcn3mzadqgykc9cg87rm40zf947sb41";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  printproto = (stdenv.mkDerivation ((if overrides ? printproto then overrides.printproto else x: x) {
+  printproto = (mkDerivation "printproto" {
     name = "printproto-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1007,9 +1012,9 @@ let
       sha256 = "06liap8n4s25sgp27d371cc7yg9a08dxcr3pmdjp761vyin3360j";
     };
     buildInputs = [pkgconfig libXau ];
-  })) // {inherit libXau ;};
+  }) // {inherit libXau ;};
 
-  randrproto = (stdenv.mkDerivation ((if overrides ? randrproto then overrides.randrproto else x: x) {
+  randrproto = (mkDerivation "randrproto" {
     name = "randrproto-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1017,9 +1022,9 @@ let
       sha256 = "1kq9h93qdnniiivry8jmhlgwn9fbx9xp5r9cmzfihlx5cs62xi45";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  recordproto = (stdenv.mkDerivation ((if overrides ? recordproto then overrides.recordproto else x: x) {
+  recordproto = (mkDerivation "recordproto" {
     name = "recordproto-1.14.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1027,9 +1032,9 @@ let
       sha256 = "0w3kgr1zabwf79bpc28dcnj0fpni6r53rpi82ngjbalj5s6m8xx7";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  renderproto = (stdenv.mkDerivation ((if overrides ? renderproto then overrides.renderproto else x: x) {
+  renderproto = (mkDerivation "renderproto" {
     name = "renderproto-0.11.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1037,9 +1042,9 @@ let
       sha256 = "0dr5xw6s0qmqg0q5pdkb4jkdhaja0vbfqla79qh5j1xjj9dmlwq6";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  resourceproto = (stdenv.mkDerivation ((if overrides ? resourceproto then overrides.resourceproto else x: x) {
+  resourceproto = (mkDerivation "resourceproto" {
     name = "resourceproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1047,9 +1052,9 @@ let
       sha256 = "0638iyfiiyjw1hg3139pai0j6m65gkskrvd9684zgc6ydcx00riw";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  scrnsaverproto = (stdenv.mkDerivation ((if overrides ? scrnsaverproto then overrides.scrnsaverproto else x: x) {
+  scrnsaverproto = (mkDerivation "scrnsaverproto" {
     name = "scrnsaverproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1057,9 +1062,9 @@ let
       sha256 = "0rfdbfwd35d761xkfifcscx56q0n56043ixlmv70r4v4l66hmdwb";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  sessreg = (stdenv.mkDerivation ((if overrides ? sessreg then overrides.sessreg else x: x) {
+  sessreg = (mkDerivation "sessreg" {
     name = "sessreg-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1067,9 +1072,9 @@ let
       sha256 = "1hy4wvgawajf4qw2k51fkcjzxw0drx60ydzpmqhj7k1g4z3cqahf";
     };
     buildInputs = [pkgconfig xproto ];
-  })) // {inherit xproto ;};
+  }) // {inherit xproto ;};
 
-  setxkbmap = (stdenv.mkDerivation ((if overrides ? setxkbmap then overrides.setxkbmap else x: x) {
+  setxkbmap = (mkDerivation "setxkbmap" {
     name = "setxkbmap-1.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1077,9 +1082,9 @@ let
       sha256 = "1inygpvlgc6vr5h9laxw9lnvafnccl3fy0g5n9ll28iq3yfmqc1x";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  })) // {inherit libX11 libxkbfile ;};
+  }) // {inherit libX11 libxkbfile ;};
 
-  smproxy = (stdenv.mkDerivation ((if overrides ? smproxy then overrides.smproxy else x: x) {
+  smproxy = (mkDerivation "smproxy" {
     name = "smproxy-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1087,9 +1092,9 @@ let
       sha256 = "02fn5wa1gs2jap6sr9j9yk6zsvz82j8l61pf74iyqwa99q4wnb67";
     };
     buildInputs = [pkgconfig libICE libSM libXmu libXt ];
-  })) // {inherit libICE libSM libXmu libXt ;};
+  }) // {inherit libICE libSM libXmu libXt ;};
 
-  twm = (stdenv.mkDerivation ((if overrides ? twm then overrides.twm else x: x) {
+  twm = (mkDerivation "twm" {
     name = "twm-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1097,9 +1102,9 @@ let
       sha256 = "0i1ff8h2gh1ab311da5dlhl0nrma0qbrk403ymzi4cnnacikaq3n";
     };
     buildInputs = [pkgconfig libICE libSM libX11 libXext libXmu xproto libXt ];
-  })) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
+  }) // {inherit libICE libSM libX11 libXext libXmu xproto libXt ;};
 
-  utilmacros = (stdenv.mkDerivation ((if overrides ? utilmacros then overrides.utilmacros else x: x) {
+  utilmacros = (mkDerivation "utilmacros" {
     name = "util-macros-1.19.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1107,9 +1112,9 @@ let
       sha256 = "1fnhpryf55l0yqajxn0cxan3kvsjzi67nlanz8clwqzf54cb2d98";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  videoproto = (stdenv.mkDerivation ((if overrides ? videoproto then overrides.videoproto else x: x) {
+  videoproto = (mkDerivation "videoproto" {
     name = "videoproto-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1117,9 +1122,9 @@ let
       sha256 = "1dnlkd9nb0m135lgd6hd61vc29sdyarsyya8aqpx7z10p261dbld";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  windowswmproto = (stdenv.mkDerivation ((if overrides ? windowswmproto then overrides.windowswmproto else x: x) {
+  windowswmproto = (mkDerivation "windowswmproto" {
     name = "windowswmproto-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1127,9 +1132,9 @@ let
       sha256 = "0syjxgy4m8l94qrm03nvn5k6bkxc8knnlld1gbllym97nvnv0ny0";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  x11perf = (stdenv.mkDerivation ((if overrides ? x11perf then overrides.x11perf else x: x) {
+  x11perf = (mkDerivation "x11perf" {
     name = "x11perf-1.5.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1137,9 +1142,9 @@ let
       sha256 = "111iwpxhnxjiq44w96zf0kszg5zpgv1g3ayx18v4nhdzl9bqivi4";
     };
     buildInputs = [pkgconfig libX11 libXext libXft libXmu libXrender ];
-  })) // {inherit libX11 libXext libXft libXmu libXrender ;};
+  }) // {inherit libX11 libXext libXft libXmu libXrender ;};
 
-  xauth = (stdenv.mkDerivation ((if overrides ? xauth then overrides.xauth else x: x) {
+  xauth = (mkDerivation "xauth" {
     name = "xauth-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1147,9 +1152,9 @@ let
       sha256 = "13y2invb0894b1in03jbglximbz6v31y2kr4yjjgica8xciibkjn";
     };
     buildInputs = [pkgconfig libX11 libXau libXext libXmu xproto ];
-  })) // {inherit libX11 libXau libXext libXmu xproto ;};
+  }) // {inherit libX11 libXau libXext libXmu xproto ;};
 
-  xbacklight = (stdenv.mkDerivation ((if overrides ? xbacklight then overrides.xbacklight else x: x) {
+  xbacklight = (mkDerivation "xbacklight" {
     name = "xbacklight-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1157,9 +1162,9 @@ let
       sha256 = "0arnd1j8vzhzmw72mqhjjcb2qwcbs9qphsy3ps593ajyld8wzxhp";
     };
     buildInputs = [pkgconfig libxcb xcbutil ];
-  })) // {inherit libxcb xcbutil ;};
+  }) // {inherit libxcb xcbutil ;};
 
-  xbitmaps = (stdenv.mkDerivation ((if overrides ? xbitmaps then overrides.xbitmaps else x: x) {
+  xbitmaps = (mkDerivation "xbitmaps" {
     name = "xbitmaps-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1167,9 +1172,9 @@ let
       sha256 = "178ym90kwidia6nas4qr5n5yqh698vv8r02js0r4vg3b6lsb0w9n";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xcbproto = (stdenv.mkDerivation ((if overrides ? xcbproto then overrides.xcbproto else x: x) {
+  xcbproto = (mkDerivation "xcbproto" {
     name = "xcb-proto-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1177,9 +1182,9 @@ let
       sha256 = "0bp3f53l9fy5x3mn1rkj1g81aiyzl90wacwvqdgy831aa3kfxb5l";
     };
     buildInputs = [pkgconfig python ];
-  })) // {inherit python ;};
+  }) // {inherit python ;};
 
-  xcbutil = (stdenv.mkDerivation ((if overrides ? xcbutil then overrides.xcbutil else x: x) {
+  xcbutil = (mkDerivation "xcbutil" {
     name = "xcb-util-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1187,9 +1192,9 @@ let
       sha256 = "1i0qbhqkcdlbbsj7ifkyjsffl61whj24d3zlg5pxf3xj1af2a4f6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  })) // {inherit gperf m4 libxcb xproto ;};
+  }) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilimage = (stdenv.mkDerivation ((if overrides ? xcbutilimage then overrides.xcbutilimage else x: x) {
+  xcbutilimage = (mkDerivation "xcbutilimage" {
     name = "xcb-util-image-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1197,9 +1202,9 @@ let
       sha256 = "1pr1l1nkg197gyl9d0fpwmn72jqpxjfgn9y13q4gawg1m873qnnk";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xcbutil xproto ];
-  })) // {inherit gperf m4 libxcb xcbutil xproto ;};
+  }) // {inherit gperf m4 libxcb xcbutil xproto ;};
 
-  xcbutilkeysyms = (stdenv.mkDerivation ((if overrides ? xcbutilkeysyms then overrides.xcbutilkeysyms else x: x) {
+  xcbutilkeysyms = (mkDerivation "xcbutilkeysyms" {
     name = "xcb-util-keysyms-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1207,9 +1212,9 @@ let
       sha256 = "0vjwk7vrcfnlhiadv445c6skfxmdrg5v4qf81y8s2s5xagqarqbv";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  })) // {inherit gperf m4 libxcb xproto ;};
+  }) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
+  xcbutilrenderutil = (mkDerivation "xcbutilrenderutil" {
     name = "xcb-util-renderutil-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1217,9 +1222,9 @@ let
       sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  })) // {inherit gperf m4 libxcb xproto ;};
+  }) // {inherit gperf m4 libxcb xproto ;};
 
-  xcbutilwm = (stdenv.mkDerivation ((if overrides ? xcbutilwm then overrides.xcbutilwm else x: x) {
+  xcbutilwm = (mkDerivation "xcbutilwm" {
     name = "xcb-util-wm-0.4.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1227,9 +1232,9 @@ let
       sha256 = "0gra7hfyxajic4mjd63cpqvd20si53j1q3rbdlkqkahfciwq3gr8";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
-  })) // {inherit gperf m4 libxcb xproto ;};
+  }) // {inherit gperf m4 libxcb xproto ;};
 
-  xclock = (stdenv.mkDerivation ((if overrides ? xclock then overrides.xclock else x: x) {
+  xclock = (mkDerivation "xclock" {
     name = "xclock-1.0.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1237,9 +1242,9 @@ let
       sha256 = "1l3xv4bsca6bwxx73jyjz0blav86i7vwffkhdb1ac81y9slyrki3";
     };
     buildInputs = [pkgconfig libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ];
-  })) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
+  }) // {inherit libX11 libXaw libXft libxkbfile libXmu xproto libXrender libXt ;};
 
-  xcmiscproto = (stdenv.mkDerivation ((if overrides ? xcmiscproto then overrides.xcmiscproto else x: x) {
+  xcmiscproto = (mkDerivation "xcmiscproto" {
     name = "xcmiscproto-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1247,9 +1252,9 @@ let
       sha256 = "1pyjv45wivnwap2wvsbrzdvjc5ql8bakkbkrvcv6q9bjjf33ccmi";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xcmsdb = (stdenv.mkDerivation ((if overrides ? xcmsdb then overrides.xcmsdb else x: x) {
+  xcmsdb = (mkDerivation "xcmsdb" {
     name = "xcmsdb-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1257,9 +1262,9 @@ let
       sha256 = "03ms731l3kvaldq7ycbd30j6134b61i3gbll4b2gl022wyzbjq74";
     };
     buildInputs = [pkgconfig libX11 ];
-  })) // {inherit libX11 ;};
+  }) // {inherit libX11 ;};
 
-  xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
+  xcursorgen = (mkDerivation "xcursorgen" {
     name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1267,9 +1272,9 @@ let
       sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
-  })) // {inherit libpng libX11 libXcursor ;};
+  }) // {inherit libpng libX11 libXcursor ;};
 
-  xcursorthemes = (stdenv.mkDerivation ((if overrides ? xcursorthemes then overrides.xcursorthemes else x: x) {
+  xcursorthemes = (mkDerivation "xcursorthemes" {
     name = "xcursor-themes-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1277,9 +1282,9 @@ let
       sha256 = "11mv661nj1p22sqkv87ryj2lcx4m68a04b0rs6iqh3fzp42jrzg3";
     };
     buildInputs = [pkgconfig libXcursor ];
-  })) // {inherit libXcursor ;};
+  }) // {inherit libXcursor ;};
 
-  xdm = (stdenv.mkDerivation ((if overrides ? xdm then overrides.xdm else x: x) {
+  xdm = (mkDerivation "xdm" {
     name = "xdm-1.1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1287,9 +1292,9 @@ let
       sha256 = "0iqw11977lpr9nk1is4fca84d531vck0mq7jldwl44m0vrnl5nnl";
     };
     buildInputs = [pkgconfig libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ];
-  })) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
+  }) // {inherit libX11 libXau libXaw libXdmcp libXext libXft libXinerama libXmu libXpm libXt ;};
 
-  xdpyinfo = (stdenv.mkDerivation ((if overrides ? xdpyinfo then overrides.xdpyinfo else x: x) {
+  xdpyinfo = (mkDerivation "xdpyinfo" {
     name = "xdpyinfo-1.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1297,9 +1302,9 @@ let
       sha256 = "154b29zlrq33lmni883jgwyrb2kx7z8h52jx1s3ys5x5d582iydf";
     };
     buildInputs = [pkgconfig libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ];
-  })) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
+  }) // {inherit libdmx libX11 libxcb libXcomposite libXext libXi libXinerama xproto libXrender libXtst libXxf86dga libXxf86misc libXxf86vm ;};
 
-  xdriinfo = (stdenv.mkDerivation ((if overrides ? xdriinfo then overrides.xdriinfo else x: x) {
+  xdriinfo = (mkDerivation "xdriinfo" {
     name = "xdriinfo-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1307,9 +1312,9 @@ let
       sha256 = "076bjix941znyjmh3j5jjsnhp2gv2iq53d0ks29mvvv87cyy9iim";
     };
     buildInputs = [pkgconfig glproto libX11 ];
-  })) // {inherit glproto libX11 ;};
+  }) // {inherit glproto libX11 ;};
 
-  xev = (stdenv.mkDerivation ((if overrides ? xev then overrides.xev else x: x) {
+  xev = (mkDerivation "xev" {
     name = "xev-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1317,9 +1322,9 @@ let
       sha256 = "0hv296mysglcgkx6lj1wxc23kshb2kix1a8yqppxj5vz16mpzw8i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr ];
-  })) // {inherit libX11 xproto libXrandr ;};
+  }) // {inherit libX11 xproto libXrandr ;};
 
-  xextproto = (stdenv.mkDerivation ((if overrides ? xextproto then overrides.xextproto else x: x) {
+  xextproto = (mkDerivation "xextproto" {
     name = "xextproto-7.3.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1327,9 +1332,9 @@ let
       sha256 = "1c2vma9gqgc2v06rfxdiqgwhxmzk2cbmknwf1ng3m76vr0xb5x7k";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xeyes = (stdenv.mkDerivation ((if overrides ? xeyes then overrides.xeyes else x: x) {
+  xeyes = (mkDerivation "xeyes" {
     name = "xeyes-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1337,9 +1342,9 @@ let
       sha256 = "08d5x2kar5kg4yammw6hhk10iva6jmh8cqq176a1z7nm1il9hplp";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu libXrender libXt ];
-  })) // {inherit libX11 libXext libXmu libXrender libXt ;};
+  }) // {inherit libX11 libXext libXmu libXrender libXt ;};
 
-  xf86bigfontproto = (stdenv.mkDerivation ((if overrides ? xf86bigfontproto then overrides.xf86bigfontproto else x: x) {
+  xf86bigfontproto = (mkDerivation "xf86bigfontproto" {
     name = "xf86bigfontproto-1.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1347,9 +1352,9 @@ let
       sha256 = "0j0n7sj5xfjpmmgx6n5x556rw21hdd18fwmavp95wps7qki214ms";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xf86dgaproto = (stdenv.mkDerivation ((if overrides ? xf86dgaproto then overrides.xf86dgaproto else x: x) {
+  xf86dgaproto = (mkDerivation "xf86dgaproto" {
     name = "xf86dgaproto-2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1357,9 +1362,9 @@ let
       sha256 = "0l4hx48207mx0hp09026r6gy9nl3asbq0c75hri19wp1118zcpmc";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xf86driproto = (stdenv.mkDerivation ((if overrides ? xf86driproto then overrides.xf86driproto else x: x) {
+  xf86driproto = (mkDerivation "xf86driproto" {
     name = "xf86driproto-2.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1367,9 +1372,9 @@ let
       sha256 = "07v69m0g2dfzb653jni4x656jlr7l84c1k39j8qc8vfb45r8sjww";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xf86inputevdev = (stdenv.mkDerivation ((if overrides ? xf86inputevdev then overrides.xf86inputevdev else x: x) {
+  xf86inputevdev = (mkDerivation "xf86inputevdev" {
     name = "xf86-input-evdev-2.8.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1377,9 +1382,9 @@ let
       sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
-  })) // {inherit inputproto udev xorgserver xproto ;};
+  }) // {inherit inputproto udev xorgserver xproto ;};
 
-  xf86inputjoystick = (stdenv.mkDerivation ((if overrides ? xf86inputjoystick then overrides.xf86inputjoystick else x: x) {
+  xf86inputjoystick = (mkDerivation "xf86inputjoystick" {
     name = "xf86-input-joystick-1.6.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1387,9 +1392,9 @@ let
       sha256 = "038mfqairyyqvz02rk7v3i070sab1wr0k6fkxvyvxdgkfbnqcfzf";
     };
     buildInputs = [pkgconfig inputproto kbproto xorgserver xproto ];
-  })) // {inherit inputproto kbproto xorgserver xproto ;};
+  }) // {inherit inputproto kbproto xorgserver xproto ;};
 
-  xf86inputkeyboard = (stdenv.mkDerivation ((if overrides ? xf86inputkeyboard then overrides.xf86inputkeyboard else x: x) {
+  xf86inputkeyboard = (mkDerivation "xf86inputkeyboard" {
     name = "xf86-input-keyboard-1.8.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1397,9 +1402,9 @@ let
       sha256 = "0nyb61w30z32djrllgr2s1i13di3vsl6hg4pqjhxdal71971ria1";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  })) // {inherit inputproto xorgserver xproto ;};
+  }) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputmouse = (stdenv.mkDerivation ((if overrides ? xf86inputmouse then overrides.xf86inputmouse else x: x) {
+  xf86inputmouse = (mkDerivation "xf86inputmouse" {
     name = "xf86-input-mouse-1.9.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1407,9 +1412,9 @@ let
       sha256 = "1kn5kx3qyn9qqvd6s24a2l1wfgck2pgfvzl90xpl024wfxsx719l";
     };
     buildInputs = [pkgconfig inputproto xorgserver xproto ];
-  })) // {inherit inputproto xorgserver xproto ;};
+  }) // {inherit inputproto xorgserver xproto ;};
 
-  xf86inputsynaptics = (stdenv.mkDerivation ((if overrides ? xf86inputsynaptics then overrides.xf86inputsynaptics else x: x) {
+  xf86inputsynaptics = (mkDerivation "xf86inputsynaptics" {
     name = "xf86-input-synaptics-1.7.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1417,9 +1422,9 @@ let
       sha256 = "0ls8f7gy92f54hdqsa19vypg0xm496jrgdhdn4qphycxwn3gwkbm";
     };
     buildInputs = [pkgconfig inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ];
-  })) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
+  }) // {inherit inputproto randrproto recordproto libX11 libXi xorgserver xproto libXtst ;};
 
-  xf86inputvmmouse = (stdenv.mkDerivation ((if overrides ? xf86inputvmmouse then overrides.xf86inputvmmouse else x: x) {
+  xf86inputvmmouse = (mkDerivation "xf86inputvmmouse" {
     name = "xf86-input-vmmouse-13.0.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1427,9 +1432,9 @@ let
       sha256 = "0b31ap9wp7nwpnihz8m7bz3p0hhaipxxhl652nw4v380cq1vdkq4";
     };
     buildInputs = [pkgconfig inputproto randrproto xorgserver xproto ];
-  })) // {inherit inputproto randrproto xorgserver xproto ;};
+  }) // {inherit inputproto randrproto xorgserver xproto ;};
 
-  xf86inputvoid = (stdenv.mkDerivation ((if overrides ? xf86inputvoid then overrides.xf86inputvoid else x: x) {
+  xf86inputvoid = (mkDerivation "xf86inputvoid" {
     name = "xf86-input-void-1.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1437,9 +1442,9 @@ let
       sha256 = "01bmk324fq48wydvy1qrnxbw6qz0fjd0i80g0n4cqr1c4mjmif9a";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  })) // {inherit xorgserver xproto ;};
+  }) // {inherit xorgserver xproto ;};
 
-  xf86miscproto = (stdenv.mkDerivation ((if overrides ? xf86miscproto then overrides.xf86miscproto else x: x) {
+  xf86miscproto = (mkDerivation "xf86miscproto" {
     name = "xf86miscproto-0.9.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1447,9 +1452,9 @@ let
       sha256 = "15dhcdpv61fyj6rhzrhnwri9hlw8rjfy05z1vik118lc99mfrf25";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xf86videoark = (stdenv.mkDerivation ((if overrides ? xf86videoark then overrides.xf86videoark else x: x) {
+  xf86videoark = (mkDerivation "xf86videoark" {
     name = "xf86-video-ark-0.7.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1457,9 +1462,9 @@ let
       sha256 = "07p5vdsj2ckxb6wh02s61akcv4qfg6s1d5ld3jn3lfaayd3f1466";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess xextproto xorgserver xproto ;};
 
-  xf86videoast = (stdenv.mkDerivation ((if overrides ? xf86videoast then overrides.xf86videoast else x: x) {
+  xf86videoast = (mkDerivation "xf86videoast" {
     name = "xf86-video-ast-0.98.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1467,9 +1472,9 @@ let
       sha256 = "188nv73w0p5xhfxz2dffli44yzyn1qhhq3qkwc8wva9dhg25n8lh";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
+  xf86videoati = (mkDerivation "xf86videoati" {
     name = "xf86-video-ati-7.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1477,9 +1482,9 @@ let
       sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videocirrus = (stdenv.mkDerivation ((if overrides ? xf86videocirrus then overrides.xf86videocirrus else x: x) {
+  xf86videocirrus = (mkDerivation "xf86videocirrus" {
     name = "xf86-video-cirrus-1.5.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1487,9 +1492,9 @@ let
       sha256 = "1mycqgjp18b6adqj2h90vp324xh8ysyi5migfmjc914vbnkf2q9k";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videodummy = (stdenv.mkDerivation ((if overrides ? xf86videodummy then overrides.xf86videodummy else x: x) {
+  xf86videodummy = (mkDerivation "xf86videodummy" {
     name = "xf86-video-dummy-0.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1497,9 +1502,9 @@ let
       sha256 = "1046p64xap69vlsmsz5rjv0djc970yhvq44fmllmas0mqp5lzy2n";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
+  }) // {inherit fontsproto randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videofbdev = (stdenv.mkDerivation ((if overrides ? xf86videofbdev then overrides.xf86videofbdev else x: x) {
+  xf86videofbdev = (mkDerivation "xf86videofbdev" {
     name = "xf86-video-fbdev-0.4.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1507,9 +1512,9 @@ let
       sha256 = "06ym7yy017lanj730hfkpfk4znx3dsj8jq3qvyzsn8w294kb7m4x";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videogeode = (stdenv.mkDerivation ((if overrides ? xf86videogeode then overrides.xf86videogeode else x: x) {
+  xf86videogeode = (mkDerivation "xf86videogeode" {
     name = "xf86-video-geode-2.11.16";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1517,9 +1522,9 @@ let
       sha256 = "19y13xl7yfrgyis92rmxi0ld95ajgr5il0n9j1dridwzw9aizz1q";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoglide = (stdenv.mkDerivation ((if overrides ? xf86videoglide then overrides.xf86videoglide else x: x) {
+  xf86videoglide = (mkDerivation "xf86videoglide" {
     name = "xf86-video-glide-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1527,9 +1532,9 @@ let
       sha256 = "1vaav6kx4n00q4fawgqnjmbdkppl0dir2dkrj4ad372mxrvl9c4y";
     };
     buildInputs = [pkgconfig xextproto xorgserver xproto ];
-  })) // {inherit xextproto xorgserver xproto ;};
+  }) // {inherit xextproto xorgserver xproto ;};
 
-  xf86videoglint = (stdenv.mkDerivation ((if overrides ? xf86videoglint then overrides.xf86videoglint else x: x) {
+  xf86videoglint = (mkDerivation "xf86videoglint" {
     name = "xf86-video-glint-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1537,9 +1542,9 @@ let
       sha256 = "08a2aark2yn9irws9c78d9q44dichr03i9zbk61jgr54ncxqhzv5";
     };
     buildInputs = [pkgconfig libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ];
-  })) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  }) // {inherit libpciaccess videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videoi128 = (stdenv.mkDerivation ((if overrides ? xf86videoi128 then overrides.xf86videoi128 else x: x) {
+  xf86videoi128 = (mkDerivation "xf86videoi128" {
     name = "xf86-video-i128-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1547,9 +1552,9 @@ let
       sha256 = "171b8lbxr56w3isph947dnw7x87hc46v6m3mcxdcz44gk167x0pq";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videointel = (stdenv.mkDerivation ((if overrides ? xf86videointel then overrides.xf86videointel else x: x) {
+  xf86videointel = (mkDerivation "xf86videointel" {
     name = "xf86-video-intel-2.21.15";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1557,9 +1562,9 @@ let
       sha256 = "1z6ncmpszmwqi9xr590c4kp4gjjf7mndcr56r35x2bx7h87i8nkx";
     };
     buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ];
-  })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
+  }) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto xorgserver xproto libXrender libXvMC ;};
 
-  xf86videomach64 = (stdenv.mkDerivation ((if overrides ? xf86videomach64 then overrides.xf86videomach64 else x: x) {
+  xf86videomach64 = (mkDerivation "xf86videomach64" {
     name = "xf86-video-mach64-6.9.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1567,9 +1572,9 @@ let
       sha256 = "0pl582vnc6hdxqhf5c0qdyanjqxb4crnhqlmxxml5a60syw0iwcp";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomga = (stdenv.mkDerivation ((if overrides ? xf86videomga then overrides.xf86videomga else x: x) {
+  xf86videomga = (mkDerivation "xf86videomga" {
     name = "xf86-video-mga-1.6.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1577,9 +1582,9 @@ let
       sha256 = "1my7y67sadjjmab1dyxckylrggi7p01yk4wwg9w6k1q96pmb213p";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
+  xf86videomodesetting = (mkDerivation "xf86videomodesetting" {
     name = "xf86-video-modesetting-0.9.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1587,9 +1592,9 @@ let
       sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
 
-  xf86videoneomagic = (stdenv.mkDerivation ((if overrides ? xf86videoneomagic then overrides.xf86videoneomagic else x: x) {
+  xf86videoneomagic = (mkDerivation "xf86videoneomagic" {
     name = "xf86-video-neomagic-1.2.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1597,9 +1602,9 @@ let
       sha256 = "0x48sxs1p3kmwk3pq1j7vl93y59gdmgkq1x5xbnh0yal0angdash";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess xorgserver xproto ;};
 
-  xf86videonewport = (stdenv.mkDerivation ((if overrides ? xf86videonewport then overrides.xf86videonewport else x: x) {
+  xf86videonewport = (mkDerivation "xf86videonewport" {
     name = "xf86-video-newport-0.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1607,9 +1612,9 @@ let
       sha256 = "1yafmp23jrfdmc094i6a4dsizapsc9v0pl65cpc8w1kvn7343k4i";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto videoproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
+  }) // {inherit fontsproto randrproto renderproto videoproto xorgserver xproto ;};
 
-  xf86videonouveau = (stdenv.mkDerivation ((if overrides ? xf86videonouveau then overrides.xf86videonouveau else x: x) {
+  xf86videonouveau = (mkDerivation "xf86videonouveau" {
     name = "xf86-video-nouveau-1.0.10";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1617,9 +1622,9 @@ let
       sha256 = "17fvjplzfx86099sqys0bfl8lfbmjz8li84kzj2x95mf1cbb7fn1";
     };
     buildInputs = [pkgconfig dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  }) // {inherit dri2proto fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videonv = (stdenv.mkDerivation ((if overrides ? xf86videonv then overrides.xf86videonv else x: x) {
+  xf86videonv = (mkDerivation "xf86videonv" {
     name = "xf86-video-nv-2.1.20";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1627,9 +1632,9 @@ let
       sha256 = "1gqh1khc4zalip5hh2nksgs7i3piqq18nncgmsx9qvzi05azd5c3";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
-  xf86videoopenchrome = (stdenv.mkDerivation ((if overrides ? xf86videoopenchrome then overrides.xf86videoopenchrome else x: x) {
+  xf86videoopenchrome = (mkDerivation "xf86videoopenchrome" {
     name = "xf86-video-openchrome-0.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1637,9 +1642,9 @@ let
       sha256 = "1v8j4i1r268n4fc5gq54zg1x50j0rhw71f3lba7411mcblg2z7p4";
     };
     buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ];
-  })) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
+  }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;};
 
-  xf86videor128 = (stdenv.mkDerivation ((if overrides ? xf86videor128 then overrides.xf86videor128 else x: x) {
+  xf86videor128 = (mkDerivation "xf86videor128" {
     name = "xf86-video-r128-6.9.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1647,9 +1652,9 @@ let
       sha256 = "1q3fsc603k2yinphx5rrcl5356qkpywwz8axlw277l2231gjjbcb";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xf86miscproto xorgserver xproto ;};
 
-  xf86videosavage = (stdenv.mkDerivation ((if overrides ? xf86videosavage then overrides.xf86videosavage else x: x) {
+  xf86videosavage = (mkDerivation "xf86videosavage" {
     name = "xf86-video-savage-2.3.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1657,9 +1662,9 @@ let
       sha256 = "0i2aqp68rfkrz9c1p6d7ny9x7bjrlnby7q56zf01fb12r42l4784";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videosiliconmotion = (stdenv.mkDerivation ((if overrides ? xf86videosiliconmotion then overrides.xf86videosiliconmotion else x: x) {
+  xf86videosiliconmotion = (mkDerivation "xf86videosiliconmotion" {
     name = "xf86-video-siliconmotion-1.7.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1667,9 +1672,9 @@ let
       sha256 = "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess videoproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess videoproto xextproto xorgserver xproto ;};
 
-  xf86videosis = (stdenv.mkDerivation ((if overrides ? xf86videosis then overrides.xf86videosis else x: x) {
+  xf86videosis = (mkDerivation "xf86videosis" {
     name = "xf86-video-sis-0.10.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1677,9 +1682,9 @@ let
       sha256 = "1l0w84x39gq4y9j81dny9r6rma1xkqvxpsavpkd8h7h8panbcbmy";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xf86driproto xineramaproto xorgserver xproto ;};
 
-  xf86videosuncg6 = (stdenv.mkDerivation ((if overrides ? xf86videosuncg6 then overrides.xf86videosuncg6 else x: x) {
+  xf86videosuncg6 = (mkDerivation "xf86videosuncg6" {
     name = "xf86-video-suncg6-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1687,9 +1692,9 @@ let
       sha256 = "04fgwgk02m4nimlv67rrg1wnyahgymrn6rb2cjj1l8bmzkii4glr";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
+  }) // {inherit fontsproto randrproto renderproto xorgserver xproto ;};
 
-  xf86videosunffb = (stdenv.mkDerivation ((if overrides ? xf86videosunffb then overrides.xf86videosunffb else x: x) {
+  xf86videosunffb = (mkDerivation "xf86videosunffb" {
     name = "xf86-video-sunffb-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1697,9 +1702,9 @@ let
       sha256 = "07z3ngifwg2d4jgq8pms47n5lr2yn0ai72g86xxjnb3k20n5ym7s";
     };
     buildInputs = [pkgconfig fontsproto randrproto renderproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videotdfx = (stdenv.mkDerivation ((if overrides ? xf86videotdfx then overrides.xf86videotdfx else x: x) {
+  xf86videotdfx = (mkDerivation "xf86videotdfx" {
     name = "xf86-video-tdfx-1.4.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1707,9 +1712,9 @@ let
       sha256 = "0nfqf1c8939s21ci1g7gacwzlr4g4nnilahgz7j2bz30zfnzpmbh";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
-  xf86videotga = (stdenv.mkDerivation ((if overrides ? xf86videotga then overrides.xf86videotga else x: x) {
+  xf86videotga = (mkDerivation "xf86videotga" {
     name = "xf86-video-tga-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1717,9 +1722,9 @@ let
       sha256 = "0cb161lvdgi6qnf1sfz722qn38q7kgakcvj7b45ba3i0020828r0";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videotrident = (stdenv.mkDerivation ((if overrides ? xf86videotrident then overrides.xf86videotrident else x: x) {
+  xf86videotrident = (mkDerivation "xf86videotrident" {
     name = "xf86-video-trident-1.3.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1727,9 +1732,9 @@ let
       sha256 = "0141qbfsm32i0pxjyx5czpa8x8m4lvapsp4amw1qigaa0gry6n3a";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videov4l = (stdenv.mkDerivation ((if overrides ? xf86videov4l then overrides.xf86videov4l else x: x) {
+  xf86videov4l = (mkDerivation "xf86videov4l" {
     name = "xf86-video-v4l-0.2.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1737,9 +1742,9 @@ let
       sha256 = "0pcjc75hgbih3qvhpsx8d4fljysfk025slxcqyyhr45dzch93zyb";
     };
     buildInputs = [pkgconfig randrproto videoproto xorgserver xproto ];
-  })) // {inherit randrproto videoproto xorgserver xproto ;};
+  }) // {inherit randrproto videoproto xorgserver xproto ;};
 
-  xf86videovesa = (stdenv.mkDerivation ((if overrides ? xf86videovesa then overrides.xf86videovesa else x: x) {
+  xf86videovesa = (mkDerivation "xf86videovesa" {
     name = "xf86-video-vesa-2.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1747,9 +1752,9 @@ let
       sha256 = "1y5fsg0c4bgmh1cfsbnaaf388fppyy02i7mcy9vax78flkjpb2yf";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xorgserver xproto ;};
 
-  xf86videovmware = (stdenv.mkDerivation ((if overrides ? xf86videovmware then overrides.xf86videovmware else x: x) {
+  xf86videovmware = (mkDerivation "xf86videovmware" {
     name = "xf86-video-vmware-13.0.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1757,9 +1762,9 @@ let
       sha256 = "0m1wfsv34s4pyr5ry87yyjb2p6vmy6vyypdz5jx0sqnkx8n3vfn8";
     };
     buildInputs = [pkgconfig fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ];
-  })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
+  }) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xineramaproto xorgserver xproto ;};
 
-  xf86videovoodoo = (stdenv.mkDerivation ((if overrides ? xf86videovoodoo then overrides.xf86videovoodoo else x: x) {
+  xf86videovoodoo = (mkDerivation "xf86videovoodoo" {
     name = "xf86-video-voodoo-1.2.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1767,9 +1772,9 @@ let
       sha256 = "1s6p7yxmi12q4y05va53rljwyzd6ry492r1pgi7wwq6cznivhgly";
     };
     buildInputs = [pkgconfig fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ];
-  })) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
+  }) // {inherit fontsproto libpciaccess randrproto renderproto xextproto xf86dgaproto xorgserver xproto ;};
 
-  xf86videowsfb = (stdenv.mkDerivation ((if overrides ? xf86videowsfb then overrides.xf86videowsfb else x: x) {
+  xf86videowsfb = (mkDerivation "xf86videowsfb" {
     name = "xf86-video-wsfb-0.4.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1777,9 +1782,9 @@ let
       sha256 = "0hr8397wpd0by1hc47fqqrnaw3qdqd8aqgwgzv38w5k3l3jy6p4p";
     };
     buildInputs = [pkgconfig xorgserver xproto ];
-  })) // {inherit xorgserver xproto ;};
+  }) // {inherit xorgserver xproto ;};
 
-  xf86vidmodeproto = (stdenv.mkDerivation ((if overrides ? xf86vidmodeproto then overrides.xf86vidmodeproto else x: x) {
+  xf86vidmodeproto = (mkDerivation "xf86vidmodeproto" {
     name = "xf86vidmodeproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1787,9 +1792,9 @@ let
       sha256 = "0w47d7gfa8zizh2bshdr2rffvbr4jqjv019mdgyh6cmplyd4kna5";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xfs = (stdenv.mkDerivation ((if overrides ? xfs then overrides.xfs else x: x) {
+  xfs = (mkDerivation "xfs" {
     name = "xfs-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1797,9 +1802,9 @@ let
       sha256 = "1dwnf5gncpnjsbh9bdrc665kfnclhzzcpwpfnprvrnq4mlr4mx3v";
     };
     buildInputs = [pkgconfig libXfont xproto xtrans ];
-  })) // {inherit libXfont xproto xtrans ;};
+  }) // {inherit libXfont xproto xtrans ;};
 
-  xgamma = (stdenv.mkDerivation ((if overrides ? xgamma then overrides.xgamma else x: x) {
+  xgamma = (mkDerivation "xgamma" {
     name = "xgamma-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1807,9 +1812,9 @@ let
       sha256 = "0463sawps86jnxn121ramsz4sicy3az5wa5wsq4rqm8dm3za48p3";
     };
     buildInputs = [pkgconfig libX11 libXxf86vm ];
-  })) // {inherit libX11 libXxf86vm ;};
+  }) // {inherit libX11 libXxf86vm ;};
 
-  xhost = (stdenv.mkDerivation ((if overrides ? xhost then overrides.xhost else x: x) {
+  xhost = (mkDerivation "xhost" {
     name = "xhost-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1817,9 +1822,9 @@ let
       sha256 = "1hlxm0is9nks1cx033s1733kkib9ivx2bxa3pb9yayqavwibkxd6";
     };
     buildInputs = [pkgconfig libX11 libXau libXmu xproto ];
-  })) // {inherit libX11 libXau libXmu xproto ;};
+  }) // {inherit libX11 libXau libXmu xproto ;};
 
-  xineramaproto = (stdenv.mkDerivation ((if overrides ? xineramaproto then overrides.xineramaproto else x: x) {
+  xineramaproto = (mkDerivation "xineramaproto" {
     name = "xineramaproto-1.2.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1827,9 +1832,9 @@ let
       sha256 = "0ns8abd27x7gbp4r44z3wc5k9zqxxj8zjnazqpcyr4n17nxp8xcp";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xinit = (stdenv.mkDerivation ((if overrides ? xinit then overrides.xinit else x: x) {
+  xinit = (mkDerivation "xinit" {
     name = "xinit-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1837,9 +1842,9 @@ let
       sha256 = "1bq0mqy7y305g2rds1g5443f3d2kgxzafqhmiyabbmg3ws6qgckl";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  })) // {inherit libX11 xproto ;};
+  }) // {inherit libX11 xproto ;};
 
-  xinput = (stdenv.mkDerivation ((if overrides ? xinput then overrides.xinput else x: x) {
+  xinput = (mkDerivation "xinput" {
     name = "xinput-1.6.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1847,9 +1852,9 @@ let
       sha256 = "07w7zlpdhpwzzshg8q0y152cy3wl2fj7x1897glnp2la487jsqxp";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext libXi libXinerama libXrandr ];
-  })) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
+  }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;};
 
-  xkbcomp = (stdenv.mkDerivation ((if overrides ? xkbcomp then overrides.xkbcomp else x: x) {
+  xkbcomp = (mkDerivation "xkbcomp" {
     name = "xkbcomp-1.2.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1857,9 +1862,9 @@ let
       sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i";
     };
     buildInputs = [pkgconfig libX11 libxkbfile xproto ];
-  })) // {inherit libX11 libxkbfile xproto ;};
+  }) // {inherit libX11 libxkbfile xproto ;};
 
-  xkbevd = (stdenv.mkDerivation ((if overrides ? xkbevd then overrides.xkbevd else x: x) {
+  xkbevd = (mkDerivation "xkbevd" {
     name = "xkbevd-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1867,9 +1872,9 @@ let
       sha256 = "05h1xcnbalndbrryyqs8wzy9h3wz655vc0ymhlk2q4aik17licjm";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  })) // {inherit libX11 libxkbfile ;};
+  }) // {inherit libX11 libxkbfile ;};
 
-  xkbprint = (stdenv.mkDerivation ((if overrides ? xkbprint then overrides.xkbprint else x: x) {
+  xkbprint = (mkDerivation "xkbprint" {
     name = "xkbprint-1.0.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1877,9 +1882,9 @@ let
       sha256 = "1h4jb3gjrbjp79h5gcgkjvdxykcy2bmq03smpls820c8wnw6v17s";
     };
     buildInputs = [pkgconfig libX11 libxkbfile ];
-  })) // {inherit libX11 libxkbfile ;};
+  }) // {inherit libX11 libxkbfile ;};
 
-  xkbutils = (stdenv.mkDerivation ((if overrides ? xkbutils then overrides.xkbutils else x: x) {
+  xkbutils = (mkDerivation "xkbutils" {
     name = "xkbutils-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1887,9 +1892,9 @@ let
       sha256 = "0c412isxl65wplhl7nsk12vxlri29lk48g3p52hbrs3m0awqm8fj";
     };
     buildInputs = [pkgconfig inputproto libX11 libXaw xproto libXt ];
-  })) // {inherit inputproto libX11 libXaw xproto libXt ;};
+  }) // {inherit inputproto libX11 libXaw xproto libXt ;};
 
-  xkeyboardconfig = (stdenv.mkDerivation ((if overrides ? xkeyboardconfig then overrides.xkeyboardconfig else x: x) {
+  xkeyboardconfig = (mkDerivation "xkeyboardconfig" {
     name = "xkeyboard-config-2.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1897,9 +1902,9 @@ let
       sha256 = "0xkdyyi759hzls42hp4j3q2lc35n4j6b2g44ilx5qarci5h584p7";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  })) // {inherit libX11 xproto ;};
+  }) // {inherit libX11 xproto ;};
 
-  xkill = (stdenv.mkDerivation ((if overrides ? xkill then overrides.xkill else x: x) {
+  xkill = (mkDerivation "xkill" {
     name = "xkill-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1907,9 +1912,9 @@ let
       sha256 = "0bl1ky8ps9jg842j4mnmf4zbx8nkvk0h77w7bqjlpwij9wq2mvw8";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  })) // {inherit libX11 libXmu xproto ;};
+  }) // {inherit libX11 libXmu xproto ;};
 
-  xlsatoms = (stdenv.mkDerivation ((if overrides ? xlsatoms then overrides.xlsatoms else x: x) {
+  xlsatoms = (mkDerivation "xlsatoms" {
     name = "xlsatoms-1.1.1";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1917,9 +1922,9 @@ let
       sha256 = "1y9nfl8s7njxbnci8c20j986xixharasgg40vdw92y593j6dk2rv";
     };
     buildInputs = [pkgconfig libxcb ];
-  })) // {inherit libxcb ;};
+  }) // {inherit libxcb ;};
 
-  xlsclients = (stdenv.mkDerivation ((if overrides ? xlsclients then overrides.xlsclients else x: x) {
+  xlsclients = (mkDerivation "xlsclients" {
     name = "xlsclients-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1927,9 +1932,9 @@ let
       sha256 = "0g9x7rrggs741x9xwvv1k9qayma980d88nhdqw7j3pn3qvy6d5jx";
     };
     buildInputs = [pkgconfig libxcb ];
-  })) // {inherit libxcb ;};
+  }) // {inherit libxcb ;};
 
-  xmessage = (stdenv.mkDerivation ((if overrides ? xmessage then overrides.xmessage else x: x) {
+  xmessage = (mkDerivation "xmessage" {
     name = "xmessage-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1937,9 +1942,9 @@ let
       sha256 = "0s5bjlpxnmh8sxx6nfg9m0nr32r1sr3irr71wsnv76s33i34ppxw";
     };
     buildInputs = [pkgconfig libXaw libXt ];
-  })) // {inherit libXaw libXt ;};
+  }) // {inherit libXaw libXt ;};
 
-  xmodmap = (stdenv.mkDerivation ((if overrides ? xmodmap then overrides.xmodmap else x: x) {
+  xmodmap = (mkDerivation "xmodmap" {
     name = "xmodmap-1.0.8";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1947,9 +1952,9 @@ let
       sha256 = "1hwzm54m4ng09ls9i4bq0x84zbyhamgzasgrvhxxp8jqk34f7qpg";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  })) // {inherit libX11 xproto ;};
+  }) // {inherit libX11 xproto ;};
 
-  xorgcffiles = (stdenv.mkDerivation ((if overrides ? xorgcffiles then overrides.xorgcffiles else x: x) {
+  xorgcffiles = (mkDerivation "xorgcffiles" {
     name = "xorg-cf-files-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1957,9 +1962,9 @@ let
       sha256 = "1m3ypq0xcy46ghxc0svl1rbhpy3zvgmy0aa2mn7w7v7d8d8bh8zd";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xorgdocs = (stdenv.mkDerivation ((if overrides ? xorgdocs then overrides.xorgdocs else x: x) {
+  xorgdocs = (mkDerivation "xorgdocs" {
     name = "xorg-docs-1.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1967,9 +1972,9 @@ let
       sha256 = "0prphdba6kgr1bxk7r07wxxx6x6pqjw6prr5qclypsb5sf5r3cdr";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
+  xorgserver = (mkDerivation "xorgserver" {
     name = "xorg-server-1.14.7";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1977,9 +1982,24 @@ let
       sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
-  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
-
-  xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
+  }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
+
+  # TODO:
+  # With the current state of ./generate-expr-from-tarballs.pl,
+  # this will get overwritten when next invoked.
+  # Could add a special case to ./generate-expr-from-tarballs.pl,
+  # or perhaps there's a cleaner solution.
+  #xquartz = (mkDerivation "xquartz" {
+  #  name = "xorg-server-1.14.6";
+  #  builder = ./builder.sh;
+  #  src = fetchurl {
+  #    url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
+  #    sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
+  #  };
+  #  buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
+  #}) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
+
+  xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" {
     name = "xorg-sgml-doctools-1.11";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1987,9 +2007,9 @@ let
       sha256 = "0k5pffyi5bx8dmfn033cyhgd3gf6viqj3x769fqixifwhbgy2777";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xpr = (stdenv.mkDerivation ((if overrides ? xpr then overrides.xpr else x: x) {
+  xpr = (mkDerivation "xpr" {
     name = "xpr-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -1997,9 +2017,9 @@ let
       sha256 = "1dbcv26w2yand2qy7b3h5rbvw1mdmdd57jw88v53sgdr3vrqvngy";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  })) // {inherit libX11 libXmu xproto ;};
+  }) // {inherit libX11 libXmu xproto ;};
 
-  xprop = (stdenv.mkDerivation ((if overrides ? xprop then overrides.xprop else x: x) {
+  xprop = (mkDerivation "xprop" {
     name = "xprop-1.2.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2007,9 +2027,9 @@ let
       sha256 = "1ilvhqfjcg6f1hqahjkp8qaay9rhvmv2blvj3w9asraq0aqqivlv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  })) // {inherit libX11 xproto ;};
+  }) // {inherit libX11 xproto ;};
 
-  xproto = (stdenv.mkDerivation ((if overrides ? xproto then overrides.xproto else x: x) {
+  xproto = (mkDerivation "xproto" {
     name = "xproto-7.0.26";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2017,9 +2037,9 @@ let
       sha256 = "0ksi8vhfd916bx2f3xlyhn6azf6cvvzrsdja26haa1cqfp0n4qb3";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xrandr = (stdenv.mkDerivation ((if overrides ? xrandr then overrides.xrandr else x: x) {
+  xrandr = (mkDerivation "xrandr" {
     name = "xrandr-1.4.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2027,9 +2047,9 @@ let
       sha256 = "06xy0kr6ih7ilrwl6b5g6ay75vm2j4lxnv1d5xlj6sdqhqsaqm3i";
     };
     buildInputs = [pkgconfig libX11 xproto libXrandr libXrender ];
-  })) // {inherit libX11 xproto libXrandr libXrender ;};
+  }) // {inherit libX11 xproto libXrandr libXrender ;};
 
-  xrdb = (stdenv.mkDerivation ((if overrides ? xrdb then overrides.xrdb else x: x) {
+  xrdb = (mkDerivation "xrdb" {
     name = "xrdb-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2037,9 +2057,9 @@ let
       sha256 = "0nsnr90wazcdd50nc5dqswy0bmq6qcj14nnrhyi7rln9pxmpp0kk";
     };
     buildInputs = [pkgconfig libX11 libXmu xproto ];
-  })) // {inherit libX11 libXmu xproto ;};
+  }) // {inherit libX11 libXmu xproto ;};
 
-  xrefresh = (stdenv.mkDerivation ((if overrides ? xrefresh then overrides.xrefresh else x: x) {
+  xrefresh = (mkDerivation "xrefresh" {
     name = "xrefresh-1.0.5";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2047,9 +2067,9 @@ let
       sha256 = "1mlinwgvql6s1rbf46yckbfr9j22d3c3z7jx3n6ix7ca18dnf4rj";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  })) // {inherit libX11 xproto ;};
+  }) // {inherit libX11 xproto ;};
 
-  xset = (stdenv.mkDerivation ((if overrides ? xset then overrides.xset else x: x) {
+  xset = (mkDerivation "xset" {
     name = "xset-1.2.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2057,9 +2077,9 @@ let
       sha256 = "0qw0iic27bz3yz2wynf1gxs70hhkcf9c4jrv7zhlg1mq57xz90j3";
     };
     buildInputs = [pkgconfig libX11 libXext libXmu xproto libXxf86misc ];
-  })) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
+  }) // {inherit libX11 libXext libXmu xproto libXxf86misc ;};
 
-  xsetroot = (stdenv.mkDerivation ((if overrides ? xsetroot then overrides.xsetroot else x: x) {
+  xsetroot = (mkDerivation "xsetroot" {
     name = "xsetroot-1.1.0";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2067,9 +2087,9 @@ let
       sha256 = "1bazzsf9sy0q2bj4lxvh1kvyrhmpggzb7jg575i15sksksa3xwc8";
     };
     buildInputs = [pkgconfig libX11 xbitmaps libXcursor libXmu ];
-  })) // {inherit libX11 xbitmaps libXcursor libXmu ;};
+  }) // {inherit libX11 xbitmaps libXcursor libXmu ;};
 
-  xtrans = (stdenv.mkDerivation ((if overrides ? xtrans then overrides.xtrans else x: x) {
+  xtrans = (mkDerivation "xtrans" {
     name = "xtrans-1.3.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2077,9 +2097,9 @@ let
       sha256 = "0fjq9xa37k1czkidj3c5sads51gibrjvrxz9ag3hh9fmxzilwk85";
     };
     buildInputs = [pkgconfig ];
-  })) // {inherit ;};
+  }) // {inherit ;};
 
-  xvinfo = (stdenv.mkDerivation ((if overrides ? xvinfo then overrides.xvinfo else x: x) {
+  xvinfo = (mkDerivation "xvinfo" {
     name = "xvinfo-1.1.2";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2087,9 +2107,9 @@ let
       sha256 = "1qsh7fszi727l3vwlaf9pb7bpikdv15smrx5qhlgg3kqzl7xklzf";
     };
     buildInputs = [pkgconfig libX11 xproto libXv ];
-  })) // {inherit libX11 xproto libXv ;};
+  }) // {inherit libX11 xproto libXv ;};
 
-  xwd = (stdenv.mkDerivation ((if overrides ? xwd then overrides.xwd else x: x) {
+  xwd = (mkDerivation "xwd" {
     name = "xwd-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2097,9 +2117,9 @@ let
       sha256 = "0ybx48agdvjp9lgwvcw79r1x6jbqbyl3fliy3i5xwy4d4si9dcrv";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  })) // {inherit libX11 xproto ;};
+  }) // {inherit libX11 xproto ;};
 
-  xwininfo = (stdenv.mkDerivation ((if overrides ? xwininfo then overrides.xwininfo else x: x) {
+  xwininfo = (mkDerivation "xwininfo" {
     name = "xwininfo-1.1.3";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2107,9 +2127,9 @@ let
       sha256 = "1y1zn8ijqslb5lfpbq4bb78kllhch8in98ps7n8fg3dxjpmb13i1";
     };
     buildInputs = [pkgconfig libX11 libxcb xproto ];
-  })) // {inherit libX11 libxcb xproto ;};
+  }) // {inherit libX11 libxcb xproto ;};
 
-  xwud = (stdenv.mkDerivation ((if overrides ? xwud then overrides.xwud else x: x) {
+  xwud = (mkDerivation "xwud" {
     name = "xwud-1.0.4";
     builder = ./builder.sh;
     src = fetchurl {
@@ -2117,6 +2137,6 @@ let
       sha256 = "1ggql6maivah58kwsh3z9x1hvzxm1a8888xx4s78cl77ryfa1cyn";
     };
     buildInputs = [pkgconfig libX11 xproto ];
-  })) // {inherit libX11 xproto ;};
+  }) // {inherit libX11 xproto ;};
 
 }; in xorg
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 04ee5f109611e..9c6618d3b105d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -230,6 +230,11 @@
 
 let
 
+  mkDerivation = name: attrs:
+    let newAttrs = (overrides."\${name}" or (x: x)) attrs;
+        stdenv = newAttrs.stdenv or args.stdenv;
+    in stdenv.mkDerivation (removeAttrs newAttrs [ "stdenv" ]);
+
   overrides = import ./overrides.nix {inherit args xorg;};
 
   xorg = rec {
@@ -261,7 +266,7 @@
     $extraAttrs = "" unless defined $extraAttrs;
 
     print OUT <<EOF
-  $pkg = (stdenv.mkDerivation ((if overrides ? $pkg then overrides.$pkg else x: x) {
+  $pkg = (mkDerivation "$pkg" {
     name = "$pkgNames{$pkg}";
     builder = ./builder.sh;
     src = fetchurl {
@@ -269,7 +274,7 @@
       sha256 = "$pkgHashes{$pkg}";
     };
     buildInputs = [pkgconfig $inputs];$extraAttrs
-  })) // {inherit $inputs;};
+  }) // {inherit $inputs;};
 
 EOF
 }

From d484c392aaa4e17f48bd09bcb2e41030f76a920a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 15:46:00 +0200
Subject: [PATCH 087/857] stdenv multiple-outputs: change propagation rules

Now development stuff is propagated from the first output,
and userEnvPkgs from the one with binaries.

Also don't move *.la files (yet). It causes problems, and they're small.
---
 pkgs/build-support/cc-wrapper/default.nix     | 15 ++++---
 .../setup-hooks/multiple-outputs.sh           | 44 ++++++++++++-------
 .../interpreters/perl/5.20/default.nix        |  4 +-
 pkgs/development/libraries/glibc/common.nix   |  2 +-
 pkgs/stdenv/generic/setup.sh                  | 26 ++++++-----
 5 files changed, 54 insertions(+), 37 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index c26cac24b2f87..a60165d5a9542 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -28,6 +28,7 @@ let
 
   libc_bin = if nativeLibc then null else libc.bin or libc;
   libc_dev = if nativeLibc then null else libc.dev or libc;
+  libc_lib = if nativeLibc then null else libc.out or libc;
   binutils_bin = if nativeTools then null else binutils.bin or binutils;
   # The wrapper scripts use 'cat', so we may need coreutils.
   coreutils_bin = if nativeTools then null else coreutils.bin or coreutils;
@@ -40,7 +41,7 @@ stdenv.mkDerivation {
 
   preferLocalBuild = true;
 
-  inherit cc shell libc_bin libc_dev binutils_bin coreutils_bin;
+  inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
 
   passthru = { inherit libc nativeTools nativeLibc nativePrefix; };
 
@@ -58,11 +59,11 @@ stdenv.mkDerivation {
     ''
 
     + optionalString (!nativeLibc) (if (!stdenv.isDarwin) then ''
-      dynamicLinker="${libc}/lib/$dynamicLinker"
+      dynamicLinker="${libc_lib}/lib/$dynamicLinker"
       echo $dynamicLinker > $out/nix-support/dynamic-linker
 
-      if [ -e ${libc}/lib/32/ld-linux.so.2 ]; then
-        echo ${libc}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+      if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
+        echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
       fi
 
       # The dynamic linker is passed in `ldflagsBefore' to allow
@@ -87,11 +88,11 @@ stdenv.mkDerivation {
       # compile, because it uses "#include_next <limits.h>" to find the
       # limits.h file in ../includes-fixed. To remedy the problem,
       # another -idirafter is necessary to add that directory again.
-      echo "-B${libc}/lib/ -idirafter ${libc_dev}/include -idirafter $cc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
+      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter $cc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
 
-      echo "-L${libc}/lib" > $out/nix-support/libc-ldflags
+      echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
 
-      echo "${libc}" > $out/nix-support/orig-libc
+      echo "${libc_lib}" > $out/nix-support/orig-libc
     ''
 
     + (if nativeTools then ''
diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 3ab77683a41d4..f621d4577b435 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -39,9 +39,6 @@ _overrideFirst outputDoc "doc" "out"
 _overrideFirst outputMan "man" "doc" "$outputBin"
 _overrideFirst outputInfo "info" "doc" "$outputMan"
 
-# Make stdenv put propagated*BuildInputs into $outputDev instead of $out
-propagateIntoOutput="${!outputDev}"
-
 
 # Add standard flags to put files into the desired outputs.
 _multioutConfig() {
@@ -67,6 +64,7 @@ NIX_NO_SELF_RPATH=1
 
 
 # Move subpaths that match pattern $1 from under any output/ to the $2 output/
+# Beware: only * ? [..] patterns are accepted.
 _moveToOutput() {
     local patt="$1"
     local dstOut="$2"
@@ -108,30 +106,46 @@ _multioutDocs() {
 # Move development-only stuff to the desired outputs.
 _multioutDevs() {
     if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi;
-    echo "Looking for development-only stuff to move between outputs"
+    echo "Looking for development-only stuff to move to $outputDev"
     _moveToOutput include "${!outputInclude}"
     _moveToOutput lib/pkgconfig "${!outputDev}"
-    _moveToOutput "lib/*.la" "${!outputDev}"
+    _moveToOutput share/pkgconfig "${!outputDev}"
+
+    # don't move libtool files yet
+    #_moveToOutput "lib/*.la" "${!outputDev}"
 
-    echo "Patching *.pc includedir to output ${!outputInclude}"
-    for f in "${!outputDev}"/lib/pkgconfig/*.pc; do
+    for f in "${!outputDev}"/{lib,share}/pkgconfig/*.pc; do
+        echo "Patching '$f' includedir to output ${!outputInclude}"
         sed -i "/^includedir=/s,=\${prefix},=${!outputInclude}," "$f"
     done
 }
 
-# Make ${!outputDev} propagate other outputs needed for development
+# Make the first output (typically "dev") propagate other outputs needed for development.
+# Take the first, because that's what one gets when putting the package into buildInputs.
 # Note: during the build, probably only the "native" development packages are useful.
 # With current cross-building setup, all packages are "native" if not cross-building.
 _multioutPropagateDev() {
     if [ "$outputs" = "out" ]; then return; fi;
 
-    if [ "${!outputInclude}" != "$propagateIntoOutput" ]; then
-        mkdir -p "$propagateIntoOutput"/nix-support
-        echo -n " ${!outputInclude}" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
-    fi
-    if [ "${!outputLib}" != "$propagateIntoOutput" ]; then
-        mkdir -p "$propagateIntoOutput"/nix-support
-        echo -n " ${!outputLib}" >> "$propagateIntoOutput"/nix-support/propagated-native-build-inputs
+    local outputFirst
+    for outputFirst in $outputs; do
+        break
+    done
+
+    # Default value: propagate binaries, includes and libraries
+    if [[ ! -v "$propagatedOutputs" ]]; then
+        local po_dirty="$outputBin $outputInclude $outputLib"
+        propagatedOutputs=`echo "$po_dirty" \
+            | tr -s ' ' '\n' | grep -v -F "$outputFirst" \
+            | sort -u | tr '\n' ' ' `
+
+    elif [ -z "$propagatedOutputs" ]; then
+        return # variable was explicitly set to empty
     fi
+
+    mkdir -p "${!outputFirst}"/nix-support
+    for output in $propagatedOutputs; do
+        echo -n " ${!output}" >> "${!outputFirst}"/nix-support/propagated-native-build-inputs
+    done
 }
 
diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 0ad955d036302..cafbe5141c166 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation rec {
       "-Uinstallusrbinperl"
       "-Dinstallstyle=lib/perl5"
       "-Duseshrplib"
-      "-Dlocincpth=${libc}/include"
-      "-Dloclibpth=${libc}/lib"
+      "-Dlocincpth=${libc.dev or libc}/include"
+      "-Dloclibpth=${libc.out or libc}/lib"
     ]
     ++ optional enableThreading "-Dusethreads";
 
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 4bff795ba5f26..d5caba68903e9 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation ({
 
   installFlags = [ "sysconfdir=$(out)/etc" ];
 
-  outputs = [ "out" "dev" "bin" "static" ];
+  outputs = [ "dev" "out" "bin" "static" ];
 
   buildInputs = [ ]
     ++ stdenv.lib.optionals (cross != null) [ gccCross ]
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b5d31e09153a1..1011c4c53480f 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -712,27 +712,29 @@ fixupPhase() {
         prefix=${!output} runHook fixupOutput
     done
 
-    # Multiple-output derivations mostly choose $dev instead of $out
-    local prOut="${propagateIntoOutput:-$out}"
+
+    # Propagate build inputs and setup hook into the development output.
 
     if [ -n "$propagatedBuildInputs" ]; then
-        mkdir -p "$prOut/nix-support"
-        echo "$propagatedBuildInputs" > "$prOut/nix-support/propagated-build-inputs"
+        mkdir -p "${!outputDev}/nix-support"
+        echo "$propagatedBuildInputs" > "${!outputDev}/nix-support/propagated-build-inputs"
     fi
 
     if [ -n "$propagatedNativeBuildInputs" ]; then
-        mkdir -p "$prOut/nix-support"
-        echo "$propagatedNativeBuildInputs" > "$prOut/nix-support/propagated-native-build-inputs"
+        mkdir -p "${!outputDev}/nix-support"
+        echo "$propagatedNativeBuildInputs" > "${!outputDev}/nix-support/propagated-native-build-inputs"
     fi
 
-    if [ -n "$propagatedUserEnvPkgs" ]; then
-        mkdir -p "$prOut/nix-support"
-        echo "$propagatedUserEnvPkgs" > "$prOut/nix-support/propagated-user-env-packages"
+    if [ -n "$setupHook" ]; then
+        mkdir -p "${!outputDev}/nix-support"
+        substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook"
     fi
 
-    if [ -n "$setupHook" ]; then
-        mkdir -p "$prOut/nix-support"
-        substituteAll "$setupHook" "$prOut/nix-support/setup-hook"
+    # Propagate user-env packages into the output with binaries, TODO?
+
+    if [ -n "$propagatedUserEnvPkgs" ]; then
+        mkdir -p "${!outputBin}/nix-support"
+        echo "$propagatedUserEnvPkgs" > "${!outputBin}/nix-support/propagated-user-env-packages"
     fi
 
     runHook postFixup

From a99e543c36e78edbbdda68f4269b37c5bcf2a4d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 19:32:52 +0200
Subject: [PATCH 088/857] bzip2: split into multiple outputs, refactor

---
 pkgs/stdenv/common-path.nix              |  2 +-
 pkgs/tools/compression/bzip2/builder.sh  | 24 -------------
 pkgs/tools/compression/bzip2/default.nix | 45 +++++++++++++++++-------
 3 files changed, 33 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/tools/compression/bzip2/builder.sh

diff --git a/pkgs/stdenv/common-path.nix b/pkgs/stdenv/common-path.nix
index 63c9f14b15c4d..da468d56a2cda 100644
--- a/pkgs/stdenv/common-path.nix
+++ b/pkgs/stdenv/common-path.nix
@@ -7,7 +7,7 @@
   pkgs.gawk
   pkgs.gnutar
   pkgs.gzip
-  pkgs.bzip2
+  pkgs.bzip2.bin
   pkgs.gnumake
   pkgs.bash
   pkgs.patch
diff --git a/pkgs/tools/compression/bzip2/builder.sh b/pkgs/tools/compression/bzip2/builder.sh
deleted file mode 100644
index a598dfcf808c1..0000000000000
--- a/pkgs/tools/compression/bzip2/builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-source $stdenv/setup
-installFlags="PREFIX=$out"
-
-if test -n "$sharedLibrary"; then
-
-    preBuild() {
-        make -f Makefile-libbz2_so
-    }
-
-    preInstall() {
-        mkdir -p $out/lib
-        mv libbz2.so* $out/lib
-        (cd $out/lib && ln -s libbz2.so.1.0.? libbz2.so && ln -s libbz2.so.1.0.? libbz2.so.1);
-    }
-    
-fi
-
-postInstall() {
-    rm $out/bin/bunzip2* $out/bin/bzcat*
-    ln -s bzip2 $out/bin/bunzip2
-    ln -s bzip2 $out/bin/bzcat
-}
-
-genericBuild
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 74da91431a439..da6695ee1da9c 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,17 +1,25 @@
 { stdenv, fetchurl, linkStatic ? false }:
 
-let version = "1.0.6"; in
-
-stdenv.mkDerivation {
+let
+  version = "1.0.6";
+  inherit (stdenv.lib) optionalString;
+  sharedLibrary = with stdenv;
+    !( isDarwin || (stdenv ? isStatic) || system == "i686-cygwin" || linkStatic );
+in
+
+stdenv.mkDerivation rec {
   name = "bzip2-${version}";
 
-  builder = ./builder.sh;
-
   src = fetchurl {
     url = "http://www.bzip.org/${version}/bzip2-${version}.tar.gz";
     sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152";
   };
 
+  patchPhase = optionalString stdenv.isDarwin
+    "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'";
+
+  outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out";
+
   crossAttrs = {
     patchPhase = ''
       sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
@@ -23,16 +31,27 @@ stdenv.mkDerivation {
     '';
   };
 
-  sharedLibrary =
-    !stdenv.isDarwin && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic;
-
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'";
-
   preConfigure = "substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'";
 
-  makeFlags = if linkStatic then "LDFLAGS=-static" else "";
-
-  inherit linkStatic;
+  preBuild = optionalString sharedLibrary "make -f Makefile-libbz2_so";
+  makeFlags = optionalString linkStatic "LDFLAGS=-static";
+
+  installFlags = "PREFIX=$(bin)";
+
+  postInstall = optionalString sharedLibrary ''
+    mkdir -p $out/lib
+    mv libbz2.so* $out/lib
+    ( cd $out/lib && ln -s libbz2.so.1.*.* libbz2.so && ln -s libbz2.so.1.*.* libbz2.so.1 )
+  '' + ''
+    mkdir -p "$static"
+    mv "$bin/lib" "$static/"
+    (
+      cd "$bin/bin"
+      rm {bunzip2,bzcat}*
+      ln -s bzip2 bunzip2
+      ln -s bzip2 bzcat
+    )
+  '';
 
   meta = {
     homepage = "http://www.bzip.org";

From 65ac24c90369ca24dd45419ec121139ad4084833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 19:48:00 +0200
Subject: [PATCH 089/857] gnumake-4.1: split docs

---
 pkgs/development/tools/build-managers/gnumake/4.1/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
index 600f6f5759d9b..92bb82039d8d4 100644
--- a/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake/4.1/default.nix
@@ -19,6 +19,8 @@ stdenv.mkDerivation {
     ./impure-dirs.patch
   ];
 
+  outputs = [ "out" "doc" ];
+
   meta = {
     homepage = http://www.gnu.org/software/make/;
     description = "A tool to control the generation of non-source files from sources";

From 4b1392fb077973114c581b4f08be75aa17836c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 19:53:59 +0200
Subject: [PATCH 090/857] systemd: fix cycles by adding gudev to libudev

Also some related fixups.
---
 pkgs/os-specific/linux/systemd/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index beee7ff3d5e1e..c10d53c5c75eb 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -151,14 +151,13 @@ stdenv.mkDerivation rec {
 
       rm -rf $out/etc/rpm
 
-      # Move libudev to a separate output.
-      mkdir -p $libudev/lib/pkgconfig $libudev/include
-      mv $out/lib/libudev* $libudev/lib/
-      mv $out/lib/pkgconfig/libudev*.pc $libudev/lib/pkgconfig/
-      mv $out/include/libudev.h $libudev/include/
-
-      for i in $libudev/lib/*.la $libudev/lib/pkgconfig/*.pc; do
-        substituteInPlace $i --replace $out $libudev
+      # Move lib(g)udev to a separate output. TODO: maybe split them up
+      #   to avoid libudev pulling glib
+      mkdir -p "$libudev/lib"
+      mv "$out"/lib/lib{,g}udev* "$libudev/lib/"
+
+      for i in "$libudev"/lib/*.la "$out"/lib/pkgconfig/*udev*.pc; do
+        substituteInPlace $i --replace "$out" "$libudev"
       done
     ''; # */
 

From 4101db0bec17f968e694a771b2a6a6d5c96d3e25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 20:59:36 +0200
Subject: [PATCH 091/857] python2*: fix detecting C libs, no header references

---
 .../interpreters/python/2.6/default.nix       | 20 +++++++++++--------
 .../interpreters/python/2.7/default.nix       | 17 ++++++++++------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 9bf161ffc1aad..787e3ea9e3b59 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
+{ stdenv, fetchurl, pkgconfig, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
 , sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }:
 
 assert zlibSupport -> zlib != null;
@@ -48,9 +48,13 @@ let
 
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
-    [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
+    [ pkgconfig bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
     ++ optional zlibSupport zlib;
 
+  mkPaths = paths: {
+    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
+    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") buildInputs);
+  };
 
   # Build the basic Python interpreter without modules that have
   # external dependencies.
@@ -60,8 +64,7 @@ let
 
     inherit majorVersion version src patches buildInputs preConfigure;
 
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+    inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
     configureFlags = "--enable-shared --with-threads --enable-unicode";
 
@@ -83,10 +86,12 @@ let
         ln -s $out/lib/python${majorVersion}/pdb.py $out/bin/pdb${majorVersion}
         mv $out/share/man/man1/{python.1,python2.6.1}
         ln -s $out/share/man/man1/{python2.6.1,python.1}
-        
+
         paxmark E $out/bin/python${majorVersion}
-        
+
         ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
+
+        rm "$out/lib/python2.7/plat-linux2/regen" # refers to glibc.dev
       '';
 
     passthru = rec {
@@ -135,8 +140,7 @@ let
 
       buildInputs = [ python ] ++ deps;
 
-      C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-      LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+      inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
       buildPhase =
         ''
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 8b24fe004631a..56f209809414b 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, self, callPackage
+{ stdenv, fetchurl, pkgconfig, self, callPackage
 , bzip2, openssl
 
 , includeModules ? false
@@ -60,13 +60,18 @@ let
 
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
-    [ bzip2 openssl ]
+    [ pkgconfig bzip2 openssl ]
     ++ optionals includeModules (
         [ db gdbm ncurses sqlite readline
         ] ++ optionals x11Support [ tcl tk x11 libX11 ]
     )
     ++ optional zlibSupport zlib;
 
+  mkPaths = paths: {
+    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
+    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") buildInputs);
+  };
+
   # Build the basic Python interpreter without modules that have
   # external dependencies.
   python = stdenv.mkDerivation {
@@ -76,8 +81,7 @@ let
     inherit majorVersion version src patches buildInputs preConfigure;
 
     LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+    inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
     configureFlags = "--enable-shared --with-threads --enable-unicode";
 
@@ -105,6 +109,8 @@ let
         paxmark E $out/bin/python${majorVersion}
 
         ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
+
+        rm "$out/lib/python2.7/plat-linux2/regen" # refers to glibc.dev
       '';
 
     passthru = rec {
@@ -153,8 +159,7 @@ let
 
       buildInputs = [ python ] ++ deps;
 
-      C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-      LIBRARY_PATH = concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
+      inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
       buildPhase = ''
           substituteInPlace setup.py --replace 'self.extensions = extensions' \

From e36dd5acf863dfe257e37c3baa30e94a17eb063a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 21:37:00 +0200
Subject: [PATCH 092/857] nix: fix paths to bzip outputs

---
 pkgs/tools/package-management/nix/default.nix  | 4 ++--
 pkgs/tools/package-management/nix/unstable.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 2d10511313363..b2cba0cc2d24b 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   # would end up using the wrong bzip2 when cross-compiling.
   # XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
   postUnpack =
-    '' export CPATH="${bzip2}/include"
-       export LIBRARY_PATH="${bzip2}/lib"
+    '' export CPATH="${bzip2.dev}/include"
+       export LIBRARY_PATH="${bzip2.out}/lib"
        export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
     '';
 
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 36d3d77c9f978..a87cde81c1a9c 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
   # would end up using the wrong bzip2 when cross-compiling.
   # XXX: The right thing would be to reinstate `--with-bzip2' in Nix.
   postUnpack =
-    '' export CPATH="${bzip2}/include"
-       export LIBRARY_PATH="${bzip2}/lib"
+    '' export CPATH="${bzip2.dev}/include"
+       export LIBRARY_PATH="${bzip2.out}/lib"
        export CXXFLAGS="-Wno-error=reserved-user-defined-literal"
     '';
 

From a8813a3db06c665fa5712979d5de20708e1ee629 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 18 Apr 2015 22:30:26 +0200
Subject: [PATCH 093/857] cmake: fix with multiple outputs, split help,
 refactor

The removed configureFlags seemed to have no effect.
---
 .../tools/build-managers/cmake/default.nix    | 41 ++++++++++---------
 .../cmake/search-path-3.2.patch               |  8 ++--
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 2804bad2595f0..0aa64ba4cbf59 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
     sha256 = "0b2hy4p0aa9zshlxyw9nmlh5q8q1lmnwmb594rvh6sx2n7v1r7vm";
   };
 
-  enableParallelBuilding = true;
-
   patches =
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc.
@@ -38,41 +36,46 @@ stdenv.mkDerivation rec {
       sha256 = "16acmdr27adma7gs9rs0dxdiqppm15vl3vv3agy7y8s94wyh4ybv";
     });
 
+  outputs = [ "out" "doc" ];
+  setOutputFlags = false;
+
+  setupHook = ./setup-hook.sh;
+
   buildInputs =
-    [ pkgconfig bzip2 curl expat libarchive xz zlib ]
+    [ setupHook pkgconfig bzip2 curl expat libarchive xz zlib ]
     ++ optional (jsoncpp != null) jsoncpp
     ++ optional useNcurses ncurses
     ++ optional useQt4 qt4;
 
   propagatedBuildInputs = optional wantPS ps;
 
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-
+  preConfigure = with stdenv; optionalString (stdenv ? glibc)
+    ''
+      fixCmakeFiles .
+      substituteInPlace Modules/Platform/UnixPaths.cmake \
+        --subst-var-by glibc_bin ${glibc.bin or glibc} \
+        --subst-var-by glibc_dev ${glibc.dev or glibc} \
+        --subst-var-by glibc_lib ${glibc.out or glibc}
+    '';
   configureFlags =
     [
-      "--docdir=/share/doc/${name}"
-      "--mandir=/share/man"
       "--system-libs"
     ]
     ++ optional (jsoncpp == null) "--no-system-jsoncpp"
     ++ optional useQt4 "--qt-gui";
 
-  setupHook = ./setup-hook.sh;
-
   dontUseCmakeConfigure = true;
 
-  preConfigure = optionalString (stdenv ? glibc)
-    ''
-      source $setupHook
-      fixCmakeFiles .
-      substituteInPlace Modules/Platform/UnixPaths.cmake \
-        --subst-var-by glibc ${stdenv.glibc}
-    '';
+  enableParallelBuilding = true;
+
+  preInstall = ''mkdir "$doc" '';
+
+  postInstall = ''_moveToOutput "share/cmake-*/Help" "$doc" '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";
-    platforms = if useQt4 then qt4.meta.platforms else stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ urkud mornfall ttuegel ];
+    platforms = if useQt4 then qt4.meta.platforms else platforms.all;
+    maintainers = with maintainers; [ urkud mornfall ttuegel ];
   };
 }
diff --git a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
index b0447e7060712..0a2d4ad43ab7d 100644
--- a/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
+++ b/pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
@@ -53,21 +53,21 @@ index 20ee1d1..39834e6 100644
 -
 -list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
 -  /usr/pkg/bin
-+  "@glibc@"
++  "@glibc_bin@"
    )
  
  list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
 -  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
-+  "@glibc@/lib"
++  "@glibc_lib@/lib"
    )
  
  list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
-+  "@glibc@/include"
++  "@glibc_dev@/include"
    )
  list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
 -  /usr/include
-+  "@glibc@/include"
++  "@glibc_dev@/include"
    )
  
  # Enable use of lib64 search path variants by default.

From 3c793aca79c8f25c8d2625f9970a5c56586bbefb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 14 Apr 2015 22:41:22 +0200
Subject: [PATCH 094/857] mesa: dependency cleanup (not using output changes)

- drop python build-time dependency; announcement:
 > Unlike mesa 10.5.2, the build process should finally be python/mako free :-)
- drop other (seemingly) unneeded deps, such as bison and flex
- make $out not depend on llvm, again
- various fixes and refactoring
---
 pkgs/development/libraries/mesa/default.nix | 68 +++++++++++----------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 39a6588658514..8747555070cde 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll
-, python, libxml2Python, file, expat, makedepend, pythonPackages
-, libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio
+{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook, substituteAll
+, file, expat, libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio
 , libvdpau, libelf, libva, libclc
 , grsecEnabled
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
@@ -22,13 +21,14 @@ else
   - libOSMesa is in $osmesa (~4 MB)
 */
 
+with { inherit (stdenv.lib) optional optionalString; };
+
 let
   version = "10.5.3";
   # this is the default search path for DRI drivers
-  driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
+  driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
   clang = if llvmPackages ? clang-unwrapped then llvmPackages.clang-unwrapped else llvmPackages.clang;
 in
-with { inherit (stdenv.lib) optional optionals optionalString; };
 
 stdenv.mkDerivation {
   name = "mesa-noglu-${version}";
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-    "--with-clang-libdir=${clang}/lib"
+    #"--with-clang-libdir=${clang}/lib"
     "--with-dri-driverdir=$(drivers)/lib/dri"
     "--with-dri-searchpath=${driverLink}/lib/dri"
 
@@ -102,17 +102,17 @@ stdenv.mkDerivation {
   ] ++ optional enableTextureFloats "--enable-texture-float"
     ++ optional grsecEnabled "--enable-glx-rts"; # slight performance degradation, enable only for grsec
 
-  nativeBuildInputs = [ pkgconfig python makedepend file flex bison pythonPackages.Mako ];
+  nativeBuildInputs = [ pkgconfig file ];
 
   propagatedBuildInputs = with xorg; [ libXdamage libXxf86vm ]
-    ++ optionals stdenv.isLinux [ libdrm ];
+    ++ optional stdenv.isLinux libdrm;
 
   buildInputs = with xorg; [
-    autoreconfHook intltool expat libxml2Python llvmPackages.llvm
+    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
+    #libclc clang
   ] ++ optional stdenv.isLinux udev;
 
   enableParallelBuilding = true;
@@ -128,16 +128,17 @@ stdenv.mkDerivation {
   # ToDo: probably not all .la files are completely fixed, but it shouldn't matter
   postInstall = with stdenv.lib; ''
     mv -t "$drivers/lib/" \
-  '' + optionalString enableExtraFeatures ''
-      `#$out/lib/libXvMC*` \
-      $out/lib/gbm $out/lib/libgbm* \
-  '' + ''
-      $out/lib/gallium-pipe \
+      $out/lib/libXvMC* \
       $out/lib/libdricore* \
       $out/lib/libgallium* \
       $out/lib/vdpau \
+      $out/lib/{bellagio,d3d} \
       $out/lib/libxatracker*
 
+    mv -t "$drivers/lib/dri/" \
+      "$out"/lib/dri/*
+    rmdir "$out/lib/dri"
+
     mkdir -p {$osmesa,$drivers}/lib/pkgconfig
     mv -t $osmesa/lib/ \
       $out/lib/libOSMesa*
@@ -150,43 +151,44 @@ stdenv.mkDerivation {
 
   '' + /* now fix references in .la files */ ''
     sed "/^libdir=/s,$out,$drivers," -i \
-  '' + optionalString enableExtraFeatures ''
-      `#$drivers/lib/libXvMC*.la` \
-  '' + ''
-      $drivers/lib/gallium-pipe/*.la \
-      $drivers/lib/libgallium.la \
+      $drivers/lib/libXvMC*.la \
       $drivers/lib/vdpau/*.la \
       $drivers/lib/libdricore*.la
 
-    sed "s,$out\(/lib/\(libdricore[0-9\.]*\|libgallium\).la\),$drivers\1,g" \
+    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
 
-  '' + /* work around bug #529, but maybe $drivers should also be patchelf-ed */ ''
-    find $drivers/ $osmesa/ -type f -executable -print0 | xargs -0 strip -S || true
+  '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
+    substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
+  '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
+    mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
+  '';
+  #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM */
 
-  '' + /* add RPATH so the drivers can find the moved libgallium and libdricore9 */ ''
+  postFixup =
+    # add RPATH so the drivers can find the moved libgallium and libdricore9
+    # moved here to avoid problems with stripping patchelfed files
+  ''
     for lib in $drivers/lib/*.so* $drivers/lib/*/*.so*; do
       if [[ ! -L "$lib" ]]; then
         patchelf --set-rpath "$(patchelf --print-rpath $lib):$drivers/lib" "$lib"
       fi
     done
-  '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
-    substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
-  '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
-    mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
   '';
-  #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM
+  # ToDo + /* check $out doesn't depend on llvm */ ''
+  # builder failures are ignored for some reason
+  #   grep -qv '${llvmPackages.llvm}' -R "$out"
 
   passthru = { inherit libdrm version driverLink; };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "An open source implementation of OpenGL";
     homepage = http://www.mesa3d.org/;
-    license = "bsd";
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-    maintainers = with stdenv.lib.maintainers; [ eduarrrd simons vcunat ];
+    license = licenses.mit; # X11 variant, in most files
+    platforms = platforms.mesaPlatforms;
+    maintainers = with maintainers; [ eduarrrd simons vcunat ];
   };
 }

From 92b968863a8890c83b66938878cf1b256a9d7a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 00:48:25 +0200
Subject: [PATCH 095/857] mesa: fix libudev path

---
 pkgs/development/libraries/mesa/default.nix                | 2 +-
 pkgs/development/libraries/mesa/dlopen-absolute-paths.diff | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 8747555070cde..1fe3bef648197 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   ] ++ optional stdenv.isLinux
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
-        inherit udev;
+        inherit (udev) libudev;
       });
 
   postPatch = ''
diff --git a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
index 2b239e760ba30..7eff8b32c592a 100644
--- a/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
+++ b/pkgs/development/libraries/mesa/dlopen-absolute-paths.diff
@@ -7,7 +7,7 @@ index 666d015..4d7a9be 100644
  {
     if (!udev_handle) {
 -      udev_handle = dlopen("libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
-+      udev_handle = dlopen("@udev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
++      udev_handle = dlopen("@libudev@/lib/libudev.so.1", RTLD_LOCAL | RTLD_LAZY);
  
        if (!udev_handle) {
           /* libudev.so.1 changed the return types of the two unref functions

From de99ea8c8fd5307c1797f03092c07a681c46a57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 00:48:52 +0200
Subject: [PATCH 096/857] libusb: get rid of systemd from library closures

---
 pkgs/development/libraries/libusb/default.nix  | 3 +++
 pkgs/development/libraries/libusb1/default.nix | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libusb/default.nix b/pkgs/development/libraries/libusb/default.nix
index 7aec64d596fc8..b1872779b707f 100644
--- a/pkgs/development/libraries/libusb/default.nix
+++ b/pkgs/development/libraries/libusb/default.nix
@@ -3,6 +3,9 @@
 stdenv.mkDerivation {
   name = "libusb-compat-0.1.5";
 
+  outputs = [ "dev" "out" ]; # get rid of propagating systemd closure
+  outputBin = "dev";
+
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ libusb1 ];
 
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index 884db2b3b25af..804da80bbcb8a 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0h38p9rxfpg9vkrbyb120i1diq57qcln82h5fr7hvy82c20jql3c";
   };
 
+  outputs = [ "dev" "out" ]; # get rid of propagating systemd closure
+
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs = stdenv.lib.optional stdenv.isLinux udev;
 

From ba62e9e81e55e53f9214659961ef06423e346a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 01:26:19 +0200
Subject: [PATCH 097/857] hunspell: split outputs, refactor

I see no reason for those buildInputs to be propagated.
They seem only use in the binary utility.

/cc maintainer @fuuzetsu.
---
 pkgs/development/libraries/hunspell/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index 98f6511f39172..0d0ff38fb47f3 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -8,8 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0v14ff9s37vkh45diaddndcrj0hmn67arh8xh8k79q9c1vgc1cm7";
   };
 
-  propagatedBuildInputs = [ ncurses readline ];
-  configureFlags = "--with-ui --with-readline";
+  outputs = [ "dev" "out" "bin" "man" ];
+
+  buildInputs = [ ncurses readline ];
+  configureFlags = [ "--with-ui" "--with-readline" ];
 
   meta = with stdenv.lib; {
     homepage = http://hunspell.sourceforge.net;

From 9ff2ec090f9d488492392ebc0ee2477fad358cfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 13:33:32 +0200
Subject: [PATCH 098/857] mariadb: fix by disabling automatic output actions

Now qt4 builds again.

I failed to split headers away from the libs
while making qt4 still detect and use mysql.
---
 pkgs/servers/sql/mariadb/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 4edf66d80d49f..f6c9d73aa8a1e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -56,6 +56,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   outputs = [ "out" "lib" ];
+  setOutputFlags = false;
+  moveToDev = false;
 
   prePatch = ''
     substituteInPlace cmake/libutils.cmake \

From ec6cb5742b2c2012c76de8ea70986df3b322de0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 14:43:06 +0200
Subject: [PATCH 099/857] boost: fix build; outputs seem same as on master

---
 pkgs/development/libraries/boost/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 464f244dda388..5920c691d9474 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -159,6 +159,7 @@ stdenv.mkDerivation {
   postFixup = fixup;
 
   outputs = [ "out" "dev" "lib" ];
+  setOutputFlags = false;
 
   crossAttrs = rec {
     buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];

From e392e3aabe8100b0955fee6c08af19b437f4bff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 14:49:18 +0200
Subject: [PATCH 100/857] multiple-outputs: remove old unused version

All its features are now included in stdenv through
build-support/setup-hooks/multiple-outputs.sh
---
 pkgs/build-support/multiple-outputs.nix | 85 -------------------------
 1 file changed, 85 deletions(-)
 delete mode 100644 pkgs/build-support/multiple-outputs.nix

diff --git a/pkgs/build-support/multiple-outputs.nix b/pkgs/build-support/multiple-outputs.nix
deleted file mode 100644
index 016558c1e7399..0000000000000
--- a/pkgs/build-support/multiple-outputs.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ stdenv }:
-
-with stdenv.lib;
-
-{ outputs ? [ "out" ], setOutputConfigureFlags ? true, ... } @ args:
-
-stdenv.mkDerivation (args // {
-
-  #postPhases = [ "fixupOutputsPhase" ] ++ args.postPhases or [];
-
-  preHook =
-    if setOutputConfigureFlags then
-      optionalString (elem "man" outputs) ''
-        configureFlags="--mandir=$man/share/man --infodir=$man/share/info $configureFlags"
-      '' +
-      optionalString (elem "bin" outputs) ''
-        configureFlags="--bindir=$bin/bin --sbindir=$bin/sbin --mandir=$bin/share/man --infodir=$man/share/info $configureFlags"
-      '' +
-      optionalString (elem "lib" outputs) ''
-        configureFlags="--libdir=$lib/lib $configureFlags"
-      '' +
-      optionalString (elem "dev" outputs) ''
-        configureFlags="--includedir=$dev/include $configureFlags"
-        installFlags="pkgconfigdir=$dev/lib/pkgconfig m4datadir=$dev/share/aclocal aclocaldir=$dev/share/aclocal $installFlags"
-      ''
-    else null;
-
-  preFixup =
-    ''
-      runHook preFixupOutputs
-
-      if [ -n "$doc" ]; then
-        for i in share/doc share/gtk-doc; do
-          if [ -e $out/$i ]; then
-            mkdir -p $doc/$i
-            mv $out/$i/* $doc/$i/
-            rmdir $out/$i
-          fi
-        done
-        rmdir --ignore-fail-on-non-empty $out/share
-      fi
-
-      if [ -n "$dev" ]; then
-        mkdir -p "$dev/nix-support"
-        if [ -n "$propagatedBuildInputs" ]; then
-          echo "$propagatedBuildInputs" > "$dev/nix-support/propagated-build-inputs"
-          propagatedBuildInputs=
-        fi
-        echo "$out $lib $bin $propagatedNativeBuildInputs" > "$dev/nix-support/propagated-native-build-inputs"
-        propagatedNativeBuildInputs=
-      elif [ -n "$out" ]; then
-        propagatedNativeBuildInputs="$lib $propagatedNativeBuildsInputs"
-      fi
-
-      for i in $bin $lib $man $static; do
-        if [ -z "$dontStrip" ]; then
-          prefix="$i" stripDirs "lib lib64 libexec bin sbin" "''${stripDebugFlags:--S}"
-        fi
-        if [ "$havePatchELF" = 1 -a -z "$dontPatchELF" ]; then
-          prefix="$i" patchELF
-        fi
-        if [ -z "$dontPatchShebangs" ]; then
-          patchShebangs "$i"
-        fi
-
-        # Cut&paste...
-        if [ -z "$dontGzipMan" ]; then
-            GLOBIGNORE=.:..:*.gz:*.bz2
-            for f in $i/share/man/*/* $i/share/man/*/*/*; do
-                if [ -f $f ]; then
-                    if gzip -c $f > $f.gz; then
-                        rm $f
-                    else
-                        rm $f.gz
-                    fi
-                fi
-            done
-            unset GLOBIGNORE
-        fi
-      done
-
-      runHook postFixupOutputs
-    ''; # */
-
-})

From fc206609451ca5888b1f6e54c7a6c7e83270a26d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 13:29:53 +0200
Subject: [PATCH 101/857] util-linux, e2fsprogs: fixup multiple outputs

Also revert back to using util-linux as the default libuuid provider,
and make e2fsprogs use shared libs from util-linux.
---
 pkgs/os-specific/linux/util-linux/default.nix | 10 ++++---
 pkgs/tools/filesystems/e2fsprogs/default.nix  | 26 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 3 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index c4ccd6d37f8a9..82c1ec120bddf 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
+{ stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam }:
 
 stdenv.mkDerivation rec {
   name = "util-linux-2.26.1";
@@ -10,7 +10,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./rtcwake-search-PATH-for-shutdown.patch
             ];
-  outputs = [ "dev" "out" "bin" ]; # ToDo: problems with e2fsprogs
+
+  outputs = [ "bin" "out" "man" ]; # TODO: $bin is kept the first for now
+  # due to lots of ${utillinux}/bin occurences and headers being rather small
+  outputDev = "bin";
 
 
   #FIXME: make it also work on non-nixos?
@@ -41,13 +44,13 @@ stdenv.mkDerivation rec {
 
   makeFlags = "usrbin_execdir=$(bin)/bin usrsbin_execdir=$(bin)/sbin";
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs =
     [ zlib pam ]
     ++ stdenv.lib.optional (ncurses != null) ncurses
     ++ stdenv.lib.optional (perl != null) perl;
 
   postInstall = ''
-    sed "s,$out$out,$out,g" -i "$dev"/lib/pkgconfig/*.pc
     rm "$bin/bin/su" # su should be supplied by the su package (shadow)
   '';
 
@@ -60,4 +63,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index 0e61e1474e886..7ae2b9c4b85a8 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, autoreconfHook, gettext, pkgconfig, libuuid }:
+{ stdenv, fetchurl, pkgconfig, libuuid }:
 
 stdenv.mkDerivation rec {
   name = "e2fsprogs-1.42.12";
@@ -8,9 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "0v0qcfyls0dlrjy8gx9m3s2wbkp5z3lbsr5hb7x8kp8f3bclcy71";
   };
 
-  outputs = [ "dev" "out" "bin" "man" ];
+  outputs = [ "bin" "out" "man" ];
+  outputDev = "bin"; # just for *.pc
 
-  buildInputs = [ pkgconfig /*libuuid*/ ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libuuid ];
 
   crossAttrs = {
     preConfigure = ''
@@ -18,15 +20,19 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
-  # ToDo: failed with shared uuid and blkid
-  configureFlags = "--enable-elf-shlibs --disable-fsck --enable-symlink-install";
+  configureFlags = [
+    "--enable-elf-shlibs" "--enable-symlink-install" "--enable-relative-symlinks"
+    # libuuid, libblkid, uuidd and fsck are in util-linux-ng (the "libuuid" dependency).
+    "--disable-libuuid" "--disable-uuidd" "--disable-libblkid" "--disable-fsck"
+  ];
 
-  enableParallelBuilding = true;
-
-  preInstall = "installFlagsArray=('LN=ln -s')";
+  # hacky way to make it install *.pc
+  postInstall = ''
+    make install-libs
+    rm "$out"/lib/*.a
+  '';
 
-  postInstall = "make install-libs";
+  enableParallelBuilding = true;
 
   meta = {
     homepage = http://e2fsprogs.sourceforge.net/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 094b3deb7d1de..7ecebc3ae6256 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8900,7 +8900,7 @@ let
       });
     })
     else if stdenv.isLinux
-    then e2fsprogs
+    then utillinux
     else null;
 
   light = callPackage ../os-specific/linux/light { };

From e3ac73af1149ff92e4e9ed9de80a65b673bdb9c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 15:22:26 +0200
Subject: [PATCH 102/857] systemd.libudev: don't depend on the main output

Also fix some references, and drop unused makeFlags:
https://github.com/NixOS/nixpkgs/commit/3300479c#commitcomment-10790021
---
 pkgs/os-specific/linux/systemd/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index c10d53c5c75eb..d193270e8ea2d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -90,9 +90,17 @@ stdenv.mkDerivation rec {
       export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib"
     '';
 
+  makeFlags = [
+    "udevlibexecdir=$(libudev)/lib"
+    # udev rules refer to $out, and anything but libs should probably go to $out
+    "udevrulesdir=$(out)/lib"
+    "udevhomedir=$(out)/lib"
+    "udevhwdbdir=$(out)/lib"
+  ];
+
   # This is needed because systemd uses the gold linker, which doesn't
   # yet have the wrapper script to add rpath flags automatically.
-  NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.cc.cc}/lib";
+  NIX_LDFLAGS = "-rpath ${pam.out}/lib -rpath ${libcap.out}/lib -rpath ${acl.out}/lib -rpath ${stdenv.cc.cc}/lib";
 
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
 
@@ -110,13 +118,6 @@ stdenv.mkDerivation rec {
       "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
     ];
 
-  # Use /var/lib/udev rather than /etc/udev for the generated hardware
-  # database.  Upstream doesn't want this (see commit
-  # 1e1954f53386cb773e2a152748dd31c4d36aa2d8) because using /var is
-  # forbidden in early boot, but in NixOS the initrd guarantees that
-  # /var is mounted.
-  makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin";
-
   enableParallelBuilding = true;
 
   installFlags =

From 2b5e7bd2ba4bd9f16a7fb928100ba4d5f99ab378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 19 Apr 2015 16:31:05 +0200
Subject: [PATCH 103/857] python2*: fix modules as well after 4101db0be

There was a typo that failed them.
Also, drop pkgconfig again, as it seems unused; and fix python26.

Now all python*.modules build, except for python26.tkinter
which fails on master as well.
---
 pkgs/development/interpreters/python/2.6/default.nix | 10 ++++------
 pkgs/development/interpreters/python/2.7/default.nix | 10 +++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 787e3ea9e3b59..83787fdb1e24a 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
+{ stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, includeModules ? false
 , sqlite, tcl, tk, x11, openssl, readline, db, ncurses, gdbm, self, callPackage }:
 
 assert zlibSupport -> zlib != null;
@@ -48,12 +48,12 @@ let
 
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
-    [ pkgconfig bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
+    [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ]
     ++ optional zlibSupport zlib;
 
   mkPaths = paths: {
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") buildInputs);
+    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
+    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
   };
 
   # Build the basic Python interpreter without modules that have
@@ -90,8 +90,6 @@ let
         paxmark E $out/bin/python${majorVersion}
 
         ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
-
-        rm "$out/lib/python2.7/plat-linux2/regen" # refers to glibc.dev
       '';
 
     passthru = rec {
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 56f209809414b..1c2f2f592ce3b 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, self, callPackage
+{ stdenv, fetchurl, self, callPackage
 , bzip2, openssl
 
 , includeModules ? false
@@ -60,7 +60,7 @@ let
 
   buildInputs =
     optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
-    [ pkgconfig bzip2 openssl ]
+    [ bzip2 openssl ]
     ++ optionals includeModules (
         [ db gdbm ncurses sqlite readline
         ] ++ optionals x11Support [ tcl tk x11 libX11 ]
@@ -68,8 +68,8 @@ let
     ++ optional zlibSupport zlib;
 
   mkPaths = paths: {
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") buildInputs);
+    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
+    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
   };
 
   # Build the basic Python interpreter without modules that have
@@ -110,7 +110,7 @@ let
 
         ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
 
-        rm "$out/lib/python2.7/plat-linux2/regen" # refers to glibc.dev
+        rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev
       '';
 
     passthru = rec {

From 6b8a8ca59f4b48669a6954c8ec2aca73ec17942f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 09:58:55 +0200
Subject: [PATCH 104/857] glib: fix splitting outputs, comment on internal pcre

glib-tested succeeds for me, assuming one reverts old splitting changes
in tzdata.
---
 pkgs/development/libraries/glib/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 939f39696656b..131f224e45e84 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -53,20 +53,21 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
 
-  #outputs = [ "dev" "out" "bin" ]; # ToDo: no idea what's wrong! docs? 
+  outputs = [ "dev" "out" "doc" ];
+  outputBin = "dev";
 
   setupHook = ./setup-hook.sh;
 
-  buildInputs = [ /*stdenv.hookLib.multiout*/ libelf ]
+  buildInputs = [ libelf setupHook/*get the gtk-doc hook*/ ]
     ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
 
   nativeBuildInputs = [ pkgconfig gettext perl python ];
 
-  propagatedBuildInputs = [ pcre zlib libffi libiconv ]
+  propagatedBuildInputs = [ zlib libffi libiconv /*pcre*/ ]
     ++ libintlOrEmpty;
 
-  configureFlags =
-    optional stdenv.isDarwin "--disable-compile-warnings"
+  configureFlags = [ ] # [ "--with-pcre=system" ] # internal pcre only adds <200kB
+    ++ optional stdenv.isDarwin "--disable-compile-warnings"
     ++ optional stdenv.isSunOS "--disable-modular-tests";
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
@@ -80,6 +81,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   DETERMINISTIC_BUILD = 1;
 
+  postInstall = ''
+    _moveToOutput "share/glib-2.0" "$dev"
+    substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
+  '';
+
   inherit doCheck;
   preCheck = optionalString doCheck
     '' export LD_LIBRARY_PATH="$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH"

From d24b3aec91b7c65301d7a24a5124ea9a0c38b588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 20:13:56 +0200
Subject: [PATCH 105/857] gtk2: fixup splitting

I forgot these changes were needed to make it build.
Leaving gtk3 and gnome stuff after 3.16.
---
 pkgs/development/libraries/gtk+/2.x.nix       | 11 +++++++++--
 pkgs/development/libraries/gtk+/setup-hook.sh | 10 ++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/gtk+/setup-hook.sh

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 16691e8588cf7..41dab3ad2df2e 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -15,13 +15,16 @@ stdenv.mkDerivation rec {
     sha256 = "1x14rnjvqslpa1q19fp1qalz5sxds72amsgjk8m7769rwk511jr0";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
+  outputBin = "dev";
 
   enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (libintlOrEmpty != []) "-lintl";
 
-  nativeBuildInputs = [ perl pkgconfig gettext ];
+  setupHook = ./setup-hook.sh;
+
+  nativeBuildInputs = [ setupHook perl pkgconfig gettext ];
 
   propagatedBuildInputs = with xlibs; with stdenv.lib;
     [ glib cairo pango gdk_pixbuf atk ]
@@ -37,6 +40,10 @@ stdenv.mkDerivation rec {
     then "--disable-glibtest --disable-introspection --disable-visibility"
     else "--with-xinput=yes";
 
+  postInstall = ''
+    _moveToOutput share/gtk-2.0/demo "$doc"
+  '';
+
   passthru = {
     gtkExeEnvPostBuild = ''
       rm $out/lib/gtk-2.0/2.10.0/immodules.cache
diff --git a/pkgs/development/libraries/gtk+/setup-hook.sh b/pkgs/development/libraries/gtk+/setup-hook.sh
new file mode 100644
index 0000000000000..c2b0ab502db7e
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/setup-hook.sh
@@ -0,0 +1,10 @@
+fixupOutputHooks+=(_gtk2CleanComments)
+
+# Clean comments that link to generator of the file
+_gtk2CleanComments() {
+    local f="$prefix/lib/gtk-2.0/2.10.0/immodules.cache"
+    if [ -f "$f" ]; then
+        sed 's|Created by .*bin/gtk-query-|Created by bin/gtk-query-|' -i "$f"
+    fi
+}
+

From 8096c7891daa4f6a322e57c5fcb0ab475e10cd45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 20:34:36 +0200
Subject: [PATCH 106/857] kdelibs: fix build by adding pcre dependency

I'm not sure where it was getting pcre from on master.
---
 pkgs/applications/kde-apps-14.12/default.nix | 2 +-
 pkgs/applications/kde-apps-15.04/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/kde-apps-14.12/default.nix b/pkgs/applications/kde-apps-14.12/default.nix
index 96f1aea68753e..c664c248171e7 100644
--- a/pkgs/applications/kde-apps-14.12/default.nix
+++ b/pkgs/applications/kde-apps-14.12/default.nix
@@ -220,7 +220,7 @@ let
 
       kdelibs = with pkgs; super.kdelibs // {
         buildInputs =
-          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
+          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz pcre ];
 
         nativeBuildInputs =
           super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];
diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 96f1aea68753e..c664c248171e7 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -220,7 +220,7 @@ let
 
       kdelibs = with pkgs; super.kdelibs // {
         buildInputs =
-          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz ];
+          super.kdelibs.buildInputs ++ [ attr libxslt polkit_qt4 xz pcre ];
 
         nativeBuildInputs =
           super.kdelibs.nativeBuildInputs ++ [ pkgconfig ];

From 9a0485f0b051988a1937bff5a9eb39a6fe845f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 22:00:13 +0200
Subject: [PATCH 107/857] systemd: fixup bad paths from e3ac73af11

I was being really careless. TODO: "${udev}/*" references.
---
 pkgs/os-specific/linux/systemd/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d193270e8ea2d..4b322be0a7eab 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -93,9 +93,8 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "udevlibexecdir=$(libudev)/lib"
     # udev rules refer to $out, and anything but libs should probably go to $out
-    "udevrulesdir=$(out)/lib"
-    "udevhomedir=$(out)/lib"
-    "udevhwdbdir=$(out)/lib"
+    "udevrulesdir=$(out)/lib/rules.d"
+    "udevhwdbdir=$(out)/lib/hwdb.d"
   ];
 
   # This is needed because systemd uses the gold linker, which doesn't

From e81e2785c7687aac2415d9bdf2d1216b83401942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 22:06:17 +0200
Subject: [PATCH 108/857] xfsprogs: fix outputs and references

---
 nixos/modules/profiles/base.nix             | 2 +-
 nixos/modules/tasks/filesystems/xfs.nix     | 4 ++--
 pkgs/tools/filesystems/ceph/default.nix     | 2 +-
 pkgs/tools/filesystems/xfsprogs/default.nix | 4 +---
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index 457642d82f713..5211b905002a8 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -33,7 +33,7 @@
     # Tools to create / manipulate filesystems.
     pkgs.ntfsprogs # for resizing NTFS partitions
     pkgs.dosfstools
-    pkgs.xfsprogs
+    pkgs.xfsprogs.bin
     pkgs.jfsutils
     pkgs.f2fs-tools
 
diff --git a/nixos/modules/tasks/filesystems/xfs.nix b/nixos/modules/tasks/filesystems/xfs.nix
index d7c3930f4a3c0..c6a90bcf1a518 100644
--- a/nixos/modules/tasks/filesystems/xfs.nix
+++ b/nixos/modules/tasks/filesystems/xfs.nix
@@ -11,13 +11,13 @@ in
 {
   config = mkIf (any (fs: fs == "xfs") config.boot.supportedFilesystems) {
 
-    system.fsPackages = [ pkgs.xfsprogs ];
+    system.fsPackages = [ pkgs.xfsprogs.bin ];
 
     boot.initrd.availableKernelModules = mkIf inInitrd [ "xfs" "crc32c" ];
 
     boot.initrd.extraUtilsCommands = mkIf inInitrd
       ''
-        copy_bin_and_libs ${pkgs.xfsprogs}/sbin/fsck.xfs
+        copy_bin_and_libs ${pkgs.xfsprogs.bin}/bin/fsck.xfs
       '';
 
     # Trick just to set 'sh' after the extraUtils nuke-refs.
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 7fd547099a276..6fd6993937ecc 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost btrfsProgs cryptopp curl expat fcgi fuse gperftools keyutils
     libatomic_ops leveldb libaio libedit libuuid linuxHeaders openssl python
-    snappy udev xfsprogs.lib xz zfs
+    snappy udev xfsprogs xz zfs
   ];
 
   preConfigure = ''
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index c01fc6ff4b326..7b38e74d04b90 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext libuuid readline ];
 
-  outputs = [ "out" "lib" ];
+  outputs = [ "dev" "out" "bin" ];
 
   preConfigure = ''
     NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
@@ -40,8 +40,6 @@ stdenv.mkDerivation rec {
     "XGETTEXT=xgettext"
     "--disable-lib64"
     "--enable-readline"
-    "--includedir=$(lib)/include"
-    "--libdir=$(lib)/lib"
   ];
 
   installFlags = [ "install-dev" ];

From a56da607b132705052e03f79e0e41f47d27fd9b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 20:53:45 +0200
Subject: [PATCH 109/857] glibcLocales: fix evaluation and build with outputs

---
 pkgs/development/libraries/glibc/locales.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index ad522f7866868..518ecea3b7258 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -18,6 +18,8 @@ build null {
 
   builder = ./locales-builder.sh;
 
+  outputs = [ "out" ];
+
   # Awful hack: `localedef' doesn't allow the path to `locale-archive'
   # to be overriden, but you *can* specify a prefix, i.e. it will use
   # <prefix>/<path-to-glibc>/lib/locale/locale-archive.  So we use
@@ -25,7 +27,7 @@ build null {
   # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
   buildPhase =
     ''
-      mkdir -p $TMPDIR/"${stdenv.gcc.libc}/lib/locale"
+      mkdir -p $TMPDIR/"${stdenv.cc.libc.out}/lib/locale"
 
       # 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

From 082843bdebe3beee7399edfb30d9c393b23513b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 20 Apr 2015 20:26:09 +0200
Subject: [PATCH 110/857] soxr, libraw, fftw, imagemagick: fix build by a hack

---
 pkgs/applications/graphics/ImageMagick/default.nix | 2 +-
 pkgs/applications/misc/audio/soxr/default.nix      | 4 +++-
 pkgs/development/libraries/fftw/default.nix        | 2 ++
 pkgs/development/libraries/libraw/default.nix      | 4 ++--
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 7ae24b38c01ca..d577bcd4f9438 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
     pkgconfig libtool libcl perl jemalloc bzip2 zlib libX11 libXext libXt fftw
     libfpx djvulibre fontconfig freetype ghostscript graphviz jbigkit libjpeg
     lcms2 openjpeg liblqr1 xz openexr pango libpng librsvg libtiff libwebp
-    libxml2
+    libxml2 (stdenv.cc.cc.lib or null)
   ];
 
   propagatedBuildInputs = []
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
index 084a95b962adb..c1ca0bac11919 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:"`pwd`/build/src
   '';
 
-  buildInputs = [ cmake ];
+  buildInputs = [ cmake (stdenv.cc.cc.lib or null) ];
+  # outputs TODO: gcc.lib might become a problem;
+  # here -out/lib/*.a got found and -lib/lib/*.so didn't
 
   meta = {
     description = "An audio resampling library";
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 104b7229bb190..8d5166a7743f7 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g";
   };
 
+  buildInputs = [ (stdenv.cc.cc.lib or null) ];
+
   configureFlags =
     [ "--enable-shared" "--disable-static"
       "--enable-threads"
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index f0012f552c1d1..a581851369013 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation rec {
     sha256 = "15ng4s24grib39r0nlgrf18r2j9yh43qyx4vbif38d95xiqkix3i";
   };
 
-  buildInputs = [ lcms2 jasper ] ;
+  buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ;
 
   nativeBuildInputs = [ pkgconfig ];
 
-  meta = { 
+  meta = {
     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;

From 2f75c6845981b38a698cf1a9f620145877c80956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 21 Apr 2015 10:02:32 +0200
Subject: [PATCH 111/857] samba.org wrappers: fix builds by a hack

---
 pkgs/development/libraries/nss_wrapper/default.nix    | 3 ++-
 pkgs/development/libraries/socket_wrapper/default.nix | 2 +-
 pkgs/development/libraries/uid_wrapper/default.nix    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss_wrapper/default.nix b/pkgs/development/libraries/nss_wrapper/default.nix
index b0595e61e65dc..4eab7a683afb1 100644
--- a/pkgs/development/libraries/nss_wrapper/default.nix
+++ b/pkgs/development/libraries/nss_wrapper/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1jka6d873vhvfr7k378xvgxmbpka87w33iq6b91ynwg36pz53ifw";
   };
 
-  buildInputs = [ cmake pkgconfig ];
+  buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
+  # outputs TODO: missing glibc.out might become a general problem
 
   meta = with stdenv.lib; {
     description = "A wrapper for the user, group and hosts NSS API";
diff --git a/pkgs/development/libraries/socket_wrapper/default.nix b/pkgs/development/libraries/socket_wrapper/default.nix
index 1344ad18d09f7..4804adc82e970 100644
--- a/pkgs/development/libraries/socket_wrapper/default.nix
+++ b/pkgs/development/libraries/socket_wrapper/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0b3sfjy7418gg52qkdblfi5x57g4m44n7434xhacz9isyl5m52vn";
   };
 
-  buildInputs = [ cmake pkgconfig ];
+  buildInputs = [ cmake pkgconfig (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/uid_wrapper/default.nix b/pkgs/development/libraries/uid_wrapper/default.nix
index b19d404bee2f4..6d6aaed79a09d 100644
--- a/pkgs/development/libraries/uid_wrapper/default.nix
+++ b/pkgs/development/libraries/uid_wrapper/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1wb71lliw56pmks3vm9m3ndf8hqnyw9iyppy1nyl80msi4ssq5jj";
   };
 
-  buildInputs = [ cmake pkgconfig ];
+  buildInputs = [ cmake pkgconfig (stdenv.cc.libc.out or null) ];
 
   meta = with stdenv.lib; {
     description = "a wrapper for the user, group and hosts NSS API";

From f074e5957d1aa5543cdd38679921bc4e426f875b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Apr 2015 11:57:22 +0200
Subject: [PATCH 112/857] tzdata: go back to using a single output

The *.{a,h} files are very tiny together,
and I didn't see why a cyclic referrence was being created.
---
 pkgs/data/misc/tzdata/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 57417022176da..bce168c2a9a6a 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
-let version = "2015c"; in
+let version = "2015c";
 
-stdenv.mkDerivation rec {
+self = stdenv.mkDerivation rec {
   name = "tzdata-${version}";
 
   srcs =
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
     ];
 
   sourceRoot = ".";
-  outputs = [ "out" "lib" ];
+  #outputs = [ "out" "lib" ]; # TODO: maybe resurrect, and maybe install man pages?
 
-  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(lib)/lib MANDIR=$(TMPDIR)/man AWK=awk CFLAGS=-DHAVE_LINK=0";
+  makeFlags = "TOPDIR=$(out) TZDIR=$(out)/share/zoneinfo ETCDIR=$(TMPDIR)/etc LIBDIR=$(out)/lib MANDIR=$(TMPDIR)/man AWK=awk CFLAGS=-DHAVE_LINK=0";
 
   postInstall =
     ''
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
       ln -s . $out/share/zoneinfo/posix
       mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
 
-      mkdir -p "$lib/include"
-      cp tzfile.h "$lib/include/tzfile.h"
+      mkdir -p "$out/include"
+      cp tzfile.h "$out/include/tzfile.h"
     '';
 
   meta = {
@@ -37,3 +37,6 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.all;
   };
 }
+
+;in self // { lib = self; }
+

From 647f0ab36604fa633169e540ce290a2f92436a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Apr 2015 12:37:40 +0200
Subject: [PATCH 113/857] systemd: give up on "dev" output for now

There are too many references to ${systemd}/foo,
and the savings would be on the order of 100 kB.

Also:
 - fix udev install paths (again), hopefully OK now;
 - fix one RPATH
 - clean libudev propagation
 - pick examples/ changes from staging (probably lost by some auto-merge)
---
 pkgs/os-specific/linux/systemd/default.nix | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index baa76d9693765..d61a242ed4dcc 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
     sha256 = "163l1y4p2a564d4ynfq3k3xf53j2v5s81blb6cvpn1y7rpxyccd0";
   };
 
-  outputs = [ "dev" "out" "libudev" "doc" ];
+  outputs = [ "out" "libudev" "doc" ]; # TODO: "dev"
+  # note: there are many references to ${systemd}/...
+  outputDev = "out";
+  propagatedOutputs = "libudev";
 
   patches =
     [ # These are all changes between upstream and
@@ -91,15 +94,15 @@ stdenv.mkDerivation rec {
     '';
 
   makeFlags = [
-    "udevlibexecdir=$(libudev)/lib"
+    "udevlibexecdir=$(libudev)/lib/udev"
     # udev rules refer to $out, and anything but libs should probably go to $out
-    "udevrulesdir=$(out)/lib/rules.d"
-    "udevhwdbdir=$(out)/lib/hwdb.d"
+    "udevrulesdir=$(out)/lib/udev/rules.d"
+    "udevhwdbdir=$(out)/lib/udev/hwdb.d"
   ];
 
   # This is needed because systemd uses the gold linker, which doesn't
   # yet have the wrapper script to add rpath flags automatically.
-  NIX_LDFLAGS = "-rpath ${pam.out}/lib -rpath ${libcap.out}/lib -rpath ${acl.out}/lib -rpath ${stdenv.cc.cc}/lib";
+  NIX_LDFLAGS = "-rpath ${pam.out}/lib -rpath ${libcap.out}/lib -rpath ${acl.out}/lib -rpath ${stdenv.cc.cc.lib}/lib";
 
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
 
@@ -134,6 +137,9 @@ stdenv.mkDerivation rec {
       # sysinit.target).
       mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/
 
+      mkdir -p $out/example/systemd
+      mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example
+      mv $out/lib/systemd/{system,user} $out/example/systemd
 
       rm -rf $out/etc/systemd/system
 
@@ -156,9 +162,12 @@ stdenv.mkDerivation rec {
       mkdir -p "$libudev/lib"
       mv "$out"/lib/lib{,g}udev* "$libudev/lib/"
 
-      for i in "$libudev"/lib/*.la "$out"/lib/pkgconfig/*udev*.pc; do
+      for i in "$libudev"/lib/*.la; do
         substituteInPlace $i --replace "$out" "$libudev"
       done
+      for i in "$out"/lib/pkgconfig/{libudev,gudev-1.0}.pc; do
+        substituteInPlace $i --replace "libdir=$out" "libdir=$libudev"
+      done
     ''; # */
 
   # some libs fail to link to liblzma and/or libffi
@@ -169,12 +178,6 @@ stdenv.mkDerivation rec {
       done
     '';
 
-  # propagate the libudev output
-  postPhases = "postPostFixup";
-  postPostFixup = ''
-    echo -n " $libudev" >> "$dev"/nix-support/propagated-*build-inputs
-  '';
-
   # The interface version prevents NixOS from switching to an
   # incompatible systemd at runtime.  (Switching across reboots is
   # fine, of course.)  It should be increased whenever systemd changes
@@ -190,3 +193,5 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.eelco stdenv.lib.maintainers.simons ];
   };
 }
+
+

From b7c3c25218f8807920318ceb61b70f4343e0bd91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 24 Apr 2015 12:21:18 +0200
Subject: [PATCH 114/857] fix ${udev} references (and a few others)

---
 nixos/modules/services/hardware/udev.nix           |  4 ++--
 nixos/modules/system/boot/stage-1.nix              | 14 +++++++-------
 pkgs/applications/audio/spotify/default.nix        |  6 +++---
 pkgs/applications/editors/lighttable/default.nix   |  2 +-
 .../networking/browsers/chromium/common.nix        |  2 +-
 pkgs/development/libraries/libvirt/default.nix     |  2 +-
 pkgs/development/tools/node-webkit/nw11.nix        |  2 +-
 pkgs/development/tools/node-webkit/nw9.nix         |  2 +-
 pkgs/misc/drivers/foo2zjs/default.nix              |  2 +-
 pkgs/os-specific/linux/drbd/default.nix            |  2 +-
 pkgs/os-specific/linux/lvm2/default.nix            |  2 +-
 pkgs/os-specific/linux/multipath-tools/default.nix |  4 ++--
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix      |  6 +++---
 pkgs/tools/filesystems/nixpart/0.4/lvm2.nix        |  4 ++--
 .../filesystems/nixpart/0.4/multipath-tools.nix    |  4 ++--
 pkgs/top-level/python-packages.nix                 |  2 +-
 16 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 50588e4495873..b3baf1a446117 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -55,13 +55,13 @@ let
           --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
       done
 
-      echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... "
+      echo -n "Checking that all programs called by relative paths in udev rules exist in ${pkgs.udev.out}/lib/udev... "
       import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* |
         sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
       run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' |
         sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
       for i in $import_progs $run_progs; do
-        if [[ ! -x ${pkgs.udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then
+        if [[ ! -x ${pkgs.udev.out}/lib/udev/$i && ! $i =~ socket:.* ]]; then
           echo "FAIL"
           echo "$i is called in udev rules but not installed by udev"
           exit 1
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 8b58eccdcec76..af1353952d8bd 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -60,9 +60,9 @@ let
       copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm
 
       # Copy udev.
-      copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd
-      copy_bin_and_libs ${udev}/bin/udevadm
-      for BIN in ${udev}/lib/udev/*_id; do
+      copy_bin_and_libs ${udev.out}/lib/systemd/systemd-udevd
+      copy_bin_and_libs ${udev.out}/bin/udevadm
+      for BIN in ${udev.libudev}/lib/udev/*_id; do
         copy_bin_and_libs $BIN
       done
 
@@ -73,7 +73,7 @@ let
       ${config.boot.initrd.extraUtilsCommands}
 
       # Copy ld manually since it isn't detected correctly
-      cp -pv ${pkgs.glibc}/lib/ld*.so.? $out/lib
+      cp -pv ${pkgs.glibc.out}/lib/ld*.so.? $out/lib
 
       # Copy all of the needed libraries for the binaries
       for BIN in $(find $out/{bin,sbin} -type f); do
@@ -140,9 +140,9 @@ let
 
       echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules
 
-      cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/
-      cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/
-      cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/
+      cp -v ${udev.out}/lib/udev/rules.d/60-cdrom_id.rules $out/
+      cp -v ${udev.out}/lib/udev/rules.d/60-persistent-storage.rules $out/
+      cp -v ${udev.out}/lib/udev/rules.d/80-drivers.rules $out/
       cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
       ${config.boot.initrd.extraUdevRulesCommands}
 
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index d66029199ce80..7a7e71f8218ce 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -79,8 +79,8 @@ stdenv.mkDerivation {
       ln -s ${nss}/lib/libsmime3.so $libdir/libsmime3.so.1d
 
       ${if stdenv.system == "x86_64-linux" then ''
-      ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
-      ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
+      ln -s ${openssl.out}/lib/libssl.so $libdir/libssl.so.1.0.0
+      ln -s ${openssl.out}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
       ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
       '' else ''
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
       ''}
 
       # Work around Spotify trying to open libudev.so.1 (which we don't have)
-      ln -s ${udev}/lib/libudev.so.1 $libdir/libudev.so.1
+      ln -s ${udev.libudev}/lib/libudev.so.1 $libdir/libudev.so.1
 
       mkdir -p $out/bin
 
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index d4fa56898c36a..287aab31fec1e 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
       $out/LightTable/ltbin
 
-    ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0
+    ln -sf ${udev.libudev}/lib/libudev.so.1 $out/LightTable/libudev.so.0
 
     makeWrapper $out/LightTable/ltbin $out/bin/lighttable \
       --prefix "LD_LIBRARY_PATH" : $out/LightTable
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 247a27ca37be8..e46b44191975d 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -144,7 +144,7 @@ let
         s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")|
       }' chrome/utility/media_galleries/image_metadata_extractor.cc
 
-      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev}/lib/\1!' \
+      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev.libudev}/lib/\1!' \
         device/udev_linux/udev?_loader.cc
 
       sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index 9c9bf40b8e816..6e4f7f4ce5da7 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:${dnsmasq}/bin:$PATH
+    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev.out}/sbin:${dnsmasq}/bin:$PATH
     patchShebangs . # fixes /usr/bin/python references
   '';
 
diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix
index 978213f676019..14109c2566665 100644
--- a/pkgs/development/tools/node-webkit/nw11.nix
+++ b/pkgs/development/tools/node-webkit/nw11.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
 
-    ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
+    ln -s ${udev.libudev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
 
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix
index 97399e5268ce9..f8ca7eb03b27a 100644
--- a/pkgs/development/tools/node-webkit/nw9.nix
+++ b/pkgs/development/tools/node-webkit/nw9.nix
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
 
-    ln -s ${udev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
+    ln -s ${udev.libudev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
 
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index 2417b0e566de8..83546b44198a6 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -36,7 +36,7 @@ rec {
       ''PIXMAPS=$out/share/pixmaps''
       ''UDEVBIN=$out/bin''
       ''UDEVDIR=$out/etc/udev/rules.d''
-      ''UDEVD=${udev}/sbin/udevd''
+      ''UDEVD=${udev.out}/sbin/udevd''
       ''LIBUDEVDIR=$out/lib/udev/rules.d''
       ''USBDIR=$out/etc/hotplug/usb''
       ''FOODB=$out/share/foomatic/db/source''
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 4c945a7fbac7e..3491cf713917c 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     ''
-      export PATH=${udev}/sbin:$PATH
+      export PATH=${udev.out}/sbin:$PATH
       substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/
       substituteInPlace user/legacy/Makefile.in \
         --replace /sbin/ $out/sbin/ \
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 228f7b34be01f..8ebe2b5ed7f19 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
         --replace /usr/bin/tr ${coreutils}/bin/tr
       substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
         --replace /usr/sbin/lvm $out/sbin/lvm \
-        --replace /usr/bin/udevadm ${udev}/bin/udevadm
+        --replace /usr/bin/udevadm ${udev.out}/bin/udevadm
 
       sed -i /DEFAULT_SYS_DIR/d Makefile.in
       sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 3da37a89923a4..03c86dec4a00b 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
       substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
       substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
 
-      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id
-      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id
+      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
+      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
     '';
 
   meta = {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 44333b519cbe5..45c79aad08e90 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -21,15 +21,15 @@ buildPythonPackage rec {
     sed -i -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
       blivet/devicelibs/mpath.py blivet/devices.py
     sed -i -e '/"wipefs"/ {
-      s|wipefs|${utillinux}/sbin/wipefs|
+      s|wipefs|${utillinux.bin}/sbin/wipefs|
       s/-f/--force/
     }' blivet/formats/__init__.py
     sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
-    sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
+    sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py
     sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
   '' + (if useNixUdev then ''
     sed -i -e '/find_library/,/find_library/ {
-      c libudev = "${udev}/lib/libudev.so.1"
+      c libudev = "${udev.libudev}/lib/libudev.so.1"
     }' blivet/pyudev.py
   '' else ''
     sed -i \
diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index 9e2b0c9007947..32bf79e4a7af9 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
         --replace /usr/bin/tr ${coreutils}/bin/tr
       substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
         --replace /usr/sbin/lvm $out/sbin/lvm \
-        --replace /usr/bin/udevadm ${udev}/bin/udevadm
+        --replace /usr/bin/udevadm ${udev.out}/bin/udevadm
 
       sed -i /DEFAULT_SYS_DIR/d Makefile.in
       sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
@@ -42,7 +42,7 @@ stdenv.mkDerivation {
   postInstall =
     ''
       substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \
-        --replace $out/sbin/blkid ${utillinux}/sbin/blkid
+        --replace $out/sbin/blkid ${utillinux.bin}/sbin/blkid
 
       # Systemd stuff
       mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators
diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
index 90722d74ace15..a3873fb25ff07 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
       substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
       substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
 
-      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id
-      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id
+      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
+      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
     '';
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e241fc6fc6dad..a82efb9b030c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9746,7 +9746,7 @@ let
 
     postPatch = ''
       sed -i -e '/udev_library_name/,/^ *libudev/ {
-        s|CDLL([^,]*|CDLL("${pkgs.udev}/lib/libudev.so.1"|p; d
+        s|CDLL([^,]*|CDLL("${pkgs.udev.libudev}/lib/libudev.so.1"|p; d
       }' pyudev/_libudev.py
     '';
 

From 3b9ef2c71b275c924c4b28caf2f8a765bfc75d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Apr 2015 19:54:51 +0200
Subject: [PATCH 115/857] fix "libc}/lib" and similar references

Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
---
 nixos/modules/security/apparmor-suid.nix      |  2 +-
 .../services/networking/dnscrypt-proxy.nix    |  2 +-
 nixos/modules/services/system/nscd.nix        | 10 +++----
 .../modules/services/torrent/transmission.nix |  2 +-
 .../services/x11/display-managers/lightdm.nix |  2 +-
 pkgs/applications/audio/ardour/default.nix    |  2 +-
 .../audio/google-musicmanager/default.nix     |  2 +-
 pkgs/applications/audio/yoshimi/default.nix   |  2 +-
 .../editors/codeblocks/default.nix            |  2 +-
 pkgs/applications/editors/eclipse/default.nix |  2 +-
 pkgs/applications/editors/idea/default.nix    |  2 +-
 .../graphics/darktable/default.nix            |  4 +--
 pkgs/applications/graphics/seg3d/default.nix  |  4 +--
 .../misc/mysql-workbench/default.nix          |  2 +-
 .../networking/copy-com/default.nix           |  2 +-
 .../networking/dropbox/default.nix            |  2 +-
 pkgs/applications/networking/ike/default.nix  |  2 +-
 .../networking/spideroak/default.nix          |  2 +-
 .../science/electronics/tkgate/1.x.nix        |  4 +--
 .../science/electronics/tkgate/2.x.nix        |  4 +--
 .../science/logic/tptp/default.nix            |  2 +-
 pkgs/applications/video/avidemux/default.nix  |  2 +-
 pkgs/applications/video/gnash/default.nix     |  2 +-
 .../virtualization/virtualbox/default.nix     |  4 +--
 .../virtualbox/guest-additions/default.nix    |  4 +--
 pkgs/build-support/vm/default.nix             |  8 +++---
 .../compilers/gcc-arm-embedded/default.nix    |  2 +-
 pkgs/development/compilers/go/1.1.nix         |  6 ++--
 pkgs/development/compilers/go/1.2.nix         |  6 ++--
 pkgs/development/compilers/go/1.3.nix         |  6 ++--
 pkgs/development/compilers/go/1.4.nix         |  6 ++--
 pkgs/development/compilers/go/default.nix     |  6 ++--
 pkgs/development/compilers/julia/0.3.nix      |  2 +-
 pkgs/development/compilers/mlton/default.nix  |  4 +--
 .../compilers/nvidia-cg-toolkit/default.nix   |  2 +-
 .../compilers/openjdk/bootstrap.nix           |  2 +-
 pkgs/development/compilers/path64/default.nix |  4 +--
 .../compilers/rustc/makeRustcDerivation.nix   |  2 +-
 pkgs/development/compilers/tinycc/default.nix |  6 ++--
 .../interpreters/luajit/default.nix           |  2 +-
 .../interpreters/perl/5.16/default.nix        |  2 +-
 .../libraries/libopensc-dnie/default.nix      |  2 +-
 .../development/libraries/scmccid/default.nix |  2 +-
 pkgs/development/libraries/ustr/default.nix   |  2 +-
 .../mobile/androidenv/androidndk.nix          |  2 +-
 .../mobile/androidenv/androidndk_r8e.nix      |  2 +-
 .../mobile/androidenv/androidsdk.nix          |  8 +++---
 .../mobile/androidenv/build-tools.nix         |  4 +--
 .../mobile/androidenv/platform-tools.nix      |  2 +-
 .../mobile/titaniumenv/titaniumsdk-3.1.nix    |  4 +--
 .../mobile/titaniumenv/titaniumsdk-3.2.nix    |  4 +--
 .../mobile/titaniumenv/titaniumsdk-3.3.nix    |  4 +--
 .../mobile/titaniumenv/titaniumsdk-3.4.nix    |  4 +--
 .../mobile/titaniumenv/titaniumsdk-3.5.nix    |  4 +--
 .../tools/build-managers/cargo/snapshot.nix   |  2 +-
 .../tools/selenium/chromedriver/default.nix   |  2 +-
 pkgs/games/dwarf-fortress/default.nix         |  2 +-
 pkgs/games/gemrb/default.nix                  |  2 +-
 pkgs/games/planetaryannihilation/default.nix  |  6 ++--
 pkgs/games/tibia/default.nix                  |  4 +--
 pkgs/games/ue4demos/default.nix               |  2 +-
 pkgs/misc/uboot/default.nix                   |  2 +-
 .../linux/apparmor/2.9/default.nix            |  8 +++---
 pkgs/os-specific/linux/apparmor/default.nix   | 12 ++++----
 pkgs/os-specific/linux/busybox/default.nix    |  2 +-
 pkgs/os-specific/linux/checksec/default.nix   |  2 +-
 pkgs/os-specific/linux/klibc/shrunk.nix       |  6 ++--
 pkgs/os-specific/linux/nfs-utils/default.nix  |  2 +-
 pkgs/os-specific/linux/shadow/default.nix     |  2 +-
 pkgs/os-specific/linux/udev/145.nix           |  2 +-
 pkgs/servers/http/openresty/default.nix       |  2 +-
 pkgs/servers/openafs-client/default.nix       |  2 +-
 .../linux/make-bootstrap-tools-cross.nix      | 26 ++++++++---------
 pkgs/stdenv/linux/make-bootstrap-tools.nix    | 28 +++++++++----------
 pkgs/tools/compression/kzipmix/default.nix    |  4 +--
 pkgs/tools/graphics/cuneiform/default.nix     |  2 +-
 pkgs/tools/graphics/pngout/default.nix        |  4 +--
 pkgs/tools/misc/trash-cli/default.nix         |  2 +-
 .../checkinstall/default.nix                  |  2 +-
 pkgs/tools/text/multitran/data/default.nix    |  2 +-
 pkgs/tools/text/xidel/default.nix             |  2 +-
 81 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index b89b379ae6668..3da6a81158d02 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -28,7 +28,7 @@ with lib;
         capability setuid,
         network inet raw,
 
-        ${pkgs.glibc}/lib/*.so mr,
+        ${pkgs.glibc.out}/lib/*.so mr,
         ${pkgs.libcap}/lib/libcap.so* mr,
         ${pkgs.attr}/lib/libattr.so* mr,
 
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 5cc33f35adb2a..1200ea291aafe 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -104,7 +104,7 @@ in
           /dev/null rw,
           /dev/urandom r,
 
-          ${pkgs.glibc}/lib/*.so mr,
+          ${pkgs.glibc.out}/lib/*.so mr,
           ${pkgs.tzdata}/share/zoneinfo/** r,
 
           ${dnscrypt-proxy}/share/dnscrypt-proxy/** r,
diff --git a/nixos/modules/services/system/nscd.nix b/nixos/modules/services/system/nscd.nix
index caedc2e42173f..59ba12bcc1758 100644
--- a/nixos/modules/services/system/nscd.nix
+++ b/nixos/modules/services/system/nscd.nix
@@ -61,14 +61,14 @@ in
         restartTriggers = [ config.environment.etc.hosts.source config.environment.etc."nsswitch.conf".source ];
 
         serviceConfig =
-          { ExecStart = "@${pkgs.glibc}/sbin/nscd nscd -f ${cfgFile}";
+          { ExecStart = "@${pkgs.glibc.bin}/sbin/nscd nscd -f ${cfgFile}";
             Type = "forking";
             PIDFile = "/run/nscd/nscd.pid";
             Restart = "always";
             ExecReload =
-              [ "${pkgs.glibc}/sbin/nscd --invalidate passwd"
-                "${pkgs.glibc}/sbin/nscd --invalidate group"
-                "${pkgs.glibc}/sbin/nscd --invalidate hosts"
+              [ "${pkgs.glibc.bin}/sbin/nscd --invalidate passwd"
+                "${pkgs.glibc.bin}/sbin/nscd --invalidate group"
+                "${pkgs.glibc.bin}/sbin/nscd --invalidate hosts"
               ];
           };
 
@@ -76,7 +76,7 @@ in
         # its pid. So wait until it's ready.
         postStart =
           ''
-            while ! ${pkgs.glibc}/sbin/nscd -g -f ${cfgFile} > /dev/null; do
+            while ! ${pkgs.glibc.bin}/sbin/nscd -g -f ${cfgFile} > /dev/null; do
               sleep 0.2
             done
           '';
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 135113b3ceb14..3e1e0bcc1df2b 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -113,7 +113,7 @@ in
           #include <abstractions/base>
           #include <abstractions/nameservice>
 
-          ${pkgs.glibc}/lib/*.so               mr,
+          ${pkgs.glibc.out}/lib/*.so               mr,
           ${pkgs.libevent}/lib/libevent*.so*   mr,
           ${pkgs.curl}/lib/libcurl*.so*        mr,
           ${pkgs.openssl}/lib/libssl*.so*      mr,
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 4aeaed8cd324c..8c6c678ed19ac 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -32,7 +32,7 @@ let
       # This wrapper ensures that we actually get themes
       makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
         $out/greeter \
-        --prefix PATH : "${pkgs.glibc}/bin" \
+        --prefix PATH : "${pkgs.glibc.bin}/bin" \
         --set GDK_PIXBUF_MODULE_FILE "$(find ${theme} -name loaders.cache)" \
         --set GTK_PATH "${theme}:${pkgs.gtk3}" \
         --set GTK_EXE_PREFIX "${theme}" \
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index 3142b2c52fcd1..b7a6cdc7fde84 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${revision}\"; }\n' > libs/ardour/revision.cc
-    sed 's|/usr/include/libintl.h|${glibc}/include/libintl.h|' -i wscript
+    sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript
     sed -e 's|^#!/usr/bin/perl.*$|#!${perl}/bin/perl|g' -i tools/fmt-bindings
     sed -e 's|^#!/usr/bin/env.*$|#!${perl}/bin/perl|g' -i tools/*.pl
   '';
diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix
index e7c513febf5b4..03218ad987bf5 100644
--- a/pkgs/applications/audio/google-musicmanager/default.nix
+++ b/pkgs/applications/audio/google-musicmanager/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc}/lib:${qt48}/lib:${stdenv.cc.cc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager
+      --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc.out}/lib:${qt48}/lib:${stdenv.cc.cc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager
   '';
 
   dontPatchELF = true;
diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 5164c80695b5d..99621c90bccf4 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation  rec {
 
   preConfigure = "cd src";
 
-  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc}/lib/libm.so" ];
+  cmakeFlags = [ "-DFLTK_MATH_LIBRARY=${stdenv.glibc.out}/lib/libm.so" ];
 
   meta = with stdenv.lib; {
     description = "high quality software synthesizer based on ZynAddSubFX";
diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix
index 750234b6399f1..f209a5223c823 100644
--- a/pkgs/applications/editors/codeblocks/default.nix
+++ b/pkgs/applications/editors/codeblocks/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   patches = [ ./writable-projects.patch ];
   preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-  postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig";
+  postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig";
   configureFlags = [ "--enable-pch=no" ]
     ++ optional contribPlugins "--with-contrib-plugins";
 
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 8964d6c648006..89ea3a1e5f96e 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -32,7 +32,7 @@ let
         tar xfvz $src -C $out
 
         # Patch binaries.
-        interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+        interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
         libCairo=$out/eclipse/libcairo-swt.so
         patchelf --set-interpreter $interpreter $out/eclipse/eclipse
         [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index b99265cf0dd9c..7d7aaae10377e 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -41,7 +41,7 @@ let
           truncate --size=$size $fname
         }
 
-        interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+        interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
         if [ "${stdenv.system}" == "x86_64-linux" ]; then
           target_size=$(get_file_size bin/fsnotifier64)
           patchelf --set-interpreter "$interpreter" bin/fsnotifier64
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 0589de8726aa2..2f384b0ec91ef 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
-    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
-    "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
+    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include"
+    "-DPTHREAD_LIBRARY=${stdenv.glibc.out}/lib/libpthread.so"
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBINARY_PACKAGE_BUILD=1"
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix
index 23a2d23b1ae16..d645a15b02eac 100644
--- a/pkgs/applications/graphics/seg3d/default.nix
+++ b/pkgs/applications/graphics/seg3d/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation {
   patches = [ ./cstdio.patch ];
 
   cmakeFlags = [
-    "-DM_LIBRARY=${stdenv.glibc}/lib/libm.so"
-    "-DDL_LIBRARY=${stdenv.glibc}/lib/libdl.so"
+    "-DM_LIBRARY=${stdenv.glibc.out}/lib/libm.so"
+    "-DDL_LIBRARY=${stdenv.glibc.out}/lib/libdl.so"
     "-DBUILD_UTILS=1"
     "-DBUILD_SEG3D=1"
     "-DBUILD_DATAFLOW=0"
diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix
index 4f2c2fba97c4a..89df403f598f0 100644
--- a/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/pkgs/applications/misc/mysql-workbench/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     mysql.lib paramiko pcre pexpect pkgconfig pycrypto python sqlite ];
 
   preConfigure = ''
-    substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc}/bin/catchsegv"
+    substituteInPlace $(pwd)/frontend/linux/workbench/mysql-workbench.in --replace "catchsegv" "${glibc.bin}/bin/catchsegv"
   '';
 
   postConfigure = ''
diff --git a/pkgs/applications/networking/copy-com/default.nix b/pkgs/applications/networking/copy-com/default.nix
index 9ef8caafa98d6..c146db9f6dc3b 100644
--- a/pkgs/applications/networking/copy-com/default.nix
+++ b/pkgs/applications/networking/copy-com/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation {
     ln -s "$out/${appdir}/CopyConsole" "$out/bin/copy_console"
     ln -s "$out/${appdir}/CopyAgent" "$out/bin/copy_agent"
     ln -s "$out/${appdir}/CopyCmd" "$out/bin/copy_cmd"
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
       "$out/${appdir}/CopyConsole"
 
     RPATH=${gcc.cc}/lib:$out/${appdir}
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 97573fb1e7b0d..06948d3c0482d 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -96,7 +96,7 @@ in stdenv.mkDerivation {
     rm -fr "$out/${appdir}/plugins"
 
     find "$out/${appdir}" -type f -a -perm +0100 \
-      -print -exec patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} {} \;
+      -print -exec patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} {} \;
 
     RPATH=${ldpath}:${gcc.cc}/lib:$out/${appdir}
     echo "updating rpaths to: $RPATH"
diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix
index 56341b64d6ce2..afb8c22272e43 100644
--- a/pkgs/applications/networking/ike/default.nix
+++ b/pkgs/applications/networking/ike/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install
     for file in "$out"/bin/* "$out"/sbin/*; do
-        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc}/lib::${gcc.cc}/lib64:${stdenv.glibc}/lib64:${libedit}/lib:${qt4}/lib"
+        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
     done
   '';
 
diff --git a/pkgs/applications/networking/spideroak/default.nix b/pkgs/applications/networking/spideroak/default.nix
index 403630e25e55c..1a6ab883c4ae6 100644
--- a/pkgs/applications/networking/spideroak/default.nix
+++ b/pkgs/applications/networking/spideroak/default.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation {
     ensureDir "$out/bin"
     rm "$out/usr/bin/SpiderOak"
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/${interpreter} \
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/${interpreter} \
       "$out/opt/SpiderOak/lib/SpiderOak"
 
     RPATH=$out/opt/SpiderOak/lib:${ldpath}
diff --git a/pkgs/applications/science/electronics/tkgate/1.x.nix b/pkgs/applications/science/electronics/tkgate/1.x.nix
index e9849d0460c8a..c62ecdcd1e2a4 100644
--- a/pkgs/applications/science/electronics/tkgate/1.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/1.x.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xproto, gccmakedep }:
 
 let
-  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
-  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
+  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include";
+  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib";
 in
 stdenv.mkDerivation rec {
   name = "tkgate-1.8.7";
diff --git a/pkgs/applications/science/electronics/tkgate/2.x.nix b/pkgs/applications/science/electronics/tkgate/2.x.nix
index 108986ddefe4b..166047a984136 100644
--- a/pkgs/applications/science/electronics/tkgate/2.x.nix
+++ b/pkgs/applications/science/electronics/tkgate/2.x.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, tcl, tk, libX11, glibc }:
 
 let
-  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc}/include";
-  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc}/lib";
+  libiconvInc = stdenv.lib.optionalString stdenv.isLinux "${glibc.dev}/include";
+  libiconvLib = stdenv.lib.optionalString stdenv.isLinux "${glibc.out}/lib";
 in
 stdenv.mkDerivation rec {
   name = "tkgate-2.0-b10";
diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index d4c6285875354..f3c0a7917cf30 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -65,7 +65,7 @@ rec {
   '' ["defEnsureDir" "minInit"];
 
   patchBinaries = a.fullDepEntry ''
-    patchelf --set-interpreter "${pkgsi686Linux.glibc}"/lib/ld-linux.so.* \
+    patchelf --set-interpreter "${pkgsi686Linux.glibc.out}"/lib/ld-linux.so.* \
       "Scripts/tptp4X"
   '' ["addInputs"];
       
diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 485d8c54eb366..96ead862e0e3c 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
     lame faad2 libvorbis yasm libvpx xvidcore libva
   ] ++ stdenv.lib.optional faacSupport faac;
 
-  cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include" +
+  cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" +
     " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
     " -DSDL_INCLUDE_DIR=${SDL}/include/SDL";
 
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index fc773211f69bb..e1e2ece8af895 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     for lib in $libs; do
       echo -n "$lib " >> macros/libslist
     done
-    echo -n "${stdenv.glibc}/lib" >> macros/libslist
+    echo -n "${stdenv.glibc.out}/lib" >> macros/libslist
 
     # Make sure to honor $TMPDIR, for chroot builds.
     for file in configure gui/Makefile.in Makefile.in
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 842985dce5bbe..c5e6f6e32d095 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -78,8 +78,8 @@ in stdenv.mkDerivation {
         -e 's@MKISOFS --version@MKISOFS -version@' \
         -e 's@PYTHONDIR=.*@PYTHONDIR=${if pythonBindings then python else ""}@' \
         -i configure
-    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2
-    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2
+    ls kBuild/bin/linux.x86/k* tools/linux.x86/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2
+    ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
     find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
     sed -e 's@"libasound.so.2"@"${alsaLib}/lib/libasound.so.2"@g' -i src/VBox/Main/xml/Settings.cpp src/VBox/Devices/Audio/alsa_stubs.c
     export USER=nix
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index e63f69ca23069..4db5622b925e5 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -63,10 +63,10 @@ stdenv.mkDerivation {
     for i in sbin/VBoxService bin/{VBoxClient,VBoxControl} lib/VBoxGuestAdditions/mount.vboxsf
     do
         ${if stdenv.system == "i686-linux" then ''
-          patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $i
+          patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $i
         ''
         else if stdenv.system == "x86_64-linux" then ''
-          patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $i
+          patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $i
         ''
         else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
         }
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index fc41e8ec52ed5..9d45fc2d3a746 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -31,9 +31,9 @@ rec {
       mkdir -p $out/lib
 
       # Copy what we need from Glibc.
-      cp -p ${pkgs.stdenv.glibc}/lib/ld-linux*.so.? $out/lib
-      cp -p ${pkgs.stdenv.glibc}/lib/libc.so.* $out/lib
-      cp -p ${pkgs.stdenv.glibc}/lib/libm.so.* $out/lib
+      cp -p ${pkgs.stdenv.glibc.out}/lib/ld-linux*.so.? $out/lib
+      cp -p ${pkgs.stdenv.glibc.out}/lib/libc.so.* $out/lib
+      cp -p ${pkgs.stdenv.glibc.out}/lib/libm.so.* $out/lib
 
       # Copy BusyBox.
       cp -pd ${pkgs.busybox}/bin/* $out/bin
@@ -561,7 +561,7 @@ rec {
       buildCommand = ''
         ${createRootFS}
 
-        PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc}/bin:${lzma}/bin
+        PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma}/bin
 
         # Unpack the .debs.  We do this to prevent pre-install scripts
         # (which have lots of circular dependencies) from barfing.
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index b6f6ac51ba2a9..1d192fbbc56af 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
 
     for f in $(find $out); do
       if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
-        patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
+        patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
                  --set-rpath $out/lib:${gcc}/lib:${ncurses}/lib \
                  "$f" || true
       fi
diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix
index 11640f2393d20..0c6d412641491 100644
--- a/pkgs/development/compilers/go/1.1.nix
+++ b/pkgs/development/compilers/go/1.1.nix
@@ -2,9 +2,9 @@
 , removeGodocExternals ? false }:
 
 let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
+  loader386 = "${glibc.out}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix
index a00fe7346701c..0454ea96d892e 100644
--- a/pkgs/development/compilers/go/1.2.nix
+++ b/pkgs/development/compilers/go/1.2.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }:
 
 let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
+  loader386 = "${glibc.out}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix
index 6d88049cfbee7..a9a3c10584b08 100644
--- a/pkgs/development/compilers/go/1.3.nix
+++ b/pkgs/development/compilers/go/1.3.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }:
 
 let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
+  loader386 = "${glibc.out}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
   srcs = {
     golang = fetchurl {
       url = https://storage.googleapis.com/golang/go1.3.3.src.tar.gz;
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 371496250056e..ccf76dc7554cd 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, fetchgit, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl, Security }:
 
 let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
+  loader386 = "${glibc.out}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
   srcs = {
     golang = fetchurl {
       url = https://github.com/golang/go/archive/go1.4.2.tar.gz;
diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix
index b35159c10e796..c684d7d5ee5db 100644
--- a/pkgs/development/compilers/go/default.nix
+++ b/pkgs/development/compilers/go/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata}:
 
 let
-  loader386 = "${glibc}/lib/ld-linux.so.2";
-  loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2";
-  loaderArm = "${glibc}/lib/ld-linux.so.3";
+  loader386 = "${glibc.out}/lib/ld-linux.so.2";
+  loaderAmd64 = "${glibc.out}/lib/ld-linux-x86-64.so.2";
+  loaderArm = "${glibc.out}/lib/ld-linux.so.3";
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/development/compilers/julia/0.3.nix b/pkgs/development/compilers/julia/0.3.nix
index 9f216c7207fc6..96e6964a3a68c 100644
--- a/pkgs/development/compilers/julia/0.3.nix
+++ b/pkgs/development/compilers/julia/0.3.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
 
     patchShebangs . contrib
 
-    export PATH="$PATH:${stdenv.cc.libc}/sbin"
+    export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
 
     # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache
     # is probably not what we want anyway on non-NixOS
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 381941acc20e5..9ff7620773898 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -6,8 +6,8 @@ let
   usr_prefix = if stdenv.isDarwin then "usr/local" else "usr";
 
   dynamic_linker =
-    if stdenv.isx86_64 then "${stdenv.glibc}/lib/ld-linux-x86-64.so.2"
-                       else "${stdenv.glibc}/lib/ld-linux.so.2";
+    if stdenv.isx86_64 then "${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2"
+                       else "${stdenv.glibc.out}/lib/ld-linux.so.2";
 in
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
index 9c6d07c4681e9..ab71090b35802 100644
--- a/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
+++ b/pkgs/development/compilers/nvidia-cg-toolkit/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     for b in cgc cgfxcat cginfo
     do
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux*.so.? "bin/$b"
+        patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux*.so.? "bin/$b"
     done
     # FIXME: cgfxcat and cginfo need more patchelf
     mkdir -p "$out/bin/"
diff --git a/pkgs/development/compilers/openjdk/bootstrap.nix b/pkgs/development/compilers/openjdk/bootstrap.nix
index 890064538cc01..04f40398dc830 100644
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@@ -20,7 +20,7 @@ runCommand "openjdk-bootstrap" {} ''
   mv openjdk-bootstrap $out
 
   for i in $out/bin/*; do
-    patchelf --set-interpreter ${glibc}/lib/ld-linux*.so.2 $i
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux*.so.2 $i
   done
 
   # Temporarily, while NixOS's OpenJDK bootstrap tarball doesn't have PaX markings:
diff --git a/pkgs/development/compilers/path64/default.nix b/pkgs/development/compilers/path64/default.nix
index d6112dcdfc482..694bdc8990fd7 100644
--- a/pkgs/development/compilers/path64/default.nix
+++ b/pkgs/development/compilers/path64/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   patchPhase = ''
     sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c
-    sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in
+    sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in
   '';
 
   cmakeFlags = ''
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
     -DPATH64_ENABLE_PSCRUNTIME=OFF
     -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 
     -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF
-    -DPSC_CRT_PATH=${stdenv.cc.libc}/lib
+    -DPSC_CRT_PATH=${stdenv.cc.libc.out}/lib
   '';
 
   makeFlags = "-j4";
diff --git a/pkgs/development/compilers/rustc/makeRustcDerivation.nix b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
index ae3981f1addc2..cb25743ddec30 100644
--- a/pkgs/development/compilers/rustc/makeRustcDerivation.nix
+++ b/pkgs/development/compilers/rustc/makeRustcDerivation.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation {
       mkdir -p "$out"
       cp -r bin "$out/bin"
     '' + (if stdenv.isLinux then ''
-      patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
+      patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
                --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/" \
                "$out/bin/rustc"
     '' else "");
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix
index c9378451d1ffd..9da1ef0dd9af1 100644
--- a/pkgs/development/compilers/tinycc/default.nix
+++ b/pkgs/development/compilers/tinycc/default.nix
@@ -19,9 +19,9 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)")
-    configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib")
-    configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include")
-    configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib")
+    configureFlagsArray+=("--crtprefix=${stdenv.glibc.out}/lib")
+    configureFlagsArray+=("--sysincludepaths=${stdenv.glibc.dev}/include:{B}/include")
+    configureFlagsArray+=("--libpaths=${stdenv.glibc.out}/lib")
   '';
 
   doCheck = true;
diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index f0d9d03991b81..6e596ba43743d 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
   ''
     substituteInPlace Makefile \
-      --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig
+      --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig
   '';
 
   configurePhase = false;
diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix
index b3bc6aafde96f..b293aa2541f02 100644
--- a/pkgs/development/interpreters/perl/5.16/default.nix
+++ b/pkgs/development/interpreters/perl/5.16/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       "-Dinstallstyle=lib/perl5"
       "-Duseshrplib"
       "-Dlocincpth=${libc}/include"
-      "-Dloclibpth=${libc}/lib"
+      "-Dloclibpth=${libc.out}/lib"
     ]
     ++ lib.optional enableThreading "-Dusethreads";
 
diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix
index f2855dd2a9240..242c4473cf216 100644
--- a/pkgs/development/libraries/libopensc-dnie/default.nix
+++ b/pkgs/development/libraries/libopensc-dnie/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ar x opensc-dnie*
     tar xf data.tar.gz
 
-    RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc}/lib:${zlib}/lib
+    RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc.out}/lib:${zlib}/lib
 
     for a in "usr/lib/"*.so*; do
         if ! test -L $a; then
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index 7dcde2a09a8c5..f9845d60b4903 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ patchelf ];
 
   installPhase = ''
-    RPATH=${libusb}/lib:${stdenv.cc.libc}/lib
+    RPATH=${libusb}/lib:${stdenv.cc.libc.out}/lib
 
     for a in proprietary/*/Contents/Linux/*.so*; do
         if ! test -L $a; then
diff --git a/pkgs/development/libraries/ustr/default.nix b/pkgs/development/libraries/ustr/default.nix
index b016a6f715c14..4e3abf7954bdd 100644
--- a/pkgs/development/libraries/ustr/default.nix
+++ b/pkgs/development/libraries/ustr/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1i623ygdj7rkizj7985q9d6vj5amwg686aqb5j3ixpkqkyp6xbrx";
   };
 
-  prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc}/include/";
+  prePatch = "substituteInPlace Makefile --replace /usr/include/ ${glibc.dev}/include/";
 
   patches = [ ./va_args.patch ]; # fixes bogus warnings that failed libsemanage
 
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 9f5393949ca79..19e8d43abf7e2 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     find $out \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm /0100 \) \
-        \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
+        \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
                           --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index 5e04bbf0116df..509c46eb4aad7 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     find $out \( \
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm /0100 \) \
-        \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \
+        \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
                           --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index f4c3448c92135..5f39290a03d00 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       
       for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard
       do
-          patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
+          patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
           patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
       done
       
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
         
         for i in emulator64-arm emulator64-mips emulator64-x86
         do
-            patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i
+            patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 $i
             patchelf --set-rpath ${stdenv.cc.cc}/lib64 $i
         done
       ''}
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
         # The monitor requires some more patching
         
         cd lib/monitor-x86
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 monitor
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 monitor
         patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
         
         wrapProgram `pwd`/monitor \
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
         # The monitor requires some more patching
         
         cd lib/monitor-x86_64
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 monitor
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor
         patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
         
         wrapProgram `pwd`/monitor \
diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix
index 158d886a5e7da..c2e01c4ebe649 100644
--- a/pkgs/development/mobile/androidenv/build-tools.nix
+++ b/pkgs/development/mobile/androidenv/build-tools.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
         # Patch the interpreter
         for i in aapt aidl dexdump llvm-rs-cc
         do
-            patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
+            patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
         done
         
         # These binaries need to find libstdc++ and libgcc_s
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
         # These binaries also need zlib in addition to libstdc++
         for i in zipalign
         do
-            patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
+            patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
             patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib:${zlib_32bit}/lib $i
         done
         
diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix
index 76e160fb0dae6..32e46e88b0254 100644
--- a/pkgs/development/mobile/androidenv/platform-tools.nix
+++ b/pkgs/development/mobile/androidenv/platform-tools.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
       ''
         for i in adb fastboot
         do
-            patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i
+            patchelf --set-interpreter ${stdenv_32bit.cc.libc.out}/lib/ld-linux.so.2 $i
             patchelf --set-rpath ${stdenv_32bit.cc.cc}/lib $i
         done
     ''}
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
index 60cab19ecbdf8..0437edad63fe4 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix
@@ -45,11 +45,11 @@ stdenv.mkDerivation {
     
     ${if stdenv.system == "i686-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
       ''
       else if stdenv.system == "x86_64-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
       ''
       else ""}
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
index 47414e205a064..37ecf62706dec 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix
@@ -44,11 +44,11 @@ stdenv.mkDerivation {
     
     ${if stdenv.system == "i686-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
       ''
       else if stdenv.system == "x86_64-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
       ''
       else ""}
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
index 59a405f61fabd..b5f1c6c53122a 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix
@@ -44,11 +44,11 @@ stdenv.mkDerivation {
     
     ${if stdenv.system == "i686-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
       ''
       else if stdenv.system == "x86_64-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
       ''
       else ""}
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
index 041ba0d4a6cf2..a927a74729af0 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix
@@ -44,11 +44,11 @@ stdenv.mkDerivation {
     
     ${if stdenv.system == "i686-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
       ''
       else if stdenv.system == "x86_64-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
       ''
       else ""}
     
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
index 8a868321e1364..c08d0a1c1f552 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.5.nix
@@ -44,11 +44,11 @@ stdenv.mkDerivation {
     
     ${if stdenv.system == "i686-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 titanium_prep.linux32
       ''
       else if stdenv.system == "x86_64-linux" then
       ''
-        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
+        patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64
       ''
       else ""}
     
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index 64aeb0736c17b..57b5378211caf 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
        "$out/lib/rustlib/rust-installer-version" \
        "$out/lib/rustlib/uninstall.sh"
   '' + (if stdenv.isLinux then ''
-    patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \
+    patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
              --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
              "$out/bin/cargo"
   '' else "");
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index f2d39938a483e..e55c3a3167d0a 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     mv chromedriver $out/bin
-    patchelf --set-interpreter ${glibc}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
     wrapProgram "$out/bin/chromedriver" \
       --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
   '';
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 4e34453a1e8a7..4ddc664ec1d43 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
     cp $permission $out/share/df_linux/nix_permission
 
-    patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
 
     # Store new hash for dwarf-therapist
     echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.patched
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 86da7686eefd0..42d80f86e8280 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional
 
   # Necessary to find libdl.
-  CMAKE_LIBRARY_PATH = "${stdenv.cc.libc}/lib";
+  CMAKE_LIBRARY_PATH = "${stdenv.cc.libc.out}/lib";
 
   # Can't have -werror because of the Vorbis header files.
   cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON";
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index a94f388b322cc..763097f509b3a 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation {
     ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" 
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" 
 
-    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64"
+    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc.out}/lib64"
 
     for f in $out/lib/*; do
-      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f
+      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc.out}/lib64" $f
     done
   '';
 
diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix
index 21e6a28cf8578..f9d252dae9809 100644
--- a/pkgs/games/tibia/default.nix
+++ b/pkgs/games/tibia/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     mkdir -pv $out/res
     cp -r * $out/res
 
-    patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
              --set-rpath ${stdenv.cc.cc}/lib:${libX11}/lib:${mesa}/lib \
              "$out/res/Tibia"
 
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     cat << EOF > "$out/bin/Tibia"
     #!${stdenv.shell}
     cd $out/res
-    ${glibc}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@"
+    ${glibc.out}/lib/ld-linux.so.2 --library-path \$LD_LIBRARY_PATH ./Tibia "\$@"
     EOF
 
     chmod +x $out/bin/Tibia
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
index a0e583e1075fe..dd1d7fd8782a2 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/pkgs/games/ue4demos/default.nix
@@ -20,7 +20,7 @@ let
         cd $out
         unzip $src
 
-        interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+        interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
         binary=$(find . -executable -type f)
         patchelf \
           --set-interpreter $interpreter \
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 5928406eb548d..7392b5f51a9ed 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   # wrappers add the glibc include as "-idirafter", the only way
   # we can make the glibc take priority is to -include errno.h.
   postPatch = if stdenv ? glibc && stdenv.glibc != null then ''
-    sed -i 's,$(HOSTCPPFLAGS),-include ${stdenv.glibc}/include/errno.h $(HOSTCPPFLAGS),' config.mk
+    sed -i 's,$(HOSTCPPFLAGS),-include ${stdenv.glibc.dev}/include/errno.h $(HOSTCPPFLAGS),' config.mk
   '' else "";
 
   patches = [ ./sheevaplug-sdio.patch ./sheevaplug-config.patch ];
diff --git a/pkgs/os-specific/linux/apparmor/2.9/default.nix b/pkgs/os-specific/linux/apparmor/2.9/default.nix
index 1b1d9a3d1ca2a..5e8ccc7569180 100644
--- a/pkgs/os-specific/linux/apparmor/2.9/default.nix
+++ b/pkgs/os-specific/linux/apparmor/2.9/default.nix
@@ -23,7 +23,7 @@ let
   prePatchCommon = ''
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
-    substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
+    substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
     substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
   '';
 
@@ -47,8 +47,8 @@ let
     ];
 
     prePatch = prePatchCommon + ''
-      substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h"
-      substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h"
+      substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h"
+      substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h"
       '';
 
     buildPhase = ''
@@ -103,7 +103,7 @@ let
     prePatch = prePatchCommon + ''
       substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
       substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
-      substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
+      substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
       ## techdoc.pdf still doesn't build ...
       substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"
     '';
diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index f68b436bed1c5..bfd6b533bb2ff 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -17,17 +17,17 @@ stdenv.mkDerivation rec {
     LocaleGettext pam TermReadKey RpcXML swig makeWrapper python ];
 
   prePatch = ''
-    substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc}/include"
-    substituteInPlace libraries/libapparmor/src/Makefile.am --replace "/usr/include" "${glibc}/include"
+    substituteInPlace libraries/libapparmor/src/Makefile.in --replace "/usr/include" "${glibc.dev}/include"
+    substituteInPlace libraries/libapparmor/src/Makefile.am --replace "/usr/include" "${glibc.dev}/include"
     substituteInPlace common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
     substituteInPlace common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
-    substituteInPlace common/Make.rules --replace "cpp -dM" "cpp -dM -I${glibc}/include"
+    substituteInPlace common/Make.rules --replace "cpp -dM" "cpp -dM -I${glibc.dev}/include"
 
     substituteInPlace parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
     substituteInPlace parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
-    substituteInPlace parser/Makefile --replace "/usr/include/bits/socket.h" "${glibc}/include/bits/socket.h"
-    substituteInPlace parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
-    #substituteInPlace parser/utils/vim/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
+    substituteInPlace parser/Makefile --replace "/usr/include/bits/socket.h" "${glibc.dev}/include/bits/socket.h"
+    substituteInPlace parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
+    #substituteInPlace parser/utils/vim/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
 
     # for some reason pdf documentation doesn't build
     substituteInPlace parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 47f9fb9a5a402..c8e7ffda91779 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
 
     make oldconfig
   '' + lib.optionalString useUclibc ''
-    makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc}/lib -L${uclibc}/lib")
+    makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc.out}/lib -L${uclibc.out}/lib")
   '';
 
   crossAttrs = {
diff --git a/pkgs/os-specific/linux/checksec/default.nix b/pkgs/os-specific/linux/checksec/default.nix
index b423dc3a08620..60468538be249 100644
--- a/pkgs/os-specific/linux/checksec/default.nix
+++ b/pkgs/os-specific/linux/checksec/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     cp checksec.sh $out/bin/checksec
     chmod +x $out/bin/checksec
     substituteInPlace $out/bin/checksec --replace /bin/bash ${stdenv.shell}
-    substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc}/lib/libc.so.6
+    substituteInPlace $out/bin/checksec --replace /lib/libc.so.6 ${glibc.out}/lib/libc.so.6
     substituteInPlace $out/bin/checksec --replace find ${findutils}/bin/find
     substituteInPlace $out/bin/checksec --replace "file $" "${file}/bin/file $"
     substituteInPlace $out/bin/checksec --replace "xargs file" "xargs ${file}/bin/file"
diff --git a/pkgs/os-specific/linux/klibc/shrunk.nix b/pkgs/os-specific/linux/klibc/shrunk.nix
index 066b4fcb4e063..2ce833d104fdf 100644
--- a/pkgs/os-specific/linux/klibc/shrunk.nix
+++ b/pkgs/os-specific/linux/klibc/shrunk.nix
@@ -8,10 +8,10 @@ stdenv.mkDerivation {
   name = "${klibc.name}";
   buildCommand = ''
     mkdir -p $out/lib
-    cp -prd ${klibc}/lib/klibc/bin $out/
-    cp -p ${klibc}/lib/*.so $out/lib/
+    cp -prd ${klibc.out}/lib/klibc/bin $out/
+    cp -p ${klibc.out}/lib/*.so $out/lib/
     chmod +w $out/*
-    old=$(echo ${klibc}/lib/klibc-*.so)
+    old=$(echo ${klibc.out}/lib/klibc-*.so)
     new=$(echo $out/lib/klibc-*.so)
     for i in $out/bin/*; do
       echo $i
diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 6b30104b08330..2d8aaaeb7ee17 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       "--with-statedir=/var/lib/nfs"
       "--with-tirpcinclude=${libtirpc}/include/tirpc"
     ]
-    ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc}/bin/rpcgen";
+    ++ stdenv.lib.optional (stdenv ? glibc) "--with-rpcgen=${stdenv.glibc.bin}/bin/rpcgen";
 
   patchPhase =
     ''
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index f928dc8e657c6..321e94e3aaf42 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   preBuild = assert glibc != null;
     ''
-      substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc}/sbin/nscd
+      substituteInPlace lib/nscd.c --replace /usr/sbin/nscd ${glibc.bin}/bin/nscd
     '';
 
   postInstall =
diff --git a/pkgs/os-specific/linux/udev/145.nix b/pkgs/os-specific/linux/udev/145.nix
index fd1cb8a2d8dcb..6dd551e1ce13e 100644
--- a/pkgs/os-specific/linux/udev/145.nix
+++ b/pkgs/os-specific/linux/udev/145.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   preConfigure =
     ''
       substituteInPlace extras/keymap/Makefile.in \
-        --replace /usr/include ${stdenv.glibc}/include
+        --replace /usr/include ${stdenv.glibc.dev}/include
     '';
 
   postInstall =
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index 8444d49b91e48..5c3a5a3e56f55 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
-    export PATH="$PATH:${stdenv.cc.libc}/sbin"
+    export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
     patchShebangs .
   '';
 
diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix
index 09c6468956f28..f2c1a072bfcd6 100644
--- a/pkgs/servers/openafs-client/default.nix
+++ b/pkgs/servers/openafs-client/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     for i in `grep -l -R '/usr/\(include\|src\)' .`; do
       echo "Patch /usr/include and /usr/src in $i"
       substituteInPlace $i \
-        --replace "/usr/include" "${glibc}/include" \
+        --replace "/usr/include" "${glibc.dev}/include" \
         --replace "/usr/src" "$TMP"
     done
 
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 013aa12d95644..cdec5cc7f4a3e 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -130,20 +130,20 @@ rec {
         mkdir -p $out/bin $out/lib $out/libexec
 
         # Copy what we need of Glibc.
-        cp -d ${glibc}/lib/ld-*.so* $out/lib
-        cp -d ${glibc}/lib/libc*.so* $out/lib
-        cp -d ${glibc}/lib/libc_nonshared.a $out/lib
-        cp -d ${glibc}/lib/libm*.so* $out/lib
-        cp -d ${glibc}/lib/libdl*.so* $out/lib
-        cp -d ${glibc}/lib/librt*.so*  $out/lib
-        cp -d ${glibc}/lib/libpthread*.so* $out/lib
-        cp -d ${glibc}/lib/libnsl*.so* $out/lib
-        cp -d ${glibc}/lib/libutil*.so* $out/lib
-        cp -d ${glibc}/lib/libnss*.so* $out/lib
-        cp -d ${glibc}/lib/libresolv*.so* $out/lib
-        cp -d ${glibc}/lib/crt?.o $out/lib
+        cp -d ${glibc.out}/lib/ld-*.so* $out/lib
+        cp -d ${glibc.out}/lib/libc*.so* $out/lib
+        cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib
+        cp -d ${glibc.out}/lib/libm*.so* $out/lib
+        cp -d ${glibc.out}/lib/libdl*.so* $out/lib
+        cp -d ${glibc.out}/lib/librt*.so*  $out/lib
+        cp -d ${glibc.out}/lib/libpthread*.so* $out/lib
+        cp -d ${glibc.out}/lib/libnsl*.so* $out/lib
+        cp -d ${glibc.out}/lib/libutil*.so* $out/lib
+        cp -d ${glibc.out}/lib/libnss*.so* $out/lib
+        cp -d ${glibc.out}/lib/libresolv*.so* $out/lib
+        cp -d ${glibc.out}/lib/crt?.o $out/lib
         
-        cp -rL ${glibc}/include $out
+        cp -rL ${glibc.dev}/include $out
         chmod -R u+w $out/include
         
         # Hopefully we won't need these.
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 3ad81476c2e95..b66d7817be797 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -43,20 +43,20 @@ rec {
         mkdir -p $out/bin $out/lib $out/libexec
 
         # Copy what we need of Glibc.
-        cp -d ${glibc}/lib/ld*.so* $out/lib
-        cp -d ${glibc}/lib/libc*.so* $out/lib
-        cp -d ${glibc}/lib/libc_nonshared.a $out/lib
-        cp -d ${glibc}/lib/libm*.so* $out/lib
-        cp -d ${glibc}/lib/libdl*.so* $out/lib
-        cp -d ${glibc}/lib/librt*.so*  $out/lib
-        cp -d ${glibc}/lib/libpthread*.so* $out/lib
-        cp -d ${glibc}/lib/libnsl*.so* $out/lib
-        cp -d ${glibc}/lib/libutil*.so* $out/lib
-        cp -d ${glibc}/lib/libnss*.so* $out/lib
-        cp -d ${glibc}/lib/libresolv*.so* $out/lib
-        cp -d ${glibc}/lib/crt?.o $out/lib
-
-        cp -rL ${glibc}/include $out
+        cp -d ${glibc.out}/lib/ld*.so* $out/lib
+        cp -d ${glibc.out}/lib/libc*.so* $out/lib
+        cp -d ${glibc.out}/lib/libc_nonshared.a $out/lib
+        cp -d ${glibc.out}/lib/libm*.so* $out/lib
+        cp -d ${glibc.out}/lib/libdl*.so* $out/lib
+        cp -d ${glibc.out}/lib/librt*.so*  $out/lib
+        cp -d ${glibc.out}/lib/libpthread*.so* $out/lib
+        cp -d ${glibc.out}/lib/libnsl*.so* $out/lib
+        cp -d ${glibc.out}/lib/libutil*.so* $out/lib
+        cp -d ${glibc.out}/lib/libnss*.so* $out/lib
+        cp -d ${glibc.out}/lib/libresolv*.so* $out/lib
+        cp -d ${glibc.out}/lib/crt?.o $out/lib
+
+        cp -rL ${glibc.dev}/include $out
         chmod -R u+w $out/include
 
         # Hopefully we won't need these.
diff --git a/pkgs/tools/compression/kzipmix/default.nix b/pkgs/tools/compression/kzipmix/default.nix
index f768189040b5b..6fcff7b292802 100644
--- a/pkgs/tools/compression/kzipmix/default.nix
+++ b/pkgs/tools/compression/kzipmix/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation {
     mkdir -p $out/bin
     cp kzip zipmix $out/bin
     
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/kzip
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/zipmix
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/kzip
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/zipmix
   '';
 
   meta = {
diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index c5d9475850e3b..6648ec8bc3198 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -25,7 +25,7 @@ rec {
     mkdir -p $PWD/builddir
     cd builddir
     export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
-    cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
+    cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc.out}/lib
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
       
   needLib64 = a.stdenv.system == "x86_64-linux";
diff --git a/pkgs/tools/graphics/pngout/default.nix b/pkgs/tools/graphics/pngout/default.nix
index 471823ed9235b..afc1a2519fe10 100644
--- a/pkgs/tools/graphics/pngout/default.nix
+++ b/pkgs/tools/graphics/pngout/default.nix
@@ -18,9 +18,9 @@ stdenv.mkDerivation {
     cp ${folder}/pngout $out/bin
     
     ${if stdenv.system == "i686-linux" then ''
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/bin/pngout
+        patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/bin/pngout
       '' else if stdenv.system == "x86_64-linux" then ''
-        patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/bin/pngout
+        patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/pngout
       '' else ""}
   '';
 
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 1c8a2e495b697..bd1d8501eeaa8 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -19,7 +19,7 @@ python2Packages.buildPythonPackage rec {
       src = ./nix-paths.patch;
       df = "${coreutils}/bin/df";
       python = "${python2}/bin/${python2.executable}";
-      libc = "${stdenv.cc.libc}/lib/libc.so.6";
+      libc = "${stdenv.cc.libc.out}/lib/libc.so.6";
     })
 
     # Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3
diff --git a/pkgs/tools/package-management/checkinstall/default.nix b/pkgs/tools/package-management/checkinstall/default.nix
index dc3373c3b6fcf..8ab9001573a24 100644
--- a/pkgs/tools/package-management/checkinstall/default.nix
+++ b/pkgs/tools/package-management/checkinstall/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     substituteInPlace checkinstallrc-dist --replace /usr/local $out
 
     substituteInPlace installwatch/create-localdecls \
-      --replace /usr/include/unistd.h ${stdenv.glibc}/include/unistd.h
+      --replace /usr/include/unistd.h ${stdenv.glibc.dev}/include/unistd.h
   '';
 
   postInstall =
diff --git a/pkgs/tools/text/multitran/data/default.nix b/pkgs/tools/text/multitran/data/default.nix
index d0e39add665ab..57a375d2a17b5 100644
--- a/pkgs/tools/text/multitran/data/default.nix
+++ b/pkgs/tools/text/multitran/data/default.nix
@@ -3,7 +3,7 @@
 # This package requires a locale ru_RU.cp1251 locale entry.
 # Waiting for a better idea, I created it modifying a store file using:
 #   localedef -f CP1251 -i ru_RU ru_RU.CP1251
-# The store file mentioned is in "${glibc}/lib/locale/locale-archive"
+# The store file mentioned is in "${glibc.out}/lib/locale/locale-archive"
 
 stdenv.mkDerivation {
   name = "multitran-data-0.3";
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 89adcc75b1951..000584a50e109 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p "$out/bin"
     cp -a usr/* "$out/"
-    interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)"
+    interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)"
     patchelf --set-interpreter "$interpreter" "$out/bin/xidel"
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [stdenv.glibc]}" "$out/bin/xidel"
   '';

From 5d26d83df227d295f27a8e7a140e7bfa9acd3353 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 26 Apr 2015 22:06:53 +0200
Subject: [PATCH 116/857] pam: don't split modules

libpam seems to need a reference to the modules anyway.
---
 pkgs/os-specific/linux/pam/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix
index 8423ea6f12367..8aaba0d3d5d5b 100644
--- a/pkgs/os-specific/linux/pam/default.nix
+++ b/pkgs/os-specific/linux/pam/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./CVE-2014-2583.patch ];
 
-  outputs = [ "out" "doc" "man" "modules" ];
+  outputs = [ "out" "doc" "man" /* "modules" */ ];
 
   nativeBuildInputs = [ flex ];
 
@@ -36,12 +36,14 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mv -v $out/sbin/unix_chkpwd{,.orig}
     ln -sv /var/setuid-wrappers/unix_chkpwd $out/sbin/unix_chkpwd
-
+  ''; /*
     rm -rf $out/etc
-
     mkdir -p $modules/lib
     mv $out/lib/security $modules/lib/
-  '';
+  '';*/
+  # don't move modules, because libpam needs to (be able to) find them,
+  # which is done by dlopening $out/lib/security/pam_foo.so
+  # $out/etc was also missed: pam_env(login:session): Unable to open config file
 
   preConfigure = ''
     configureFlags="$configureFlags --includedir=$out/include/security"

From f0746b846c1b89933733f08fd86c89981f359e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 27 Apr 2015 13:18:16 +0200
Subject: [PATCH 117/857] gnutls: fixup 6b6183125 with multiple-output changes

---
 pkgs/development/libraries/gnutls/generic.nix | 2 +-
 pkgs/tools/security/trousers/default.nix      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 930713f598735..2191721afc155 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   # Fixup broken libtool and pkgconfig files
   preFixup = ''
     sed -e 's,-ltspi,-L${trousers}/lib -ltspi,' \
-        -e 's,-lz,-L${zlib}/lib -lz,' \
+        -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
   '';
diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix
index 38ff4acc43bd6..208ffa136d081 100644
--- a/pkgs/tools/security/trousers/default.nix
+++ b/pkgs/tools/security/trousers/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   # Fix broken libtool file
   preFixup = ''
-    sed 's,-lcrypto,-L${openssl}/lib -lcrypto,' -i $out/lib/libtspi.la
+    sed 's,-lcrypto,-L${openssl.out}/lib -lcrypto,' -i $out/lib/libtspi.la
   '';
 
   meta = with stdenv.lib; {

From 4949d5ec4a34eee070daa4b28cd3d22343f708e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 27 Apr 2015 13:45:07 +0200
Subject: [PATCH 118/857] pulseaudio: fixup -lcap with multiple-output changes

---
 pkgs/servers/pulseaudio/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index b031b0b450896..78e18b6cef949 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -29,7 +29,8 @@ let
 
   hasXlibs = xlibs != null;
 
-  optLibcap = shouldUsePkg libcap;
+  optLibcap = shouldUsePkg libcap.out;
+  optLibcapDev = shouldUsePkg libcap.dev;
   hasCaps = optLibcap != null || stdenv.isFreeBSD; # Built-in on FreeBSD
 
   optOss = if libOnly then null else shouldUsePkg oss;
@@ -81,7 +82,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     json_c libsndfile gettext check database
 
-    optLibcap valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
+    optLibcap optLibcapDev valgrind optOss optCoreaudio optAlsaLib optEsound optGlib
     optGtk3 optGconf optAvahi optLibjack2 optLibasyncns optLirc optDbus optUdev
     optOpenssl optFftw optSpeexdsp optSystemd optWebrtc-audio-processing
   ] ++ stdenv.lib.optionals hasXlibs (with xlibs; [

From 2be435422c06849c092a3660c8d3ec430753f425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 3 May 2015 13:35:58 +0200
Subject: [PATCH 119/857] zlib: refactor (and darwin fix), add meta.platforms

---
 pkgs/development/libraries/zlib/default.nix | 26 ++++++++++-----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index e19d8cdfcb2e0..38b1d70cc86b8 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -2,7 +2,7 @@
 
 let version = "1.2.8"; in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "zlib-${version}";
 
   src = fetchurl {
@@ -16,16 +16,24 @@ stdenv.mkDerivation (rec {
   outputs = [ "dev" "out" "static" "man" ];
   setOutputFlags = false;
 
-  configureFlags = stdenv.lib.optional (!static) "--shared";
-
   preConfigure = ''
     if test -n "$crossConfig"; then
       export CC=$crossConfig-gcc
     fi
   '';
 
+  configureFlags = stdenv.lib.optional (!static) "--shared";
+
   postInstall = ''
     _moveToOutput lib/libz.a "$static"
+  ''
+    # jww (2015-01-06): Sometimes this library install as a .so, even on
+    # Darwin; others time it installs as a .dylib.  I haven't yet figured out
+    # what causes this difference.
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    for file in $out/lib/*.so* $out/lib/*.dylib* ; do
+      install_name_tool -id "$file" $file
+    done
   '';
 
   # As zlib takes part in the stdenv building, we don't want references
@@ -56,13 +64,5 @@ stdenv.mkDerivation (rec {
     license = licenses.zlib;
     platforms = platforms.all;
   };
-} // (if stdenv.isDarwin then {
-  postInstall = ''
-    # jww (2015-01-06): Sometimes this library install as a .so, even on
-    # Darwin; others time it installs as a .dylib.  I haven't yet figured out
-    # what causes this difference.
-    for file in $out/lib/*.so* $out/lib/*.dylib* ; do
-      install_name_tool -id "$file" $file
-    done
-  '';
-} else {}))
+}
+

From cefdc20c00ffc4210eb84cb8aeaa83c3ccca3c29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 3 May 2015 13:37:15 +0200
Subject: [PATCH 120/857] gawk: disable doCheck again, add meta.platforms

It didn't work when chrooted.
---
 pkgs/tools/text/gawk/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 234cd1655dc50..e09012f94900f 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   # When we do build separate interactive version, it makes sense to always include docs.
-  outputs = stdenv.lib.optionals (!interactive) [ "out" "doc" ]; #ToDo
+  outputs = [ "out" ] ++ stdenv.lib.optional (!interactive) "doc"; #ToDo
 
   # Currently broken due to locale tests failing
   #doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
@@ -23,11 +23,9 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-libsigsegv-prefix=${libsigsegv}" ]
     ++ [(if interactive then "--with-readline=${readline}" else "--without-readline")];
 
-  doCheck = !stdenv.isCygwin; # XXX: `test-dup2' segfaults on Cygwin 6.1
-
   postInstall = "rm $out/bin/gawk-*";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gawk/;
     description = "GNU implementation of the Awk programming language";
 
@@ -45,8 +43,11 @@ stdenv.mkDerivation rec {
       lines of code.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
+
+    platforms = platforms.unix;
 
     maintainers = [ ];
   };
 }
+

From c2fff7283676110607b6d85de0323aedf440d86e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 May 2015 11:35:11 +0200
Subject: [PATCH 121/857] systemPackages, makeLibraryPath: try to guess outputs

---
 lib/strings.nix                      |  4 +++-
 nixos/modules/config/system-path.nix | 10 +++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 39112407c5708..ee5a59bdaf801 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -47,7 +47,9 @@ rec {
 
   # Construct a library search path (such as RPATH) containing the
   # libraries for a set of packages, e.g. "${pkg1}/lib:${pkg2}/lib:...".
-  makeLibraryPath = makeSearchPath "lib";
+  makeLibraryPath = pkgs: makeSearchPath "lib"
+    # try to guess the right output of each pkg
+    (map (pkg: pkg.lib or (pkg.out or pkg)) pkgs);
 
 
   # Idem for Perl search paths.
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index d22f9ebd1dfd7..58ebea1dabc2f 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -115,7 +115,15 @@ in
 
     system.path = pkgs.buildEnv {
       name = "system-path";
-      paths = config.environment.systemPackages;
+      paths = let
+        #outputs TODO: make it user-customizable?
+        pkgOutputFun = pkg: lib.filter (p: p!=null) [
+          (pkg.bin or (pkg.out or pkg))
+          (pkg.man or null)
+          (pkg.info or null)
+          (pkg.doc or null)
+        ];
+        in lib.concatMap pkgOutputFun config.environment.systemPackages;
       inherit (config.environment) pathsToLink;
       ignoreCollisions = true;
       # !!! Hacky, should modularise.

From d449020d878811dd4e7165b0b36bf2e4d03d53ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 May 2015 11:39:28 +0200
Subject: [PATCH 122/857] nixos: try to fix, choosing correct binary outputs

---
 nixos/modules/system/activation/activation-script.nix | 3 ++-
 nixos/modules/system/boot/systemd.nix                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 2e5a70b3aa54f..b29488edc0819 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -12,7 +12,8 @@ let
     '';
   });
 
-  path =
+  path = map # outputs TODO?
+    (pkg: (pkg.bin or (pkg.out or pkg)))
     [ pkgs.coreutils pkgs.gnugrep pkgs.findutils
       pkgs.glibc # needed for getent
       pkgs.shadow
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 78aac7fe96f13..4beab19d4b22d 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -663,7 +663,7 @@ in
         # Make all journals readable to users in the wheel and adm
         # groups, in addition to those in the systemd-journal group.
         # Users can always read their own journals.
-        ${pkgs.acl}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
+        ${pkgs.acl.bin}/bin/setfacl -nm g:wheel:rx,d:g:wheel:rx,g:adm:rx,d:g:adm:rx /var/log/journal || true
       '';
 
     # Target for ‘charon send-keys’ to hook into.

From d6dd3b8bd1eaeeb21dfdb5051cd4732c748ce5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 May 2015 11:41:37 +0200
Subject: [PATCH 123/857] a few packages: work-arounds with split outputs

There's something wrong with imake-based packages,
but I couldn't find out what, so disabling transfig in libgcrypt for now.
---
 pkgs/applications/video/vlc/default.nix      | 2 ++
 pkgs/development/libraries/libgcrypt/1.6.nix | 3 ++-
 pkgs/tools/filesystems/xfsprogs/default.nix  | 2 +-
 pkgs/top-level/all-packages.nix              | 4 ++--
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index e25f833eabc30..5de5843230a3a 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy";
   };
 
+  # outputs TODO: some modules are "corrupt", even without splitting vlc
+
   buildInputs =
     [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread
       libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt
diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix
index 39160675a2a8c..82bed6eba4dc1 100644
--- a/pkgs/development/libraries/libgcrypt/1.6.nix
+++ b/pkgs/development/libraries/libgcrypt/1.6.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0pq2nwfqgggrsh8rk84659d80vfnlkbphwqjwahccd5fjdxr3d21";
   };
 
-  nativeBuildInputs = [ transfig ghostscript texinfo ];
+  # transfig broke with multiple outputs, and it doesn't seem important here
+  nativeBuildInputs = [ /*transfig*/ ghostscript texinfo ];
 
   propagatedBuildInputs = [ libgpgerror ];
 
diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 7b38e74d04b90..52e1ed7c28fd8 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext libuuid readline ];
 
-  outputs = [ "dev" "out" "bin" ];
+  outputs = [ "dev" "out" "bin" ]; # TODO: review xfs
 
   preConfigure = ''
     NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 34794049d7d0a..ce29f446a9ee6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3252,7 +3252,7 @@ let
   xflux = callPackage ../tools/misc/xflux { };
 
   xfsprogs = callPackage ../tools/filesystems/xfsprogs { };
-  libxfs = xfsprogs.lib;
+  libxfs = xfsprogs.dev; # outputs TODO
 
   xml2 = callPackage ../tools/text/xml/xml2 { };
 
@@ -7136,7 +7136,7 @@ let
   );
   mesa = mesaDarwinOr (buildEnv {
     name = "mesa-${mesa_noglu.version}";
-    paths = [ mesa_noglu mesa_glu ];
+    paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu ];
   });
 
   metaEnvironment = recurseIntoAttrs (let callPackage = newScope pkgs.metaEnvironment; in rec {

From 98419b2e544eb0f5fb4e36e55df1185dfeb37615 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 26 Aug 2015 20:48:33 +0300
Subject: [PATCH 124/857] flac: Remove conflicting outputs produced by auto
 merge

---
 pkgs/applications/audio/flac/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix
index e9b57fcd0725f..80e4e49fb1830 100644
--- a/pkgs/applications/audio/flac/default.nix
+++ b/pkgs/applications/audio/flac/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c";
   };
 
-  outputs = [ "out" "doc" ];
-
   buildInputs = [ libogg ];
 
   #doCheck = true; # takes lots of time

From f72376fd20d2abd0a58d5aabc0712480d567f7eb Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 26 Aug 2015 20:50:50 +0300
Subject: [PATCH 125/857] x11: Remove conflicting outputs produced by auto
 merge

---
 pkgs/servers/x11/xorg/overrides.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 54ec5c8e116d6..65860dbe7ae68 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -91,7 +91,6 @@ in
         rm -rf $out/share/doc
       '';
     CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
-    outputs = [ "out" "man" ];
   };
 
   libAppleWM = attrs: attrs // {

From 2b67ba2ad2da3a2bcab711f333ab8ae44154ffeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 14:07:34 +0200
Subject: [PATCH 126/857] pkgconfig: post-merge fixup

---
 pkgs/development/tools/misc/pkgconfig/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index 0d5e2d275aa2e..127223c4ee15c 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -14,17 +14,17 @@ stdenv.mkDerivation rec {
   };
     # Process Requires.private properly, see
     # http://bugs.freedesktop.org/show_bug.cgi?id=4738.
-  patches = optional (!vanilla) ./requires-private.patch;
+  patches = optional (!vanilla) ./requires-private.patch
+    ++ optional stdenv.isCygwin ./2.36.3-not-win32.patch;
+
+  buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;
 
   preConfigure = stdenv.lib.optionalString (stdenv.system == "mips64el-linux")
     ''cp -v ${automake}/share/automake*/config.{sub,guess} .'';
 
-  buildInputs = optional (stdenv.isCygwin || stdenv.isDarwin) libiconv;
-
   configureFlags = [ "--with-internal-glib" ];
 
   postInstall = ''rm "$out"/bin/*-pkg-config''; # clean the duplicate file
-  patches = optional stdenv.isCygwin ./2.36.3-not-win32.patch;
 
   meta = {
     description = "A tool that allows packages to find out information about other packages";

From 52c433735699201babf07a59bf7c54c1ae17e68e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 02:53:31 +0300
Subject: [PATCH 127/857] stdenv/multiple-outputs: Guard greps with 'set +/-o
 pipefail'

This is required since #7524 is fixed ("stdenv: Errors in hooks (such as
postUnpack) get ignored")
---
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 7527000eb2574..08e2106acc70a 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -138,9 +138,11 @@ _multioutPropagateDev() {
     # Default value: propagate binaries, includes and libraries
     if [[ ! -v "$propagatedOutputs" ]]; then
         local po_dirty="$outputBin $outputInclude $outputLib"
+        set +o pipefail
         propagatedOutputs=`echo "$po_dirty" \
             | tr -s ' ' '\n' | grep -v -F "$outputFirst" \
             | sort -u | tr '\n' ' ' `
+        set -o pipefail
 
     elif [ -z "$propagatedOutputs" ]; then
         return # variable was explicitly set to empty

From d844a1002f083d81084203f8f3431421a0fc1698 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 21:29:00 +0300
Subject: [PATCH 128/857] stdenv/multiple-outputs: Fix checking of
 propagatedOutputs

'[[ ! -v "$propagatedOutputs" ]]' is incorrect and always evaluates to
true. The correct form using double brackets would be
'[[ ! -v propagatedOutputs ]]', but I strongly dislike '[[ ]]' due to
the totally different quoting rules compared to everything else in bash.
---
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 08e2106acc70a..ef199ae9cb57e 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -136,7 +136,7 @@ _multioutPropagateDev() {
     done
 
     # Default value: propagate binaries, includes and libraries
-    if [[ ! -v "$propagatedOutputs" ]]; then
+    if [ -z "${propagatedOutputs+1}" ]; then
         local po_dirty="$outputBin $outputInclude $outputLib"
         set +o pipefail
         propagatedOutputs=`echo "$po_dirty" \

From 61b4bdded460ea943e3d627722152868e35958a0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 04:51:07 +0300
Subject: [PATCH 129/857] gcc 4.9: Port multiple-outputs changes from gcc 4.8

---
 pkgs/development/compilers/gcc/4.9/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 8b2fda05095cb..46f070322650c 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -217,6 +217,12 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
+  outputs = [ "out" "lib" "doc" ];
+  setOutputFlags = false;
+  NIX_NO_SELF_RPATH = true;
+
+  libc_dev = stdenv.cc.libc_dev;
+
   postPatch =
     if (stdenv.isGNU
         || (libcCross != null                  # e.g., building `gcc.crossDrv'

From 8a460bf953a2d6529b5372e26bb9ce5aa505929c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 04:51:53 +0300
Subject: [PATCH 130/857] gcc 4.8, 4.9: Revert conflicting info output

---
 pkgs/development/compilers/gcc/4.8/default.nix | 2 --
 pkgs/development/compilers/gcc/4.9/default.nix | 2 --
 2 files changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 83fbbef3fb7ae..a90d9e7c8ec4e 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -209,8 +209,6 @@ stdenv.mkDerivation ({
 
   builder = ../builder.sh;
 
-  outputs = [ "out" "info" ];
-
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
     sha256 = "08yggr18v373a1ihj0rg2vd6psnic42b518xcgp3r9k81xz1xyr2";
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 46f070322650c..430e4ea1bf99f 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -208,8 +208,6 @@ stdenv.mkDerivation ({
 
   builder = ../builder.sh;
 
-  outputs = [ "out" "info" ];
-
   src = fetchurl {
     url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2";
     sha256 = "0zmnm00d2a1hsd41g34bhvxzvxisa2l584q3p447bd91lfjv4ci3";

From bd028b24bb1f90e04b5f430568aca710ad786b68 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 13:50:34 +0300
Subject: [PATCH 131/857] gcc 4.9: Fix multi-out fixups

- $out/libexec/ now contains subdirectories that we want to patchelf too
- $out/libexec/ now contains some .so and a related .la file, which must
  not be passed to patchelf
---
 pkgs/development/compilers/gcc/builder.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 8cf04ce1c35c7..bfe3b6a559f3d 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -231,14 +231,14 @@ postInstall() {
     rm -rf $out/bin/gccbug
 
     # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out
-    for i in "$out"/libexec/gcc/*/*/*; do
+    for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do
         PREV_RPATH=`patchelf --print-rpath "$i"`
         NEW_RPATH=`echo "$PREV_RPATH" | sed 's,:[^:]*bootstrap-tools/lib,,g'`
         patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK
     done
 
     # For some reason the libs retain RPATH to $out
-    for i in "$lib"/lib/{libtsan.so.0.0.0,libasan.so.0.0.0}; do
+    for i in "$lib"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do
         PREV_RPATH=`patchelf --print-rpath "$i"`
         NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"`
         patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK

From 15471a86595a0ec7d558b856d0c3f1c6169d4966 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 20:54:37 +0300
Subject: [PATCH 132/857] gcc: Do bootstrapped compilation on MIPS and ARM as
 well

Since the multiple-output changes building a non-bootstrapped gcc
doesn't work anymore. TODO: also test if cross compilation is broken
---
 pkgs/development/compilers/gcc/4.9/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 430e4ea1bf99f..07dca989c9bac 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -196,7 +196,7 @@ let version = "4.9.3";
     stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
     crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
 
-  bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
+  bootstrap = cross == null;
 
 in
 

From a39f5839eab3a2b01f2d6697b9a0a77cc8e4709c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 15:54:55 +0300
Subject: [PATCH 133/857] groff: Fix multiple-output build

---
 pkgs/tools/text/groff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix
index 039bff8c655a9..e08c10fd9ed2e 100644
--- a/pkgs/tools/text/groff/default.nix
+++ b/pkgs/tools/text/groff/default.nix
@@ -35,9 +35,9 @@ stdenv.mkDerivation rec {
   postInstall = ''
       # Remove example output with (random?) colors to 
       # avoid non-determinism in the output
-      rm $out/share/doc/${name}/examples/hdtbl/*color*ps
+      rm $doc/share/doc/examples/hdtbl/*color*ps
       # Remove creation date
-      find $out/share/doc/${name} -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
+      find $doc/share/doc/ -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//'
     '';
 
   meta = with stdenv.lib; {

From 947542be6dee872b9b55b02f6ae4a23d6b59d937 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 16:10:24 +0300
Subject: [PATCH 134/857] libxft: Fix reference to incorrect output

---
 pkgs/servers/x11/xorg/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 65860dbe7ae68..607023f6f8e71 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -163,7 +163,7 @@ in
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     # the include files need ft2build.h, and Requires.private isn't enough for us
     postInstall = ''
-      sed "/^Requires:/s/$/, freetype2/" -i "$out/lib/pkgconfig/xft.pc"
+      sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
     '';
   };
 

From 4be9702fe07fca86cdaa4c58ff8939623f326eca Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 16:15:29 +0300
Subject: [PATCH 135/857] libffi: Don't manually move lib64 stuff

It breaks the i686 build. TODO: test that this doesn't break x86_64 ;)
---
 pkgs/development/libraries/libffi/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index cc7d1f75bb1b2..662b36f93460e 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
 
   # Install headers and libs in the right places.
   postInstall = ''
-    mv "$out"/lib64/* "$out/lib"
-    rmdir "$out/lib64"
-    ln -s lib "$out/lib64"
-
     mkdir -p "$dev/"
     mv "$out/lib/${name}/include" "$dev/include"
     rmdir "$out/lib/${name}"

From 0054c8aa5a6bed9763cca4e130bae618120491f4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 20 Aug 2015 22:35:01 +0300
Subject: [PATCH 136/857] python3: Use correct build inputs for multi-output
 deps

Without this, python will silently build without native extensions (e.g
openssl); this causes wget to fail its tests for instance.

vcunat added python-3.5.
---
 pkgs/development/interpreters/python/3.2/default.nix | 4 ++--
 pkgs/development/interpreters/python/3.3/default.nix | 4 ++--
 pkgs/development/interpreters/python/3.4/default.nix | 4 ++--
 pkgs/development/interpreters/python/3.5/default.nix | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index f4103662316ec..c0b5d3401ddd3 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
     configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index a8953f38245a0..a46ef7c056b2d 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 10bb8b3215df9..3d3069cf0b569 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -50,8 +50,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix
index d689fdeee4c27..5c07b9e0cf02e 100644
--- a/pkgs/development/interpreters/python/3.5/default.nix
+++ b/pkgs/development/interpreters/python/3.5/default.nix
@@ -50,8 +50,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p}/lib") buildInputs)}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';

From 0100b270694ecab8aaa13fa5f3d30639b50d7777 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 02:12:27 +0300
Subject: [PATCH 137/857] imake: Add uberhack to workaround broken 'gcc -x c'

Our cc-wrapper is broken whenever the '-x' flag is used:
'gcc -x c foo.c -o bar' doesn't work the same way as 'gcc foo.c -o bar'
does. (Try both with NIX_DEBUG=1.)

What happens is that passing '-x' causes linker-related flags (such as
-Wl,-dynamic-linker) not to be added, just like if '-c' is passed.
The bug happens outside the multiple-outputs branch as well, but it
doesn't break imake there. It only breaks in multiple-outputs because
linking without -Wl,-dynamic-linker produces a binary with an invalid
ELF interpreter path. (Which arguably, is a bug in its own.)
---
 .../x11/xorg/imake-cc-wrapper-uberhack.patch        | 13 +++++++++++++
 pkgs/servers/x11/xorg/overrides.nix                 |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch

diff --git a/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch b/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch
new file mode 100644
index 0000000000000..fe079eeb42a75
--- /dev/null
+++ b/pkgs/servers/x11/xorg/imake-cc-wrapper-uberhack.patch
@@ -0,0 +1,13 @@
+diff --git a/imake.c b/imake.c
+index c20cd4a..ec2589b 100644
+--- a/imake.c
++++ b/imake.c
+@@ -959,7 +959,7 @@ get_libc_version(FILE *inFile)
+ {
+   char aout[4096], *tmpdir;
+   FILE *fp;
+-  const char *format = "%s -o %s -x c -";
++  const char *format = "f=$(mktemp imakeXXXXXX.c); cat > $f; %s $f -o %s";
+   char *cc;
+   int len;
+   char *command;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 607023f6f8e71..bbd78c886cf14 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -48,7 +48,7 @@ in
   imake = attrs: attrs // {
     inherit (xorg) xorgcffiles;
     x11BuildHook = ./imake.sh;
-    patches = [./imake.patch];
+    patches = [./imake.patch ./imake-cc-wrapper-uberhack.patch];
     setupHook = if stdenv.isDarwin then ./darwin-imake-setup-hook.sh else null;
     CFLAGS = [ "-DIMAKE_COMPILETIME_CPP=\\\"${if stdenv.isDarwin
       then "${args.tradcpp}/bin/cpp"

From 331aee2a61073e11adfddac43218d4b1ef00bb1a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 03:12:41 +0300
Subject: [PATCH 138/857] slim: Add glibc as build input

I don't know why this is needed, but other cmake packages seem to need
this as well.
---
 pkgs/applications/display-managers/slim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 42d2c777aea20..f3147ca5187c0 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, xorg, libjpeg, libpng
-, fontconfig, freetype, pam, dbus_libs, makeWrapper, pkgs }:
+, fontconfig, freetype, pam, dbus_libs, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "slim-1.3.6";
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ cmake pkgconfig libjpeg libpng fontconfig freetype
-      pam dbus_libs
+      pam dbus_libs (stdenv.cc.libc.out or null)
       xorg.libX11 xorg.libXext xorg.libXrandr xorg.libXrender xorg.libXmu xorg.libXft makeWrapper
     ];
 

From 0e6d0a5868e23722e2949ae8990f02a6efb6b15f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 20:12:59 +0300
Subject: [PATCH 139/857] unionfs-fuse: Fix the utillinux path hack for
 multiple-outputs

Double ugh.
---
 nixos/modules/tasks/filesystems/unionfs-fuse.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/unionfs-fuse.nix b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
index 3e38bffa3ba2c..1dcc4c87e3cec 100644
--- a/nixos/modules/tasks/filesystems/unionfs-fuse.nix
+++ b/nixos/modules/tasks/filesystems/unionfs-fuse.nix
@@ -18,9 +18,9 @@
 
       boot.initrd.postDeviceCommands = ''
           # Hacky!!! fuse hard-codes the path to mount
-          mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-          ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
-          ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}/bin
+          mkdir -p /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
+          ln -s $(which mount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
+          ln -s $(which umount) /nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-${pkgs.utillinux.name}-bin/bin
         '';
     })
 

From 0b5353b319f970fab4454fa7491ab9d013841fb3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 20:35:23 +0300
Subject: [PATCH 140/857] kbd: Reference correct output of bzip2

---
 pkgs/os-specific/linux/kbd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kbd/default.nix b/pkgs/os-specific/linux/kbd/default.nix
index bb2915958f7ca..fddaa84a82404 100644
--- a/pkgs/os-specific/linux/kbd/default.nix
+++ b/pkgs/os-specific/linux/kbd/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       # Fix the path to gzip/bzip2.
       substituteInPlace src/libkeymap/findfile.c \
         --replace gzip ${gzip}/bin/gzip \
-        --replace bzip2 ${bzip2}/bin/bzip2 \
+        --replace bzip2 ${bzip2.bin}/bin/bzip2 \
 
       # We get a warning in armv5tel-linux and the fuloong2f, so we
       # disable -Werror in it.

From 86919e2ae40cd08c53734ee252e7c6a95074a50b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 20:38:12 +0300
Subject: [PATCH 141/857] nixos/auto-upgrade: Reference correct xz output

---
 nixos/modules/installer/tools/auto-upgrade.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index b2676b05a02cb..dd8663a12db82 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -67,7 +67,7 @@ let cfg = config.system.autoUpgrade; in
           HOME = "/root";
         };
 
-      path = [ pkgs.gnutar pkgs.xz config.nix.package ];
+      path = [ pkgs.gnutar pkgs.xz.bin config.nix.package ];
 
       script = ''
         ${config.system.build.nixos-rebuild}/bin/nixos-rebuild test ${toString cfg.flags}

From c856b13067a4a23e1800e7a17d8be6742fcac906 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 20:39:40 +0300
Subject: [PATCH 142/857] nixos/nix-daemon: Reference correct output of openssl

---
 nixos/modules/services/misc/nix-daemon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4aed91c349788..ceffdbead4e43 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -359,7 +359,7 @@ in
     systemd.sockets.nix-daemon.wantedBy = [ "sockets.target" ];
 
     systemd.services.nix-daemon =
-      { path = [ nix pkgs.openssl pkgs.utillinux config.programs.ssh.package ]
+      { path = [ nix pkgs.openssl.bin pkgs.utillinux config.programs.ssh.package ]
           ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
 
         environment = cfg.envVars

From 7cd13b9003da2dfe50e7fcf92933e5ae812d1701 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 21:12:25 +0300
Subject: [PATCH 143/857] apache-httpd: Enable SSL via buildInputs

The old approach doesn't seem to work with multiple outputs.
---
 pkgs/servers/http/apache-httpd/2.4.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 29f8a9621c9ef..bcfd885ae012b 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [perl] ++
+    optional sslSupport openssl ++
     optional ldapSupport openldap ++    # there is no --with-ldap flag
     optional libxml2Support libxml2;
 
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
     --enable-imagemap
     --enable-cgi
     ${optionalString proxySupport "--enable-proxy"}
-    ${optionalString sslSupport "--enable-ssl --with-ssl=${openssl}"}
+    ${optionalString sslSupport "--enable-ssl"}
     ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
     ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"}
   '';

From 8088ad396c15cf33e009df5c8ce1f65763c1814e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 21:48:08 +0300
Subject: [PATCH 144/857] nixos/networking: Reference correct glibc output

---
 nixos/modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index b49f8a156d1d1..e76f15f233768 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -128,7 +128,7 @@ in
         "protocols".source  = pkgs.iana_etc + "/etc/protocols";
 
         # /etc/rpc: RPC program numbers.
-        "rpc".source = pkgs.glibc + "/etc/rpc";
+        "rpc".source = pkgs.glibc.out + "/etc/rpc";
 
         # /etc/hosts: Hostname-to-IP mappings.
         "hosts".text =

From 92bf5c5277a2b3bb77be9b882ed8488291e39f11 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 22 Aug 2015 00:17:30 +0300
Subject: [PATCH 145/857] nixos/x11: Refer to correct outputs of libX11 and
 libXext

---
 nixos/modules/services/x11/xserver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 3348e8d0582c9..0339ba2f71fc1 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -495,7 +495,7 @@ in
             XKB_BINDIR = "${xorg.xkbcomp}/bin"; # Needed for the Xkb extension.
             XORG_DRI_DRIVER_PATH = "/run/opengl-driver/lib/dri"; # !!! Depends on the driver selected at runtime.
             LD_LIBRARY_PATH = concatStringsSep ":" (
-              [ "${xorg.libX11}/lib" "${xorg.libXext}/lib" ]
+              [ "${xorg.libX11.out}/lib" "${xorg.libXext.out}/lib" ]
               ++ concatLists (catAttrs "libPath" cfg.drivers));
           } // cfg.displayManager.job.environment;
 

From 95e11c35698a1645fafdd60496e85de88e79a8fd Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 11:14:06 +0300
Subject: [PATCH 146/857] nixos/lightdm: Reference correct output of gdk_pixbuf

---
 nixos/modules/services/x11/display-managers/lightdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 54874780bada1..b7b57e0fbd75a 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -33,7 +33,7 @@ let
       makeWrapper ${pkgs.lightdm_gtk_greeter}/sbin/lightdm-gtk-greeter \
         $out/greeter \
         --prefix PATH : "${pkgs.glibc.bin}/bin" \
-        --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
+        --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
         --set GTK_PATH "${theme}:${pkgs.gtk3}" \
         --set GTK_EXE_PREFIX "${theme}" \
         --set GTK_DATA_PREFIX "${theme}" \

From 54dcadad6c979ba94360a6b5959d16a4c00c0116 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 11:14:42 +0300
Subject: [PATCH 147/857] librsvg: Reference correct output of gdk_pixbuf

---
 pkgs/development/libraries/librsvg/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index ea1910733e7d2..927ee472ec330 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   # 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
+    cat ${gdk_pixbuf.out}/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
   '';
 }

From cd3088455d518b4416cfaec569b9614d92f97023 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 13:32:05 +0300
Subject: [PATCH 148/857] nixos/stage-2: Build readonly-mountpoint with normal
 mkDerivation phases

This way the binary gets stripped & rpath-shrinked etc. as usual.
We'd seem to get a runtime reference to gcc otherwise.

TODO: Maybe we should be able to set e.g. 'dontUnpack = true;'
to make this more pretty.
---
 nixos/modules/system/boot/stage-2.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index c0ef4e02d1ffa..b67f42a017e69 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -7,11 +7,14 @@ let
   kernel = config.boot.kernelPackages.kernel;
   activateConfiguration = config.system.activationScripts.script;
 
-  readonlyMountpoint = pkgs.runCommand "readonly-mountpoint" {} ''
-    mkdir -p $out/bin
-    cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint
-    strip -s $out/bin/readonly-mountpoint
-  '';
+  readonlyMountpoint = pkgs.stdenv.mkDerivation {
+    name = "readonly-mountpoint";
+    unpackPhase = "true";
+    installPhase = ''
+      mkdir -p $out/bin
+      cc -O3 ${./readonly-mountpoint.c} -o $out/bin/readonly-mountpoint
+    '';
+  };
 
   bootStage2 = pkgs.substituteAll {
     src = ./stage-2-init.sh;

From 1ac0e05f69674839d0a3478d8dd776caccca9b04 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 13:36:47 +0300
Subject: [PATCH 149/857] nixos/setuid-wrappers: Build with normal mkDerivation
 phases

This way the binary gets stripped & rpath-shrinked etc. as usual.
We'd seem to get a runtime reference to gcc otherwise.
---
 nixos/modules/security/setuid-wrappers.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix
index 2a289dc402ce8..7d69f9b1183da 100644
--- a/nixos/modules/security/setuid-wrappers.nix
+++ b/nixos/modules/security/setuid-wrappers.nix
@@ -8,12 +8,12 @@ let
 
   setuidWrapper = pkgs.stdenv.mkDerivation {
     name = "setuid-wrapper";
-    buildCommand = ''
+    unpackPhase = "true";
+    installPhase = ''
       mkdir -p $out/bin
       cp ${./setuid-wrapper.c} setuid-wrapper.c
       gcc -Wall -O2 -DWRAPPER_DIR=\"${wrapperDir}\" \
           setuid-wrapper.c -o $out/bin/setuid-wrapper
-      strip -S $out/bin/setuid-wrapper
     '';
   };
 

From 09637ac36362a28d9e0347a22aa05fc2d6991fea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 21:37:23 +0300
Subject: [PATCH 150/857] kernel: Don't propagate the dev output

The current default multiple-output propagation rules don't seem to work
too well if the dev output isn't the first one; without this we get an
unnecessary runtime reference to the kernel headers.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 49880e0ecdd04..091855a165259 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -74,7 +74,7 @@ let
 
       installsFirmware = (config.isEnabled "FW_LOADER") &&
         (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL"));
-    in (optionalAttrs isModular { outputs = [ "out" "dev" ]; }) // {
+    in (optionalAttrs isModular { outputs = [ "out" "dev" ]; propagatedOutputs = ""; }) // {
       passthru = {
         inherit version modDirVersion config kernelPatches;
       };

From 0da9c49303df6748c9de4343d8cea15861ede2a0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 24 Aug 2015 01:29:08 +0300
Subject: [PATCH 151/857] autogen: Split into multiple outputs

In particular, this avoids runtime-depending on guile.
---
 pkgs/development/tools/misc/autogen/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index bba50b3208920..d2ddcabc0b1eb 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/pkgs/development/tools/misc/autogen/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0sfmmy19k9z0j3f738fyk6ljf6b66410cvd5zzyplxi2683j10qs";
   };
 
+  outputs = [ "dev" "bin" "lib" "out" "man" "info" ];
+
   nativeBuildInputs = [ which pkgconfig perl ];
   buildInputs = [ guile libxml2 ];
 
@@ -20,6 +22,17 @@ stdenv.mkDerivation rec {
     substituteInPlace pkg/libopts/mklibsrc.sh --replace /tmp $TMPDIR
   '';
 
+  postInstall = ''
+    mkdir -p $dev/bin
+    mv $bin/bin/autoopts-config $dev/bin
+
+    for f in $lib/lib/autogen/tpl-config.tlib $out/share/autogen/tpl-config.tlib; do
+      sed -e "s|$dev/include|/no-such-autogen-include-path|" -i $f
+      sed -e "s|$bin/bin|/no-such-autogen-bin-path|" -i $f
+      sed -e "s|$lib/lib|/no-such-autogen-lib-path|" -i $f
+    done
+  '';
+
   #doCheck = true; # 2 tests fail because of missing /dev/tty
 
   meta = with stdenv.lib; {

From 837c104512b96627b686506665f77336af9484c8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 23 Aug 2015 11:14:59 +0300
Subject: [PATCH 152/857] perl: Port multiple-output changes from 5.16 to 5.20
 and 5.22

---
 pkgs/development/interpreters/perl/5.20/default.nix | 11 +++++++++++
 pkgs/development/interpreters/perl/5.22/default.nix | 11 +++++++++++
 2 files changed, 22 insertions(+)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index bcf22654969d0..d5c8efa5a61cc 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -92,6 +92,17 @@ stdenv.mkDerivation rec {
       substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
     '';
 
+  postInstall =
+    ''
+      # Remove dependency between "out" and "man" outputs.
+      rm $out/lib/perl5/*/*/.packlist
+
+      # Remove dependencies on glibc.dev and coreutils.
+      substituteInPlace $out/lib/perl5/*/*/Config_heavy.pl \
+        --replace ${stdenv.glibc.dev or "/blabla"} /no-such-path \
+        --replace $man /no-such-path
+    ''; # */
+
   setupHook = ./setup-hook.sh;
 
   passthru.libPrefix = "lib/perl5/site_perl";
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index 2cf6981c7637e..14aa741b24679 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -101,6 +101,17 @@ stdenv.mkDerivation rec {
     unset LD_LIBRARY_PATH
   '';
 
+  postInstall =
+    ''
+      # Remove dependency between "out" and "man" outputs.
+      rm $out/lib/perl5/*/*/.packlist
+
+      # Remove dependencies on glibc.dev and coreutils.
+      substituteInPlace $out/lib/perl5/*/*/Config_heavy.pl \
+        --replace ${stdenv.glibc.dev or "/blabla"} /no-such-path \
+        --replace $man /no-such-path
+    ''; # */
+
   meta = {
     homepage = https://www.perl.org/;
     description = "The standard implementation of the Perl 5 programmming language";

From 8c811ea13afdb5dc1a850855892ed390ea2652a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 14:37:07 +0200
Subject: [PATCH 153/857] jasper: fixup

---
 pkgs/development/libraries/jasper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 82d86d46fada2..17395561eda52 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, libjpeg }:
+{ stdenv, fetchurl, unzip, libjpeg, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "jasper-1.900.1";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     ./jasper-CVE-2014-9029.diff
   ];
 
-  # outputs TODO: why reconf
+  # newer reconf to recognize a multiout flag
   nativeBuildInputs = [ unzip autoreconfHook ];
   propagatedBuildInputs = [ libjpeg ];
 

From f2cb132c34d115761a19728a2a6a595f4fa08761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 14:37:35 +0200
Subject: [PATCH 154/857] libtiff: fixup

---
 pkgs/development/libraries/libtiff/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index 1de75f72e6e3a..a506279c2a4af 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -14,8 +14,6 @@ stdenv.mkDerivation rec {
     sha256 = "136nf1rj9dp5jgv1p7z4dk0xy3wki1w0vfjbk82f645m0w4samsd";
   };
 
-  outputs = [ "out" "doc" "man" ];
-
   outputs = [ "dev" "out" "bin" "doc" ];
 
   nativeBuildInputs = [ pkgconfig ];

From cf7163f6f40732838fafeaa0f7d2f4a8ccc285bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:23:00 +0200
Subject: [PATCH 155/857] rustc: re-add missing file from staging

I'm not sure why it has disappeared.
Also try to fixup with multiple-output changes.
---
 pkgs/development/compilers/rustc/generic.nix | 168 +++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 pkgs/development/compilers/rustc/generic.nix

diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
new file mode 100644
index 0000000000000..ef8c372f2fd68
--- /dev/null
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -0,0 +1,168 @@
+{ stdenv, fetchurl, fetchgit, fetchzip, file, python2, tzdata, procps
+, llvmPackages_37, jemalloc, ncurses, binutils
+
+, shortVersion, isRelease
+, srcSha, srcRev ? ""
+, snapshotHashLinux686, snapshotHashLinux64
+, snapshotHashDarwin686, snapshotHashDarwin64
+, snapshotDate, snapshotRev
+, configureFlags ? []
+
+, patches
+}:
+
+assert !stdenv.isFreeBSD;
+
+/* Rust's build process has a few quirks :
+
+- The Rust compiler is written is Rust, so it requires a bootstrap
+  compiler, which is downloaded during the build. To make the build
+  pure, we download it ourself before and put it where it is
+  expected. Once the language is stable (1.0) , we might want to
+  switch it to use nix's packaged rust compiler. This might not be possible
+  as the compiler is highly coupled to the bootstrap.
+
+NOTE : some derivation depend on rust. When updating this, please make
+sure those derivations still compile. (racer, for example).
+
+*/
+
+assert (if isRelease then srcRev == "" else srcRev != "");
+
+let version = if isRelease then
+        "${shortVersion}"
+      else
+        "${shortVersion}-g${builtins.substring 0 7 srcRev}";
+
+    name = "rustc-${version}";
+
+    platform = if stdenv.system == "i686-linux"
+      then "linux-i386"
+      else if stdenv.system == "x86_64-linux"
+      then "linux-x86_64"
+      else if stdenv.system == "i686-darwin"
+      then "macos-i386"
+      else if stdenv.system == "x86_64-darwin"
+      then "macos-x86_64"
+      else abort "no snapshot to bootstrap for this platform (missing platform url suffix)";
+
+    target = if stdenv.system == "i686-linux"
+      then "i686-unknown-linux-gnu"
+      else if stdenv.system == "x86_64-linux"
+      then "x86_64-unknown-linux-gnu"
+      else if stdenv.system == "i686-darwin"
+      then "i686-apple-darwin"
+      else if stdenv.system == "x86_64-darwin"
+      then "x86_64-apple-darwin"
+      else abort "no snapshot to bootstrap for this platform (missing target triple)";
+
+    meta = with stdenv.lib; {
+      homepage = http://www.rust-lang.org/;
+      description = "A safe, concurrent, practical language";
+      maintainers = with maintainers; [ madjar cstrahan wizeman globin havvy wkennington ];
+      license = [ licenses.mit licenses.asl20 ];
+      platforms = platforms.linux;
+    };
+
+    snapshotHash = if stdenv.system == "i686-linux"
+      then snapshotHashLinux686
+      else if stdenv.system == "x86_64-linux"
+      then snapshotHashLinux64
+      else if stdenv.system == "i686-darwin"
+      then snapshotHashDarwin686
+      else if stdenv.system == "x86_64-darwin"
+      then snapshotHashDarwin64
+      else abort "no snapshot for platform ${stdenv.system}";
+    snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshotHash}.tar.bz2";
+in
+
+stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+  inherit meta;
+
+  __impureHostDeps = [ "/usr/lib/libedit.3.dylib" ];
+
+  src = if isRelease then
+      fetchzip {
+        url = "http://static.rust-lang.org/dist/rustc-${version}-src.tar.gz";
+        sha256 = srcSha;
+      }
+    else
+      fetchgit {
+        url = https://github.com/rust-lang/rust;
+        rev = srcRev;
+        sha256 = srcSha;
+      };
+
+  # We need rust to build rust. If we don't provide it, configure will try to download it.
+  snapshot = stdenv.mkDerivation {
+    name = "rust-stage0";
+    src = fetchurl {
+      url = "http://static.rust-lang.org/stage0-snapshots/${snapshotName}";
+      sha1 = snapshotHash;
+    };
+    dontStrip = true;
+    installPhase = ''
+      mkdir -p "$out"
+      cp -r bin "$out/bin"
+    '' + stdenv.lib.optionalString stdenv.isLinux ''
+      patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
+               --set-rpath "${stdenv.cc.cc.lib}/lib/:${stdenv.cc.cc.lib}/lib64/" \
+               "$out/bin/rustc"
+    '';
+  };
+
+  configureFlags = configureFlags
+                ++ [ "--enable-local-rust" "--local-rust-root=$snapshot" "--enable-rpath" ]
+                ++ [ "--llvm-root=${llvmPackages_37.llvm}" ] #"--jemalloc-root=${jemalloc}/lib" ]
+                ++ [ "--default-linker=${stdenv.cc}/bin/cc" "--default-ar=${binutils}/bin/ar" ]
+                ++ stdenv.lib.optional (stdenv.cc.cc ? isClang) "--enable-clang";
+
+  inherit patches;
+
+  postPatch = ''
+    substituteInPlace src/rust-installer/gen-install-script.sh \
+      --replace /bin/echo "$(type -P echo)"
+    substituteInPlace src/rust-installer/gen-installer.sh \
+      --replace /bin/echo "$(type -P echo)"
+
+    # Workaround for NixOS/nixpkgs#8676
+    substituteInPlace mk/rustllvm.mk \
+      --replace "\$\$(subst  /,//," "\$\$(subst /,/,"
+
+    # Fix dynamic linking against llvm
+    sed -i 's/, kind = \\"static\\"//g' src/etc/mklldeps.py
+
+    # Fix the configure script to not require curl as we won't use it
+    sed -i configure \
+      -e '/probe_need CFG_CURLORWGET/d'
+
+    # Fix the use of jemalloc prefixes which our jemalloc doesn't have
+    # TODO: reenable if we can figure out how to get our jemalloc to work
+    #[ -f src/liballoc_jemalloc/lib.rs ] && sed -i 's,je_,,g' src/liballoc_jemalloc/lib.rs
+    #[ -f src/liballoc/heap.rs ] && sed -i 's,je_,,g' src/liballoc/heap.rs # Remove for 1.4.0+
+
+    # Useful debugging parameter
+    #export VERBOSE=1
+  '';
+
+  preConfigure = ''
+    # Needed flags as the upstream configure script has a broken prefix substitution
+    configureFlagsArray+=("--datadir=$out/share")
+    configureFlagsArray+=("--infodir=$out/share/info")
+  '';
+
+  # Procps is needed for one of the test cases
+  nativeBuildInputs = [ file python2 ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ procps ];
+  buildInputs = [ llvmPackages_37.llvm ncurses ];
+
+  enableParallelBuilding = true;
+
+  outputs = [ "out" "doc" ];
+
+  preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
+
+  doCheck = true;
+}

From b1a38cd40d8a51c0a575ac85fa9406d54565b825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:28:06 +0200
Subject: [PATCH 156/857] nodejs: fixup

---
 pkgs/development/web/nodejs/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix
index ca46db39a3f9e..361fbf6bf4c9b 100644
--- a/pkgs/development/web/nodejs/default.nix
+++ b/pkgs/development/web/nodejs/default.nix
@@ -44,9 +44,10 @@ in stdenv.mkDerivation {
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
 
   buildInputs = [ python zlib libuv openssl python ]
-    ++ optionals stdenv.isLinux [ utillinux http-parser ]
+    ++ optionals stdenv.isLinux [ utillinux http-parser ];
   nativeBuildInputs = [ pkgconfig ]
     ++ optional stdenv.isDarwin libtool;
+
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;

From 9fbb83b46741b76827f73654464473b409725667 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:28:39 +0200
Subject: [PATCH 157/857] openssl: fixup after merge

---
 .../development/libraries/openssl/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 5b846af62661c..d5d6a3caa79ec 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -43,6 +43,7 @@ stdenv.mkDerivation rec {
     "-DUSE_CRYPTODEV_DIGESTS"
   ];
 
+  makeFlags = [ "MANDIR=$(man)/share/man" ];
 
   # Parallel building is broken in OpenSSL.
   enableParallelBuilding = false;
@@ -54,24 +55,18 @@ stdenv.mkDerivation rec {
         rm "$out/lib/"*.a
     fi
 
-      mkdir -p $bin
-      mv $out/bin $bin/
+    mkdir -p $bin
+    mv $out/bin $bin/
 
-      rm -rf $out/etc/ssl/misc
-
-      mkdir $dev
-      mv $out/include $dev/
-
-      # OpenSSL installs readonly files, which otherwise we can't strip.
-      # FIXME: Can remove this after the next stdenv merge.
-      chmod -R +w $out
+    mkdir $dev
+    mv $out/include $dev/
 
     # remove dependency on Perl at runtime
-    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+    rm -r $out/etc/ssl/misc
   '';
 
   postFixup = ''
-    # Check to make sure we don't depend on perl
+    # Check to make sure the main output doesn't depend on perl
     if grep -r '${perl}' $out; then
       echo "Found an erroneous dependency on perl ^^^" >&2
       exit 1

From 2f7568e0928a4c0de64e8a63aee1eb015fad8940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:33:49 +0200
Subject: [PATCH 158/857] guile: fixup with multiple-output libtool

---
 pkgs/development/interpreters/guile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix
index c4634de5d3f20..bb0ef7594a4f5 100644
--- a/pkgs/development/interpreters/guile/default.nix
+++ b/pkgs/development/interpreters/guile/default.nix
@@ -49,7 +49,7 @@
     sed -i "$out/lib/pkgconfig/guile-2.0.pc"    \
         -e 's|-lunistring|-L${libunistring}/lib -lunistring|g ;
             s|^Cflags:\(.*\)$|Cflags: -I${libunistring}/include \1|g ;
-            s|-lltdl|-L${libtool}/lib -lltdl|g'
+            s|-lltdl|-L${libtool.lib}/lib -lltdl|g'
   '';
 
   # make check doesn't work on darwin

From 753cfbe09b06a40c35bc49f84d7ad9b128b0deff Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 21 Aug 2015 21:36:06 +0300
Subject: [PATCH 159/857] libXmu: Split into multiple outputs

We need to override BITMAPDIR, since the default:
    -DBITMAPDIR=\"$(includedir)/X11/bitmaps\"
would cause cycles between the outputs. Setting it to a nonexistent path
doesn't affect the code logic, since the corresponding single-output
directory $out/include/X11/bitmaps doesn't exist either.

(cherry picked from commit 15007c88108d9c6a3bc82b22eff53175bbddf75e)
---
 pkgs/servers/x11/xorg/overrides.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bbd78c886cf14..a7464a12485e8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -185,6 +185,11 @@ in
     outputs = [ "dev" "out" "man" ];
   };
 
+  libXmu = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ];
+    buildFlags = ''BITMAP_DEFINES=-DBITMAPDIR=\"/no-such-path\"'';
+  };
+
   libXrandr = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;

From 9d19ac7d0d27e9e7da6b46afcd6543d9002f48d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:37:26 +0200
Subject: [PATCH 160/857] apparmor: fixup to use some multiple-output paths

---
 pkgs/os-specific/linux/apparmor/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix
index 64c6f66575b63..49fdbab24caa8 100644
--- a/pkgs/os-specific/linux/apparmor/default.nix
+++ b/pkgs/os-specific/linux/apparmor/default.nix
@@ -22,7 +22,7 @@ let
   prePatchCommon = ''
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${perl}/bin/pod2man"
     substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2html" "${perl}/bin/pod2html"
-    substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
+    substituteInPlace ./common/Make.rules --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
     substituteInPlace ./common/Make.rules --replace "/usr/share/man" "share/man"
   '';
 
@@ -49,8 +49,8 @@ let
     dontDisableStatic = true;
 
     prePatch = prePatchCommon + ''
-      substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h"
-      substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc}/include/netinet/in.h"
+      substituteInPlace ./libraries/libapparmor/src/Makefile.am --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h"
+      substituteInPlace ./libraries/libapparmor/src/Makefile.in --replace "/usr/include/netinet/in.h" "${glibc.dev}/include/netinet/in.h"
       '';
 
     postPatch = "cd ./libraries/libapparmor";
@@ -104,7 +104,7 @@ let
     prePatch = prePatchCommon + ''
       substituteInPlace ./parser/Makefile --replace "/usr/bin/bison" "${bison}/bin/bison"
       substituteInPlace ./parser/Makefile --replace "/usr/bin/flex" "${flex}/bin/flex"
-      substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc}/include/linux/capability.h"
+      substituteInPlace ./parser/Makefile --replace "/usr/include/linux/capability.h" "${glibc.dev}/include/linux/capability.h"
       ## techdoc.pdf still doesn't build ...
       substituteInPlace ./parser/Makefile --replace "manpages htmlmanpages pdf" "manpages htmlmanpages"
     '';

From 1858a39c9a61b177acdb11e0728903bcdea90457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:41:51 +0200
Subject: [PATCH 161/857] apr: don't manually move apr-1-config

Also refactor meta.
---
 pkgs/development/libraries/apr/default.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/apr/default.nix b/pkgs/development/libraries/apr/default.nix
index 74994223e0f47..c6e505f43d231 100644
--- a/pkgs/development/libraries/apr/default.nix
+++ b/pkgs/development/libraries/apr/default.nix
@@ -11,6 +11,7 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./is-this-a-compiler-bug.patch ];
 
   outputs = [ "dev" "out" ];
+  outputBin = "dev";
 
   preConfigure =
     ''
@@ -24,17 +25,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall =
-    ''
-      mkdir $dev/bin $dev/lib
-      mv $out/bin/apr-1-config $dev/bin
-      mv $out/lib/pkgconfig $dev/lib
-    '';
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://apr.apache.org/;
     description = "The Apache Portable Runtime library";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = platforms.all;
+    maintainers = [ maintainers.eelco ];
   };
 }

From 77580d42ad4ba7f0307a7861681e372508bbd76d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 24 Aug 2015 17:07:41 +0300
Subject: [PATCH 162/857] php: Enable SSL via buildInputs

The old way doesn't seem to work with multiple outputs.
TODO: this seems to be a recurring pattern with openssl, maybe the
splitting isn't done correctly?
---
 pkgs/development/interpreters/php/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 7da631a3cbdab..59630d1814fa2 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -146,7 +146,7 @@ let
         };
 
         openssl = {
-          configureFlags = ["--with-openssl=${openssl}"];
+          configureFlags = ["--enable-openssl"];
           buildInputs = [openssl];
         };
 

From ad1eb36dac9479afa80afb87338cb8e7c184ef35 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 25 Aug 2015 18:52:41 +0300
Subject: [PATCH 163/857] binutils: Don't use multiple-outputs when cross
 compiling

---
 pkgs/development/tools/misc/binutils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index ccdb52238de71..ceec956004f5c 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     ./pt-pax-flags-20121023.patch
   ];
 
-  outputs = [ "dev" "out" "info" ];
+  outputs = (optional (cross == null) "dev") ++ [ "out" "info" ];
 
   nativeBuildInputs = optional gold bison;
   buildInputs = [ zlib ];
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postFixup = "ln -s $out/bin $dev/bin"; # tools needed for development
+  postFixup = optionalString (cross == null) "ln -s $out/bin $dev/bin"; # tools needed for development
 
   meta = {
     description = "Tools for manipulating binaries (linker, assembler, etc.)";

From c8d9e2fb67ee5a17e7cfd08003dff59974a1b3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:48:44 +0200
Subject: [PATCH 164/857] orc: split dev stuff, and refactor meta

---
 pkgs/development/compilers/orc/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 3b8916c67e90a..5f9db1fe69ea7 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -8,20 +8,21 @@ stdenv.mkDerivation rec {
     sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
+  outputBin = "dev"; # compilation tools
 
   # building memcpy_speed.log
   # ../test-driver: line 107:  4495 Segmentation fault      "$@" > $log_file 2>&1
   # FAIL: memcpy_speed
   doCheck = false; # see https://bugzilla.gnome.org/show_bug.cgi?id=728129#c7
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "The Oil Runtime Compiler";
     homepage = "http://code.entropywave.com/orc/";
     # The source code implementing the Marsenne Twister algorithm is licensed
     # under the 3-clause BSD license. The rest is 2-clause BSD license.
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.bsd3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.fuuzetsu ];
   };
 }

From c071e4aab42baf2ce7f57a4112c2c819954bb210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 16:49:13 +0200
Subject: [PATCH 165/857] planetary-annihilation: fixup to use multiple-output
 paths

Hopefully... there are way too many similar references everywhere.
---
 pkgs/games/planetaryannihilation/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index ed682e7bed93d..cf968c08287e2 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -34,12 +34,12 @@ stdenv.mkDerivation {
     ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host" 
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host" 
 
-    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64"
+    wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
 
     for f in $out/lib/*; do
-      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc curl xorg.libX11 stdenv.glibc xorg.libXcursor "$out" ]}:${stdenv.cc.cc}/lib64:${stdenv.glibc}/lib64" $f
+      patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib curl xorg.libX11 stdenv.glibc.out xorg.libXcursor "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" $f
     done
   '';
 

From 32a5deb455914ab13f1b1a2e7b105bc328dc94a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 17:07:49 +0200
Subject: [PATCH 166/857] libffi: fixup libffi.pc, and refactor

---
 pkgs/development/libraries/libffi/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 662b36f93460e..816b9728cc99c 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0dya49bnhianl0r65m65xndz6ls2jn1xngyn72gd28ls3n7bnvnh";
   };
 
-  patches = if stdenv.isCygwin then [ ./3.2.1-cygwin.patch ] else null;
+  patches = stdenv.lib.optional stdenv.isCygwin ./3.2.1-cygwin.patch;
 
   outputs = [ "dev" "out" "doc" ];
 
@@ -20,13 +20,15 @@ stdenv.mkDerivation rec {
   dontStrip = stdenv ? cross; # Don't run the native `strip' when cross-compiling.
 
   # Install headers and libs in the right places.
-  postInstall = ''
+  postFixup = ''
     mkdir -p "$dev/"
     mv "$out/lib/${name}/include" "$dev/include"
     rmdir "$out/lib/${name}"
+    substituteInPlace "$dev/lib/pkgconfig/libffi.pc" \
+      --replace 'includedir=''${libdir}/libffi-3.2.1' "includedir=$dev"
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A foreign function call interface library";
     longDescription = ''
       The libffi library provides a portable, high level programming
@@ -44,8 +46,8 @@ stdenv.mkDerivation rec {
     '';
     homepage = http://sourceware.org/libffi/;
     # See http://github.com/atgreen/libffi/blob/master/LICENSE .
-    license = stdenv.lib.licenses.free;
+    license = licenses.free;
     maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
   };
 }

From c83b59130fac7edfd5c856409835bee10044725a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 19:02:13 +0200
Subject: [PATCH 167/857] libsodium: fix build by removing -lssp

There seems no reason why it should be there anyway.
/cc maintainers: @raskin, @viric, @wkennington.
---
 pkgs/development/libraries/libsodium/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 0b0656df4f66a..2a550e4f3d6ae 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -8,8 +8,6 @@ stdenv.mkDerivation rec {
     sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";
-
   doCheck = true;
 
   meta = with stdenv.lib; {

From 54eef655333659bef5f4e1057dcddad8963c4af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 19:12:06 +0200
Subject: [PATCH 168/857] libcap*: fix with multiple outputs

I don't think we need the license file in each of these,
so I only left it with the library (it isn't big).
---
 pkgs/os-specific/linux/libcap/default.nix | 1 +
 pkgs/os-specific/linux/libcap/man.nix     | 2 --
 pkgs/os-specific/linux/libcap/pam.nix     | 2 --
 pkgs/os-specific/linux/libcap/progs.nix   | 5 ++++-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/libcap/default.nix b/pkgs/os-specific/linux/libcap/default.nix
index 84e363b68242d..c8484babcdf83 100644
--- a/pkgs/os-specific/linux/libcap/default.nix
+++ b/pkgs/os-specific/linux/libcap/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
   makeFlags = "lib=lib prefix=$(out)";
 
   postInstall = ''
+    rm "$out"/lib/*.a
     mkdir -p "$dev/share/doc/${name}"
     cp ../License "$dev/share/doc/${name}/License"
   '';
diff --git a/pkgs/os-specific/linux/libcap/man.nix b/pkgs/os-specific/linux/libcap/man.nix
index 9aac3c4e1f5a0..eeb780f095bdc 100644
--- a/pkgs/os-specific/linux/libcap/man.nix
+++ b/pkgs/os-specific/linux/libcap/man.nix
@@ -10,6 +10,4 @@ stdenv.mkDerivation rec {
   makeFlags = "MANDIR=$(out)/share/man";
 
   preConfigure = "cd doc";
-
-  postInstall = libcap.postinst name;
 }
diff --git a/pkgs/os-specific/linux/libcap/pam.nix b/pkgs/os-specific/linux/libcap/pam.nix
index b78f32dccbb44..3dd7cd947af22 100644
--- a/pkgs/os-specific/linux/libcap/pam.nix
+++ b/pkgs/os-specific/linux/libcap/pam.nix
@@ -12,6 +12,4 @@ stdenv.mkDerivation rec {
   preConfigure = "cd pam_cap";
 
   makeFlags = "${libcap.makeFlags} PAM_CAP=yes";
-
-  postInstall = libcap.postinst name;
 }
diff --git a/pkgs/os-specific/linux/libcap/progs.nix b/pkgs/os-specific/linux/libcap/progs.nix
index ae4446c82e6cf..e3871f15f885c 100644
--- a/pkgs/os-specific/linux/libcap/progs.nix
+++ b/pkgs/os-specific/linux/libcap/progs.nix
@@ -21,5 +21,8 @@ stdenv.mkDerivation rec {
 
   installFlags = "RAISE_SETFCAP=no";
 
-  postInstall = libcap.postinst name;
+  postInstall = ''
+    mkdir -p "$out/share/doc/${name}"
+    cp ../License "$out/share/doc/${name}/"
+  '';
 }

From ec7a4ddd92e19e0084a07448671cd79d974cd818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 19:29:05 +0200
Subject: [PATCH 169/857] all-packages: fix openssl_* reference

(cherry picked from commit 976b1dd423ac73eb29a20de84f1a5b79da4dd5bb)
---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50bb9bab40c48..602fe1c024f56 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2022,7 +2022,6 @@ let
 
   nodejs-4_1 = callPackage ../development/web/nodejs {
     libtool = darwin.cctools;
-    openssl = openssl_1_0_2;
   };
 
   nodejs-0_10 = callPackage ../development/web/nodejs/v0_10.nix {

From b44d846990d779f7201f114076a2f2bcacdc91c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 20:52:03 +0200
Subject: [PATCH 170/857] udev: complete rework

- systemd puts all into one output now (except for man),
  because I wasn't able to fix all systemd/udev refernces
  for NixOS to work well
- libudev is now by default *copied* into another path,
  which is what most packages will use as build input :-)
- pkgs.udev = [ libudev.out libudev.dev ]; because there are too many
  references that just put `udev` into build inputs (to rewrite them all),
  also this made "${udev}/foo" fail at *evaluation* time
  so it's easier to catch and change to something more specific
---
 nixos/modules/services/hardware/udev.nix      |  4 ++--
 nixos/modules/system/boot/stage-1.nix         | 12 +++++-----
 .../editors/lighttable/default.nix            |  4 ++--
 .../networking/browsers/chromium/common.nix   |  6 ++---
 .../development/libraries/libusb1/default.nix |  6 ++---
 .../development/libraries/libvirt/default.nix |  6 ++---
 pkgs/development/libraries/mesa/default.nix   |  6 ++---
 pkgs/development/tools/node-webkit/nw11.nix   |  4 ++--
 pkgs/development/tools/node-webkit/nw12.nix   |  4 ++--
 pkgs/development/tools/node-webkit/nw9.nix    |  4 ++--
 pkgs/misc/drivers/foo2zjs/default.nix         |  4 ++--
 pkgs/os-specific/linux/drbd/default.nix       |  4 ++--
 pkgs/os-specific/linux/lvm2/default.nix       |  6 ++---
 .../linux/multipath-tools/default.nix         |  6 ++---
 pkgs/os-specific/linux/systemd/default.nix    | 24 ++++++++++++-------
 .../linux/systemd/hwdb-location.diff          | 19 +++++++++++++++
 pkgs/os-specific/linux/systemd/libudev.nix    | 19 +++++++++++++++
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix |  8 +++----
 .../tools/filesystems/nixpart/0.4/default.nix |  6 ++---
 pkgs/tools/filesystems/nixpart/0.4/lvm2.nix   |  6 ++---
 .../nixpart/0.4/multipath-tools.nix           |  6 ++---
 pkgs/top-level/all-packages.nix               | 11 +++++++--
 pkgs/top-level/python-packages.nix            |  2 +-
 23 files changed, 115 insertions(+), 62 deletions(-)
 create mode 100644 pkgs/os-specific/linux/systemd/hwdb-location.diff
 create mode 100644 pkgs/os-specific/linux/systemd/libudev.nix

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 7ff13af15926a..107e1012b88df 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -58,13 +58,13 @@ let
           --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
       done
 
-      echo -n "Checking that all programs called by relative paths in udev rules exist in ${pkgs.udev.out}/lib/udev... "
+      echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... "
       import_progs=$(grep 'IMPORT{program}="[^/$]' $out/* |
         sed -e 's/.*IMPORT{program}="\([^ "]*\)[ "].*/\1/' | uniq)
       run_progs=$(grep -v '^[[:space:]]*#' $out/* | grep 'RUN+="[^/$]' |
         sed -e 's/.*RUN+="\([^ "]*\)[ "].*/\1/' | uniq)
       for i in $import_progs $run_progs; do
-        if [[ ! -x ${pkgs.udev.out}/lib/udev/$i && ! $i =~ socket:.* ]]; then
+        if [[ ! -x ${udev}/lib/udev/$i && ! $i =~ socket:.* ]]; then
           echo "FAIL"
           echo "$i is called in udev rules but not installed by udev"
           exit 1
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 6b722c4e11056..0759b10c00a51 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -60,9 +60,9 @@ let
       copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm
 
       # Copy udev.
-      copy_bin_and_libs ${udev.out}/lib/systemd/systemd-udevd
-      copy_bin_and_libs ${udev.out}/bin/udevadm
-      for BIN in ${udev.libudev}/lib/udev/*_id; do
+      copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd
+      copy_bin_and_libs ${udev}/bin/udevadm
+      for BIN in ${udev}/lib/udev/*_id; do
         copy_bin_and_libs $BIN
       done
 
@@ -146,9 +146,9 @@ let
 
       echo 'ENV{LD_LIBRARY_PATH}="${extraUtils}/lib"' > $out/00-env.rules
 
-      cp -v ${udev.out}/lib/udev/rules.d/60-cdrom_id.rules $out/
-      cp -v ${udev.out}/lib/udev/rules.d/60-persistent-storage.rules $out/
-      cp -v ${udev.out}/lib/udev/rules.d/80-drivers.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/60-cdrom_id.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/60-persistent-storage.rules $out/
+      cp -v ${udev}/lib/udev/rules.d/80-drivers.rules $out/
       cp -v ${pkgs.lvm2}/lib/udev/rules.d/*.rules $out/
       ${config.boot.initrd.extraUdevRulesCommands}
 
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 38a01db0c5b27..72ecbbc59839c 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev
+, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, libudev
 }:
 
 let
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
       --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
       $out/LightTable/ltbin
 
-    ln -sf ${udev.libudev}/lib/libudev.so.1 $out/LightTable/libudev.so.0
+    ln -sf ${libudev.out}/lib/libudev.so.1 $out/LightTable/libudev.so.0
 
     makeWrapper $out/LightTable/ltbin $out/bin/lighttable \
       --prefix "LD_LIBRARY_PATH" : $out/LightTable
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 070859b902d9b..2f3a8738cc543 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -8,7 +8,7 @@
 , libusb1, libexif, pciutils
 
 , python, pythonPackages, perl, pkgconfig
-, nspr, udev, kerberos
+, nspr, libudev, kerberos
 , utillinux, alsaLib
 , bison, gperf
 , glib, gtk, dbus_glib
@@ -107,7 +107,7 @@ let
     buildInputs = defaultDependencies ++ [
       which
       python perl pkgconfig
-      nspr udev
+      nspr libudev
       (if useOpenSSL then openssl else nss)
       utillinux alsaLib
       bison gperf kerberos
@@ -135,7 +135,7 @@ let
         s|= [^;]*|= base::FilePath().AppendASCII("${libexif}/lib/libexif.so")|
       }' chrome/utility/media_galleries/image_metadata_extractor.cc
 
-      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${udev.libudev}/lib/\1!' \
+      sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${libudev.out}/lib/\1!' \
         device/udev_linux/udev?_loader.cc
 
       sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \
diff --git a/pkgs/development/libraries/libusb1/default.nix b/pkgs/development/libraries/libusb1/default.nix
index e488b7b8eec7a..fe920bba411fd 100644
--- a/pkgs/development/libraries/libusb1/default.nix
+++ b/pkgs/development/libraries/libusb1/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev ? null, libobjc, IOKit }:
+{ stdenv, fetchurl, pkgconfig, libudev ? null, libobjc, IOKit }:
 
 stdenv.mkDerivation rec {
   name = "libusb-1.0.19";
@@ -12,13 +12,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig ];
   propagatedBuildInputs =
-    stdenv.lib.optional stdenv.isLinux udev ++
+    stdenv.lib.optional stdenv.isLinux libudev ++
     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
+    sed 's,-ludev,-L${libudev.out}/lib -ludev,' -i $out/lib/libusb-1.0.la
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix
index f2d6a089119ce..a8295380829e9 100644
--- a/pkgs/development/libraries/libvirt/default.nix
+++ b/pkgs/development/libraries/libvirt/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libxml2, gnutls, devicemapper, perl, python
-, iproute, iptables, readline, lvm2, utillinux, udev, libpciaccess, gettext
+, iproute, iptables, readline, lvm2, utillinux, systemd, libpciaccess, gettext
 , libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
 , dnsmasq, libnl, libpcap, libxslt, xhtml1
 , pythonPackages, perlPackages
@@ -19,12 +19,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig libxml2 gnutls devicemapper perl python readline lvm2
-    utillinux udev libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
+    utillinux systemd.udev.lib libpciaccess gettext libtasn1 libgcrypt yajl makeWrapper
     libcap_ng libnl libxslt xhtml1 perlPackages.XMLXPath
   ];
 
   preConfigure = ''
-    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev.out}/sbin:${dnsmasq}/bin:$PATH
+    PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${systemd.udev.bin}/sbin:${dnsmasq}/bin:$PATH
     patchShebangs . # fixes /usr/bin/python references
   '';
 
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 5ffc71b71f942..581368589b14b 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, autoreconfHook, substituteAll
-, file, expat, libdrm, xorg, wayland, udev, llvmPackages, libffi, libomxil-bellagio
+, file, expat, libdrm, xorg, wayland, libudev, llvmPackages, libffi, libomxil-bellagio
 , libvdpau, libelf, libva
 , grsecEnabled
 , enableTextureFloats ? false # Texture floats are patented, see docs/patents.txt
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
   ] ++ optional stdenv.isLinux
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
-        inherit (udev) libudev;
+        libudev = libudev.out;
       });
 
   postPatch = ''
@@ -107,7 +107,7 @@ stdenv.mkDerivation {
     glproto dri2proto dri3proto presentproto
     libX11 libXext libxcb libXt libXfixes libxshmfence
     libffi wayland libvdpau libelf libXvMC /* libomxil-bellagio libva */
-  ] ++ optional stdenv.isLinux udev;
+  ] ++ optional stdenv.isLinux libudev;
 
   enableParallelBuilding = true;
   doCheck = false;
diff --git a/pkgs/development/tools/node-webkit/nw11.nix b/pkgs/development/tools/node-webkit/nw11.nix
index b1e848acb4bcf..2fe1ddf42d439 100644
--- a/pkgs/development/tools/node-webkit/nw11.nix
+++ b/pkgs/development/tools/node-webkit/nw11.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev, libcap
 , libnotify}:
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
 
-    ln -s ${udev.libudev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
+    ln -s ${libudev.out}/lib/libudev.so $out/share/node-webkit/libudev.so.0
 
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 7492acb136782..4cacc75d77768 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev, libcap
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev, libcap
 , libnotify}:
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
@@ -37,7 +37,7 @@ in stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc
 
-    ln -s ${udev}/lib/libudev.so $out/share/nwjs/libudev.so.0
+    ln -s ${libudev.out}/lib/libudev.so $out/share/nwjs/libudev.so.0
 
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc
diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix
index f33914ec7be2a..d8601865c6d14 100644
--- a/pkgs/development/tools/node-webkit/nw9.nix
+++ b/pkgs/development/tools/node-webkit/nw9.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 , xorg, alsaLib, dbus, glib, gtk, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, udev}:
+, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, libudev }:
 let
   bits = if stdenv.system == "x86_64-linux" then "x64"
          else "ia32";
@@ -33,7 +33,7 @@ in stdenv.mkDerivation rec {
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
 
-    ln -s ${udev.libudev}/lib/libudev.so $out/share/node-webkit/libudev.so.0
+    ln -s ${libudev.out}/lib/libudev.so $out/share/node-webkit/libudev.so.0
 
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
     patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix
index 83546b44198a6..2547baec4f12a 100644
--- a/pkgs/misc/drivers/foo2zjs/default.nix
+++ b/pkgs/misc/drivers/foo2zjs/default.nix
@@ -1,5 +1,5 @@
 x@{builderDefsPackage
-  , foomatic_filters, bc, unzip, ghostscript, udev, vim
+  , foomatic_filters, bc, unzip, ghostscript, systemd, vim
   , ...}:
 builderDefsPackage
 (a :  
@@ -36,7 +36,7 @@ rec {
       ''PIXMAPS=$out/share/pixmaps''
       ''UDEVBIN=$out/bin''
       ''UDEVDIR=$out/etc/udev/rules.d''
-      ''UDEVD=${udev.out}/sbin/udevd''
+      ''UDEVD=${systemd.udev.bin}/sbin/udevd''
       ''LIBUDEVDIR=$out/lib/udev/rules.d''
       ''USBDIR=$out/etc/hotplug/usb''
       ''FOODB=$out/share/foomatic/db/source''
diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 3491cf713917c..95c851da30f82 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, udev, perl }:
+{ stdenv, fetchurl, flex, systemd, perl }:
 
 assert stdenv.isLinux;
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     ''
-      export PATH=${udev.out}/sbin:$PATH
+      export PATH=${systemd.udev.bin}/sbin:$PATH
       substituteInPlace user/Makefile.in --replace /sbin/ $out/sbin/
       substituteInPlace user/legacy/Makefile.in \
         --replace /sbin/ $out/sbin/ \
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 2ec7ff5189dd1..32a8ba4ad46af 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
+{ stdenv, fetchurl, pkgconfig, systemd, libudev, utillinux, coreutils, enable_dmeventd ? false }:
 
 let
   version = "2.02.132";
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ udev ];
+  buildInputs = [ libudev ];
 
   preConfigure =
     ''
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
         --replace /usr/bin/tr ${coreutils}/bin/tr
       substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
         --replace /usr/sbin/lvm $out/sbin/lvm \
-        --replace /usr/bin/udevadm ${udev.out}/bin/udevadm
+        --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm
 
       sed -i /DEFAULT_SYS_DIR/d Makefile.in
       sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 03c86dec4a00b..e2daa9199a98a 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }:
+{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd }:
 
 stdenv.mkDerivation rec {
   name = "multipath-tools-0.4.9";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
       substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
       substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
 
-      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
-      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
+      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id
+      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id
     '';
 
   meta = {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index ca0a4ba23b401..d6827c81b28d7 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -22,10 +22,15 @@ stdenv.mkDerivation rec {
     sha256 = "07sc1x43j60d5jnps0d7bfka10fihnpgkdrfrh9iskgmc9qangjb";
   };
 
+  patches = [ ./hwdb-location.diff ];
+
+  /* gave up for now!
   outputs = [ "out" "libudev" "doc" ]; # TODO: "dev"
   # note: there are many references to ${systemd}/...
   outputDev = "out";
   propagatedOutputs = "libudev";
+  */
+  outputs = [ "out" "man" ];
 
   buildInputs =
     [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl
@@ -88,24 +93,26 @@ stdenv.mkDerivation rec {
           --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \
           --replace /bin/echo ${coreutils}/bin/echo \
           --replace /bin/cat ${coreutils}/bin/cat \
-          --replace /sbin/sulogin ${utillinux}/sbin/sulogin \
+          --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \
           --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck
       done
 
       substituteInPlace src/journal/catalog.c \
         --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/
 
-      export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib"
-
       configureFlagsArray+=("--with-ntp-servers=0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org")
+
+      #export NIX_CFLAGS_LINK+=" -Wl,-rpath,$libudev/lib"
     '';
 
+  /*
   makeFlags = [
     "udevlibexecdir=$(libudev)/lib/udev"
     # udev rules refer to $out, and anything but libs should probably go to $out
     "udevrulesdir=$(out)/lib/udev/rules.d"
     "udevhwdbdir=$(out)/lib/udev/hwdb.d"
   ];
+  */
 
 
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
@@ -124,8 +131,6 @@ stdenv.mkDerivation rec {
       "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
     ];
 
-  enableParallelBuilding = true;
-
   installFlags =
     [ "localstatedir=$(TMPDIR)/var"
       "sysconfdir=$(out)/etc"
@@ -167,7 +172,8 @@ stdenv.mkDerivation rec {
 
       # "kernel-install" shouldn't be used on NixOS.
       find $out -name "*kernel-install*" -exec rm {} \;
-
+    ''; # */
+  /*
       # Move lib(g)udev to a separate output. TODO: maybe split them up
       #   to avoid libudev pulling glib
       mkdir -p "$libudev/lib"
@@ -179,8 +185,10 @@ stdenv.mkDerivation rec {
       for i in "$out"/lib/pkgconfig/{libudev,gudev-1.0}.pc; do
         substituteInPlace $i --replace "libdir=$out" "libdir=$libudev"
       done
-    ''; # */
+  */
 
+  enableParallelBuilding = true;
+  /*
   # some libs fail to link to liblzma and/or libffi
   postFixup = let extraLibs = stdenv.lib.makeLibraryPath [ xz.out libffi.out zlib.out ];
     in ''
@@ -188,6 +196,7 @@ stdenv.mkDerivation rec {
         patchelf --set-rpath `patchelf --print-rpath "$f"`':${extraLibs}' "$f"
       done
     '';
+  */
 
   # The interface version prevents NixOS from switching to an
   # incompatible systemd at runtime.  (Switching across reboots is
@@ -205,4 +214,3 @@ stdenv.mkDerivation rec {
   };
 }
 
-
diff --git a/pkgs/os-specific/linux/systemd/hwdb-location.diff b/pkgs/os-specific/linux/systemd/hwdb-location.diff
new file mode 100644
index 0000000000000..31e7a027f50d7
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/hwdb-location.diff
@@ -0,0 +1,19 @@
+diff --git a/src/libsystemd/sd-hwdb/sd-hwdb.c b/src/libsystemd/sd-hwdb/sd-hwdb.c
+index 06c9831..e74825c 100644
+--- a/src/libsystemd/sd-hwdb/sd-hwdb.c
++++ b/src/libsystemd/sd-hwdb/sd-hwdb.c
+@@ -268,13 +268,8 @@ static int trie_search_f(sd_hwdb *hwdb, const char *search) {
+ }
+ 
+ static const char hwdb_bin_paths[] =
+-        "/etc/systemd/hwdb/hwdb.bin\0"
+         "/etc/udev/hwdb.bin\0"
+-        "/usr/lib/systemd/hwdb/hwdb.bin\0"
+-#ifdef HAVE_SPLIT_USR
+-        "/lib/systemd/hwdb/hwdb.bin\0"
+-#endif
+-        UDEVLIBEXECDIR "/hwdb.bin\0";
++        ;
+ 
+ _public_ int sd_hwdb_new(sd_hwdb **ret) {
+         _cleanup_hwdb_unref_ sd_hwdb *hwdb = NULL;
diff --git a/pkgs/os-specific/linux/systemd/libudev.nix b/pkgs/os-specific/linux/systemd/libudev.nix
new file mode 100644
index 0000000000000..0fe45aee91642
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/libudev.nix
@@ -0,0 +1,19 @@
+{ stdenv, systemd }:
+
+stdenv.mkDerivation {
+  name = "libudev-${systemd.version}";
+
+  unpackPhase = ":";
+  outputs = [ "dev" "out" ];
+  installPhase = ''
+    mkdir -p "$out/lib" "$dev/lib/pkgconfig" "$dev/include"
+    cp -P "${systemd}"/lib/libudev.* "$out/lib/"
+    cp -P "${systemd}"/lib/pkgconfig/libudev.pc "$dev/lib/pkgconfig/"
+    cp -P "${systemd}"/include/libudev.h "$dev/include/"
+
+    substituteInPlace "$dev"/lib/pkgconfig/*.pc \
+      --replace "${systemd}" "$out"
+    sed "/^includedir=/cincludedir=$dev/include" -i "$dev"/lib/pkgconfig/*.pc
+  '';
+}
+
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index 4033cdc87e0ec..0995a8bfd23e6 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
 , libselinux, cryptsetup, multipath_tools, lsof, utillinux
-, useNixUdev ? true, udev ? null
+, useNixUdev ? true, libudev ? null
 # This is only used when useNixUdev is false
 , udevSoMajor ? 1
 }:
 
-assert useNixUdev -> udev != null;
+assert useNixUdev -> libudev != null;
 
 buildPythonPackage rec {
   name = "blivet-${version}";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     sed -i '/pvscan/s/, *"--cache"//' blivet/devicelibs/lvm.py
   '' + (if useNixUdev then ''
     sed -i -e '/find_library/,/find_library/ {
-      c libudev = "${udev.libudev}/lib/libudev.so.1"
+      c libudev = "${libudev.out}/lib/libudev.so.1"
     }' blivet/pyudev.py
   '' else ''
     sed -i \
@@ -40,7 +40,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     pykickstart pyparted pyblock libselinux cryptsetup
-  ] ++ stdenv.lib.optional useNixUdev udev;
+  ] ++ stdenv.lib.optional useNixUdev libudev;
 
   # tests are currently _heavily_ broken upstream
   doCheck = false;
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 9ea2f9bfdc77e..1ac8083c2594c 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -10,7 +10,7 @@ let
     inherit stdenv fetchurl buildPythonPackage;
     inherit pykickstart pyparted pyblock cryptsetup multipath_tools;
     inherit useNixUdev udevSoMajor;
-    inherit (pkgs) lsof utillinux udev;
+    inherit (pkgs) lsof utillinux libudev;
     libselinux = pkgs.libselinux.override { enablePython = true; };
   };
 
@@ -27,12 +27,12 @@ let
 
   lvm2 = import ./lvm2.nix {
     inherit stdenv fetchurl;
-    inherit (pkgs) pkgconfig utillinux udev coreutils;
+    inherit (pkgs) pkgconfig utillinux libudev systemd coreutils;
   };
 
   multipath_tools = import ./multipath-tools.nix {
     inherit stdenv fetchurl lvm2;
-    inherit (pkgs) readline udev libaio gzip;
+    inherit (pkgs) readline systemd libaio gzip;
   };
 
   parted = import ./parted.nix {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
index 32bf79e4a7af9..b92c40ba99e62 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/lvm2.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }:
+{ stdenv, fetchurl, pkgconfig, libudev, systemd, utillinux, coreutils }:
 
 let
   v = "2.02.106";
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   configureFlags =
     "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib";
 
-  buildInputs = [ pkgconfig udev ];
+  buildInputs = [ pkgconfig libudev ];
 
   preConfigure =
     ''
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
         --replace /usr/bin/tr ${coreutils}/bin/tr
       substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
         --replace /usr/sbin/lvm $out/sbin/lvm \
-        --replace /usr/bin/udevadm ${udev.out}/bin/udevadm
+        --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm
 
       sed -i /DEFAULT_SYS_DIR/d Makefile.in
       sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in
diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
index a3873fb25ff07..b78605504bf88 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }:
+{ stdenv, fetchurl, lvm2, libaio, gzip, readline, systemd }:
 
 stdenv.mkDerivation rec {
   name = "multipath-tools-0.4.9";
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
       substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
       substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
 
-      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
-      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev.libudev}/lib/udev/scsi_id
+      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id
+      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.udev.lib}/lib/udev/scsi_id
     '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 602fe1c024f56..b5dd0dc97689f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10188,7 +10188,11 @@ let
 
   systemd = callPackage ../os-specific/linux/systemd {
     linuxHeaders = linuxHeaders_3_18;
-  };
+  }
+    // {
+      udev.bin = systemd;     # ${systemd.udev.bin}/bin/udevadm
+      udev.lib = libudev.out; # ${systemd.udev.lib}/lib/libudev.*
+    };
 
   systemtap = callPackage ../development/tools/profiling/systemtap {
     inherit (gnome) libglademm;
@@ -10271,8 +10275,11 @@ let
     cross = assert crossSystem != null; crossSystem;
   });
 
+  # This hacky alias covers most use cases without mass-replace (build inputs)
+  # and causes an *evaluation* error if "${udev}" is attempted.
+  udev = [ libudev.dev libudev.out ];
+  libudev = callPackage ../os-specific/linux/systemd/libudev.nix { };
 
-  udev = pkgs.systemd; # headers are not in the libudev output
   eudev = callPackage ../os-specific/linux/eudev {};
 
   udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a692777285b8..d02b7dda1e17a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11951,7 +11951,7 @@ let
 
     postPatch = ''
       sed -i -e '/udev_library_name/,/^ *libudev/ {
-        s|CDLL([^,]*|CDLL("${pkgs.udev.libudev}/lib/libudev.so.1"|p; d
+        s|CDLL([^,]*|CDLL("${pkgs.libudev.out}/lib/libudev.so.1"|p; d
       }' pyudev/_libudev.py
     '';
 

From 2323d70d88aab404b9ce00af6c3ab4f5f6da2fa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Oct 2015 21:06:37 +0200
Subject: [PATCH 171/857] all-packages: revert accidentally committed change

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b5dd0dc97689f..a1791f483244b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3842,7 +3842,7 @@ let
     inherit noSysDirs;
 
     # PGO seems to speed up compilation by gcc by ~10%, see #445 discussion
-    profiledCompiler = false; #for now. with stdenv; (!isDarwin && (isi686 || isx86_64));
+    profiledCompiler = with stdenv; (!isDarwin && (isi686 || isx86_64));
 
     # When building `gcc.crossDrv' (a "Canadian cross", with host == target
     # and host != build), `cross' must be null but the cross-libc must still

From 7434b8c29f977f84ffbe3e2f6d12fd8346b95d18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 09:52:46 +0200
Subject: [PATCH 172/857] mesa: fixup with multiple outputs

---
 pkgs/development/libraries/mesa/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 581368589b14b..1d34b87ce6413 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -125,29 +125,18 @@ stdenv.mkDerivation {
       $out/lib/libXvMC* \
       $out/lib/d3d \
       $out/lib/vdpau \
-      $out/lib/{bellagio,d3d} \
       $out/lib/libxatracker*
 
-    mv -t "$drivers/lib/dri/" \
-      "$out"/lib/dri/*
-    rmdir "$out/lib/dri"
-
-    mkdir -p {$osmesa,$drivers}/lib/pkgconfig
+    mkdir -p {$osmesa,$drivers}/lib/
     mv -t $osmesa/lib/ \
       $out/lib/libOSMesa*
 
-    mv -t $drivers/lib/pkgconfig/ \
-      $out/lib/pkgconfig/xatracker.pc
-
-    mv -t $osmesa/lib/pkgconfig/ \
-      $out/lib/pkgconfig/osmesa.pc
-
   '' + /* now fix references in .la files */ ''
     sed "/^libdir=/s,$out,$osmesa," -i \
       $osmesa/lib/libOSMesa*.la
 
   '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
-    substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
+    substituteInPlace "$dev/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
   '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
     mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
   '';

From 1004d44d80ebbfb3eab4deea3cd7c50f51c681e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 10:12:56 +0200
Subject: [PATCH 173/857] llvm-3.7: fix build by -lpthread

This is strange. Morover, 3.6 builds fine without modifications.
---
 pkgs/development/compilers/llvm/3.7/llvm.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 4ff61b2787831..361ae4ba11771 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -51,6 +51,8 @@ in stdenv.mkDerivation rec {
     "-DCAN_TARGET_i386=false"
   ];
 
+  NIX_LDFLAGS = "-lpthread"; # no idea what's the problem
+
   postBuild = ''
     rm -fR $out
 

From 0cf11036b467068875d2dce9fe10b38b006f4528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 11:08:18 +0200
Subject: [PATCH 174/857] texlive.bin.core: fixup with multiple outputs

There was an interaction with hand-moving the docs.
---
 pkgs/tools/typesetting/tex/texlive-new/bin.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/tex/texlive-new/bin.nix b/pkgs/tools/typesetting/tex/texlive-new/bin.nix
index 677e64c57dc68..7ed9b58d14d74 100644
--- a/pkgs/tools/typesetting/tex/texlive-new/bin.nix
+++ b/pkgs/tools/typesetting/tex/texlive-new/bin.nix
@@ -97,7 +97,8 @@ core = stdenv.mkDerivation rec {
     cp ../texk/texlive/linked_scripts/scripts.lst "$out/share/texmf-dist/scripts/texlive/"
   '' + /* doc location identical with individual TeX pkgs */ ''
     mkdir -p "$doc/doc"
-    mv "$out"/share/{man,info} "$doc"/doc
+    mv "$doc"/share/{man,info} "$doc"/doc
+    rmdir "$doc"/share
   '' + cleanBrokenLinks;
 
   setupHook = ./setup-hook.sh; # TODO: maybe texmf-nix -> texmf (and all references)

From d0f72e729ad5e6500d19c3d1dcfba05475885770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 11:29:37 +0200
Subject: [PATCH 175/857] libav: fix with multiple outputs and improve
 splitting

---
 pkgs/development/libraries/libav/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 8ca8695def8fd..5b1aa2f42846c 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -77,13 +77,11 @@ let
 
     enableParallelBuilding = true;
 
-    outputs = [ "dev" "out" "bin" ]; #TODO: re-check
+    outputs = [ "dev" "out" "bin" ];
+    setOutputFlags = false;
 
-    # move avplay to get rid of the SDL dependency in the main output
-    postInstall = ''
-      mkdir -p "$bin/bin"
-      mv "$out/bin/avplay" "$bin/bin"
-    '';
+    # move tools away to lighten runtime deps and size
+    postInstall = ''_moveToOutput bin "$bin" '';
 
     doInstallCheck = false; # fails randomly
     installCheckTarget = "check"; # tests need to be run *after* installation

From 40e4ab37cfd2d80e8ac482a7a2f933f9ea76de4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 11:47:01 +0200
Subject: [PATCH 176/857] wildmidi: fix build

---
 pkgs/development/libraries/wildmidi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wildmidi/default.nix b/pkgs/development/libraries/wildmidi/default.nix
index 8660d15e06a38..4dec0555ae9fe 100644
--- a/pkgs/development/libraries/wildmidi/default.nix
+++ b/pkgs/development/libraries/wildmidi/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  buildInputs = [ alsaLib ];
+  buildInputs = [ alsaLib stdenv.cc.libc/*couldn't find libm*/ ];
 
   preConfigure = ''
     substituteInPlace CMakeLists.txt \

From b2e73c81d9bbfb76e925d98f818bec1b01b26143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 11:59:15 +0200
Subject: [PATCH 177/857] media-player-info: fix build `missing udev`

I don't know what it actually needs, but it's satisfied by systemd.
---
 pkgs/data/misc/media-player-info/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix
index 9abe5d6ea8e70..ddb53d728202f 100644
--- a/pkgs/data/misc/media-player-info/default.nix
+++ b/pkgs/data/misc/media-player-info/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, python3, udev }:
+{ stdenv, fetchurl, pkgconfig, python3, udev, systemd }:
 
 let
   name = "media-player-info-22";
@@ -12,7 +12,7 @@ in
       sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy";
     };
 
-    buildInputs = [ udev ];
+    buildInputs = [ udev systemd ];
     nativeBuildInputs = [ pkgconfig python3 ];
 
     postPatch = ''

From afd37d925105ebf6ee4843dd9768d77b8959bfa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 12:32:25 +0200
Subject: [PATCH 178/857] boost-1.55: fix build with gcc-5 by upstream patch

Our higher versions have fix integrated upstream.

(cherry picked from commit 4e8da0747c88375c221bf1b0f060183a863c6851)
---
 pkgs/development/libraries/boost/1.55.nix    |  2 +-
 pkgs/development/libraries/boost/gcc-5.patch | 64 ++++++++++++++++++++
 2 files changed, 65 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/boost/gcc-5.patch

diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix
index a10cd8ce22025..0a38f35af753e 100644
--- a/pkgs/development/libraries/boost/1.55.nix
+++ b/pkgs/development/libraries/boost/1.55.nix
@@ -3,7 +3,7 @@
 callPackage ./generic.nix (args // rec {
   version = "1.55.0";
 
-  patches = [ ./clang-math.patch ./clang-math-2.patch ];
+  patches = [ ./clang-math.patch ./clang-math-2.patch ./gcc-5.patch ];
 
   src = fetchurl {
     url = "mirror://sourceforge/boost/boost_1_55_0.tar.bz2";
diff --git a/pkgs/development/libraries/boost/gcc-5.patch b/pkgs/development/libraries/boost/gcc-5.patch
new file mode 100644
index 0000000000000..2b2713590ca79
--- /dev/null
+++ b/pkgs/development/libraries/boost/gcc-5.patch
@@ -0,0 +1,64 @@
+https://svn.boost.org/trac/boost/ticket/10125
+
+ boost/thread/pthread/once.hpp        | 6 +++---
+ boost/thread/pthread/once_atomic.hpp | 2 +-
+ boost/thread/win32/once.hpp          | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/boost/thread/pthread/once.hpp b/boost/thread/pthread/once.hpp
+index ccfb051..0bef038 100644
+--- a/boost/thread/pthread/once.hpp
++++ b/boost/thread/pthread/once.hpp
+@@ -42,7 +42,7 @@ namespace boost
+   }
+ 
+ #ifdef BOOST_THREAD_PROVIDES_ONCE_CXX11
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+     template<typename Function, class ...ArgTypes>
+     inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
+ #else
+@@ -65,7 +65,7 @@ namespace boost
+   private:
+       volatile thread_detail::uintmax_atomic_t epoch;
+ 
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+       template<typename Function, class ...ArgTypes>
+       friend void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args);
+ #else
+@@ -118,7 +118,7 @@ namespace boost
+     // http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2007/n2444.html
+ 
+ 
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+ 
+ 
+   template<typename Function, class ...ArgTypes>
+diff --git a/boost/thread/pthread/once_atomic.hpp b/boost/thread/pthread/once_atomic.hpp
+index 9e2f876..923f07b 100644
+--- a/boost/thread/pthread/once_atomic.hpp
++++ b/boost/thread/pthread/once_atomic.hpp
+@@ -115,7 +115,7 @@ namespace boost
+ #endif
+ 
+ 
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+ 
+   template<typename Function, class ...ArgTypes>
+   inline void call_once(once_flag& flag, BOOST_THREAD_RV_REF(Function) f, BOOST_THREAD_RV_REF(ArgTypes)... args)
+diff --git a/boost/thread/win32/once.hpp b/boost/thread/win32/once.hpp
+index cafcfd4..9b37b31 100644
+--- a/boost/thread/win32/once.hpp
++++ b/boost/thread/win32/once.hpp
+@@ -227,7 +227,7 @@ namespace boost
+         }
+     }
+ 
+-#ifndef BOOST_NO_CXX11_VARIADIC_TEMPLATES
++#if !defined BOOST_NO_CXX11_VARIADIC_TEMPLATES && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+ //#if defined(BOOST_THREAD_RVALUE_REFERENCES_DONT_MATCH_FUNTION_PTR)
+     inline void call_once(once_flag& flag, void (*f)())
+     {

From 861debbf9f72aafe63bbaa1200f2d15317b1ba9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 13:08:28 +0200
Subject: [PATCH 179/857] phonon_qt5_backend_gstreamer: hack-fix build

---
 pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
index bc34d249b46d0..feaa743aca748 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
   ]
   ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
 
+  NIX_CFLAGS_COMPILE = "-fPIC";
+
   meta = with stdenv.lib; {
     homepage = http://phonon.kde.org/;
     description = "GStreamer backend for Phonon";

From 551cce01ffee0848024835bde098553cfebf86db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 13:13:46 +0200
Subject: [PATCH 180/857] network-manager: fix build after udev changes

It's missing libsystemd-login but only `udev` was in inputs...
---
 pkgs/tools/networking/network-manager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index 30aff794baa02..7c9d6080b0039 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, wirelesstools, pkgconfig, dbus_glib, xz
-, udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
+, systemd, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup }:
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     "--with-libsoup=yes"
   ];
 
-  buildInputs = [ wirelesstools udev libgudev libnl libuuid polkit ppp libndp
+  buildInputs = [ wirelesstools systemd libgudev libnl libuuid polkit ppp libndp
                   xz bluez5 gobjectIntrospection modemmanager readline newt libsoup ];
 
   propagatedBuildInputs = [ dbus_glib gnutls libgcrypt ];

From a0581b1e7459beed2b3916746fe2dd04a4f4a0ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 14:54:57 +0200
Subject: [PATCH 181/857] kde-gtk-config-*: fix with multiple outputs

---
 pkgs/desktops/plasma-5.3/default.nix        | 4 ++--
 pkgs/desktops/plasma-5.4/kde-gtk-config.nix | 4 ++--
 pkgs/tools/misc/kde-gtk-config/default.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index ec9873390e50b..ea202e981c5e5 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -182,9 +182,9 @@ let
         lib.concatStringsSep " " [
           "-I${cairo}/include/cairo"
           "-I${gtk2}/include/gtk-2.0"
-          "-I${gtk2}/lib/gtk-2.0/include"
+          "-I${gtk2.out}/lib/gtk-2.0/include"
           "-I${glib}/include/glib-2.0"
-          "-I${glib}/lib/glib-2.0/include"
+          "-I${glib.out}/lib/glib-2.0/include"
           "-I${pango}/include/pango-1.0"
         ];
     };
diff --git a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix
index 9c59665f1a0c8..8ff69dbb7c32f 100644
--- a/pkgs/desktops/plasma-5.4/kde-gtk-config.nix
+++ b/pkgs/desktops/plasma-5.4/kde-gtk-config.nix
@@ -20,7 +20,7 @@ plasmaPackage {
     kio knewstuff
   ];
   cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
   ];
 }
diff --git a/pkgs/tools/misc/kde-gtk-config/default.nix b/pkgs/tools/misc/kde-gtk-config/default.nix
index 809d0c65c6ece..bf868790de2d3 100644
--- a/pkgs/tools/misc/kde-gtk-config/default.nix
+++ b/pkgs/tools/misc/kde-gtk-config/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = ''
-    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include
-    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include
+    -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include
+    -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include
     -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0
     -DKDE4_LIBEXEC_INSTALL_DIR=lib/kde4/libexec
   '';

From 374e657193fa6fbee41d1ed65a207cef5a7b5a5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 14:55:47 +0200
Subject: [PATCH 182/857] kdelibs-*: fix missing pcre

I don't know why/when it started missing.
---
 pkgs/applications/kde-apps-15.04/default.nix         | 4 ++--
 pkgs/applications/kde-apps-15.08/kdelibs/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.04/default.nix b/pkgs/applications/kde-apps-15.04/default.nix
index 4bae82976af25..41dc641e8999e 100644
--- a/pkgs/applications/kde-apps-15.04/default.nix
+++ b/pkgs/applications/kde-apps-15.04/default.nix
@@ -174,7 +174,7 @@ let
               libvncserver libical networkmanager openal opencv
               openexr perl phonon pkgconfig polkit_qt4 prison python qca2
               qimageblitz qjson qt4 samba saneBackends soprano speechd
-              strigi taglib udev xorg xplanet xscreensaver xz;
+              strigi taglib udev xorg xplanet xscreensaver xz pcre;
       alsa = alsaLib;
       assuan = libassuan;
       boost = boost155;
@@ -307,7 +307,7 @@ let
       kdegraphics-thumbnailers = kde4Package super.kdegraphics-thumbnailers;
 
       kdelibs = extendDerivation super.kdelibs {
-        buildInputs = with scope; [ attr polkit_qt4 xsltproc xz ];
+        buildInputs = with scope; [ attr polkit_qt4 xsltproc xz pcre ];
         propagatedBuildInputs = with scope; [ qt4 soprano phonon strigi ];
         nativeBuildInputs = [ scope.pkgconfig ];
         propagatedNativeBuildInputs = with scope; [
diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
index 06788006f61e5..f87b1114c55a5 100644
--- a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
+++ b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
@@ -2,7 +2,7 @@
 , docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase
 , libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
 , polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
-, soprano, strigi, udev, xz
+, soprano, strigi, udev, xz, pcre
 , lib
 }:
 
@@ -11,7 +11,7 @@ kdeApp {
 
   buildInputs = [
     attica attr avahi giflib herqq libdbusmenu_qt libjpeg libxml2
-    polkit_qt4 qca2 shared_desktop_ontologies udev xz
+    polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
   ];
   propagatedBuildInputs = [ qt4 soprano phonon strigi ];
   nativeBuildInputs = [

From c817263b0c2f4fa4267e9979d9722078a8dff7d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 4 Oct 2015 17:34:29 +0200
Subject: [PATCH 183/857] plasma53.breeze: fix missing automoc4

I don't know why/when it started missing.
---
 pkgs/desktops/plasma-5.3/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index ea202e981c5e5..ad5316a9cb26f 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -157,7 +157,7 @@ let
 
         breeze-qt4 = overrideDerivation super.breeze (drv: {
           name = "breeze-qt4-${version}";
-          buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 ];
+          buildInputs = [ pkgs.xorg.xproto pkgs.kde4.kdelibs pkgs.qt4 pkgs.automoc4 ];
           nativeBuildInputs = [ scope.cmake pkgs.pkgconfig ];
           cmakeFlags = [
             "-DUSE_KDE4=ON"

From 68530a4fb7ac26c5893a6204e1dde4535f38f149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 10:51:22 +0200
Subject: [PATCH 184/857] dbus-glib: split into multiple outputs

Fixed all 'dbus_glib}' references too.
---
 pkgs/applications/misc/roxterm/default.nix                     | 2 +-
 .../networking/instant-messengers/telepathy/kde/default.nix    | 2 +-
 .../networking/instant-messengers/telepathy/logger/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/empathy/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.16/core/folks/default.nix              | 2 +-
 .../gnome-3/3.16/core/gnome-online-accounts/default.nix        | 2 +-
 pkgs/desktops/gnome-3/3.18/core/empathy/default.nix            | 2 +-
 pkgs/desktops/gnome-3/3.18/core/folks/default.nix              | 2 +-
 .../gnome-3/3.18/core/gnome-online-accounts/default.nix        | 2 +-
 pkgs/development/libraries/dbus-glib/default.nix               | 3 ++-
 10 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 60322c2b911e9..947d790c3bbae 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -24,7 +24,7 @@ in stdenv.mkDerivation rec {
   propagatedBuildInputs =
     [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
+  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
                          "-I${dbus_libs}/include/dbus-1.0"
                          "-I${dbus_libs}/lib/dbus-1.0/include" ];
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index 532d68ad66050..2bcb4d631b34d 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -11,7 +11,7 @@ let
     call_ui = x : x // {
       NIX_CFLAGS_COMPILE =
         "-I${telepathy_glib}/include/telepathy-1.0"
-        + " -I${dbus_glib}/include/dbus-1.0"
+        + " -I${dbus_glib.dev}/include/dbus-1.0"
         + " -I${dbus_libs}/include/dbus-1.0";
     };
     telepathy_logger_qt = x : x // {
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 173dfe9c929f1..8341bef946e37 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
 
   buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
                   gobjectIntrospection dbus_libs ];
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
index 4c42c6c026d3c..83f33fbc3c561 100644
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
                   gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
                   file libtool librsvg ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
+  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
                          "-I${dbus_libs}/include/dbus-1.0"
                          "-I${dbus_libs}/lib/dbus-1.0/include" ];
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
index 6e200bdb3188f..41e75a38c7632 100644
--- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-fatal-warnings";
 
   NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
+                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
index ac285819e8f44..6cedbca61d707 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix
index 4c42c6c026d3c..83f33fbc3c561 100644
--- a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
                   gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
                   file libtool librsvg ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
+  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
                          "-I${dbus_libs}/include/dbus-1.0"
                          "-I${dbus_libs}/lib/dbus-1.0/include" ];
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix
index 6e200bdb3188f..41e75a38c7632 100644
--- a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   configureFlags = "--disable-fatal-warnings";
 
   NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
+                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
index d810fbb862b72..b08aa1c999070 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
@@ -7,7 +7,7 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 480dc61897bb5..28df5593695c8 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ]; # "dev-doc" only
+  outputBin = "dev";
 
   nativeBuildInputs = [ pkgconfig gettext ];
 

From 252b3dcc8716d3be1cc5763d1e4807b662f3debd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 10:53:30 +0200
Subject: [PATCH 185/857] unbound: split into multiple outputs

---
 pkgs/tools/networking/unbound/default.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index e356d6d653767..ab37f30fb64d0 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1jly2apag4yg649w3flaq73wdrcfyxnhx5py9j73y7adxmswigbn";
   };
 
+  outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB
+
   buildInputs = [ openssl expat libevent ];
 
   configureFlags = [
@@ -21,11 +23,17 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
-  meta = {
+  # get rid of runtime dependency
+  postInstall = ''
+    substituteInPlace "$lib/lib/libunbound.la" \
+      --replace '-L${openssl.dev}/lib' ""
+  '';
+
+  meta = with stdenv.lib; {
     description = "Validating, recursive, and caching DNS resolver";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = http://www.unbound.net;
-    maintainers = [ stdenv.lib.maintainers.emery ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.emery ];
+    platforms = platforms.unix;
   };
 }

From 328eafa8857c0b4de84581935cdcb323259f2e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 11:07:54 +0200
Subject: [PATCH 186/857] gnutls: split into multiple outputs

Fixed all 'gnutls}' references, too.
---
 .../networking/instant-messengers/blink/default.nix         | 2 +-
 pkgs/development/libraries/gnutls/generic.nix               | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 7bb14efc1bb51..e8ebd82d0bfbd 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -22,7 +22,7 @@ pythonPackages.buildPythonPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/blink \
-      --prefix LD_LIBRARY_PATH ":" ${gnutls}/lib
+      --prefix LD_LIBRARY_PATH ":" ${gnutls.lib}/lib
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index d2bdc3fd2815d..7cbdd8c8ca94d 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   inherit src patches postPatch;
 
-  outputs = [ "out" "man" ];
+  outputs = [ "dev" "out" "bin" "man" ];
 
   configureFlags =
     # FIXME: perhaps use $SSL_CERT_FILE instead
@@ -34,8 +34,6 @@ stdenv.mkDerivation {
     ++ [ unbound ]
     ++ lib.optional guileBindings guile;
 
-  # 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:
@@ -47,7 +45,7 @@ stdenv.mkDerivation {
     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
+        -i "$out/lib/libgnutls.la" "$dev/lib/pkgconfig/gnutls.pc"
   '';
 
   meta = with lib; {

From 32b31398eb562152a11d1be992c5ea6e110013f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 11:22:48 +0200
Subject: [PATCH 187/857] xorg.libXt: re-split into multiple outputs

Fixed all 'libXt}' references, too.
---
 .../virtualization/virtualbox/guest-additions/default.nix     | 2 +-
 pkgs/servers/x11/xorg/overrides.nix                           | 2 +-
 pkgs/tools/system/plan9port/builder.sh                        | 4 ++--
 pkgs/tools/system/plan9port/default.nix                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 5ca5cc1cb5827..15b675c9a5d50 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
         ''
         else throw ("Architecture: "+stdenv.system+" not supported for VirtualBox guest additions")
         }
-        patchelf --set-rpath ${stdenv.cc.cc}/lib:${dbus}/lib:${libX11}/lib:${libXt}/lib:${libXext}/lib:${libXmu}/lib:${libXfixes}/lib:${libXrandr}/lib:${libXcursor}/lib $i
+        patchelf --set-rpath ${lib.makeLibraryPath [ stdenv.cc.cc dbus libX11 libXt libXext libXmu libXfixes libXrandr libXcursor ]} $i
     done
 
     for i in lib/VBoxOGL*.so
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a7464a12485e8..b590b97c5713f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -127,7 +127,7 @@ in
     '';
     propagatedBuildInputs = [ xorg.libSM ];
     CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
-    outputs = [ "out" "doc" "man" ];
+    outputs = [ "dev" "out" "doc" ]; # "dev-doc" only (incl. man pages)
   };
 
   # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 2434889581ed3..98b8ac7418b5e 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -5,8 +5,8 @@ export PLAN9_TARGET=$PLAN9
 
 configurePhase()
 {
-    echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config
-    echo X11=\"${libXt}/include\" >> LOCAL.config
+    echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config
+    echo X11=\"${libXt_dev}/include\" >> LOCAL.config
 
     for f in `grep -l -r /usr/local/plan9`; do
         sed "s,/usr/local/plan9,${PLAN9},g" -i $f
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 3a78cb2baf637..9833d81be1a25 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -47,6 +47,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
   };
 
-  inherit libXt;
+  libXt_dev = libXt.dev;
   inherit fontconfig;
 }

From f8c211fd2b53d970a439d643bea9d0928fb08666 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 12:23:02 +0200
Subject: [PATCH 188/857] fontconfig: split into multiple outputs

Fixed all 'fontconfig}' references as well, hopefully, ugh!
---
 nixos/modules/config/fonts/fontconfig.nix     |  2 +-
 pkgs/applications/editors/eclipse/default.nix |  6 +++---
 pkgs/applications/misc/calibre/default.nix    |  4 ++--
 .../science/logic/hol/default.nix             |  2 +-
 .../libraries/fontconfig/default.nix          |  2 ++
 .../libraries/fontconfig/make-fonts-conf.nix  |  6 +++---
 pkgs/development/libraries/qt-3/default.nix   |  6 +++---
 .../mobile/androidenv/androidsdk.nix          | 16 +++++++++-------
 pkgs/development/tools/phantomjs/default.nix  | 19 +++++++++++--------
 .../tools/selenium/chromedriver/default.nix   |  2 +-
 pkgs/games/oilrush/default.nix                | 14 ++++++++------
 pkgs/games/sdlmame/default.nix                |  2 +-
 pkgs/servers/x11/xquartz/default.nix          |  2 +-
 pkgs/tools/graphics/gnuplot/default.nix       |  2 +-
 pkgs/tools/system/plan9port/builder.sh        |  2 +-
 pkgs/tools/system/plan9port/default.nix       |  2 +-
 .../tools/typesetting/tex/dblatex/default.nix |  8 ++++----
 pkgs/top-level/perl-packages.nix              |  2 +-
 18 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index be6662decea6e..c027796d54767 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -228,7 +228,7 @@ with lib;
       # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig.
       # Otherwise specify only font directories.
       environment.etc."fonts/${pkgs.fontconfig.configVersion}/fonts.conf".source =
-        "${pkgs.fontconfig}/etc/fonts/fonts.conf";
+        "${pkgs.fontconfig.out}/etc/fonts/fonts.conf";
 
       environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/00-nixos.conf".text =
         ''
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 854d4d521a296..9d47cc5993ac9 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeDesktopItem, makeWrapper
+{ stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
 , glib, gtk, libXtst, jre
 , webkitgtk2 ? null  # for internal web browser
@@ -37,7 +37,7 @@ let
         interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
         libCairo=$out/eclipse/libcairo-swt.so
         patchelf --set-interpreter $interpreter $out/eclipse/eclipse
-        [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
+        [ -f $libCairo ] && patchelf --set-rpath ${lib.makeLibraryPath [ freetype fontconfig libX11 libXrender zlib ]} "$libCairo"
 
         # Create wrapper script.  Pass -configuration to store
         # settings in ~/.eclipse/org.eclipse.platform_<version> rather
@@ -47,7 +47,7 @@ let
         
         makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
           --prefix PATH : ${jre}/bin \
-          --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
+          --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib gtk libXtst ] ++ lib.optional (webkitgtk2 != null) webkitgtk2)} \
           --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
 
         # Create desktop item.
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 5bd9bcf5c49e2..e3f3f25a0711a 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -37,8 +37,8 @@ stdenv.mkDerivation rec {
     export POPPLER_LIB_DIR=${poppler_utils}/lib
     export MAGICK_INC=${imagemagick}/include/ImageMagick
     export MAGICK_LIB=${imagemagick}/lib
-    export FC_INC_DIR=${fontconfig}/include/fontconfig
-    export FC_LIB_DIR=${fontconfig}/lib
+    export FC_INC_DIR=${fontconfig.dev}/include/fontconfig
+    export FC_LIB_DIR=${fontconfig.lib}/lib
     export PODOFO_INC_DIR=${podofo}/include/podofo
     export PODOFO_LIB_DIR=${podofo}/lib
     export SIP_BIN=${sip_4_16}/bin/sip
diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix
index f8a57aebb6dcb..c7fb4ffbb978a 100644
--- a/pkgs/applications/science/logic/hol/default.nix
+++ b/pkgs/applications/science/logic/hol/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   buildCommand = ''
 
     mkdir chroot-fontconfig
-    cat ${fontconfig}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf
+    cat ${fontconfig.out}/etc/fonts/fonts.conf > chroot-fontconfig/fonts.conf
     sed -e 's@</fontconfig>@@' -i chroot-fontconfig/fonts.conf
     echo "<dir>${liberation_ttf}</dir>" >> chroot-fontconfig/fonts.conf
     echo "</fontconfig>" >> chroot-fontconfig/fonts.conf
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index b03528de2d5db..f72f65ddad74c 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config
+
   propagatedBuildInputs = [ freetype ];
   buildInputs = [ pkgconfig expat ];
 
diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
index 2b02e0df7a04c..2d0a21ea9ddfe 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.nix
@@ -8,9 +8,9 @@ runCommand "fonts.conf"
   }
   ''
     xsltproc --stringparam fontDirectories "$fontDirectories" \
-      --stringparam fontconfig "${fontconfig}" \
+      --stringparam fontconfig "${fontconfig.out}" \
       --stringparam fontconfigConfigVersion "${fontconfig.configVersion}" \
-      --path ${fontconfig}/share/xml/fontconfig \
-      ${./make-fonts-conf.xsl} ${fontconfig}/etc/fonts/fonts.conf \
+      --path ${fontconfig.out}/share/xml/fontconfig \
+      ${./make-fonts-conf.xsl} ${fontconfig.out}/etc/fonts/fonts.conf \
       > $out
   ''
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 08d8f141deb0b..82345b86e9603 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -49,9 +49,9 @@ stdenv.mkDerivation {
     ${if cursorSupport then "-L${libXcursor}/lib -I${libXcursor}/include" else ""}
     ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
     ${if xftSupport then "-xft
-      -L${libXft}/lib -I${libXft}/include
-      -L${libXft.freetype}/lib -I${libXft.freetype}/include
-      -L${libXft.fontconfig}/lib -I${libXft.fontconfig}/include" else "-no-xft"}
+      -L${libXft.out}/lib -I${libXft.dev}/include
+      -L${libXft.freetype.lib}/lib -I${libXft.freetype.dev}/include
+      -L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"}
   ";
 
   patches = [
diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix
index afedfe54e9428..f26b0d3f2f3c4 100644
--- a/pkgs/development/mobile/androidenv/androidsdk.nix
+++ b/pkgs/development/mobile/androidenv/androidsdk.nix
@@ -7,6 +7,8 @@
 }:
 {platformVersions, abiVersions, useGoogleAPIs, useExtraSupportLibs?false, useGooglePlayServices?false}:
 
+with { inherit (stdenv.lib) makeLibraryPath; };
+
 stdenv.mkDerivation rec {
   name = "android-sdk-${version}";
   version = "24.1.2";
@@ -57,7 +59,7 @@ stdenv.mkDerivation rec {
       # The following wrapper ensures that they can be found:
       wrapProgram `pwd`/android \
         --prefix PATH : ${jdk}/bin \
-        --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib
+        --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ glib gtk libXtst ]}
     
       # The emulators need additional libraries, which are dynamically loaded => let's wrap them
     
@@ -65,7 +67,7 @@ stdenv.mkDerivation rec {
       do
           wrapProgram `pwd`/$i \
             --prefix PATH : ${file}/bin \
-            --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11_32bit}/lib:${libxcb_32bit}/lib:${libXau_32bit}/lib:${libXdmcp_32bit}/lib:${libXext_32bit}/lib:${mesa_32bit}/lib
+            --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ libX11_32bit libxcb_32bit libXau_32bit libXdmcp_32bit libXext_32bit mesa_32bit ]}
       done
       
       ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") ''
@@ -73,7 +75,7 @@ stdenv.mkDerivation rec {
         do
             wrapProgram `pwd`/$i \
               --prefix PATH : ${file}/bin \
-              --suffix LD_LIBRARY_PATH : `pwd`/lib:${libX11}/lib:${libxcb}/lib:${libXau}/lib:${libXdmcp}/lib:${libXext}/lib:${mesa}/lib:${alsaLib}/lib
+              --suffix LD_LIBRARY_PATH : `pwd`/lib:${makeLibraryPath [ libX11 libxcb libXau libXdmcp libXext mesa alsaLib ]}
         done
       ''}
     ''}
@@ -86,10 +88,10 @@ stdenv.mkDerivation rec {
         
         cd lib/monitor-x86
         patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux.so.2 monitor
-        patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
+        patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
         
         wrapProgram `pwd`/monitor \
-          --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib:${libXtst}/lib
+          --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]}
 
         cd ../..
       ''
@@ -99,10 +101,10 @@ stdenv.mkDerivation rec {
         
         cd lib/monitor-x86_64
         patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-linux-x86-64.so.2 monitor
-        patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so
+        patchelf --set-rpath ${makeLibraryPath [ libX11 libXext libXrender freetype fontconfig ]} libcairo-swt.so
         
         wrapProgram `pwd`/monitor \
-          --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.cc}/lib::${libXtst}/lib
+          --prefix LD_LIBRARY_PATH : ${makeLibraryPath [ gtk atk stdenv.cc.cc libXtst ]}
 
         cd ../..
       ''
diff --git a/pkgs/development/tools/phantomjs/default.nix b/pkgs/development/tools/phantomjs/default.nix
index 77bc1e5a885fd..8b6b655b6a56b 100644
--- a/pkgs/development/tools/phantomjs/default.nix
+++ b/pkgs/development/tools/phantomjs/default.nix
@@ -1,6 +1,9 @@
-{ stdenv, fetchurl, freetype, fontconfig, openssl, unzip }:
+{ stdenv, lib, fetchurl, freetype, fontconfig, openssl, unzip }:
 
-assert stdenv.lib.elem stdenv.system [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+let
+  platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+in
+assert lib.elem stdenv.system platforms;
 
 stdenv.mkDerivation rec {
   name = "phantomjs-1.9.8";
@@ -27,12 +30,12 @@ stdenv.mkDerivation rec {
               sha256 = "0j0aq8dgzmb210xdrh0v3d4nblskl3zsckl8bzf1a603wcx085cg";
             };
 
-  buildInputs = if stdenv.isDarwin then [ unzip ] else [];
+  buildInputs = lib.optional stdenv.isDarwin unzip;
 
-  buildPhase = if stdenv.isDarwin then "" else ''
+  buildPhase = lib.optionalString (!stdenv.isDarwin) ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${freetype}/lib:${fontconfig}/lib:${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${openssl}/lib" \
+      --set-rpath "${stdenv.lib.makeLibraryPath [ freetype fontconfig stdenv.cc.cc stdenv.cc.cc openssl ]}" \
       bin/phantomjs
   '';
 
@@ -60,9 +63,9 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://phantomjs.org/;
-    license = stdenv.lib.licenses.bsd3;
+    license = lib.licenses.bsd3;
 
-    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
-    platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" ];
+    maintainers = [ lib.maintainers.bluescreen303 ];
+    inherit platforms;
   };
 }
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 8f2e44ce8a6b4..b2f566ece8de3 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     mv chromedriver $out/bin
     patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver
     wrapProgram "$out/bin/chromedriver" \
-      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${cairo}/lib:${fontconfig}/lib:${freetype}/lib:${gdk_pixbuf}/lib:${glib}/lib:${gtk}/lib:${libX11}/lib:${nspr}/lib:${nss}/lib:${pango}/lib:${libXrender}/lib:${gconf}/lib:${libXext}/lib:${libXi}/lib:\$LD_LIBRARY_PATH"
+      --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-cc)/lib64:${stdenv.lib.makeLibraryPath [ cairo fontconfig freetype gdk_pixbuf glib gtk libX11 nspr nss pango libXrender gconf libXext libXi ]}:\$LD_LIBRARY_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix
index d75f02c5e941e..ec9c928b7982f 100644
--- a/pkgs/games/oilrush/default.nix
+++ b/pkgs/games/oilrush/default.nix
@@ -1,6 +1,8 @@
 { stdenv, config, fetchurl, libX11, libXext, libXinerama, libXrandr
 , libXrender, fontconfig, freetype, openal }:
 
+with { inherit (stdenv.lib) makeLibraryPath; };
+
 stdenv.mkDerivation {
   name = "oilrush";
   src = 
@@ -25,25 +27,25 @@ stdenv.mkDerivation {
     do
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f
     done
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              launcher_$arch
     patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
              libNetwork_$arch.so
     patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
              libQtCoreUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtGuiUnigine_$arch.so.4
     patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
              libQtNetworkUnigine_$arch.so.4
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXrender fontconfig freetype ]}\
              libQtWebKitUnigine_$arch.so.4
     patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
              libQtXmlUnigine_$arch.so.4
     patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib\
              libRakNet_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              libUnigine_$arch.so
-    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${stdenv.cc.cc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\
+    patchelf --set-rpath ${stdenv.cc.cc}/lib64:${makeLibraryPath [ stdenv.cc.cc libX11 libXext libXinerama libXrandr ]}\
              OilRush_$arch
   '';
   installPhase = ''
@@ -53,7 +55,7 @@ stdenv.mkDerivation {
     mkdir -p "$out/bin"
     cat << EOF > "$out/bin/oilrush"
     #! /bin/sh
-    LD_LIBRARY_PATH=.:${openal}/lib:\$LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=.:${makeLibraryPath [ openal ]}:\$LD_LIBRARY_PATH
     cd "$out/opt/oilrush"
     exec ./launcher_$arch.sh "\$@"
     EOF
diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
index 7cc4c2b96b1e7..52a892705742e 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/pkgs/games/sdlmame/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xorg.libX11}/lib:${xorg.libXinerama}/lib:${stdenv.cc.cc}/lib" \
+      --set-rpath "${stdenv.lib.makeLibraryPath [ alsaLib qt48 SDL fontconfig freetype SDL_ttf xorg.libX11 xorg.libXinerama stdenv.cc.cc ]}" \
       share/sdlmame/sdlmame
 
     mkdir -p "$out/bin"
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index 178e7a59d8310..da3df8a483d1b 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -152,7 +152,7 @@ in stdenv.mkDerivation {
       --replace "@ENCODINGSDIR@"    "${xorg.encodings}/share/fonts/X11/encodings" \
       --replace "@MKFONTDIR@"       "${xorg.mkfontdir}/bin/mkfontdir" \
       --replace "@MKFONTSCALE@"     "${xorg.mkfontscale}/bin/mkfontscale" \
-      --replace "@FC_CACHE@"        "${fontconfig}/bin/fc-cache" \
+      --replace "@FC_CACHE@"        "${fontconfig.bin}/bin/fc-cache" \
       --replace "@FONTCONFIG_FILE@" "$fontsConfPath"
 
     cp ${./xinitrc} $out/etc/X11/xinit/xinitrc
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index f8dd35576ff78..08799d3e712b0 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/gnuplot \
        --prefix PATH : '${gnused}/bin' \
        --prefix PATH : '${coreutils}/bin' \
-       --prefix PATH : '${fontconfig}/bin' \
+       --prefix PATH : '${fontconfig.bin}/bin' \
        --run '. ${./set-gdfontpath-from-fontconfig.sh}'
   '';
 
diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh
index 98b8ac7418b5e..15fcdcf6c9ddc 100644
--- a/pkgs/tools/system/plan9port/builder.sh
+++ b/pkgs/tools/system/plan9port/builder.sh
@@ -5,7 +5,7 @@ export PLAN9_TARGET=$PLAN9
 
 configurePhase()
 {
-    echo CFLAGS=\"-I${fontconfig}/include -I${libXt_dev}/include\" > LOCAL.config
+    echo CFLAGS=\"-I${fontconfig_dev}/include -I${libXt_dev}/include\" > LOCAL.config
     echo X11=\"${libXt_dev}/include\" >> LOCAL.config
 
     for f in `grep -l -r /usr/local/plan9`; do
diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix
index 9833d81be1a25..70f792953b856 100644
--- a/pkgs/tools/system/plan9port/default.nix
+++ b/pkgs/tools/system/plan9port/default.nix
@@ -48,5 +48,5 @@ stdenv.mkDerivation rec {
   };
 
   libXt_dev = libXt.dev;
-  inherit fontconfig;
+  fontconfig_dev = fontconfig.dev;
 }
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index 408ef8ae263c0..18f9c99ee2406 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -37,16 +37,16 @@ stdenv.mkDerivation rec {
     sed -i 's|self.install_layout == "deb"|False|' setup.py
   '' + stdenv.lib.optionalString enableAllFeatures ''
     for file in $(find -name "*.py"); do
-        sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt}/bin/xsltproc|g' \
-            -e 's|Popen(\["xsltproc|Popen(\["${libxslt}/bin/xsltproc|g' \
+        sed -e 's|cmd = \["xsltproc|cmd = \["${libxslt.bin}/bin/xsltproc|g' \
+            -e 's|Popen(\["xsltproc|Popen(\["${libxslt.bin}/bin/xsltproc|g' \
             -e 's|cmd = \["texindy|cmd = ["nixpkgs_is_missing_texindy|g' \
             -e 's|cmd = "epstopdf|cmd = "${tex}/bin/epstopdf|g' \
             -e 's|cmd = \["makeindex|cmd = ["${tex}/bin/makeindex|g' \
             -e 's|doc.program = "pdflatex"|doc.program = "${tex}/bin/pdflatex"|g' \
             -e 's|self.program = "latex"|self.program = "${tex}/bin/latex"|g' \
             -e 's|Popen("pdflatex|Popen("${tex}/bin/pdflatex|g' \
-            -e 's|"fc-match"|"${fontconfig}/bin/fc-match"|g' \
-            -e 's|"fc-list"|"${fontconfig}/bin/fc-list"|g' \
+            -e 's|"fc-match"|"${fontconfig.bin}/bin/fc-match"|g' \
+            -e 's|"fc-list"|"${fontconfig.bin}/bin/fc-list"|g' \
             -e 's|cmd = "inkscape|cmd = "${inkscape}/bin/inkscape|g' \
             -e 's|cmd = "fig2dev|cmd = "${transfig}/bin/fig2dev|g' \
             -e 's|cmd = \["ps2pdf|cmd = ["${ghostscript}/bin/ps2pdf|g' \
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6b95fbb2c7fca..cdebdf5b4317d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -4777,7 +4777,7 @@ let self = _self // overrides; _self = with self; {
     # tests fail
     doCheck = false;
 
-    makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xorg.libXpm}";
+    makeMakerFlags = "--lib_png_path=${pkgs.libpng.out} --lib_jpeg_path=${pkgs.libjpeg.out} --lib_zlib_path=${pkgs.zlib.out} --lib_ft_path=${pkgs.freetype.out} --lib_fontconfig_path=${pkgs.fontconfig.lib} --lib_xpm_path=${pkgs.xorg.libXpm.out}";
   };
 
   GDSecurityImage = buildPerlPackage {

From 38313d5d877fc421d1381971051107e4b03dc40d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 13:23:01 +0200
Subject: [PATCH 189/857] libxml2,libxslt: split into multiple outputs

Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
---
 nixos/doc/manual/default.nix                  |  2 +-
 pkgs/applications/audio/swh-lv2/default.nix   |  2 +-
 .../networking/feedreaders/newsbeuter/dev.nix |  2 +-
 .../networking/p2p/retroshare/0.6.nix         |  2 +-
 .../networking/p2p/retroshare/default.nix     |  2 +-
 pkgs/applications/search/recoll/default.nix   |  4 +-
 .../version-management/redmine/bootstrap.nix  |  4 +-
 pkgs/development/interpreters/php/default.nix |  2 +-
 .../ruby/bundler-env/default-gem-config.nix   | 12 +++---
 .../development/interpreters/ruby/patches.nix |  4 +-
 .../libraries/fontconfig/default.nix          |  2 +-
 pkgs/development/libraries/gupnp/default.nix  |  2 +-
 .../libraries/libguestfs/default.nix          |  2 +-
 .../development/libraries/libxml2/default.nix | 41 +++++++++----------
 .../development/libraries/libxslt/default.nix | 15 ++++---
 .../libraries/mailcore2/default.nix           |  2 +-
 .../development/libraries/pdf2xml/default.nix |  4 +-
 pkgs/development/r-modules/default.nix        |  2 +-
 pkgs/development/tools/vagrant/default.nix    | 14 +++----
 pkgs/games/openlierox/default.nix             |  2 +-
 pkgs/misc/cups/drivers/canon/default.nix      |  4 +-
 pkgs/servers/http/apache-httpd/2.4.nix        |  2 +-
 pkgs/servers/http/nginx/default.nix           |  2 +-
 pkgs/servers/http/nginx/unstable.nix          |  2 +-
 pkgs/servers/http/openresty/default.nix       |  2 +-
 pkgs/tools/misc/snapper/default.nix           |  2 +-
 pkgs/tools/networking/openconnect.nix         |  4 +-
 pkgs/tools/security/modsecurity/default.nix   |  3 +-
 pkgs/tools/security/mpw/default.nix           |  2 +-
 pkgs/tools/typesetting/asciidoc/default.nix   |  4 +-
 pkgs/tools/typesetting/xmlto/default.nix      |  2 +-
 pkgs/top-level/all-packages.nix               | 11 +++--
 32 files changed, 83 insertions(+), 79 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 87964e27bb9cd..61a71d834050d 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -43,7 +43,7 @@ let
       echo "for hints about the offending path)."
       exit 1
     fi
-    ${libxslt}/bin/xsltproc \
+    ${libxslt.bin}/bin/xsltproc \
       --stringparam revision '${revision}' \
       -o $out ${./options-to-docbook.xsl} $optionsXML
   '';
diff --git a/pkgs/applications/audio/swh-lv2/default.nix b/pkgs/applications/audio/swh-lv2/default.nix
index 2955a9371ff6f..4bc7801637c6d 100644
--- a/pkgs/applications/audio/swh-lv2/default.nix
+++ b/pkgs/applications/audio/swh-lv2/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   patchPhase = ''
-    sed -e "s#xsltproc#${libxslt}/bin/xsltproc#" -i Makefile
+    sed -e "s#xsltproc#${libxslt.bin}/bin/xsltproc#" -i Makefile
     sed -e "s#PREFIX = /usr/local#PREFIX = $out#" -i Makefile
   '';
 
diff --git a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
index a254535dd703c..99196cdf796b9 100644
--- a/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
+++ b/pkgs/applications/networking/feedreaders/newsbeuter/dev.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   NIX_CFLAGS_COMPILE =
-    "-I${libxml2}/include/libxml2 -I${json-c-0-11}/include/json-c";
+    "-I${libxml2.dev}/include/libxml2 -I${json-c-0-11}/include/json-c";
 
   NIX_LDFLAGS = "-lsqlite3 -lcurl -lxml2 -lstfl -ljson";
 
diff --git a/pkgs/applications/networking/p2p/retroshare/0.6.nix b/pkgs/applications/networking/p2p/retroshare/0.6.nix
index 855ebdd059365..020d001705310 100644
--- a/pkgs/applications/networking/p2p/retroshare/0.6.nix
+++ b/pkgs/applications/networking/p2p/retroshare/0.6.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "189qndkfq9kgv3qi3wx8ivla4j8fxr4iv7c8y9rjrjaz8jwdkn5x";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2 -I${sqlcipher}/include/sqlcipher";
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2 -I${sqlcipher}/include/sqlcipher";
 
   patchPhase = ''
     # Fix build error
diff --git a/pkgs/applications/networking/p2p/retroshare/default.nix b/pkgs/applications/networking/p2p/retroshare/default.nix
index a139531b19a63..e7fe79d66a564 100644
--- a/pkgs/applications/networking/p2p/retroshare/default.nix
+++ b/pkgs/applications/networking/p2p/retroshare/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "0l2n4pr1hq66q6qa073hrdx3s3d7iw54z8ay1zy82zhk2rwhsavp";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${libxml2}/include/libxml2";
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.dev}/lib/glib-2.0/include -I${libxml2.dev}/include/libxml2";
 
   patchPhase = ''
     sed -i 's/UpnpString_get_String(es_event->PublisherUrl)/es_event->PublisherUrl/' \
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 3182f4a5c66cc..059c5eacc496d 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace grep          ${gnugrep}/bin/grep
       substituteInPlace  $f --replace groff         ${groff}/bin/groff
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
-      substituteInPlace  $f --replace iconv         ${libiconv}/bin/iconv
+      substituteInPlace  $f --replace iconv         ${libiconv.bin}/bin/iconv
       substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
       substituteInPlace  $f --replace pdftotext     ${xpdf}/bin/pdftotext
       substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace tar           ${gnutar}/bin/tar
       substituteInPlace  $f --replace unzip         ${unzip}/bin/unzip
       substituteInPlace  $f --replace xls2csv       ${catdoc}/bin/xls2csv
-      substituteInPlace  $f --replace xsltproc      ${libxslt}/bin/xsltproc
+      substituteInPlace  $f --replace xsltproc      ${libxslt.bin}/bin/xsltproc
       substituteInPlace  $f --replace unrtf         ${unrtf}/bin/unrtf
       substituteInPlace  $f --replace untex         ${untex}/bin/untex
       substituteInPlace  $f --replace wpd2html      ${libwpd}/bin/wpd2html
diff --git a/pkgs/applications/version-management/redmine/bootstrap.nix b/pkgs/applications/version-management/redmine/bootstrap.nix
index 5971f2e9cddcc..82643f18a554b 100644
--- a/pkgs/applications/version-management/redmine/bootstrap.nix
+++ b/pkgs/applications/version-management/redmine/bootstrap.nix
@@ -32,8 +32,8 @@ in stdenv.mkDerivation rec {
 
     bundle config --local build.nokogiri --use-system-libraries \
       --with-iconv-dir=${libiconv} \
-      --with-xslt-dir=${libxslt} \
-      --with-xml2-dir=${libxml2} \
+      --with-xslt-dir=${libxslt.out} \
+      --with-xml2-dir=${libxml2.out} \
       --with-pkg-config \
       --with-pg-config=${postgresql}/bin/pg_config
 
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 59630d1814fa2..6247663e3f404 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -67,7 +67,7 @@ let
 
         libxml2 = {
           configureFlags = [
-            "--with-libxml-dir=${libxml2}"
+            "--with-libxml-dir=${libxml2.dev}"
             ];
           buildInputs = [ libxml2 ];
         };
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
index 3ae74057a54f7..c91c6da28d9f6 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
@@ -63,12 +63,12 @@ in
     buildFlags = [
       "--use-system-libraries"
       "--with-zlib-dir=${zlib}"
-      "--with-xml2-lib=${libxml2}/lib"
-      "--with-xml2-include=${libxml2}/include/libxml2"
-      "--with-xslt-lib=${libxslt}/lib"
-      "--with-xslt-include=${libxslt}/include"
-      "--with-exslt-lib=${libxslt}/lib"
-      "--with-exslt-include=${libxslt}/include"
+      "--with-xml2-lib=${libxml2.out}/lib"
+      "--with-xml2-include=${libxml2.dev}/include/libxml2"
+      "--with-xslt-lib=${libxslt.out}/lib"
+      "--with-xslt-include=${libxslt.dev}/include"
+      "--with-exslt-lib=${libxslt.out}/lib"
+      "--with-exslt-include=${libxslt.dev}/include"
     ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
     buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
   };
diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix
index 0cc477c991efc..be79c5c957abf 100644
--- a/pkgs/development/interpreters/ruby/patches.nix
+++ b/pkgs/development/interpreters/ruby/patches.nix
@@ -82,8 +82,8 @@ in
   nokogiri = {
     buildInputs = [ libxml2 ];
     buildFlags =
-      [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2"
-        "--with-xslt-dir=${libxslt}  --use-system-libraries"
+      [ "--with-xml2-dir=${libxml2.out} --with-xml2-include=${libxml2.dev}/include/libxml2"
+        "--with-xslt-dir=${libxslt.out}  --use-system-libraries"
         libiconv
       ];
   };
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index f72f65ddad74c..6acf1ebce29c5 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     cd "$out/etc/fonts"
     rm conf.d/{50-user,51-local}.conf
-    "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \
+    "${libxslt.bin}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \
       --stringparam fontconfig "$out" \
       --stringparam fontconfigConfigVersion "${configVersion}" \
       --path $out/share/xml/fontconfig \
diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix
index 6145c8c494773..45f5217d3c91b 100644
--- a/pkgs/development/libraries/gupnp/default.nix
+++ b/pkgs/development/libraries/gupnp/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     ln -sv ${libsoup}/include/*/libsoup $out/include
-    ln -sv ${libxml2}/include/*/libxml $out/include
+    ln -sv ${libxml2.dev}/include/*/libxml $out/include
     ln -sv ${gssdp}/include/*/libgssdp $out/include
   '';
 
diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix
index 313934c66574f..ac6a8b2b74c3b 100644
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-appliance --disable-daemon";
   patches = [ ./libguestfs-syms.patch ];
-  NIX_CFLAGS_COMPILE="-I${libxml2}/include/libxml2/";
+  NIX_CFLAGS_COMPILE="-I${libxml2.dev}/include/libxml2/";
 
   preConfigure = ''
     AUTOPOINT=true LIBTOOLIZE=true autoreconf --verbose --install
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 2fdc198aa115b..af71c05a1c870 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,14 +1,11 @@
-{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }:
-
-assert pythonSupport -> python != null;
-
-#TODO: share most stuff between python and non-python builds, perhaps via multiple-output
+{ stdenv, fetchurl, zlib, xz, python, findXMLCatalogs }:
 
 let
   version = "2.9.2";
+  inherit (stdenv.lib) optional;
 in
 
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation rec {
   name = "libxml2-${version}";
 
   src = fetchurl {
@@ -16,20 +13,32 @@ stdenv.mkDerivation (rec {
     sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "bin" "doc" "py" ];
+  propagatedOutputs = "out bin py";
 
-  buildInputs = stdenv.lib.optional pythonSupport python
+  buildInputs = [ 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;
+    ++ optional stdenv.isFreeBSD xz;
 
   propagatedBuildInputs = [ zlib findXMLCatalogs ];
 
-  passthru = { inherit pythonSupport version; };
+  configureFlags = "--with-python=${python}";
 
   enableParallelBuilding = true;
 
+  preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
+  installFlags = ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"'';
+
+  postFixup = ''
+    _moveToOutput bin/xml2-config "$dev"
+    _moveToOutput lib/xml2Conf.sh "$dev"
+    _moveToOutput share/man/man1 "$bin"
+  '';
+
+  passthru = { inherit version; pythonSupport = true; };
+
   meta = {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
@@ -37,15 +46,5 @@ stdenv.mkDerivation (rec {
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
-
-} // 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/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 3579e99ec7a8e..dc74d8e95eeb8 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "bin" "doc" ];
 
   buildInputs = [ libxml2 ];
 
@@ -17,7 +17,6 @@ stdenv.mkDerivation rec {
   patches = stdenv.lib.optionals stdenv.isSunOS [ ./patch-ah.patch ];
 
   configureFlags = [
-    "--with-libxml-prefix=${libxml2}"
     "--without-python"
     "--without-crypto"
     "--without-debug"
@@ -25,11 +24,17 @@ stdenv.mkDerivation rec {
     "--without-debugger"
   ];
 
-  meta = {
+  postFixup = ''
+    _moveToOutput bin/xslt-config "$dev"
+    _moveToOutput lib/xsltConf.sh "$dev"
+    _moveToOutput share/man/man1 "$bin"
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://xmlsoft.org/XSLT/;
     description = "A C library and tools to do XSL transformations";
     license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = platforms.unix;
+    maintainers = [ maintainers.eelco ];
   };
 }
diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix
index 8cf0744a0d14f..c86205226dddb 100644
--- a/pkgs/development/libraries/mailcore2/default.nix
+++ b/pkgs/development/libraries/mailcore2/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     substituteInPlace CMakeLists.txt \
        --replace "tidy/tidy.h" "tidy.h" \
        --replace "/usr/include/tidy" "${libtidy}/include" \
-       --replace "/usr/include/libxml2" "${libxml2}/include/libxml2" \
+       --replace "/usr/include/libxml2" "${libxml2.dev}/include/libxml2" \
   '';
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix
index c7c5aff24558e..4ebb0cbcc2607 100644
--- a/pkgs/development/libraries/pdf2xml/default.nix
+++ b/pkgs/development/libraries/pdf2xml/default.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   preBuild = ''
     cp Makefile.linux Makefile
   
-    sed -i 's|/usr/include/libxml2|${libxml2}/include/libxml2|' Makefile
-    sed -i 's|-lxml2|-lxml2 -L${libxml2}/lib|' Makefile
+    sed -i 's|/usr/include/libxml2|${libxml2.dev}/include/libxml2|' Makefile
+    sed -i 's|-lxml2|-lxml2 -L${libxml2.out}/lib|' Makefile
     sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile
 
     mkdir exe
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index a9d81f028f4a0..fc0cdf72449fd 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1558,7 +1558,7 @@ let
     });
 
     xml2 = old.xml2.overrideDerivation (attrs: {
-      preConfigure = "export LIBXML_INCDIR=${pkgs.libxml2}/include/libxml2";
+      preConfigure = "export LIBXML_INCDIR=${pkgs.libxml2.dev}/include/libxml2";
     });
 
     curl = old.curl.overrideDerivation (attrs: {
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 085807e1bfadb..f7a592682cade 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -57,8 +57,8 @@ stdenv.mkDerivation rec {
 
     # openssl: c_rehash, openssl
     rm opt/vagrant/embedded/bin/{c_rehash,openssl}
-    ln -s ${openssl}/bin/c_rehash opt/vagrant/embedded/bin
-    ln -s ${openssl}/bin/openssl opt/vagrant/embedded/bin
+    ln -s ${openssl.bin}/bin/c_rehash opt/vagrant/embedded/bin
+    ln -s ${openssl.bin}/bin/openssl opt/vagrant/embedded/bin
 
     # ruby: erb, gem, irb, rake, rdoc, ri, ruby, testrb
     rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby,testrb}
@@ -77,14 +77,14 @@ stdenv.mkDerivation rec {
 
     # libxml: xml2-config, xmlcatalog, xmllint
     rm opt/vagrant/embedded/bin/{xml2-config,xmlcatalog,xmllint}
-    ln -s ${libxml2}/bin/xml2-config opt/vagrant/embedded/bin
-    ln -s ${libxml2}/bin/xmlcatalog opt/vagrant/embedded/bin
-    ln -s ${libxml2}/bin/xmllint opt/vagrant/embedded/bin
+    ln -s ${libxml2.dev}/bin/xml2-config opt/vagrant/embedded/bin
+    ln -s ${libxml2.bin}/bin/xmlcatalog opt/vagrant/embedded/bin
+    ln -s ${libxml2.bin}/bin/xmllint opt/vagrant/embedded/bin
 
     # libxslt: xslt-config, xsltproc
     rm opt/vagrant/embedded/bin/{xslt-config,xsltproc}
-    ln -s ${libxslt}/bin/xslt-config opt/vagrant/embedded/bin
-    ln -s ${libxslt}/bin/xsltproc opt/vagrant/embedded/bin
+    ln -s ${libxslt.dev}/bin/xslt-config opt/vagrant/embedded/bin
+    ln -s ${libxslt.bin}/bin/xsltproc opt/vagrant/embedded/bin
 
     mkdir -p "$out"
     cp -r opt "$out"
diff --git a/pkgs/games/openlierox/default.nix b/pkgs/games/openlierox/default.nix
index 2dc4dece75f38..04b74b4214fa3 100644
--- a/pkgs/games/openlierox/default.nix
+++ b/pkgs/games/openlierox/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1k35xppfqi3qfysv81xq3hj4qdy9j2ciinbkfdcmwclcsf3nh94z";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2";
+  NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
 
   # The breakpad fails to build on x86_64, and it's only to report bugs upstream
   cmakeFlags = [ "-DBREAKPAD=0" ];
diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix
index 4c31e8d37d254..779cf9656863f 100644
--- a/pkgs/misc/cups/drivers/canon/default.nix
+++ b/pkgs/misc/cups/drivers/canon/default.nix
@@ -202,10 +202,10 @@ stdenv.mkDerivation rec {
       cp libs/ThLB* $out/share/ufr2filter
     )
 
-    patchelf --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/lib32/libcanonufr2.so.1.0.0
+    patchelf --set-rpath "$out/lib32:${i686_libxml2.out}/lib" $out/lib32/libcanonufr2.so.1.0.0
 
     patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32" $out/bin/cnpkmoduleufr2
-    patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32:${i686_libxml2}/lib" $out/bin/cnpkbidi
+    patchelf --interpreter "$(cat ${i686_NIX_GCC}/nix-support/dynamic-linker)" --set-rpath "$out/lib32:${i686_libxml2.out}/lib" $out/bin/cnpkbidi
 
     makeWrapper "${ghostscript}/bin/gs" "$out/bin/gs" \
       --prefix LD_LIBRARY_PATH ":" "$out/lib" \
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index bcfd885ae012b..1ab3eaf03824f 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     ${optionalString proxySupport "--enable-proxy"}
     ${optionalString sslSupport "--enable-ssl"}
     ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
-    ${optionalString libxml2Support "--with-libxml2=${libxml2}/include/libxml2"}
+    ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
   '';
 
   postInstall = ''
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 54f4e1599b8cf..6866dc0086163 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = optionalString modsecurity "-I${aprutil}/include/apr-1 -I${apacheHttpd}/include -I${apr}/include/apr-1 -I${yajl}/include";
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
   '';
 
   meta = {
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index e71adba3e5721..4806eabc361af 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
   additionalFlags = optionalString stdenv.isDarwin "-Wno-error=deprecated-declarations";
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
   '';
 
   postInstall = ''
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix
index aac6262829054..147e24c014d27 100644
--- a/pkgs/servers/http/openresty/default.nix
+++ b/pkgs/servers/http/openresty/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags"
     export PATH="$PATH:${stdenv.cc.libc.bin}/bin"
     patchShebangs .
   '';
diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 0f28b15ea973a..0d165bb4a2da3 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = "DESTDIR=$(out)";
 
-  NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ];
+  NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ];
 
   # Probably a hack, but using DESTDIR and PREFIX makes everything work!
   postInstall = ''
diff --git a/pkgs/tools/networking/openconnect.nix b/pkgs/tools/networking/openconnect.nix
index 54239b7661743..43e48e9a4cdfe 100644
--- a/pkgs/tools/networking/openconnect.nix
+++ b/pkgs/tools/networking/openconnect.nix
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
       export PKG_CONFIG=${pkgconfig}/bin/pkg-config
-      export LIBXML2_CFLAGS="-I ${libxml2}/include/libxml2"
-      export LIBXML2_LIBS="-L${libxml2}/lib -lxml2"
+      export LIBXML2_CFLAGS="-I ${libxml2.dev}/include/libxml2"
+      export LIBXML2_LIBS="-L${libxml2.out}/lib -lxml2"
     '';
 
   configureFlags = [
diff --git a/pkgs/tools/security/modsecurity/default.nix b/pkgs/tools/security/modsecurity/default.nix
index 5ed6c9ecdc4a9..29007807e10cc 100644
--- a/pkgs/tools/security/modsecurity/default.nix
+++ b/pkgs/tools/security/modsecurity/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl
+{ stdenv, lib, fetchurl, pkgconfig
 , curl, apacheHttpd, pcre, apr, aprutil, libxml2 }:
 
 with lib;
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ curl apacheHttpd pcre apr aprutil libxml2 ];
   configureFlags = [
     "--enable-standalone-module"
diff --git a/pkgs/tools/security/mpw/default.nix b/pkgs/tools/security/mpw/default.nix
index 15937a6792e69..a565c3b96e14e 100644
--- a/pkgs/tools/security/mpw/default.nix
+++ b/pkgs/tools/security/mpw/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation {
     patchShebangs .
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${libxml2}/include/libxml2";
+  NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
 
   buildInputs = [ autoconf automake openssl libxml2 ];
 
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index b26582a6cc716..7c393c5241514 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -237,12 +237,12 @@ stdenv.mkDerivation rec {
     # We can remove PATH= when those impurities are fixed.
     sed -e "s|^ENV =.*|ENV = dict(XML_CATALOG_FILES='${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook5_xsl}/xml/xsl/docbook/catalog.xml ${docbook_xsl}/xml/xsl/docbook/catalog.xml', PATH='${tetex}/bin:${coreutils}/bin:${gnused}/bin')|" \
         -e "s|^ASCIIDOC =.*|ASCIIDOC = '$out/bin/asciidoc'|" \
-        -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt}/bin/xsltproc'|" \
+        -e "s|^XSLTPROC =.*|XSLTPROC = '${libxslt.bin}/bin/xsltproc'|" \
         -e "s|^DBLATEX =.*|DBLATEX = '${dblatexFull}/bin/dblatex'|" \
         -e "s|^FOP =.*|FOP = '${fop}/bin/fop'|" \
         -e "s|^W3M =.*|W3M = '${w3m}/bin/w3m'|" \
         -e "s|^LYNX =.*|LYNX = '${lynx}/bin/lynx'|" \
-        -e "s|^XMLLINT =.*|XMLLINT = '${libxml2}/bin/xmllint'|" \
+        -e "s|^XMLLINT =.*|XMLLINT = '${libxml2.bin}/bin/xmllint'|" \
         -e "s|^EPUBCHECK =.*|EPUBCHECK = 'nixpkgs_is_missing_epubcheck'|" \
         -i a2x.py
   '' + ''
diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix
index 49fe7dc681fe9..f99c14720760d 100644
--- a/pkgs/tools/typesetting/xmlto/default.nix
+++ b/pkgs/tools/typesetting/xmlto/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/xmlto" \
-       --prefix PATH : "${libxslt}/bin:${libxml2}/bin:${getopt}/bin"
+       --prefix PATH : "${libxslt.bin}/bin:${libxml2.bin}/bin:${getopt}/bin"
 
     # `w3m' is needed for HTML to text conversions.
     substituteInPlace "$out/share/xmlto/format/docbook/txt" \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a1791f483244b..30228a63c1102 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7480,14 +7480,13 @@ let
 
   libxmi = callPackage ../development/libraries/libxmi { };
 
-  libxml2 = callPackage ../development/libraries/libxml2 {
-    pythonSupport = false;
+  libxml2 = callPackage ../development/libraries/libxml2 { };
+  libxml2Python = pkgs.buildEnv { # slightly hacky
+    name = "libxml2+py-${pkgs.libxml2.version}";
+    paths = with libxml2; [ dev bin py ];
+    inherit (pkgs.libxml2) passthru;
   };
 
-  libxml2Python = lowPrio (libxml2.override {
-    pythonSupport = true;
-  });
-
   libxmlxx = callPackage ../development/libraries/libxmlxx { };
 
   libxmp = callPackage ../development/libraries/libxmp { };

From 6d86a93c43790c887ec4a6bc42c2a79d23e33612 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 15:58:37 +0200
Subject: [PATCH 190/857] libevent: split into multiple outputs

Hopefully all references are fixed.
---
 nixos/modules/services/torrent/transmission.nix |  2 +-
 pkgs/development/libraries/libevent/default.nix |  8 ++++----
 pkgs/servers/dns/nsd/default.nix                |  2 +-
 pkgs/servers/mail/opensmtpd/default.nix         |  2 +-
 pkgs/tools/networking/nylon/default.nix         | 12 +++++++++---
 pkgs/tools/networking/p2p/seeks/default.nix     |  6 +++---
 pkgs/tools/networking/unbound/default.nix       |  4 ++--
 7 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index d32868f7f8ebb..b5abfb717b709 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -114,7 +114,7 @@ in
           #include <abstractions/nameservice>
 
           ${pkgs.glibc.out}/lib/*.so               mr,
-          ${pkgs.libevent}/lib/libevent*.so*   mr,
+          ${pkgs.libevent.out}/lib/libevent*.so*   mr,
           ${pkgs.curl}/lib/libcurl*.so*        mr,
           ${pkgs.openssl}/lib/libssl*.so*      mr,
           ${pkgs.openssl}/lib/libcrypto*.so*   mr,
diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix
index 284a09bc92756..98185da168add 100644
--- a/pkgs/development/libraries/libevent/default.nix
+++ b/pkgs/development/libraries/libevent/default.nix
@@ -8,14 +8,14 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/levent/libevent-${version}-stable.tar.gz";
     sha256 = "18qz9qfwrkakmazdlwxvjmw8p76g70n3faikwvdwznns1agw9hki";
   };
+  postPatch = "patchShebangs event_rpcgen.py";
+
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
 
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ python ] ++ stdenv.lib.optional stdenv.isCygwin findutils;
 
-  patchPhase = ''
-    patchShebangs event_rpcgen.py
-  '';
-
   meta = with stdenv.lib; {
     description = "Event notification library";
 
diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 218c7dc73f18d..ed258f317881a 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
      ++ edf rootServer       "root-server"
      ++ edf rrtypes          "draft-rrtypes"
      ++ edf zoneStats        "zone-stats"
-     ++ [ "--with-ssl=${openssl}" "--with-libevent=${libevent}" ];
+     ++ [ "--with-ssl=${openssl.dev}" "--with-libevent=${libevent.dev}" ];
 
   meta = with stdenv.lib; {
     homepage = http://www.nlnetlabs.nl;
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 2fd3f0421b975..34de9c3674ba2 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     "--with-privsep-user=smtpd"
     "--with-queue-user=smtpq"
     "--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
-    "--with-libevent-dir=${libevent}"
+    "--with-libevent-dir=${libevent.dev}"
   ];
 
   installFlags = [
diff --git a/pkgs/tools/networking/nylon/default.nix b/pkgs/tools/networking/nylon/default.nix
index daeb7ffb57bb8..fc89ea8db51b6 100644
--- a/pkgs/tools/networking/nylon/default.nix
+++ b/pkgs/tools/networking/nylon/default.nix
@@ -1,5 +1,11 @@
-{ stdenv, fetchurl, libevent }:
-
+{ stdenv, fetchurl, libevent, buildEnv }:
+let
+  # failed to find a better way to make it work
+  libevent-comb = buildEnv {
+    inherit (libevent.out) name;
+    paths = [ libevent.dev libevent.out ];
+  };
+in
 stdenv.mkDerivation {
   name = "nylon-1.21";
   src = fetchurl {
@@ -9,7 +15,7 @@ stdenv.mkDerivation {
 
   patches = [ ./configure-use-solib.patch ];
 
-  configureFlags = [ "--with-libevent=${libevent}" ];
+  configureFlags = [ "--with-libevent=${libevent-comb}" ];
 
   buildInputs = [ libevent ];
 
diff --git a/pkgs/tools/networking/p2p/seeks/default.nix b/pkgs/tools/networking/p2p/seeks/default.nix
index 28dce0f567e91..621e71c9eae2d 100644
--- a/pkgs/tools/networking/p2p/seeks/default.nix
+++ b/pkgs/tools/networking/p2p/seeks/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, stdenv, zlib, docbook2x, pcre, curl, libxml2, libevent, perl
+{ fetchgit, stdenv, zlib, bzip2, docbook2x, pcre, curl, libxml2, libevent, perl
 , pkgconfig, protobuf, tokyocabinet, tokyotyrant, opencv, autoconf, automake
 , libtool, seeks_confDir ? ""
 }:
@@ -13,14 +13,14 @@ stdenv.mkDerivation {
   };
 
   buildInputs =
-    [ zlib docbook2x pcre curl libxml2 libevent perl pkgconfig
+    [ zlib bzip2 docbook2x pcre curl libxml2 libevent perl pkgconfig
       protobuf tokyocabinet tokyotyrant opencv autoconf automake libtool
     ];
 
   configureFlags =
     [ # Enable the built-in web server providing a web search interface.
       "--enable-httpserv-plugin=yes"
-      "--with-libevent=${libevent}"
+      "--with-libevent=${libevent.dev}"
     ];
 
   preConfigure = ''
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index ab37f30fb64d0..c8a502d8c77c0 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -14,9 +14,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl expat libevent ];
 
   configureFlags = [
-    "--with-ssl=${openssl}"
+    "--with-ssl=${openssl.dev}"
     "--with-libexpat=${expat}"
-    "--with-libevent=${libevent}"
+    "--with-libevent=${libevent.dev}"
     "--localstatedir=/var"
     "--sysconfdir=/etc"
   ];

From e4f38fb050bb7f390ebbc16de154cd9e78852e72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 16:00:55 +0200
Subject: [PATCH 191/857] xorg.xcb-util: split into multiple outputs

I see no references likely to break.
---
 pkgs/servers/x11/xorg/overrides.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b590b97c5713f..5bf2648a2cd95 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -230,6 +230,10 @@ in
     buildInputs = attrs.buildInputs ++ [ args.freetype args.fontconfig ];
   };
 
+  xcbutil = attrs: attrs // {
+    outputs = [ "dev" "out" ];
+  };
+
   xcbutilcursor = attrs: attrs // {
     meta.maintainers = [ stdenv.lib.maintainers.lovek323 ];
   };

From bf7403f030d1a47822178ceb84ad70b3f21669d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 16:05:40 +0200
Subject: [PATCH 192/857] unbound: purge runtime dependency on python

---
 pkgs/tools/networking/unbound/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index c8a502d8c77c0..1e1469d0010ec 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -23,10 +23,11 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
-  # get rid of runtime dependency
+  # get rid of runtime dependencies on $dev outputs
   postInstall = ''
     substituteInPlace "$lib/lib/libunbound.la" \
-      --replace '-L${openssl.dev}/lib' ""
+      --replace '-L${openssl.dev}/lib' "" \
+      --replace '-L${libevent.dev}/lib' ""
   '';
 
   meta = with stdenv.lib; {

From ba9b80c7e08953cb63ad0061f33538680ea764db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 17:45:54 +0200
Subject: [PATCH 193/857] nspr,nss: split into multiple outputs

Hopefully most references are OK.
---
 pkgs/applications/audio/spotify/default.nix    |  4 ++--
 .../gecko-mediaplayer/default.nix              |  2 +-
 .../instant-messengers/carrier/2.5.0.nix       | 10 +++++-----
 .../instant-messengers/oneteam/default.nix     |  2 +-
 .../instant-messengers/pidgin/default.nix      | 10 +++++-----
 .../gnome-3/3.16/apps/evolution/default.nix    |  2 +-
 .../gnome-3/3.16/core/epiphany/default.nix     |  2 +-
 .../gnome-3/3.16/core/folks/default.nix        |  4 ++--
 .../gnome-3/3.18/apps/evolution/default.nix    |  2 +-
 .../gnome-3/3.18/core/epiphany/default.nix     |  2 +-
 .../gnome-3/3.18/core/folks/default.nix        |  4 ++--
 .../interpreters/spidermonkey/1.8.0-rc1.nix    |  2 +-
 .../interpreters/spidermonkey/17.0.nix         |  2 +-
 .../interpreters/spidermonkey/185-1.0.0.nix    |  2 +-
 .../interpreters/spidermonkey/24.2.nix         |  2 +-
 pkgs/development/libraries/nspr/default.nix    |  4 ++++
 pkgs/development/libraries/nss/default.nix     | 18 +++++++++++-------
 pkgs/tools/package-management/rpm/default.nix  |  2 +-
 pkgs/top-level/all-packages.nix                |  5 +----
 19 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 05027350cc2f8..d9983a3268541 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -68,8 +68,8 @@ stdenv.mkDerivation {
 
       ln -s ${openssl.out}/lib/libssl.so $libdir/libssl.so.1.0.0
       ln -s ${openssl.out}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
-      ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
-      ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
+      ln -s ${nspr.out}/lib/libnspr4.so $libdir/libnspr4.so
+      ln -s ${nspr.out}/lib/libplc4.so $libdir/libplc4.so
 
       mkdir -p $out/bin
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
index ba40925e1d1eb..f59de7db9f5c0 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/gecko-mediaplayer/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # !!! fix this
   preBuild =
     ''
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr}/include/nspr"
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$(echo ${browser}/include/xulrunner-*) -I${browser.nspr.dev}/include/nspr"
       echo $NIX_CFLAGS_COMPILE
     '';
 
diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 7368a8842147e..d29ec7ab8d3b1 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -1,4 +1,4 @@
-args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss
+args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss, nspr
 , gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
 , libtool, automake, autoconf, gstreamer
 , gtk, glib
@@ -19,7 +19,7 @@ rec {
 
   buildInputs = [gtkspell aspell
     gstreamer startupnotification
-    libxml2 openssl nss
+    libxml2 openssl nss nspr
     libXScrnSaver ncurses scrnsaverproto
     libX11 xproto kbproto GConf avahi
     dbus dbus_glib glib python
@@ -29,9 +29,9 @@ rec {
     pkgconfig gtk perl perlXMLParser gettext
   ];
 
-  configureFlags="--with-nspr-includes=${nss}/include/nspr"
-    + " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
-    + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
+  configureFlags="--with-nspr-includes=${nspr.dev}/include/nspr"
+    + " --with-nspr-libs=${nspr.out}/lib --with-nss-includes=${nss.dev}/include/nss"
+    + " --with-nss-libs=${nss.out}/lib --with-ncurses-headers=${ncurses.dev}/include"
     + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
 
   preBuild = fullDepEntry (''
diff --git a/pkgs/applications/networking/instant-messengers/oneteam/default.nix b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
index 2ab0930842bc0..bec367818e2ff 100644
--- a/pkgs/applications/networking/instant-messengers/oneteam/default.nix
+++ b/pkgs/applications/networking/instant-messengers/oneteam/default.nix
@@ -43,7 +43,7 @@ rec {
   '' ["minInit" "doUnpack"];
 
   setVars=a.noDepEntry ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
   '';
 
   cmakeBuildDir="cmake-build";
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 5e8f266930ff7..ebb82a7826252 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -41,11 +41,11 @@ stdenv.mkDerivation rec {
   patches = [./pidgin-makefile.patch ./add-search-path.patch ];
 
   configureFlags = [
-    "--with-nspr-includes=${nspr}/include/nspr"
-    "--with-nspr-libs=${nspr}/lib"
-    "--with-nss-includes=${nss}/include/nss"
-    "--with-nss-libs=${nss}/lib"
-    "--with-ncurses-headers=${ncurses}/include"
+    "--with-nspr-includes=${nspr.dev}/include/nspr"
+    "--with-nspr-libs=${nspr.out}/lib"
+    "--with-nss-includes=${nss.dev}/include/nss"
+    "--with-nss-libs=${nss.out}/lib"
+    "--with-ncurses-headers=${ncurses.dev}/include"
     "--disable-meanwhile"
     "--disable-nm"
     "--disable-tcl"
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
index d77740d35075f..1aa9dd62d41e3 100644
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" ];
 
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
index 5ec07d01b2e0b..bab4cb672e5e3 100644
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
                   gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
                   gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
index 41e75a38c7632..4385c6b6f75b8 100644
--- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-fatal-warnings";
 
-  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
+  NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss"
+                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix
index a9bb87d4dddfc..100dfbf3acec5 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/default.nix
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" ];
 
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
index 5a98770b6632c..33e724ce99756 100644
--- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
                   gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
                   gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
 
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix
index 41e75a38c7632..4385c6b6f75b8 100644
--- a/pkgs/desktops/gnome-3/3.18/core/folks/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/folks/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-fatal-warnings";
 
-  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
+  NIX_CFLAGS_COMPILE = ["-I${nspr.dev}/include/nspr" "-I${nss.dev}/include/nss"
+                        "-I${dbus_glib.dev}/include/dbus-1.0" "-I${dbus_libs.dev}/include/dbus-1.0"];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
index ecaed5077121e..99f66199d939d 100644
--- a/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
+++ b/pkgs/development/interpreters/spidermonkey/1.8.0-rc1.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     '';
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
   '';
 
   makeFlags = "-f ${makefile} JS_DIST=\${out} BUILD_OPT=1 JS_READLINE=1 JS_THREADSAFE=1";
diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix
index 7573b546164b0..9cbfde596c45c 100644
--- a/pkgs/development/interpreters/spidermonkey/17.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.0.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
     export LIBXUL_DIST=$out
   '';
 
diff --git a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
index a036388f15eed..94f070d1a91d3 100644
--- a/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/185-1.0.0.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
     export LIBXUL_DIST=$out
   '';
 
diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix
index 3a9bd8ad7a462..2c59b2c435a94 100644
--- a/pkgs/development/interpreters/spidermonkey/24.2.nix
+++ b/pkgs/development/interpreters/spidermonkey/24.2.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   postUnpack = "sourceRoot=\${sourceRoot}/js/src";
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr}/include/nspr"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${nspr.dev}/include/nspr"
     export LIBXUL_DIST=$out
   '';
 
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index 55cb75d6b7da8..5050741dcbca6 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation {
     sha256 = "4112ff6ad91d32696ca0c6c3d4abef6367b5dc0127fa172fcb3c3ab81bb2d881";
   };
 
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
+
   preConfigure = ''
     cd nspr
   '';
@@ -21,6 +24,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     find $out -name "*.a" -delete
+    _moveToOutput share "$dev" # just aclocal
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 27fb7cec81a65..fd5834b206ead 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, nspr, perl, zlib, sqlite
-, includeTools ? false
-}:
+{ stdenv, fetchurl, nspr, perl, zlib, sqlite }:
 
 let
 
@@ -46,15 +44,18 @@ in stdenv.mkDerivation rec {
     INSTALL_TARGET
   '';
 
+  outputs = [ "dev" "out" "tools" ];
+
   preConfigure = "cd nss";
 
   makeFlags = [
-    "NSPR_INCLUDE_DIR=${nspr}/include/nspr"
-    "NSPR_LIB_DIR=${nspr}/lib"
+    "NSPR_INCLUDE_DIR=${nspr.dev}/include/nspr"
+    "NSPR_LIB_DIR=${nspr.out}/lib"
     "NSDISTMODE=copy"
     "BUILD_OPT=1"
     "SOURCE_PREFIX=\$(out)"
     "NSS_ENABLE_ECC=1"
+    "USE_SYSTEM_ZLIB=1"
     "NSS_USE_SYSTEM_SQLITE=1"
   ] ++ stdenv.lib.optional stdenv.is64bit "USE_64=1";
 
@@ -75,8 +76,11 @@ in stdenv.mkDerivation rec {
       libfile="$out/lib/lib$libname.so"
       LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile"
     done
-  '' + stdenv.lib.optionalString (!includeTools) ''
-    find $out/bin -type f \( -name nss-config -o -delete \)
+
+    _moveToOutput bin "$tools"
+    _moveToOutput bin/nss-config "$dev"
+    _moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
+    rm "$out"/lib/*.a
   '';
 
   meta = {
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index ef7b999529681..0397723a2252d 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   # Note: we don't add elfutils to buildInputs, since it provides a
   # bad `ld' and other stuff.
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${elfutils}/include";
+  NIX_CFLAGS_COMPILE = "-I${nspr.dev}/include/nspr -I${nss.dev}/include/nss -I${elfutils}/include";
 
   NIX_CFLAGS_LINK = "-L${elfutils}/lib";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30228a63c1102..84b984a713479 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7690,13 +7690,10 @@ let
   nspr = callPackage ../development/libraries/nspr { };
 
   nss = lowPrio (callPackage ../development/libraries/nss { });
+  nssTools = nss.tools;
 
   nss_wrapper = callPackage ../development/libraries/nss_wrapper { };
 
-  nssTools = callPackage ../development/libraries/nss {
-    includeTools = true;
-  };
-
   ntk = callPackage ../development/libraries/audio/ntk { };
 
   ntrack = callPackage ../development/libraries/ntrack { };

From 17a3f6a6fa33de932fcd6e31c7a81db88af794b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 19:25:49 +0200
Subject: [PATCH 194/857] icu: split into multiple outputs

---
 pkgs/development/libraries/boost/generic.nix  |  2 +-
 pkgs/development/libraries/icu/default.nix    |  5 +++++
 pkgs/servers/nosql/eventstore/default.nix     |  4 ++--
 pkgs/stdenv/darwin/make-bootstrap-tools.nix   | 20 +++++++++----------
 .../pure-darwin/make-bootstrap-tools.nix      | 20 +++++++++----------
 .../tools/typesetting/tex/texlive/default.nix |  2 +-
 6 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 677652a733b2b..1fd78761cd3b3 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation {
 
   configureScript = "./bootstrap.sh";
   configureFlags = commonConfigureFlags ++ [
-    "--with-icu=${icu}"
+    "--with-icu=${icu.dev}"
     "--with-python=${python.interpreter}"
   ] ++ optional (toolset != null) "--with-toolset=${toolset}";
 
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index 909f4e936a94b..2158314438ab9 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation {
     sha256 = "0ys5f5spizg45qlaa31j2lhgry0jka2gfha527n4ndfxxz5j4sz1";
   };
 
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
+
   makeFlags = stdenv.lib.optionalString stdenv.isDarwin
     "CXXFLAGS=-headerpad_max_install_names";
 
@@ -37,6 +40,8 @@ stdenv.mkDerivation {
     sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
   '';
 
+  postFixup = ''_moveToOutput lib/icu "$dev" '';
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/nosql/eventstore/default.nix b/pkgs/servers/nosql/eventstore/default.nix
index 9cb5dd41c1c3f..e682ebb1c8175 100644
--- a/pkgs/servers/nosql/eventstore/default.nix
+++ b/pkgs/servers/nosql/eventstore/default.nix
@@ -23,8 +23,8 @@ stdenv.mkDerivation rec {
 
   buildPhase = ''
     ln -s ${v8}/lib/libv8.so src/libs/libv8.so
-    ln -s ${icu}/lib/libicui18n.so src/libs/libicui18n.so
-    ln -s ${icu}/lib/libicuuc.so src/libs/libicuuc.so
+    ln -s ${icu.out}/lib/libicui18n.so src/libs/libicui18n.so
+    ln -s ${icu.out}/lib/libicuuc.so src/libs/libicuuc.so
 
     patchShebangs build.sh
     ./build.sh js1
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 636410fdd788c..39d4ed8623536 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -30,9 +30,9 @@ rec {
 
       cp -rL ${darwin.Libsystem}/include $out
       chmod -R u+w $out/include
-      cp -rL ${icu}/include*             $out/include
+      cp -rL ${icu.dev}/include*             $out/include
       cp -rL ${libiconv}/include/*       $out/include
-      cp -rL ${gnugrep.pcre}/include/*   $out/include
+      cp -rL ${gnugrep.pcre.dev}/include/*   $out/include
       mv $out/include $out/include-Libsystem
 
       # Copy coreutils, bash, etc.
@@ -49,20 +49,20 @@ rec {
       cp -d ${gawk}/bin/awk $out/bin
       cp ${gnutar}/bin/tar $out/bin
       cp ${gzip}/bin/gzip $out/bin
-      cp ${bzip2}/bin/bzip2 $out/bin
+      cp ${bzip2.bin}/bin/bzip2 $out/bin
       cp -d ${gnumake}/bin/* $out/bin
       cp -d ${patch}/bin/* $out/bin
-      cp -d ${xz}/bin/xz $out/bin
+      cp -d ${xz.bin}/bin/xz $out/bin
 
       # This used to be in-nixpkgs, but now is in the bundle
       # because I can't be bothered to make it partially static
       cp ${curl}/bin/curl $out/bin
       cp -d ${curl}/lib/libcurl*.dylib $out/lib
       cp -d ${libssh2}/lib/libssh*.dylib $out/lib
-      cp -d ${openssl}/lib/*.dylib $out/lib
+      cp -d ${openssl.out}/lib/*.dylib $out/lib
 
-      cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib
-      cp -d ${libiconv}/lib/libiconv*.dylib $out/lib
+      cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
+      cp -d ${libiconv.lib}/lib/libiconv*.dylib $out/lib
 
       # Copy what we need of clang
       cp -d ${llvmPackages.clang}/bin/clang $out/bin
@@ -77,10 +77,10 @@ rec {
       mkdir $out/include
       cp -rd ${libcxx}/include/c++     $out/include
 
-      cp -d ${icu}/lib/libicu*.dylib $out/lib
-      cp -d ${zlib}/lib/libz.*       $out/lib
+      cp -d ${icu.out}/lib/libicu*.dylib $out/lib
+      cp -d ${zlib.out}/lib/libz.*       $out/lib
       cp -d ${gmpxx}/lib/libgmp*.*   $out/lib
-      cp -d ${xz}/lib/liblzma*.*     $out/lib
+      cp -d ${xz.out}/lib/liblzma*.*     $out/lib
 
       # Copy binutils.
       for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do
diff --git a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
index 433638dd1bdeb..a36a3066330e1 100644
--- a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
@@ -30,9 +30,9 @@ rec {
 
       cp -rL ${darwin.Libsystem}/include $out
       chmod -R u+w $out/include
-      cp -rL ${icu}/include*             $out/include
+      cp -rL ${icu.dev}/include*             $out/include
       cp -rL ${libiconv}/include/*       $out/include
-      cp -rL ${gnugrep.pcre}/include/*   $out/include
+      cp -rL ${gnugrep.pcre.dev}/include/*   $out/include
       mv $out/include $out/include-Libsystem
 
       # Copy coreutils, bash, etc.
@@ -49,20 +49,20 @@ rec {
       cp -d ${gawk}/bin/awk $out/bin
       cp ${gnutar}/bin/tar $out/bin
       cp ${gzip}/bin/gzip $out/bin
-      cp ${bzip2}/bin/bzip2 $out/bin
+      cp ${bzip2.bin}/bin/bzip2 $out/bin
       cp -d ${gnumake}/bin/* $out/bin
       cp -d ${patch}/bin/* $out/bin
-      cp -d ${xz}/bin/xz $out/bin
+      cp -d ${xz.bin}/bin/xz $out/bin
 
       # This used to be in-nixpkgs, but now is in the bundle
       # because I can't be bothered to make it partially static
       cp ${curl}/bin/curl $out/bin
       cp -d ${curl}/lib/libcurl*.dylib $out/lib
       cp -d ${libssh2}/lib/libssh*.dylib $out/lib
-      cp -d ${openssl}/lib/*.dylib $out/lib
+      cp -d ${openssl.out}/lib/*.dylib $out/lib
 
-      cp -d ${gnugrep.pcre}/lib/libpcre*.dylib $out/lib
-      cp -d ${libiconv}/lib/libiconv*.dylib $out/lib
+      cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
+      cp -d ${libiconv.lib}/lib/libiconv*.dylib $out/lib
       cp -d ${gettext}/lib/libintl*.dylib $out/lib
       chmod +x $out/lib/libintl*.dylib
 
@@ -79,10 +79,10 @@ rec {
       mkdir $out/include
       cp -rd ${libcxx}/include/c++     $out/include
 
-      cp -d ${icu}/lib/libicu*.dylib $out/lib
-      cp -d ${zlib}/lib/libz.*       $out/lib
+      cp -d ${icu.out}/lib/libicu*.dylib $out/lib
+      cp -d ${zlib.out}/lib/libz.*       $out/lib
       cp -d ${gmpxx}/lib/libgmp*.*   $out/lib
-      cp -d ${xz}/lib/liblzma*.*     $out/lib
+      cp -d ${xz.out}/lib/liblzma*.*     $out/lib
 
       # Copy binutils.
       for i in as ld ar ranlib nm strip otool install_name_tool dsymutil; do
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 9f0b9d07b932f..008de2d252091 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -54,7 +54,7 @@ rec {
     # sed -e s@ncurses/curses.h@curses.h@g -i $(grep ncurses/curses.h -rl . )
     sed -e '1i\#include <string.h>\n\#include <stdlib.h>' -i $( find libs/teckit -name '*.cpp' -o -name '*.c' )
 
-    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu}/include/layout";
+    NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${icu.dev}/include/layout";
 
     ./Build --prefix="$out" --datadir="$out/share" --mandir="$out/share/man" --infodir="$out/share/info" \
       ${args.lib.concatStringsSep " " configureFlags}

From 9a1aa51fed2b62edcce9f1722cfc822cf07f31a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 19:26:54 +0200
Subject: [PATCH 195/857] harfbuzz-icu: share the non-icu library

---
 .../libraries/harfbuzz/default.nix            | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index d2f8416b3eab7..6ee88f6ea4fb8 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -1,38 +1,49 @@
 { stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintlOrEmpty
-, icu, graphite2
+, icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one.
 , withIcu ? false # recommended by upstream as default, but most don't needed and it's big
 , withGraphite2 ? true # it is small and major distros do include it
 }:
 
-# TODO: split non-icu and icu lib into different outputs?
-# (icu is a ~30 MB dependency, the rest is very small in comparison)
+let
+  version = "1.0.3";
+  inherit (stdenv.lib) optional optionals optionalString;
+in
 
-stdenv.mkDerivation rec {
-  name = "harfbuzz-1.0.3";
+stdenv.mkDerivation {
+  name = "harfbuzz${optionalString withIcu "-icu"}-1.0.3";
 
   src = fetchurl {
-    url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
+    url = "http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.bz2";
     sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
+  outputBin = "dev";
 
   configureFlags = [
     ( "--with-graphite2=" + (if withGraphite2 then "yes" else "no") ) # not auto-detected by default
     ( "--with-icu=" +       (if withIcu       then "yes" else "no") )
   ];
 
-  buildInputs = [ pkgconfig glib freetype cairo ] # recommended by upstream
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ glib freetype cairo ] # recommended by upstream
     ++ libintlOrEmpty;
   propagatedBuildInputs = []
-    ++ stdenv.lib.optional withGraphite2 graphite2
-    ++ stdenv.lib.optional withIcu icu
+    ++ optional withGraphite2 graphite2
+    ++ optionals withIcu [ icu harfbuzz ]
     ;
 
-  meta = {
+  # Slightly hacky; some pkgs expect them in a single directory.
+  postInstall = optionalString withIcu ''
+    rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc"
+    ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.la
+    ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc
+  '';
+
+  meta = with stdenv.lib; {
     description = "An OpenType text shaping engine";
     homepage = http://www.freedesktop.org/wiki/Software/HarfBuzz;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
+    maintainers = [ maintainers.eelco ];
+    platforms = with platforms; linux ++ darwin;
   };
 }

From 91407a8bdfb2dbb95b6cc5c99a44b0925bd464f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 20:32:54 +0200
Subject: [PATCH 196/857] ncurses: split into multiple outputs

Some programs (e.g. tput) might better be moved somewhere else than
$dev/bin, but that can be improved later if need be.
---
 .../audio/google-musicmanager/default.nix     |  2 +-
 .../editors/emacs-24/macport-24.3.nix         |  6 ++--
 pkgs/applications/editors/heme/default.nix    |  5 +--
 pkgs/applications/misc/girara/default.nix     |  2 +-
 pkgs/applications/misc/pinfo/default.nix      |  2 +-
 .../misc/zathura/core/default.nix             |  2 +-
 .../science/logic/saw-tools/default.nix       |  2 +-
 .../virtualization/xen/generic.nix            |  2 +-
 pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix  |  2 +-
 .../gnome-3/3.16/core/vte/default.nix         |  2 +-
 pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix  |  2 +-
 .../gnome-3/3.18/core/vte/default.nix         |  2 +-
 .../compilers/gcc-arm-embedded/default.nix    |  2 +-
 .../compilers/ghc/6.10.2-binary.nix           |  2 +-
 pkgs/development/compilers/ghc/6.12.3.nix     |  4 +--
 .../compilers/ghc/7.0.4-binary.nix            |  2 +-
 pkgs/development/compilers/ghc/7.0.4.nix      |  4 +--
 pkgs/development/compilers/ghc/7.10.2.nix     |  4 +--
 pkgs/development/compilers/ghc/7.2.2.nix      |  4 +--
 .../compilers/ghc/7.4.2-binary.nix            |  2 +-
 pkgs/development/compilers/ghc/7.4.2.nix      |  4 +--
 pkgs/development/compilers/ghc/7.6.3.nix      |  4 +--
 pkgs/development/compilers/ghc/7.8.3.nix      |  4 +--
 pkgs/development/compilers/ghc/7.8.4.nix      |  4 +--
 pkgs/development/compilers/ghc/head.nix       |  4 +--
 pkgs/development/compilers/ghc/nokinds.nix    |  4 +--
 pkgs/development/compilers/mentor/default.nix |  2 +-
 .../development/interpreters/pypy/default.nix |  8 ++---
 .../ruby/bundler-env/default-gem-config.nix   |  4 +--
 .../development/libraries/libedit/default.nix |  2 +-
 .../development/libraries/ncurses/default.nix | 31 ++++++++++---------
 pkgs/development/libraries/slang/default.nix  |  5 +--
 .../mobile/androidenv/androidndk.nix          |  2 +-
 pkgs/development/tools/misc/drush/default.nix |  2 +-
 .../development/tools/misc/global/default.nix |  2 +-
 pkgs/tools/misc/entr/default.nix              |  2 +-
 pkgs/tools/networking/inetutils/default.nix   |  2 +-
 pkgs/tools/security/tor/tor-arm.nix           |  2 +-
 pkgs/top-level/perl-packages.nix              |  2 +-
 39 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix
index 48f17564ef426..8127579f0229d 100644
--- a/pkgs/applications/audio/google-musicmanager/default.nix
+++ b/pkgs/applications/audio/google-musicmanager/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc.out}/lib:${qt48}/lib:${stdenv.cc.cc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager
+      --set-rpath "$out/opt/google/musicmanager:${stdenv.lib.makeLibraryPath [ readline ncurses stdenv.cc.libc.out qt48 stdenv.cc.cc libidn expat flac libvorbis ]}" opt/google/musicmanager/MusicManager
   '';
 
   dontPatchELF = true;
diff --git a/pkgs/applications/editors/emacs-24/macport-24.3.nix b/pkgs/applications/editors/emacs-24/macport-24.3.nix
index 191969eef5b0a..edf8a28d6ff46 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.3.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.3.nix
@@ -33,12 +33,12 @@ stdenv.mkDerivation rec {
     # Further, we need to make sure that the -L option occurs before mention
     # of the library, so that it finds it within the Nix store.
     sed -i 's/tinfo ncurses/tinfo ncursesw/' configure
-    ncurseslib=$(echo ${ncurses}/lib | sed 's#/#\\/#g')
+    ncurseslib=$(echo ${ncurses.lib}/lib | sed 's#/#\\/#g')
     sed -i "s/OLIBS=\$LIBS/OLIBS=\"-L$ncurseslib \$LIBS\"/" configure
     sed -i 's/LIBS="\$LIBS_TERMCAP \$LIBS"/LIBS="\$LIBS \$LIBS_TERMCAP"/' configure
 
     configureFlagsArray=(
-      LDFLAGS=-L${ncurses}/lib
+      LDFLAGS=-L${ncurses.lib}/lib
       --with-xml2=yes
       --with-gnutls=yes
       --with-mac
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     )
     makeFlagsArray=(
       CFLAGS=-O3
-      LDFLAGS="-O3 -L${ncurses}/lib"
+      LDFLAGS="-O3 -L${ncurses.lib}/lib"
     );
   '';
 
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index d377e5cb36f67..19c4183ea6721 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -10,10 +10,11 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Makefile \
       --replace "/usr/local" "$out" \
-      --replace "CFLAGS = " "CFLAGS = -I${ncurses}/include " \
-      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses}/lib " \
+      --replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \
+      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.lib}/lib " \
       --replace "-lcurses" "-lncurses"
   '';
+  buildInputs = [ ncurses ];
   preBuild = ''
     mkdir -p $out/bin
     mkdir -p $out/man/man1
diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index e91e94695f5a0..7bb5fb7ddcc03 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk gettext ];
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ optional withBuildColors "TPUT=${ncurses}/bin/tput"
+    ++ optional withBuildColors "TPUT=${ncurses.dev}/bin/tput"
     ++ optional (!withBuildColors) "TPUT_AVAILABLE=0"
     ;
 
diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix
index 658ff410d3790..222dddc0e8974 100644
--- a/pkgs/applications/misc/pinfo/default.nix
+++ b/pkgs/applications/misc/pinfo/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ autoreconfHook gettext texinfo ncurses readline ];
 
-  configureFlags = [ "--with-curses=${ncurses}" "--with-readline=${readline}" ];
+  configureFlags = [ "--with-curses=${ncurses.dev}" "--with-readline=${readline}" ];
 
   meta = with stdenv.lib; {
     description = "A viewer for info files";
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index cab6423b77e5e..92892b54845c6 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
     "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
-    "TPUT=${ncurses}/bin/tput"
+    "TPUT=${ncurses.dev}/bin/tput"
   ];
 
   postInstall = ''
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index eebe6ff0a06c8..97a06bf093d35 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     mv doc $out/share
 
     # Hack around lack of libtinfo in NixOS
-    ln -s ${ncurses}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
+    ln -s ${ncurses.lib}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
     ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
 
     # Add a clang symlink for easy building with a suitable compiler.
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 71c26c5f99c91..5f4147ea2cfa7 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
         --replace /usr/bin/pkill ${procps}/bin/pkill
 
       substituteInPlace tools/xenstat/Makefile \
-        --replace /usr/include/curses.h ${ncurses}/include/curses.h
+        --replace /usr/include/curses.h ${ncurses.dev}/include/curses.h
 
       substituteInPlace tools/qemu-xen-traditional/xen-hooks.mak \
         --replace /usr/include/pci ${pciutils}/include/pci
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
index 5ccca36bcaad5..663d6b9e35242 100644
--- a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
index 89a1405f62b7b..2f0062101f2ed 100644
--- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix
index 5ccca36bcaad5..663d6b9e35242 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
index b47381cf61b8f..e1e260f1e0216 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 1d192fbbc56af..cfd6ecd713da5 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     for f in $(find $out); do
       if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
         patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
-                 --set-rpath $out/lib:${gcc}/lib:${ncurses}/lib \
+                 --set-rpath $out/lib:${gcc.lib}/lib:${ncurses.lib}/lib \
                  "$f" || true
       fi
     done
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 96ec4e6c114a0..cafbe0e5a6cb6 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     (if stdenv.isLinux then ''
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \;
+          --set-rpath "${libedit}/lib:${ncurses.lib}/lib:${gmp}/lib" {} \;
       for prog in ld ar gcc strip ranlib; do
         find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
       done
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index f6beaf3a00672..1fa10f3ed0782 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
   '';
 
   preConfigure = ''
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 31df7f1fa355b..73a589f44ba67 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${ncurses}/lib:${gmp}/lib" {} \;
+          --set-rpath "${ncurses.lib}/lib:${gmp}/lib" {} \;
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       for prog in ld ar gcc strip ranlib; do
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index 281e5ca66a2cd..46605daee93d9 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 73fcd788c74f8..3dfd94eea7d66 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -7,8 +7,8 @@ let
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index 7276f413967fa..f8459cd2a13bd 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 03dd4dcd35bbf..a57aff4d864f6 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     # find editline/gmp.
     stdenv.lib.optionalString stdenv.isLinux ''
       mkdir -p "$out/lib"
-      ln -sv "${ncurses}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
+      ln -sv "${ncurses.lib}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
           --set-rpath "$out/lib:${gmp}/lib" {} \;
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index b2abcb08ec3a5..68bc922e17679 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index 366c0044a67ad..d14ecc32b8b4d 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -24,8 +24,8 @@ in stdenv.mkDerivation rec {
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix
index 2e0f5ba07e4d0..3cbc04f6d7f19 100644
--- a/pkgs/development/compilers/ghc/7.8.3.nix
+++ b/pkgs/development/compilers/ghc/7.8.3.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation rec {
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
index 4323341dc4a49..3ceea24b3dba1 100644
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ b/pkgs/development/compilers/ghc/7.8.4.nix
@@ -16,8 +16,8 @@ stdenv.mkDerivation (rec {
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index fe0d0b37371ec..adff7f12a3c45 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -5,8 +5,8 @@ let
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 6334759496f09..09dac0e951153 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -5,8 +5,8 @@ let
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
     SRC_HC_OPTS        = -H64m -O -fasm
     GhcLibHcOpts       = -O -dcore-lint
diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix
index 7ff013b234410..573bf82103197 100644
--- a/pkgs/development/compilers/mentor/default.nix
+++ b/pkgs/development/compilers/mentor/default.nix
@@ -34,7 +34,7 @@ let
 
             # GDB needs ncurses
             case "$file" in
-              *gdb) patchelf --set-rpath "${ncurses}/lib" "$file";;
+              *gdb) patchelf --set-rpath "${ncurses.lib}/lib" "$file";;
             esac
         done
 
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index fe209f6f11489..4f26a40b0ce7f 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -43,9 +43,9 @@ let
 
       # hint pypy to find nix ncurses
       substituteInPlace pypy/module/_minimal_curses/fficurses.py \
-        --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \
-        --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \
-        --replace "ncurses/term.h" "${ncurses}/include/term.h" \
+        --replace "/usr/include/ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
+        --replace "ncurses/curses.h" "${ncurses.dev}/include/curses.h" \
+        --replace "ncurses/term.h" "${ncurses.dev}/include/term.h" \
         --replace "libraries=['curses']" "libraries=['ncurses']"
 
       # tkinter hints
@@ -72,7 +72,7 @@ let
 
     doCheck = true;
     checkPhase = ''
-       export TERMINFO="${ncurses}/share/terminfo/";
+       export TERMINFO="${ncurses.out}/share/terminfo/";
        export TERM="xterm";
        export HOME="$TMPDIR";
        # disable shutils because it assumes gid 0 exists
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
index c91c6da28d9f6..cbb64bc12774b 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
@@ -54,8 +54,8 @@ in
   ncursesw = attrs: {
     buildInputs = [ ncurses ];
     buildFlags = [
-      "--with-cflags=-I${ncurses}/include"
-      "--with-ldflags=-L${ncurses}/lib"
+      "--with-cflags=-I${ncurses.dev}/include"
+      "--with-ldflags=-L${ncurses.lib}/lib"
     ];
   };
 
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index dc8ecf7e95d83..23b26e343db6e 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
-      -e 's,-lncurses[a-z]*,-L${ncurses}/lib -lncursesw,g'
+      -e 's,-lncurses[a-z]*,-L${ncurses.lib}/lib -lncursesw,g'
   '';
 
   configureFlags = [ "--enable-widec" ];
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 046c7347f8639..04fa1d4b81b94 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -16,6 +16,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./clang.patch ];
 
+  outputs = [ "dev" "lib" "out" ];
+  setOutputFlags = false; # some aren't supported
+
   configureFlags = [
     "--with-shared"
     "--with-cxx-shared"
@@ -24,14 +27,14 @@ stdenv.mkDerivation rec {
     "--enable-overwrite"  # Needed for proper header installation
     "--enable-pc-files"
     "--enable-symlinks"
+    "--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--bindir=$(dev)/bin"
   ] ++ lib.optional unicode "--enable-widec";
 
   nativeBuildInputs = [ pkgconfig libtool ];
   buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
 
   preConfigure = ''
-    configureFlagsArray+=("--includedir=$out/include")
-    export PKG_CONFIG_LIBDIR="$out/lib/pkgconfig"
+    export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
     configureFlagsArray+=("--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR")
   '' + lib.optionalString stdenv.isCygwin ''
@@ -47,37 +50,37 @@ stdenv.mkDerivation rec {
   # 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 = ''
+  postFixup = ''
     # 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")"
+    libs="$(ls $dev/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)
+    cfg=$(basename $dev/bin/ncurses*-config)
 
     # symlink the full suffixed include directory
-    ln -svf . $out/include/ncurses$suffix
+    ln -svf . $dev/include/ncurses$suffix
 
     for newsuffix in $suffixes ""; do
       # Create a non-abi versioned config util links
-      ln -svf $cfg $out/bin/ncurses$newsuffix-config
+      ln -svf $cfg $dev/bin/ncurses$newsuffix-config
 
       # Allow for end users who #include <ncurses?w/*.h>
-      ln -svf . $out/include/ncurses$newsuffix
+      ln -svf . $dev/include/ncurses$newsuffix
 
-      for lib in $libs; do
+      for library 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
+          if [ -e "$lib/lib/lib''${library}$suffix.$dylibtype" ]; then
+            ln -svf lib''${library}$suffix.$dylibtype $lib/lib/lib$library$newsuffix.$dylibtype
           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
+          if [ -e "$lib/lib/lib''${library}$suffix.$statictype" ]; then
+            ln -svf lib''${library}$suffix.$statictype $lib/lib/lib$library$newsuffix.$statictype
           fi
         done
-        ln -svf ''${lib}$suffix.pc $out/lib/pkgconfig/$lib$newsuffix.pc
+        ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
       done
     done
   '';
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index bf1f38fbb83d7..8aeb19ac2e359 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -9,9 +9,10 @@ stdenv.mkDerivation rec {
 
   # Fix some wrong hardcoded paths
   preConfigure = ''
-    sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" configure
-    sed -i -e "s|/usr/lib/terminfo|${ncurses}/lib/terminfo|" src/sltermin.c
+    sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure
+    sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" src/sltermin.c
     sed -i -e "s|/bin/ln|ln|" src/Makefile.in
+    sed -i -e "s|-ltermcap|-lncurses|" ./configure
   '';
   configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";
   buildInputs = [ncurses pcre libpng zlib readline];
diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix
index 03d7cae1a9dbf..3ffc4dab145c1 100644
--- a/pkgs/development/mobile/androidenv/androidndk.nix
+++ b/pkgs/development/mobile/androidenv/androidndk.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
+                          --set-rpath ${stdenv.lib.makeLibraryPath [ zlib ncurses ]} {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
     do
diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index cb534d511eaf5..0751f51281ded 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"
     cp -r . "$out/src"
     mkdir "$out/bin"
-    wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses}/bin"
+    wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.dev}/bin"
     ln -s "$out/src/drush" "$out/bin/drush"
   '';
 }
diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix
index 63b29fccd5277..741b494ec398e 100644
--- a/pkgs/development/tools/misc/global/default.nix
+++ b/pkgs/development/tools/misc/global/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-ltdl-include=${libtool}/include"
-    "--with-ltdl-lib=${libtool}/lib"
+    "--with-ltdl-lib=${libtool.lib}/lib"
     "--with-ncurses=${ncurses}"
     "--with-sqlite3=${sqlite}"
     "--with-exuberant-ctags=${ctags}/bin/ctags"
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 8770a5858875b..ae402e35c2eb6 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Makefile.bsd --replace /bin/echo echo
     substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat
-    substituteInPlace entr.c --replace /usr/bin/clear ${ncurses}/bin/clear
+    substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.dev}/bin/clear
     substituteInPlace entr.1 --replace /bin/cat cat
     substituteInPlace entr.1 --replace /usr/bin/clear clear
   '';
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index eca416b53d4ed..a92c343285798 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ ncurses /* for `talk' */ ];
 
-  configureFlags = "--with-ncurses-include-dir=${ncurses}/include";
+  configureFlags = "--with-ncurses-include-dir=${ncurses.dev}/include";
 
   # Test fails with "UNIX socket name too long", probably because our
   # $TMPDIR is too long.
diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix
index 6c4d61d825f94..365379c8f6a8d 100644
--- a/pkgs/tools/security/tor/tor-arm.nix
+++ b/pkgs/tools/security/tor/tor-arm.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     for i in $(cd $out/bin && ls); do
       wrapProgram $out/bin/$i \
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \
-        --set TERMINFO "${ncurses}/share/terminfo" \
+        --set TERMINFO "${ncurses.out}/share/terminfo" \
         --set TERM     "xterm"
     done
   '';
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index cdebdf5b4317d..ecd5f8d93cf21 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10448,7 +10448,7 @@ let self = _self // overrides; _self = with self; {
     preConfigure =
       ''
         substituteInPlace Makefile.PL --replace '$Config{libpth}' \
-          "'${pkgs.ncurses}/lib'"
+          "'${pkgs.ncurses.lib}/lib'"
       '';
 
     # Tests don't work because they require /dev/tty.

From f28924173eceb6c9e17a458ccd893f6f8aa51ef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 22:47:22 +0200
Subject: [PATCH 197/857] libvpx: split into multiple outputs

Rather an easy one, it seems.
---
 pkgs/development/libraries/libvpx/default.nix | 5 +++++
 pkgs/development/libraries/libvpx/git.nix     | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index 6a47566707860..c33c5d9ad01e2 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -72,6 +72,9 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''patchShebangs .'';
 
+  outputs = [ "dev" "out" "bin" ];
+  setOutputFlags = false;
+
   configureFlags = [
     (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
     (enableFeature vp8EncoderSupport "vp8-encoder")
@@ -146,6 +149,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''_moveToOutput bin "$bin" '';
+
   crossAttrs = let
     isCygwin = stdenv.cross.libc == "msvcrt";
     isDarwin = stdenv.cross.libc == "libSystem";
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index 31b1c197e9ff0..bfe1f9424cd56 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -73,6 +73,9 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''patchShebangs .'';
 
+  outputs = [ "dev" "out" "bin" ];
+  setOutputFlags = false;
+
   configureFlags = [
     (enableFeature (vp8EncoderSupport || vp8DecoderSupport) "vp8")
     (enableFeature vp8EncoderSupport "vp8-encoder")
@@ -147,6 +150,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''_moveToOutput bin "$bin" '';
+
   crossAttrs = let
     isCygwin = stdenv.cross.libc == "msvcrt";
     isDarwin = stdenv.cross.libc == "libSystem";

From a6e4c87391e6696e468fb132cba619e416dd7c1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 22:56:47 +0200
Subject: [PATCH 198/857] gtk3: split into multiple outputs

All references OK, hopefully. Seems surprisingly smooth.
---
 nixos/modules/services/x11/display-managers/lightdm.nix      | 2 +-
 pkgs/applications/graphics/shotwell/default.nix              | 2 +-
 pkgs/applications/misc/sweethome3d/default.nix               | 2 +-
 pkgs/applications/misc/sweethome3d/editors.nix               | 2 +-
 pkgs/applications/video/kazam/default.nix                    | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/evince/default.nix           | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix             | 2 +-
 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.18/core/evince/default.nix           | 2 +-
 pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix             | 2 +-
 pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix | 2 +-
 pkgs/development/libraries/gtk+/3.x.nix                      | 3 +++
 pkgs/misc/cups/default.nix                                   | 2 +-
 pkgs/tools/inputmethods/ibus/default.nix                     | 2 +-
 pkgs/tools/networking/gupnp-tools/default.nix                | 4 ++--
 pkgs/top-level/python-packages.nix                           | 2 +-
 22 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index b7b57e0fbd75a..2dfa07ac6cb13 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -34,7 +34,7 @@ let
         $out/greeter \
         --prefix PATH : "${pkgs.glibc.bin}/bin" \
         --set GDK_PIXBUF_MODULE_FILE "${pkgs.gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache" \
-        --set GTK_PATH "${theme}:${pkgs.gtk3}" \
+        --set GTK_PATH "${theme}:${pkgs.gtk3.out}" \
         --set GTK_EXE_PREFIX "${theme}" \
         --set GTK_DATA_PREFIX "${theme}" \
         --set XDG_DATA_DIRS "${theme}/share:${icons}/share" \
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 052ba9402bed6..cbb72471de55b 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/shotwell" \
      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
+     --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
      --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
   '';
 
diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 0c9b6e8c08a0c..f55d8ed34eeb7 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -31,7 +31,7 @@ let
       cp install/${module}-${version}.jar $out/share/java/.
       cp "${sweethome3dItem}/share/applications/"* $out/share/applications
       makeWrapper ${jre}/bin/java $out/bin/$exec \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
         --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
     '';
 
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 87da1c6643b2c..204e5eeae5953 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -40,7 +40,7 @@ let
       cp ${module}-${version}.jar $out/share/java/.
       cp "${editorItem}/share/applications/"* $out/share/applications
       makeWrapper ${jre}/bin/java $out/bin/$exec \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
         --add-flags "-jar $out/share/java/${module}-${version}.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
     '';
 
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 17bf282a459ad..1e3f5d57a0642 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -34,9 +34,9 @@ python3Packages.buildPythonPackage rec {
   preFixup = ''
     wrapProgram $out/bin/kazam \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH ":" "${gtk3}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \
+      --prefix LD_LIBRARY_PATH ":" "${gtk3.out}/lib:${gst_all_1.gstreamer}/lib:${keybinder}/lib" \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share" \
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share" \
       --set GST_REGISTRY "/tmp/kazam.gstreamer.registry";
   '';
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
index aa75b55358b51..483f5104d8d10 100644
--- a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     "--enable-introspection"
   ];
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
   preConfigure = with stdenv.lib;
     optionalString doCheck ''
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     # by `g_file_info_get_content_type ()'.
     wrapProgram "$out/bin/evince" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
 
   '';
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
index 9e3906dbed135..18b89279696e0 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-dictionary" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
index c36e1b87d668d..e87201306813b 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
   propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-screenshot" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
index 716f92a072d46..50ee229cfa498 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib.dev}/include/gio-unix-2.0";
 
   propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
   propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-system-log" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
index 998f1f5f735fe..6295773d4587a 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gitg" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
index 6600345060f96..c790d41f10737 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-tweak-tool" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --suffix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
   '';
diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix
index 154182eef8875..bed67184eeb02 100644
--- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     # by `g_file_info_get_content_type ()'.
     wrapProgram "$out/bin/evince" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
 
   '';
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix
index 1d1f9d18c5662..51e3f6ab31332 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-dictionary" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix
index 763fc990bdab1..15d93793088bb 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-screenshot/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-screenshot" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix
index 716f92a072d46..6b7b28ad4000e 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-system-log/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-system-log" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix
index c517fca57bf94..e625541f5c0f9 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/gitg/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/gitg" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix
index 986d4058af92e..d0c6674ad9bde 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/gnome-tweak-tool/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     wrapProgram "$out/bin/gnome-tweak-tool" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+      --suffix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
   '';
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 9bf95d015dd72..0e8c058bf7d2c 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
     sha256 = "7fb8ae257403317d3852bad28d064d35f67e978b1fed8b71d5997e87204271b9";
   };
 
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
+
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
 
   buildInputs = [ libxkbcommon epoxy ];
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 3d335a01d9ba2..82fe6299a7278 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
     sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
   };
 
-  # FIXME: Split off the cups client library.
+  # FIXME: the cups libraries contains some $out/share strings so can't be split.
   outputs = [ "dev" "out" "doc" "man" ];
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 97a8c3e7d1c75..61e6594e358a0 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     for f in "$out"/bin/*; do
       wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
                        --prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
-                       --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
+                       --prefix LD_LIBRARY_PATH : "${gnome3.gtk3.out}/lib:${atk.out}/lib:$out/lib" \
                        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
                        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
     done
diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix
index d0f2ef5466918..b1c0235a35b35 100644
--- a/pkgs/tools/networking/gupnp-tools/default.nix
+++ b/pkgs/tools/networking/gupnp-tools/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
                  gnome3.defaultIconTheme gnome3.gnome_themes_standard makeWrapper];
 
   postInstall = ''
-    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
-    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
+    wrapProgram "$out/bin/gupnp-av-cp" --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
+    wrapProgram "$out/bin/gupnp-universal-cp" --prefix XDG_DATA_DIRS : "${gtk3.out}/share:${gnome3.gnome_themes_standard}/share:${gnome3.defaultIconTheme}/share:$out/share"
   '';
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d02b7dda1e17a..088cd63f0891f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3841,7 +3841,7 @@ let
     preFixup = ''
         wrapProgram $out/bin/gtimelog \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-          --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3.out}/lib" \
 
     '';
 

From 0338199544a7df4ce8dde1b6dc987f17760863f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 5 Oct 2015 23:53:26 +0200
Subject: [PATCH 199/857] lcms*: split into multiple outputs

Referrers look fine.
---
 pkgs/development/libraries/lcms/default.nix  |  2 ++
 pkgs/development/libraries/lcms2/default.nix | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/lcms/default.nix b/pkgs/development/libraries/lcms/default.nix
index c98a01f6f70f1..9365cf0b5f091 100644
--- a/pkgs/development/libraries/lcms/default.nix
+++ b/pkgs/development/libraries/lcms/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1abkf8iphwyfs3z305z3qczm3z1i9idc1lz4gvfg92jnkz5k5bl0";
   };
 
+  outputs = [ "dev" "out" "bin" "man" ];
+
   meta = {
     description = "Color management engine";
     homepage = http://www.littlecms.com/;
diff --git a/pkgs/development/libraries/lcms2/default.nix b/pkgs/development/libraries/lcms2/default.nix
index db82c943d7c2b..7dea029491aa7 100644
--- a/pkgs/development/libraries/lcms2/default.nix
+++ b/pkgs/development/libraries/lcms2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libtiff, libjpeg, zlib}:
+{ stdenv, fetchurl, libtiff, libjpeg, zlib }:
 
 stdenv.mkDerivation rec {
   name = "lcms2-2.7";
@@ -8,13 +8,14 @@ stdenv.mkDerivation rec {
     sha256 = "0lvaglcjsvnyglgj3cb3pjc22nq8fml1vlx5dmmmw66ywx526925";
   };
 
+  outputs = [ "dev" "out" "bin" ];
+
   propagatedBuildInputs = [ libtiff libjpeg zlib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Color management engine";
     homepage = http://www.littlecms.com/;
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
+    license = licenses.mit;
+    platforms = platforms.all;
   };
 }

From b9031ea1da2e69c3101a4ddaf056b2cf3a30201a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 11:52:25 +0200
Subject: [PATCH 200/857] slang: fix some dependants and split into outputs

These termcap and similar (nonexistent) libraries are baffling me.
---
 pkgs/development/libraries/newt/default.nix  | 10 ++++++----
 pkgs/development/libraries/slang/default.nix | 18 +++++++++++++-----
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/newt/default.nix b/pkgs/development/libraries/newt/default.nix
index f5f72c006c73e..8a4b793cad797 100644
--- a/pkgs/development/libraries/newt/default.nix
+++ b/pkgs/development/libraries/newt/default.nix
@@ -14,16 +14,18 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ slang popt ];
 
+  NIX_LDFLAGS = "-lncurses";
+
   crossAttrs = {
     makeFlags = "CROSS_COMPILE=${stdenv.cross.config}-";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://fedorahosted.org/newt/;
     description = "Library for color text mode, widget based user interfaces";
 
-    license = stdenv.lib.licenses.lgpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.viric ];
+    license = licenses.lgpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.viric ];
   };
 }
diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix
index 8aeb19ac2e359..e83718673aaea 100644
--- a/pkgs/development/libraries/slang/default.nix
+++ b/pkgs/development/libraries/slang/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "0aqd2cjabj6nhd4r3dc4vhqif2bf3dmqnrn2gj0xm4gqyfd177jy";
   };
 
+  outputs = [ "dev" "out" "doc" ];
+
   # Fix some wrong hardcoded paths
   preConfigure = ''
     sed -i -e "s|/usr/lib/terminfo|${ncurses.out}/lib/terminfo|" configure
@@ -15,13 +17,19 @@ stdenv.mkDerivation rec {
     sed -i -e "s|-ltermcap|-lncurses|" ./configure
   '';
   configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}";
-  buildInputs = [ncurses pcre libpng zlib readline];
+  buildInputs = [ pcre libpng zlib readline ];
+  propagatedBuildInputs = [ ncurses ];
+
+  postInstall = ''
+    find "$out"/lib/ -name '*.so' -exec chmod +x "{}" \;
+    sed '/^Libs:/s/$/ -lncurses/' -i "$dev"/lib/pkgconfig/slang.pc
+  '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A multi-platform programmer's library designed to allow a developer to create robust software";
     homepage = http://www.jedsoft.org/slang/;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.fuuzetsu ];
   };
 }

From de43f843b5b1c6085dc484d2139eead9d5a98b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 12:28:29 +0200
Subject: [PATCH 201/857] libproxy: split into multiple outputs

Referrers look OK.
---
 pkgs/development/libraries/libproxy/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libproxy/default.nix b/pkgs/development/libraries/libproxy/default.nix
index 7085236feb52c..0f08085063983 100644
--- a/pkgs/development/libraries/libproxy/default.nix
+++ b/pkgs/development/libraries/libproxy/default.nix
@@ -7,6 +7,8 @@ stdenv.mkDerivation rec {
     sha256 = "0jw6454gxjykmbnbh544axi8hzz9gmm4jz1y5gw1hdqnakg36gyw";
   };
 
+  outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs
+
   nativeBuildInputs = [ pkgconfig cmake ];
   propagatedBuildInputs = [ zlib ]
     # now some optional deps, but many more are possible

From b9d2c364a12c7f3f8b654987bad34c678b388af6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 13:10:31 +0200
Subject: [PATCH 202/857] orc: fix path to orcc in *.pc

---
 pkgs/development/compilers/orc/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 5f9db1fe69ea7..763b161aa9ec7 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" "doc" ];
   outputBin = "dev"; # compilation tools
 
+  postInstall = ''
+    sed "/^toolsdir=/ctoolsdir=$dev/bin" -i "$dev"/lib/pkgconfig/orc*.pc
+  '';
+
   # building memcpy_speed.log
   # ../test-driver: line 107:  4495 Segmentation fault      "$@" > $log_file 2>&1
   # FAIL: memcpy_speed

From 11970039665563b9c8e872b55205cf8f679b0203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 13:23:53 +0200
Subject: [PATCH 203/857] fix references to ${libtool}/lib

---
 pkgs/applications/misc/xca/default.nix                | 3 ++-
 pkgs/applications/virtualization/bochs/default.nix    | 4 ++--
 pkgs/development/libraries/libcanberra/default.nix    | 2 +-
 pkgs/development/libraries/libextractor/default.nix   | 2 +-
 pkgs/development/libraries/libopensc-dnie/default.nix | 2 +-
 pkgs/servers/pulseaudio/default.nix                   | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 76de3627630a6..64b9009f15217 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram "$out/bin/xca" \
-      --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib"
+      --prefix LD_LIBRARY_PATH : \
+        "${gcc.cc.lib}/lib64:${stdenv.lib.makeLibraryPath [ qt4 gcc.cc openssl libtool ]}"
   '';
 
   buildInputs = [ openssl qt4 libtool gcc makeWrapper ];
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index b876403d63279..d1150d7024b29 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -143,8 +143,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional busMouse "--enable-busmouse"
     ;
 
-  NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/ -I${libtool}/include/";
-  NIX_LDFLAGS="-L${libtool}/lib";
+  NIX_CFLAGS_COMPILE="-I${gtk.dev}/include/gtk-2.0/ -I${libtool}/include/";
+  NIX_LDFLAGS="-L${libtool.lib}/lib";
 	
   meta = with stdenv.lib; {
     description = "An open-source IA-32 (x86) PC emulator";
diff --git a/pkgs/development/libraries/libcanberra/default.nix b/pkgs/development/libraries/libcanberra/default.nix
index b441719d31cd0..8e3523a27e9fd 100644
--- a/pkgs/development/libraries/libcanberra/default.nix
+++ b/pkgs/development/libraries/libcanberra/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     for f in $out/lib/*.la; do
-      sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $f
+      sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $f
     done
   '';
 
diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix
index 18387c904f83e..2b6571290dfb9 100644
--- a/pkgs/development/libraries/libextractor/default.nix
+++ b/pkgs/development/libraries/libextractor/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--disable-ltdl-install "
     + "--with-ltdl-include=${libtool}/include "
-    + "--with-ltdl-lib=${libtool}/lib "
+    + "--with-ltdl-lib=${libtool.lib}/lib "
     + "--enable-xpdf";
 
   # Checks need to be run after "make install", otherwise plug-ins are not in
diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix
index 242c4473cf216..b610fe23edeee 100644
--- a/pkgs/development/libraries/libopensc-dnie/default.nix
+++ b/pkgs/development/libraries/libopensc-dnie/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     ar x opensc-dnie*
     tar xf data.tar.gz
 
-    RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc.out}/lib:${zlib}/lib
+    RPATH=${stdenv.lib.makeLibraryPath [ glib opensc openssl openct libtool pcsclite stdenv.cc.libc zlib ]}
 
     for a in "usr/lib/"*.so*; do
         if ! test -L $a; then
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index d1888e1928a9b..d3fa49a38d067 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -110,7 +110,8 @@ stdenv.mkDerivation rec {
 
   postInstall = lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
-    sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
+    sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
+    _moveToOutput lib/cmake "$dev"
   '';
 
   meta = {

From 9935a85851b10ad1d6999e97233db5eb717c422a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 14:34:09 +0200
Subject: [PATCH 204/857] libogg: fix splitting and some referrers

---
 pkgs/development/libraries/libogg/default.nix |  4 +---
 pkgs/games/nexuiz/default.nix                 | 16 ++++++++--------
 pkgs/games/openarena/default.nix              |  5 +++--
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/libogg/default.nix b/pkgs/development/libraries/libogg/default.nix
index 2e19c1a588fc2..11300f6151aec 100644
--- a/pkgs/development/libraries/libogg/default.nix
+++ b/pkgs/development/libraries/libogg/default.nix
@@ -8,11 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "16z74q422jmprhyvy7c9x909li8cqzmvzyr8cgbm52xcsp6pqs1z";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
   meta = with stdenv.lib; {
-
-  outputs = [ "dev" "doc" "out" ];
     homepage = http://xiph.org/ogg/;
     license = licenses.bsd3;
     maintainers = [ maintainers.emery ];
diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix
index e40dec3c23fcc..0bfebd510c940 100644
--- a/pkgs/games/nexuiz/default.nix
+++ b/pkgs/games/nexuiz/default.nix
@@ -36,14 +36,14 @@ in stdenv.mkDerivation {
   '';
 
   NIX_LDFLAGS = ''
-    -rpath ${zlib}/lib
-    -rpath ${curl}/lib
-    -rpath ${libjpeg}/lib
-    -rpath ${libpng}/lib
-    -rpath ${libvorbis}/lib
-    -rpath ${libtheora}/lib
-    -rpath ${libogg}/lib
-    -rpath ${libmodplug}/lib
+    -rpath ${zlib.out}/lib
+    -rpath ${curl.out}/lib
+    -rpath ${libjpeg.out}/lib
+    -rpath ${libpng.out}/lib
+    -rpath ${libvorbis.out}/lib
+    -rpath ${libtheora.out}/lib
+    -rpath ${libogg.out}/lib
+    -rpath ${libmodplug.out}/lib
   '';
 
   buildPhase = ''
diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix
index 1926afaeb3b64..1e396318bbbd0 100644
--- a/pkgs/games/openarena/default.nix
+++ b/pkgs/games/openarena/default.nix
@@ -15,6 +15,7 @@ stdenv.mkDerivation rec {
   installPhase = let
     gameDir = "$out/openarena-$version";
     interpreter = "$(< \"$NIX_CC/nix-support/dynamic-linker\")";
+    libPath = stdenv.lib.makeLibraryPath [ SDL libogg libvorbis ];
   in ''
     mkdir -pv $out/bin
     cd $out
@@ -23,11 +24,11 @@ stdenv.mkDerivation rec {
     ${if stdenv.system == "x86_64-linux" then ''
       patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.x86_64"
       makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \
-        --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib"
+        --prefix LD_LIBRARY_PATH : "${libPath}"
     '' else ''
       patchelf --set-interpreter "${interpreter}" "${gameDir}/openarena.i386"
       makeWrapper "${gameDir}/openarena.i386" "$out/bin/openarena" \
-        --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib"
+        --prefix LD_LIBRARY_PATH : "${libPath}"
     ''}
   '';
 

From e71c9cfaa23ddaffc03667e2020cf2ee6bd71fb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 14:52:57 +0200
Subject: [PATCH 205/857] libssh2: split into multiple outputs

And fixup referrers.
---
 nixos/modules/services/torrent/transmission.nix | 16 ++++++++--------
 pkgs/development/libraries/git2/default.nix     |  4 ++--
 pkgs/development/libraries/libssh2/default.nix  |  2 ++
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index b5abfb717b709..c8fc08570408c 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -115,15 +115,15 @@ in
 
           ${pkgs.glibc.out}/lib/*.so               mr,
           ${pkgs.libevent.out}/lib/libevent*.so*   mr,
-          ${pkgs.curl}/lib/libcurl*.so*        mr,
-          ${pkgs.openssl}/lib/libssl*.so*      mr,
-          ${pkgs.openssl}/lib/libcrypto*.so*   mr,
-          ${pkgs.zlib}/lib/libz*.so*           mr,
-          ${pkgs.libssh2}/lib/libssh2*.so*     mr,
+          ${pkgs.curl.out}/lib/libcurl*.so*        mr,
+          ${pkgs.openssl.out}/lib/libssl*.so*      mr,
+          ${pkgs.openssl.out}/lib/libcrypto*.so*   mr,
+          ${pkgs.zlib.out}/lib/libz*.so*           mr,
+          ${pkgs.libssh2.out}/lib/libssh2*.so*     mr,
           ${pkgs.systemd}/lib/libsystemd*.so*  mr,
-          ${pkgs.xz}/lib/liblzma*.so*          mr,
-          ${pkgs.libgcrypt}/lib/libgcrypt*.so* mr,
-          ${pkgs.libgpgerror}/lib/libgpg-error*.so* mr,
+          ${pkgs.xz.out}/lib/liblzma*.so*          mr,
+          ${pkgs.libgcrypt.out}/lib/libgcrypt*.so* mr,
+          ${pkgs.libgpgerror.out}/lib/libgpg-error*.so* mr,
 
           @{PROC}/sys/kernel/random/uuid   r,
           @{PROC}/sys/vm/overcommit_memory r,
diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix
index 3f0412bf83973..3e3cb41089515 100644
--- a/pkgs/development/libraries/git2/default.nix
+++ b/pkgs/development/libraries/git2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, cmake, zlib, python, libssh2, openssl, http-parser}:
+{ stdenv, fetchurl, cmake, pkgconfig, zlib, python, libssh2, openssl, http-parser }:
 
 stdenv.mkDerivation rec {
   version = "0.23.2";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DTHREADSAFE=ON";
 
-  nativeBuildInputs = [ cmake python ];
+  nativeBuildInputs = [ cmake pkgconfig python ];
   buildInputs = [ zlib libssh2 openssl http-parser ];
 
   meta = {
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 2bd7950751bd2..4d66654c9a8fb 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
+
   buildInputs = [ openssl zlib ];
 
   meta = {

From 99e4371526a9cc48f1f10e2e9f144e3e839ad709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 15:32:17 +0200
Subject: [PATCH 206/857] curl: split into multiple outputs

Also use pkgconfig to be safer and fix (some) referrers.
---
 .../continuous-integration/jenkins/default.nix         |  4 ++--
 nixos/modules/services/databases/influxdb.nix          |  2 +-
 nixos/modules/services/misc/docker-registry.nix        |  2 +-
 nixos/modules/services/monitoring/cadvisor.nix         |  2 +-
 nixos/modules/services/networking/i2pd.nix             |  2 +-
 nixos/modules/services/search/elasticsearch.nix        |  2 +-
 nixos/tests/cadvisor.nix                               |  2 +-
 pkgs/applications/altcoins/bitcoin-xt.nix              |  2 +-
 pkgs/applications/video/kodi/default.nix               | 10 +++-------
 pkgs/applications/virtualization/nova/default.nix      |  2 +-
 pkgs/applications/window-managers/awesome/default.nix  |  6 +++---
 pkgs/development/interpreters/elixir/default.nix       |  2 +-
 pkgs/development/r-modules/default.nix                 |  2 +-
 pkgs/development/tools/vagrant/default.nix             |  2 +-
 pkgs/games/minetest/default.nix                        |  2 +-
 pkgs/games/xonotic/default.nix                         |  6 +++---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix            |  6 +++---
 pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix       |  6 +++---
 pkgs/test/openftd/default.nix                          |  2 +-
 pkgs/tools/misc/debian-devscripts/default.nix          |  2 +-
 pkgs/tools/misc/pipelight/default.nix                  |  2 +-
 pkgs/tools/misc/plowshare/default.nix                  |  2 +-
 pkgs/tools/networking/curl/default.nix                 | 10 +++++++++-
 pkgs/tools/security/prey/default.nix                   |  2 +-
 pkgs/tools/virtualization/aws/default.nix              |  2 +-
 25 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index 95d2aecfac7d7..31e585f211fe5 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -117,11 +117,11 @@ in {
       '';
 
       postStart = ''
-        until ${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port} ; do
+        until ${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port} ; do
           sleep 10
         done
         while true ; do
-          index=`${pkgs.curl}/bin/curl -s -L localhost:${toString cfg.port}`
+          index=`${pkgs.curl.bin}/bin/curl -s -L localhost:${toString cfg.port}`
           if [[ !("$index" =~ 'Please wait while Jenkins is restarting' ||
                   "$index" =~ 'Please wait while Jenkins is getting ready to work') ]]; then
             exit 0
diff --git a/nixos/modules/services/databases/influxdb.nix b/nixos/modules/services/databases/influxdb.nix
index 08963f7aab7fd..4be0428caa330 100644
--- a/nixos/modules/services/databases/influxdb.nix
+++ b/nixos/modules/services/databases/influxdb.nix
@@ -225,7 +225,7 @@ in
         if [ "$(id -u)" = 0 ]; then chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}; fi
       '';
       postStart = mkBefore ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do
+        until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.bindAddress}:${toString cfg.apiPort}/'; do
           sleep 1;
         done
       '';
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index f472e530a70ba..d0431e546e499 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -65,7 +65,7 @@ in {
       };
 
       postStart = ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do
+        until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do
           sleep 1;
         done
       '';
diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix
index b6cf397f35c07..031558a373c93 100644
--- a/nixos/modules/services/monitoring/cadvisor.nix
+++ b/nixos/modules/services/monitoring/cadvisor.nix
@@ -71,7 +71,7 @@ in {
       after = [ "network.target" "docker.service" "influxdb.service" ];
 
       postStart = mkBefore ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do
+        until ${pkgs.curl.bin}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/containers/'; do
           sleep 1;
         done
       '';
diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index 7ee78f01d497a..5e974555aada6 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -8,7 +8,7 @@ let
 
   homeDir = "/var/lib/i2pd";
 
-  extip = "EXTIP=\$(${pkgs.curl}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
+  extip = "EXTIP=\$(${pkgs.curl.bin}/bin/curl -sf \"http://jsonip.com\" | ${pkgs.gawk}/bin/awk -F'\"' '{print $4}')";
 
   i2pSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 3436bd01d8484..968739877074b 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -142,7 +142,7 @@ in {
         ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins
       '';
       postStart = mkBefore ''
-        until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do
+        until ${pkgs.curl.bin}/bin/curl -s -o /dev/null ${cfg.host}:${toString cfg.port}; do
           sleep 1
         done
       '';
diff --git a/nixos/tests/cadvisor.nix b/nixos/tests/cadvisor.nix
index 1644cb856cece..c55b08c0e9249 100644
--- a/nixos/tests/cadvisor.nix
+++ b/nixos/tests/cadvisor.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... } : {
       services.cadvisor.storageDriver = "influxdb";
       services.influxdb.enable = true;
       systemd.services.influxdb.postStart = mkAfter ''
-        ${pkgs.curl}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \
+        ${pkgs.curl.bin}/bin/curl -X POST 'http://localhost:8086/db?u=root&p=root' \
           -d '{"name": "root"}'
       '';
     };
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index e6c95729c6ec2..c141130766853 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec{
 
   configureFlags = [
     "--with-boost-libdir=${boost.lib}/lib"
-    "--with-libcurl-headers=${curl}/include"
+    "--with-libcurl-headers=${curl.dev}/include"
   ] ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = {
diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 3fd3d31c18cc4..5bdb0bab93440 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -104,13 +104,9 @@ in stdenv.mkDerivation rec {
           --prefix PATH ":" "${pythonFull}/bin" \
           --prefix PATH ":" "${glxinfo}/bin" \
           --prefix PATH ":" "${xdpyinfo}/bin" \
-          --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
+          --prefix LD_LIBRARY_PATH ":" "${lib.makeLibraryPath
+              [ curl systemd libmad libvdpau libcec libcec_platform rtmpdump ]
+            }"
       done
     '';
 
diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix
index 0023cf44f33b2..45e15de988047 100644
--- a/pkgs/applications/virtualization/nova/default.nix
+++ b/pkgs/applications/virtualization/nova/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       sed -i nova/flags.py \
         -e "/DEFINE.*'state_path'/ s|../|/var/lib/nova|"
 
-      substituteInPlace nova/virt/images.py --replace /usr/bin/curl ${curl}/bin/curl
+      substituteInPlace nova/virt/images.py --replace /usr/bin/curl ${curl.bin}/bin/curl
 
       substituteInPlace nova/api/ec2/cloud.py \
         --replace 'sh genrootca.sh' $out/libexec/nova/genrootca.sh
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 9c9d3d5f45144..5fd72a4b4d768 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
 
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
 
-  LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib";
+  LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
   GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0";
   LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
   LUA_PATH  = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
@@ -70,8 +70,8 @@ stdenv.mkDerivation rec {
       --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \
       --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \
-      --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin"
+      --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+      --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl.bin}/bin:${alsaUtils}/bin:${findutils}/bin:${xterm}/bin"
 
     wrapProgram $out/bin/awesome-client \
       --prefix PATH : "${which}/bin"
diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 380da51da77d5..21523899b92d8 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
      b=$(basename $f)
       if [ $b == "mix" ]; then continue; fi
       wrapProgram $f \
-        --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl}/bin:${bash}/bin" \
+        --prefix PATH ":" "${erlang}/bin:${coreutils}/bin:${curl.bin}/bin:${bash}/bin" \
         --set CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
     done
 
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index fc0cdf72449fd..a0900a25c85e4 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1562,7 +1562,7 @@ let
     });
 
     curl = old.curl.overrideDerivation (attrs: {
-      preConfigure = "export CURL_INCLUDES=${pkgs.curl}/include";
+      preConfigure = "export CURL_INCLUDES=${pkgs.curl.dev}/include";
     });
 
     iFes = old.iFes.overrideDerivation (attrs: {
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index f7a592682cade..7d98028762949 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
 
     # curl: curl
     rm opt/vagrant/embedded/bin/curl
-    ln -s ${curl}/bin/curl opt/vagrant/embedded/bin
+    ln -s ${curl.bin}/bin/curl opt/vagrant/embedded/bin
 
     # libarchive: bsdtar, bsdcpio
     rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}
diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix
index 850b1d391c548..245262067e11e 100644
--- a/pkgs/games/minetest/default.nix
+++ b/pkgs/games/minetest/default.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation {
   cmakeFlags = [
     "-DENABLE_FREETYPE=1"
     "-DENABLE_GETTEXT=1"
-    "-DCURL_INCLUDE_DIR=${curl}/include/curl"
+    "-DCURL_INCLUDE_DIR=${curl.dev}/include/curl"
     "-DIRRLICHT_INCLUDE_DIR=${irrlicht}/include/irrlicht"
   ];
 
diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix
index 7b68e1e3d3655..5471816d584de 100644
--- a/pkgs/games/xonotic/default.nix
+++ b/pkgs/games/xonotic/default.nix
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
   #'';
 
   NIX_LDFLAGS = ''
-    -rpath ${zlib}/lib
-    -rpath ${libvorbis}/lib
-    -rpath ${curl}/lib
+    -rpath ${zlib.out}/lib
+    -rpath ${libvorbis.out}/lib
+    -rpath ${curl.out}/lib
   '';
 
   buildPhase = ''
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 39d4ed8623536..d6b5bef8f4705 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -56,9 +56,9 @@ rec {
 
       # This used to be in-nixpkgs, but now is in the bundle
       # because I can't be bothered to make it partially static
-      cp ${curl}/bin/curl $out/bin
-      cp -d ${curl}/lib/libcurl*.dylib $out/lib
-      cp -d ${libssh2}/lib/libssh*.dylib $out/lib
+      cp ${curl.bin}/bin/curl $out/bin
+      cp -d ${curl.out}/lib/libcurl*.dylib $out/lib
+      cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
       cp -d ${openssl.out}/lib/*.dylib $out/lib
 
       cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
diff --git a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
index a36a3066330e1..428d2847a7cdb 100644
--- a/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/pure-darwin/make-bootstrap-tools.nix
@@ -56,9 +56,9 @@ rec {
 
       # This used to be in-nixpkgs, but now is in the bundle
       # because I can't be bothered to make it partially static
-      cp ${curl}/bin/curl $out/bin
-      cp -d ${curl}/lib/libcurl*.dylib $out/lib
-      cp -d ${libssh2}/lib/libssh*.dylib $out/lib
+      cp ${curl.bin}/bin/curl $out/bin
+      cp -d ${curl.out}/lib/libcurl*.dylib $out/lib
+      cp -d ${libssh2.out}/lib/libssh*.dylib $out/lib
       cp -d ${openssl.out}/lib/*.dylib $out/lib
 
       cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
diff --git a/pkgs/test/openftd/default.nix b/pkgs/test/openftd/default.nix
index 91042fe059115..13b6b01f32599 100644
--- a/pkgs/test/openftd/default.nix
+++ b/pkgs/test/openftd/default.nix
@@ -45,5 +45,5 @@ stdenv.mkDerivation {
     glib gtk pkgconfig dbus_glib realCurl pcre libsexy libgnomeui gtkspell libnotify libgtkhtml
   ];
 
-  configureFlags="--with-libcurl-libraries=${curl}/lib --with-libcurl-headers=${curl}/include --with-pcre_libraries=${pcre}/lib --with-pcre_headers=${pcre}/include";  
+  configureFlags="--with-libcurl-libraries=${curl.out}/lib --with-libcurl-headers=${curl.dev}/include --with-pcre_libraries=${pcre.out}/lib --with-pcre_headers=${pcre.dev}/include";
 }
diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index b6158ab644546..2f484c22ddfe6 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       -e "s@/usr/(s|)bin/sendmail@${sendmailPath}@g" \
       -e "s@/usr/bin/diff@${diffutils}/bin/diff@g" \
       -e "s@/usr/bin/gpgv(2|)@${gnupg}/bin/gpgv2@g" \
-      -e "s@(command -v|/usr/bin/)curl@${curl}/bin/curl@g" \
+      -e "s@(command -v|/usr/bin/)curl@${curl.bin}/bin/curl@g" \
       -i {} +
     sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
     sed -r \
diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix
index 40f441e065df6..070d30cb2496a 100644
--- a/pkgs/tools/misc/pipelight/default.nix
+++ b/pkgs/tools/misc/pipelight/default.nix
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
       --wine-path=${wine_custom} \
       --gpg-exec=${gnupg}/bin/gpg2 \
       --bash-interp=${bash}/bin/bash \
-      --downloader=${curl}/bin/curl
+      --downloader=${curl.bin}/bin/curl
       $configureFlags
   '';
 
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 40540ad1c20db..418a9a1b9a336 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     make PREFIX="$out" install
 
     for fn in plow{del,down,list,up}; do
-      wrapProgram "$out/bin/$fn" --prefix PATH : "${curl}/bin:${spidermonkey}/bin"
+      wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.bin}/bin"
     done
   '';
 
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index f9f638ec81362..5a134e572ae95 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, pkgconfig
 , idnSupport ? false, libidn ? null
 , ldapSupport ? false, openldap ? null
 , zlibSupport ? false, zlib ? null
@@ -23,6 +23,9 @@ stdenv.mkDerivation rec {
     sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y";
   };
 
+  outputs = [ "dev" "out" "bin" "doc" ]; # man3 is "dev-doc"
+
+  nativeBuildInputs = [ pkgconfig ];
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
@@ -59,6 +62,11 @@ stdenv.mkDerivation rec {
   CXX = "g++";
   CXXCPP = "g++ -E";
 
+  postInstall = ''
+    _moveToOutput bin/curl-config "$dev"
+    sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
+  '';
+
   crossAttrs = {
     # We should refer to the cross built openssl
     # For the 'urandom', maybe it should be a cross-system option
diff --git a/pkgs/tools/security/prey/default.nix b/pkgs/tools/security/prey/default.nix
index b36c11cf9345b..f9bd6ea50e8d9 100644
--- a/pkgs/tools/security/prey/default.nix
+++ b/pkgs/tools/security/prey/default.nix
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
     cp -R . $out
     cp -R ${modulesSrc}/* $out/modules/
     wrapProgram "$out/prey.sh" \
-      --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
+      --prefix PATH ":" "${xawtv}/bin:${imagemagick}/bin:${curl.bin}/bin:${scrot}/bin:${inetutils}/bin:${coreutils}/bin" \
       --set CURL_CA_BUNDLE "/etc/ssl/certs/ca-certificates.crt"
   '';
 
diff --git a/pkgs/tools/virtualization/aws/default.nix b/pkgs/tools/virtualization/aws/default.nix
index 123dbf647f0d7..efce0c92b78f0 100644
--- a/pkgs/tools/virtualization/aws/default.nix
+++ b/pkgs/tools/virtualization/aws/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   installPhase =
     ''
       mkdir -p $out/bin
-      sed 's|\[curl|[${curl}/bin/curl|g' $src > $out/bin/aws
+      sed 's|\[curl|[${curl.bin}/bin/curl|g' $src > $out/bin/aws
       chmod +x $out/bin/aws
     '';
 

From 4682557b3b351e3c8307a6945c54eb2c91887bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 16:56:11 +0200
Subject: [PATCH 207/857] speexdsp: split into multiple outputs

---
 pkgs/development/libraries/speexdsp/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/speexdsp/default.nix b/pkgs/development/libraries/speexdsp/default.nix
index 7112afbea8a29..56b1900837ac6 100644
--- a/pkgs/development/libraries/speexdsp/default.nix
+++ b/pkgs/development/libraries/speexdsp/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
   patches = [ ./build-fix.patch ];
   postPatch = "sed '3i#include <stdint.h>' -i ./include/speex/speexdsp_config_types.h.in";
 
+  outputs = [ "dev" "out" "doc" ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ fftw ];
 

From e424e23638f6f38d251d413e6b14d1ce6caf454e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 16:58:14 +0200
Subject: [PATCH 208/857] libtheora: split into multiple outputs

---
 pkgs/development/libraries/libtheora/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index da590adae0623..2f2a85d670e66 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ libogg libvorbis ];
 

From 55eb356b7837295084db2a4b6a97670bb4153c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 17:00:31 +0200
Subject: [PATCH 209/857] fftw: split into multiple outputs

Again, referrers look good.
---
 pkgs/development/libraries/fftw/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index aa383b0c73adb..020d07dcc0f65 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -14,6 +14,9 @@ stdenv.mkDerivation rec {
     sha256 = "10h9mzjxnwlsjziah4lri85scc05rlajz39nqf3mbh4vja8dw34g";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
+  outputBin = "dev"; # fftw-wisdom
+
   buildInputs = [ (stdenv.cc.cc.lib or null) ];
 
   configureFlags =

From b95b0405b0bfcc5ed888d491bb708e2ebb057c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 17:03:27 +0200
Subject: [PATCH 210/857] liboil: split into multiple outputs

---
 pkgs/development/libraries/liboil/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index 43b1f34709347..597d96e187c37 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -8,10 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "0sgwic99hxlb1av8cm0albzh8myb7r3lpcwxfm606l0bkc3h4pqh";
   };
 
-  buildInputs = [ pkgconfig ];
-
   patches = [ ./x86_64-cpuid.patch ];
 
+  outputs = [ "dev" "out" "doc" ]; # just dev-doc
+  outputBin = "dev"; # oil-bugreport
+
+  nativeBuildInputs = [ pkgconfig ];
+
   # fix "argb_paint_i386.c:53:Incorrect register `%rax' used with `l' suffix"
   # errors
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64";

From 7a030ac3dcfb8a2cc03f191a5e6fcdf911ed6d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 17:06:02 +0200
Subject: [PATCH 211/857] libao: split into multiple outputs

---
 pkgs/development/libraries/libao/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index a8948e8ae8c07..419ba8de9e4dc 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83";
   };
 
+  outputs = [ "dev" "out" "doc" ];
+
   buildInputs =
     [ pkgconfig ] ++
     lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++

From 5f58c0b6874180d58ab9132918bdcd5693ce1724 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 17:07:50 +0200
Subject: [PATCH 212/857] json-c: split into multiple outputs

---
 pkgs/development/libraries/json-c/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/json-c/default.nix b/pkgs/development/libraries/json-c/default.nix
index ad425f2a38123..d5e0694e0516f 100644
--- a/pkgs/development/libraries/json-c/default.nix
+++ b/pkgs/development/libraries/json-c/default.nix
@@ -9,11 +9,13 @@ stdenv.mkDerivation rec {
 
   patches = [ ./unused-variable.patch ];
 
-  buildInputs = [ autoreconfHook ]; # won't configure without it, no idea why
+  outputs = [ "dev" "out" ];
+
+  nativeBuildInputs = [ autoreconfHook ]; # won't configure without it, no idea why
 
   # compatibility hack (for mypaint at least)
   postInstall = ''
-    ln -s json-c.pc "$out/lib/pkgconfig/json.pc"
+    ln -s json-c.pc "$dev/lib/pkgconfig/json.pc"
   '';
 
   meta = with stdenv.lib; {

From d500232fcce00df8fc8098d82b4b03a3db6a6c03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 17:34:08 +0200
Subject: [PATCH 213/857] libvdpau: split into multiple outputs

---
 pkgs/development/libraries/libvdpau/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 6c5d5a91ad888..04d06a149fcf2 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
 
   propagatedBuildInputs = [ xorg.libX11 ];

From fd819711c6787996bfc3bb140fff9edee9410b0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 19:57:45 +0200
Subject: [PATCH 214/857] cairo: get rid of xlibs-wrapper

---
 pkgs/development/libraries/cairo/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 18a9a7aa051f0..7dce7d49b9624 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -23,12 +23,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
   propagatedBuildInputs =
-    with xorg; [ xorg.xlibsWrapper fontconfig expat freetype pixman zlib libpng ]
+    with xorg; [ libXext fontconfig expat freetype pixman zlib libpng ]
     ++ optional (!stdenv.isDarwin) libXrender
     ++ optionals xcbSupport [ libxcb xcbutil ]
     ++ optional gobjectSupport glib
-    ++ optionals glSupport [ mesa_noglu ]
-    ;
+    ++ optional glSupport mesa_noglu
+    ; # TODO: maybe liblzo but what would it be for here?
 
   configureFlags = [ "--enable-tee" ]
     ++ optional xcbSupport "--enable-xcb"
@@ -38,14 +38,14 @@ stdenv.mkDerivation rec {
 
   preConfigure =
   # On FreeBSD, `-ldl' doesn't exist.
-    (stdenv.lib.optionalString stdenv.isFreeBSD
+    stdenv.lib.optionalString stdenv.isFreeBSD
        '' for i in "util/"*"/Makefile.in" boilerplate/Makefile.in
           do
             cat "$i" | sed -es/-ldl//g > t
             mv t "$i"
           done
-       '') 
-       +
+       ''
+    +
     ''
     # Work around broken `Requires.private' that prevents Freetype
     # `-I' flags to be propagated.

From 339926031e6043aecd6afe178d03cbf934d0d168 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 20:19:06 +0200
Subject: [PATCH 215/857] pango: get rid of xlibs-wrapper and simplify

---
 pkgs/development/libraries/pango/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 01c76489ba523..cfa5aadd0f916 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, xlibsWrapper, glib, cairo, libpng, harfbuzz
-, fontconfig, freetype, libintlOrEmpty, gobjectIntrospection
+{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
+, libintlOrEmpty, gobjectIntrospection
 }:
 
 let
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gobjectIntrospection ];
   nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ xlibsWrapper glib cairo libpng fontconfig freetype harfbuzz ] ++ libintlOrEmpty;
+  propagatedBuildInputs = [ cairo harfbuzz libXft ] ++ libintlOrEmpty;
 
   enableParallelBuilding = true;
 

From cba6641623e8a22e37ed3538c73fd6b45dbaed60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 20:31:39 +0200
Subject: [PATCH 216/857] cairo, pango: fix some string references

---
 pkgs/applications/editors/emacs-24/default.nix     |  2 +-
 pkgs/applications/graphics/darktable/default.nix   | 12 ++++++------
 pkgs/applications/misc/xneur/default.nix           | 14 +++++++-------
 .../science/astronomy/celestia/default.nix         |  2 +-
 .../window-managers/awesome/default.nix            |  2 +-
 .../applications/window-managers/qtile/default.nix | 12 +++++-------
 pkgs/desktops/plasma-5.3/default.nix               |  8 ++++----
 pkgs/development/libraries/cogl/1.20.nix           |  2 +-
 pkgs/development/libraries/cogl/1.22.nix           |  2 +-
 pkgs/development/libraries/cogl/default.nix        |  2 +-
 pkgs/development/libraries/librsvg/default.nix     |  2 +-
 pkgs/tools/graphics/graphviz/2.32.nix              |  2 +-
 pkgs/tools/graphics/graphviz/default.nix           |  2 +-
 pkgs/top-level/python-packages.nix                 |  2 +-
 14 files changed, 32 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index e0d74afabcd35..60078b6590185 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
              "--with-gif=no" "--with-tiff=no" ];
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.isDarwin && withX)
-    "-I${cairo}/include/cairo";
+    "-I${cairo.dev}/include/cairo";
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 454dad5cf8992..7d5d4cc7acb97 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -26,10 +26,10 @@ stdenv.mkDerivation rec {
     ];
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
   '';
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
     "-DPTHREAD_LIBRARY=${stdenv.glibc.out}/lib/libpthread.so"
     "-DCMAKE_BUILD_TYPE=Release"
     "-DBINARY_PACKAGE_BUILD=1"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk.out}/lib/gtk-2.0/include"
     "-DBUILD_USERMANUAL=False"
   ];
 
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index cc08436fa0331..8e3165b75d26b 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -23,13 +23,13 @@ stdenv.mkDerivation rec {
     sed -e 's@for imlib2_dir in@for imlib2_dir in ${imlib2} @' -i configure
     sed -e 's@for xosd_dir in@for xosd_dir in ${xosd} @' -i configure
 
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango}/include/pango-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/include/gdk-pixbuf-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf}/lib/gdk-pixbuf-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.dev}/include/gtk-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk.out}/lib/gtk-2.0/include"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo.dev}/include/cairo"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pango.dev}/include/pango-1.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk.dev}/include/atk-1.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/include"
 
     export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
   '';
diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix
index d4da5c113c999..0213348a593c7 100644
--- a/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/pkgs/applications/science/astronomy/celestia/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
       CPPFLAGS="-DNDEBUG"
       CFLAGS="-O2 -fsigned-char"
       CXXFLAGS="-O2 -fsigned-char"
-      GTK_CFLAGS="-I${gtk2}/include/gtk-2.0 -I${gtk2}/lib/gtk-2.0/include -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include -I${cairo}/include/cairo -I${pango}/include/pango-1.0 -I${gdk_pixbuf}/include/gdk-pixbuf-2.0 -I${atk}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"
+      GTK_CFLAGS="-I${gtk2.dev}/include/gtk-2.0 -I${gtk2.out}/lib/gtk-2.0/include -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include -I${cairo.dev}/include/cairo -I${pango.dev}/include/pango-1.0 -I${gdk_pixbuf.dev}/include/gdk-pixbuf-2.0 -I${atk.dev}/include/atk-1.0 -I${gtkglext}/include/gtkglext-1.0 -I${gtkglext}/lib/gtkglext-1.0/include"
       GTK_LIBS="-lgtk-x11-2.0 -lgtkglext-x11-1.0 -lcairo -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0"
     )
   '';
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 5fd72a4b4d768..0e05afa0d60e6 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
   #cmakeFlags = "-DGENERATE_MANPAGES=ON";
 
   LD_LIBRARY_PATH = "${stdenv.lib.makeLibraryPath [ cairo pango gobjectIntrospection ]}";
-  GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0";
+  GI_TYPELIB_PATH = "${pango.out}/lib/girepository-1.0";
   LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so";
   LUA_PATH  = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua";
 
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 236baa131c946..3a26666a529b4 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }:
+{ stdenv, lib, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }:
 
 buildPythonPackage rec {
   name = "qtile-${version}";
@@ -20,20 +20,18 @@ buildPythonPackage rec {
   buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];
 
   cairocffi-xcffib = python27Packages.cairocffi.override {
-    LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";
+    inherit LD_LIBRARY_PATH;
     pythonPath = [ python27Packages.xcffib ];
   };
 
   pythonPath = with python27Packages; [ xcffib cairocffi-xcffib trollius readline ];
 
-  LD_LIBRARY_PATH = "${pkgs.xorg.libxcb}/lib:${pkgs.cairo}/lib";
+  LD_LIBRARY_PATH = "${lib.makeLibraryPath [ pkgs.xorg.libxcb pkgs.cairo ]}";
 
   postInstall = ''
     wrapProgram $out/bin/qtile \
-      --prefix LD_LIBRARY_PATH : ${pkgs.xorg.libxcb}/lib \
-      --prefix LD_LIBRARY_PATH : ${pkgs.glib}/lib \
-      --prefix LD_LIBRARY_PATH : ${pkgs.cairo}/lib \
-      --prefix LD_LIBRARY_PATH : ${pkgs.pango}/lib
+      --prefix LD_LIBRARY_PATH : \
+        "${LD_LIBRARY_PATH}:${lib.makeLibraryPath [ pkgs.glib pkgs.pango ]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index ad5316a9cb26f..35c32829921bb 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -180,12 +180,12 @@ let
     kde-gtk-config = extendDerivation super.kde-gtk-config {
       NIX_CFLAGS_COMPILE = with scope;
         lib.concatStringsSep " " [
-          "-I${cairo}/include/cairo"
-          "-I${gtk2}/include/gtk-2.0"
+          "-I${cairo.dev}/include/cairo"
+          "-I${gtk2.dev}/include/gtk-2.0"
           "-I${gtk2.out}/lib/gtk-2.0/include"
-          "-I${glib}/include/glib-2.0"
+          "-I${glib.dev}/include/glib-2.0"
           "-I${glib.out}/lib/glib-2.0/include"
-          "-I${pango}/include/pango-1.0"
+          "-I${pango.dev}/include/pango-1.0"
         ];
     };
 
diff --git a/pkgs/development/libraries/cogl/1.20.nix b/pkgs/development/libraries/cogl/1.20.nix
index 5eb12fe299891..ae202b0937773 100644
--- a/pkgs/development/libraries/cogl/1.20.nix
+++ b/pkgs/development/libraries/cogl/1.20.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   COGL_PANGO_DEP_CFLAGS
     = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
-      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
+      "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
diff --git a/pkgs/development/libraries/cogl/1.22.nix b/pkgs/development/libraries/cogl/1.22.nix
index ce4fda5bd4686..88bb670774906 100644
--- a/pkgs/development/libraries/cogl/1.22.nix
+++ b/pkgs/development/libraries/cogl/1.22.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   COGL_PANGO_DEP_CFLAGS
     = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
-      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
+      "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index a4a20fce023aa..e457020906650 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   COGL_PANGO_DEP_CFLAGS
     = stdenv.lib.optionalString (stdenv.isDarwin && pangoSupport)
-      "-I${pango}/include/pango-1.0 -I${cairo}/include/cairo";
+      "-I${pango.dev}/include/pango-1.0 -I${cairo.dev}/include/cairo";
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 927ee472ec330..0768a21bf5436 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
   NIX_CFLAGS_COMPILE
-    = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo}/include/cairo";
+    = stdenv.lib.optionalString stdenv.isDarwin "-I${cairo.dev}/include/cairo";
 
   # It wants to add loaders and update the loaders.cache in gdk-pixbuf
   # Patching the Makefiles to it creates rsvg specific loaders and the
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index 2743bd78aa7c9..6eb8b5bceb2e9 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender ]
     ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
 
-  CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo";
+  CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";
 
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index fbf1c114d0a6a..993e6314fb8d9 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
 
   CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
-    "-I${cairo}/include/cairo";
+    "-I${cairo.dev}/include/cairo";
 
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 088cd63f0891f..f3e816039388b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17156,7 +17156,7 @@ let
       mock
     ];
 
-    LD_LIBRARY_PATH = "${pkgs.cairo}/lib";
+    LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
 
     meta = {
       description = "Graphite-web, without the interface. Just the rendering HTTP API";

From e7b681297d501216b123461360bef768264844c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 6 Oct 2015 20:45:49 +0200
Subject: [PATCH 217/857] schroedinger: split outputs and doCheck

---
 .../libraries/schroedinger/default.nix           | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
index 33f5ba867d6a1..f47ce4e2e46ca 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, orc, pkgconfig}:
+{ stdenv, fetchurl, orc, pkgconfig }:
 
 stdenv.mkDerivation {
   name = "schroedinger-1.0.11";
@@ -11,16 +11,12 @@ stdenv.mkDerivation {
     sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy";
   };
 
-  buildInputs = [orc pkgconfig];
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
 
-  # The test suite is known not to build against Orc >0.4.16 in Schroedinger 1.0.11.
-  # A fix is in upstream, so test when pulling 1.0.12 if this is still needed. See:
-  # http://www.mail-archive.com/schrodinger-devel@lists.sourceforge.net/msg00415.html
-  preBuild = ''
-    substituteInPlace Makefile \
-      --replace "SUBDIRS = schroedinger doc tools testsuite" "SUBDIRS = schroedinger doc tools" \
-      --replace "DIST_SUBDIRS = schroedinger doc tools testsuite" "DIST_SUBDIRS = schroedinger doc tools"
-  '';
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ orc ];
+
+  doCheck = true;
 
   meta = with stdenv.lib; {
     homepage = "http://diracvideo.org/";

From 2113428989ca65364c968bc49e00cf6d9caf9243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 21:47:56 +0200
Subject: [PATCH 218/857] libxkbcommon: split "dev" output

Referrers look OK.
---
 pkgs/development/libraries/libxkbcommon/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libxkbcommon/default.nix b/pkgs/development/libraries/libxkbcommon/default.nix
index 5543b05ce9d15..d11e2ed943964 100644
--- a/pkgs/development/libraries/libxkbcommon/default.nix
+++ b/pkgs/development/libraries/libxkbcommon/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha1 = "z9dvxrkcyb4b7f2zybgkrqb9zcxrj9vi";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ pkgconfig yacc flex xkeyboard_config libxcb ];
 
   configureFlags = ''

From aabf50802d809b309339795a9e2f6640a333821c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 21:53:44 +0200
Subject: [PATCH 219/857] nettle: split a "dev" output

Referrers look OK; seems too easy again.
---
 pkgs/development/libraries/nettle/generic.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 3c439eb404cc3..5dd990a70e8d0 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -9,6 +9,9 @@ stdenv.mkDerivation (rec {
 
   inherit src;
 
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
+
   buildInputs = [ gnum4 ];
   propagatedBuildInputs = [ gmp ];
 

From 0dff97ec729409ca942ea85fd4cebb01d4496916 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 22:11:08 +0200
Subject: [PATCH 220/857] libidn: split into many outputs

Referrers are nice again, (almost) always just adding it into build inputs.
---
 pkgs/development/libraries/libidn/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 21013d2e072a9..625da63084c3e 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -8,8 +8,12 @@ stdenv.mkDerivation rec {
     sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds";
   };
 
+  outputs = [ "dev" "out" "bin" "info" "doc" ]; # $doc has just man3
+
   doCheck = ! stdenv.isDarwin;
 
+  postFixup = ''_moveToOutput share/man/man1 "$bin" '';
+
   meta = {
     homepage = http://www.gnu.org/software/libidn/;
     description = "Library for internationalized domain names";

From 90a0c457751900fec6b8ef8e29b3554b7cec18aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 22:24:10 +0200
Subject: [PATCH 221/857] libtasn1: split "dev" and "doc" outputs

---
 pkgs/development/libraries/libtasn1/default.nix | 3 +++
 pkgs/servers/shishi/default.nix                 | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index 1ae26c48fc21a..a7007da3a0163 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # it's dev-doc only, lots of it
+  outputBin = "dev";
+
   buildInputs = [ perl texinfo ];
 
   doCheck = true;
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index a97e6847a450f..2e9e8bb5009e4 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, pkgconfig
 , libgcrypt, libgpgerror, libtasn1
 
 # Optional Dependencies
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
   # Fixes support for gcrypt 1.6+
   patches = [ ./gcrypt-fix.patch ];
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libgcrypt libgpgerror libtasn1 optPam optLibidn optGnutls ];
 
   configureFlags = [
@@ -62,11 +63,11 @@ stdenv.mkDerivation rec {
   '' + optionalString (optLibidn != null) ''
       -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
   '' + optionalString (optGnutls != null) ''
-      -e 's,\(-lgnutls\),-L${optGnutls}/lib \1,' \
+      -e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
   '' + ''
       -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
       -e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \
-      -e 's,\(-ltasn1\),-L${libtasn1}/lib \1,'
+      -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
   '';
 
   meta = {

From 6acaeb372632832966b94aae34594cdefc56d5a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 22:36:11 +0200
Subject: [PATCH 222/857] p11-kit: split "dev" and "doc" outputs

Referrers all seem so well behaved again.
---
 pkgs/development/libraries/p11-kit/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index eefed304134f3..e3bb518cf2054 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # only dev-doc
+  outputBin = "dev";
+
   buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
 
   configureFlags = [

From 0a0e41b083160e057e425754d548437998b465f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 22:52:16 +0200
Subject: [PATCH 223/857] epoxy: split the "dev" output

---
 pkgs/development/libraries/epoxy/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix
index 66039daa4792d..ccbf457968407 100644
--- a/pkgs/development/libraries/epoxy/default.nix
+++ b/pkgs/development/libraries/epoxy/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "0dfkd4xbp7v5gwsf6qwaraz54yzizf3lj5ymyc0msjn0adq3j5yl";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ];
   buildInputs = [ mesa libX11 ];
 

From fab1fb95c51530f7ad0599ac79e4413acbb66f80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 23:03:07 +0200
Subject: [PATCH 224/857] libssh: split "dev" output, fix a referrer

---
 pkgs/development/libraries/libssh/default.nix | 2 ++
 pkgs/tools/security/thc-hydra/default.nix     | 7 ++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 1766a685aaab8..645354d2445aa 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c
   '';
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ zlib openssl libsodium ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 29c29d6b93af7..26afe5e29904f 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh, postgresql92 }:
+{ stdenv, fetchurl, pkgconfig, openssl, libidn, ncurses, pcre, libssh, postgresql92 }:
 
 with stdenv.lib;
 
@@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-   substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib ${postgresql92}/lib"
-   substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include ${postgresql92}/include"
+   substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92}/lib"
+   substituteInPlace configure --replace "\$INCDIRS" "${openssl.dev}/include ${pcre.dev}/include ${libssh.dev}/include ${postgresql92}/include"
   '';
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ openssl libidn ncurses pcre libssh ];
 
   meta = {

From 968567c6e51a27f88373a1004c9efa563202673d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 23:12:30 +0200
Subject: [PATCH 225/857] soxr: split away the documentation

---
 pkgs/applications/misc/audio/soxr/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
index e8f22a86b2a78..dd2e560c00f81 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0xf2w3piwz9gfr1xqyrj4k685q5dy53kq3igv663i4f4y4sg9rjl";
   };
 
+  outputs = [ "out" "doc" ]; # headers are just two and very small
+
   preConfigure = if stdenv.isDarwin then ''
     export DYLD_LIBRARY_PATH="$DYLD_LIBRARY_PATH:"`pwd`/build/src
   '' else ''

From b528a5a95ee492c862c31bc67904d02b6eac6f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 23:20:28 +0200
Subject: [PATCH 226/857] lame: split into multiple outputs, slightly unusually

Here it seemed that the library doesn't belong into $out,
so I left most in $out and separated $lib (and $doc).
---
 pkgs/development/libraries/lame/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/lame/default.nix b/pkgs/development/libraries/lame/default.nix
index f4ea47e633f9e..b324494faff74 100644
--- a/pkgs/development/libraries/lame/default.nix
+++ b/pkgs/development/libraries/lame/default.nix
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./gcc-4.9.patch ];
 
+  outputs = [ "out" "lib" "doc" ]; # a small single header
+  outputMan = "out";
+
   nativeBuildInputs = [ ]
     ++ optional nasmSupport nasm;
 

From 888183ffd6a1614971ab5a684e5e4d6a397fc7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 7 Oct 2015 23:46:00 +0200
Subject: [PATCH 227/857] at-spi2-core: add "dev" output

---
 pkgs/development/libraries/at-spi2-core/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index b49d1ddb8040d..256865aefb9d9 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
   buildInputs = [
     python pkgconfig popt  intltool dbus_glib

From 1fdbc3097b42e6458b7f29a7aba9141c0e6e0e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 Oct 2015 11:23:19 +0200
Subject: [PATCH 228/857] alsa-lib: split "dev" output and fix referrers

---
 pkgs/applications/editors/music/tuxguitar/default.nix   | 2 +-
 pkgs/applications/virtualization/virtualbox/default.nix | 6 +++---
 pkgs/development/compilers/openjdk/7.nix                | 6 +++---
 pkgs/development/libraries/SDL/default.nix              | 2 +-
 pkgs/development/libraries/SDL2/default.nix             | 2 +-
 pkgs/development/libraries/portaudio/default.nix        | 2 +-
 pkgs/games/stepmania/default.nix                        | 2 +-
 pkgs/os-specific/linux/alsa-lib/default.nix             | 2 ++
 pkgs/tools/audio/qastools/default.nix                   | 2 +-
 9 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/editors/music/tuxguitar/default.nix b/pkgs/applications/editors/music/tuxguitar/default.nix
index 768842a3875da..65ea62b33686a 100644
--- a/pkgs/applications/editors/music/tuxguitar/default.nix
+++ b/pkgs/applications/editors/music/tuxguitar/default.nix
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/tuxguitar \
       --set JAVA "${jdk}/bin/java" \
-      --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib}/lib" \
+      --prefix LD_LIBRARY_PATH : "$out/lib/:${swt}/lib:${alsaLib.out}/lib" \
       --prefix CLASSPATH : "${swt}/jars/swt.jar:$out/lib/tuxguitar.jar:$out/lib/itext.jar"
   '';
 
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 3576923f00264..efb1ceeb09827 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -85,10 +85,10 @@ in stdenv.mkDerivation {
     ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
     find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
     sed -i -e '
-      s@"libdbus-1\.so\.3"@"${dbus}/lib/libdbus-1.so.3"@g
-      s@"libasound\.so\.2"@"${alsaLib}/lib/libasound.so.2"@g
+      s@"libdbus-1\.so\.3"@"${dbus.out}/lib/libdbus-1.so.3"@g
+      s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g
       ${optionalString pulseSupport ''
-      s@"libpulse\.so\.0"@"${libpulseaudio}/lib/libpulse.so.0"@g
+      s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g
       ''}
     ' src/VBox/Main/xml/Settings.cpp \
       src/VBox/Devices/Audio/{alsa,pulse}_stubs.c \
diff --git a/pkgs/development/compilers/openjdk/7.nix b/pkgs/development/compilers/openjdk/7.nix
index 19dec917bf82f..12d32a134c8e6 100644
--- a/pkgs/development/compilers/openjdk/7.nix
+++ b/pkgs/development/compilers/openjdk/7.nix
@@ -107,9 +107,9 @@ let
 
     makeFlags = [
       "SORT=${coreutils}/bin/sort"
-      "ALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
-      "FREETYPE_HEADERS_PATH=${freetype}/include"
-      "FREETYPE_LIB_PATH=${freetype}/lib"
+      "ALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h"
+      "FREETYPE_HEADERS_PATH=${freetype.dev}/include"
+      "FREETYPE_LIB_PATH=${freetype.out}/lib"
       "MILESTONE=${update}"
       "BUILD_NUMBER=b${build}"
       "USRBIN_PATH="
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index ac895b5113edc..070cf76da6d96 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     "--disable-osmesa-shared"
   ] ++ stdenv.lib.optionals (stdenv ? cross) ([
     "--without-x"
-  ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib");
+  ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib.out}/lib");
 
   # Fix a build failure on OS X Mavericks
   # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix
index 7573d1e1cd29c..ad4cce30c6431 100644
--- a/pkgs/development/libraries/SDL2/default.nix
+++ b/pkgs/development/libraries/SDL2/default.nix
@@ -18,7 +18,7 @@ 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 alsaSupport then "--with-alsa-prefix=${attrs.alsaLib.out}/lib" else ""}
         ${if (!x11Support) then "--without-x" else ""}
       '';
 in
diff --git a/pkgs/development/libraries/portaudio/default.nix b/pkgs/development/libraries/portaudio/default.nix
index 46d5128140151..5d8c2430ab9f9 100644
--- a/pkgs/development/libraries/portaudio/default.nix
+++ b/pkgs/development/libraries/portaudio/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     make install
 
     # fixup .pc file to find alsa library
-    sed -i "s|-lasound|-L${alsaLib}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
+    sed -i "s|-lasound|-L${alsaLib.out}/lib -lasound|" "$out/lib/pkgconfig/"*.pc
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
index 99bafe95b757f..7d83a05bc3bce 100644
--- a/pkgs/games/stepmania/default.nix
+++ b/pkgs/games/stepmania/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin
     echo "#!/bin/sh" > $out/bin/stepmania
-    echo "export LD_LIBRARY_PATH=$out/stepmania-5.0:${alsaLib}/lib:\$LD_LIBRARY_PATH" >> $out/bin/stepmania
+    echo "export LD_LIBRARY_PATH=$out/stepmania-5.0:${alsaLib.out}/lib:\$LD_LIBRARY_PATH" >> $out/bin/stepmania
     echo "exec $out/stepmania-5.0/stepmania" >> $out/bin/stepmania
     chmod +x $out/bin/stepmania
   '';
diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index ed72e7011663e..8f46bb29c1fba 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
   '';
 
+  outputs = [ "dev" "out" ];
+
   crossAttrs = {
     patchPhase = ''
       sed -i s/extern/static/g include/iatomic.h
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index 920f6913d090b..3743b38a2103b 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DCMAKE_INSALL_PREFIX=$out"
-    "-DALSA_INCLUDE=${alsaLib}/include/alsa/version.h"
+    "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h"
   ];
 
   meta = with stdenv.lib; {

From e0ed398346bbd84e42931df7fd88a3b2427c0049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 Oct 2015 11:25:09 +0200
Subject: [PATCH 229/857] libopus: split "dev" output

---
 pkgs/development/libraries/libopus/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 460aaa2b0eca0..b8951e66c8bdb 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "158xprn2086arvdib3vbbygz7z6jqkw2nci7nlywzzwallap0wmr";
   };
 
+  outputs = [ "dev" "out" ];
+
   configureFlags = stdenv.lib.optional fixedPoint "--enable-fixed-point"
                 ++ stdenv.lib.optional withCustomModes "--enable-custom-modes";
 

From 8db97583ae35fbefbdfced150ea86289b66ffc7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 8 Oct 2015 11:51:10 +0200
Subject: [PATCH 230/857] pulseaudio: split the "dev" output

This is meant mainly for the `libpulseaudio` attribute.
---
 nixos/modules/config/pulseaudio.nix                     | 8 ++++----
 nixos/modules/services/x11/display-managers/default.nix | 6 +++---
 pkgs/servers/pulseaudio/default.nix                     | 6 ++++--
 pkgs/tools/bluetooth/blueman/default.nix                | 2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 2ebc612605586..2c40895296c64 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -26,7 +26,7 @@ let
   # are built with PulseAudio support (like KDE).
   clientConf = writeText "client.conf" ''
     autospawn=${if nonSystemWide then "yes" else "no"}
-    ${optionalString nonSystemWide "daemon-binary=${cfg.package}/bin/pulseaudio"}
+    ${optionalString nonSystemWide "daemon-binary=${cfg.package.out}/bin/pulseaudio"}
   '';
 
   # Write an /etc/asound.conf that causes all ALSA applications to
@@ -129,11 +129,11 @@ in {
         source = clientConf;
       };
 
-      hardware.pulseaudio.configFile = mkDefault "${cfg.package}/etc/pulse/default.pa";
+      hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa";
     }
 
     (mkIf cfg.enable {
-      environment.systemPackages = [ cfg.package ];
+      environment.systemPackages = [ cfg.package.out ];
 
       environment.etc = singleton {
         target = "asound.conf";
@@ -170,7 +170,7 @@ in {
         before = [ "sound.target" ];
         environment.PULSE_RUNTIME_PATH = stateDir;
         serviceConfig = {
-          ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}";
+          ExecStart = "${cfg.package.out}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}";
           PIDFile = "${stateDir}/pid";
         };
       };
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index ca0832e5b0c8e..997ab030af92c 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -85,14 +85,14 @@ let
       # Start PulseAudio if enabled.
       ${optionalString (config.hardware.pulseaudio.enable) ''
         ${optionalString (!config.hardware.pulseaudio.systemWide)
-          "${config.hardware.pulseaudio.package}/bin/pulseaudio --start"
+          "${config.hardware.pulseaudio.package.out}/bin/pulseaudio --start"
         }
 
         # Publish access credentials in the root window.
-        ${config.hardware.pulseaudio.package}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
+        ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
 
         # Keep track of devices.  Mostly useful for Phonon/KDE.
-        ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+        ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-device-manager "do_routing=1"
       ''}
 
       # Tell systemd about our $DISPLAY. This is needed by the
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index d3fa49a38d067..530f43fa81961 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./caps-fix.patch ];
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig intltool autoreconfHook ];
 
   propagatedBuildInputs =
@@ -111,8 +113,8 @@ stdenv.mkDerivation rec {
   postInstall = lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
     sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
-    _moveToOutput lib/cmake "$dev"
-  '';
+  ''
+    + ''_moveToOutput lib/cmake "$dev" '';
 
   meta = {
     description = "Sound server for POSIX and Win32 systems";
diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 5330dfb82bd2e..7acb8ce2eb0bf 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
       for i in $out/bin/* $out/libexec/*; do
           wrapProgram $i \
               --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \
-              --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \
+              --set LD_LIBRARY_PATH "${libpulseaudio.out}/lib:" \
               --prefix PATH : ${xdg_utils}/bin
       done
 

From 8e381b89a1fd5730b3119bdaa4acb2e61a6c2f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 16:06:34 +0200
Subject: [PATCH 231/857] glib-networking: split the dev output

That's done to get rid of propagatedBuildInputs from regular closure.
Also references were fixed, mainly to its gio modules.
---
 nixos/modules/services/x11/desktop-managers/gnome3.nix        | 2 +-
 pkgs/applications/misc/surf/default.nix                       | 2 +-
 pkgs/applications/networking/browsers/dwb/default.nix         | 4 ++--
 pkgs/applications/networking/browsers/jumanji/default.nix     | 2 +-
 pkgs/applications/networking/browsers/luakit/default.nix      | 2 +-
 pkgs/applications/networking/browsers/midori/default.nix      | 2 +-
 pkgs/applications/networking/browsers/uzbl/default.nix        | 2 +-
 pkgs/applications/networking/browsers/vimb/default.nix        | 2 +-
 .../applications/networking/browsers/vimprobable2/default.nix | 2 +-
 pkgs/applications/networking/newsreaders/liferea/default.nix  | 2 +-
 pkgs/applications/video/miro/default.nix                      | 2 +-
 pkgs/development/libraries/glib-networking/default.nix        | 4 +++-
 pkgs/development/libraries/libsoup/default.nix                | 2 +-
 pkgs/tools/networking/megatools/default.nix                   | 2 +-
 pkgs/tools/networking/network-manager-applet/default.nix      | 2 +-
 15 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index fdee5fbc6c5b0..0fc255c4d64c2 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -148,7 +148,7 @@ in {
       };
 
     environment.variables.GIO_EXTRA_MODULES = [ "${gnome3.dconf}/lib/gio/modules"
-                                                "${gnome3.glib_networking}/lib/gio/modules"
+                                                "${gnome3.glib_networking.out}/lib/gio/modules"
                                                 "${gnome3.gvfs}/lib/gio/modules" ];
     environment.systemPackages = gnome3.corePackages ++ cfg.sessionPath
       ++ (removePackagesByName gnome3.optionalPackages config.environment.gnome3.excludePackages);
diff --git a/pkgs/applications/misc/surf/default.nix b/pkgs/applications/misc/surf/default.nix
index 983fbde0c4593..089bc1b23db73 100644
--- a/pkgs/applications/misc/surf/default.nix
+++ b/pkgs/applications/misc/surf/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/surf" \
-      --prefix GIO_EXTRA_MODULES : ${glib_networking}/lib/gio/modules \
+      --prefix GIO_EXTRA_MODULES : ${glib_networking.out}/lib/gio/modules \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix
index d79a5215ce218..8a8478d3867aa 100644
--- a/pkgs/applications/networking/browsers/dwb/default.nix
+++ b/pkgs/applications/networking/browsers/dwb/default.nix
@@ -18,10 +18,10 @@ stdenv.mkDerivation {
 
   preFixup=''
     wrapProgram "$out/bin/dwb" \
-     --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${dconf}/lib/gio/modules" \
+     --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${dconf}/lib/gio/modules" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
     wrapProgram "$out/bin/dwbem" \
-     --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules"
+     --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/networking/browsers/jumanji/default.nix b/pkgs/applications/networking/browsers/jumanji/default.nix
index 1969a1f502f2a..3555a712cc300 100644
--- a/pkgs/applications/networking/browsers/jumanji/default.nix
+++ b/pkgs/applications/networking/browsers/jumanji/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   preFixup=''
     wrapProgram "$out/bin/jumanji" \
-     --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+     --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
diff --git a/pkgs/applications/networking/browsers/luakit/default.nix b/pkgs/applications/networking/browsers/luakit/default.nix
index a3edaad37d40b..2777cb15fca93 100644
--- a/pkgs/applications/networking/browsers/luakit/default.nix
+++ b/pkgs/applications/networking/browsers/luakit/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
   in ''
     make DEVELOPMENT_PATHS=0 INSTALLDIR=$out DESTDIR=$out PREFIX=$out USE_GTK3=1 install
     wrapProgram $out/bin/luakit                                         \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share:$out/usr/share/:$out/share/:$GSETTINGS_SCHEMAS_PATH"     \
       --prefix XDG_CONFIG_DIRS : "$out/etc/xdg"                         \
       --set LUA_PATH '"${luaKitPath};${luaPath};"'                      \
diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 5cdfcf5e975a0..d5e73c3be7d06 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram $out/bin/midori \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 }
diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 318b957639208..1a46b1adce8af 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   preFixup = ''
     for f in $out/bin/*; do
       wrapProgram $f \
-        --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+        --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
         --prefix PYTHONPATH : "$PYTHONPATH" \
         --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
     done
diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix
index 84a2870b6d0aa..d67c8abf4569d 100644
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/vimb" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index 6f8eede9b3f81..45aa2a9c2d124 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/vimprobable2" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index def45c7e7565b..f2844edd4f034 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       wrapProgram "$f" \
         --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
         --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking}/lib/gio/modules" \
+        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules:${glib_networking.out}/lib/gio/modules" \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 6585306b2898d..f2e75c087c3dd 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
     mv "$out/bin/miro.real" "$out/bin/miro"
     wrapProgram "$out/bin/miro" \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share"
   '';
 
diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index a17b7a21409bc..869fdcc70a12d 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -13,10 +13,12 @@ stdenv.mkDerivation rec {
     sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
   };
 
+  outputs = [ "dev" "out" ]; # to deal with propagatedBuildInputs
+
   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)
+    sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
   '';
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index f71cc77321a52..053c7efebae3b 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
     ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring ];
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
+  passthru.propagatedUserEnvPackages = [ glib_networking.out ];
 
   # glib_networking is a runtime dependency, not a compile-time dependency
   configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index 10a951f84fc16..7c2a437ab658a 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     for i in $(find $out/bin/ -type f); do
       wrapProgram "$i" \
-            --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+            --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules" \
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
     done
   '';
diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index f3e64c866569e..0a8a1f10c0067 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     wrapProgram "$out/bin/nm-applet" \
-      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking.out}/lib/gio/modules:${gnome3.dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
       --set GCONF_CONFIG_SOURCE "xml::~/.gconf" \
       --prefix PATH ":" "${gnome3.gconf}/bin"

From 9da12a6713b100367809e53e6419a01229f5f61e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 16:21:43 +0200
Subject: [PATCH 232/857] SDL: split the dev output and fix referrers

---
 pkgs/applications/video/avidemux/default.nix   | 2 +-
 pkgs/applications/video/gnash/default.nix      | 2 +-
 pkgs/development/interpreters/love/default.nix | 2 +-
 pkgs/development/libraries/SDL/default.nix     | 5 ++++-
 pkgs/development/libraries/smpeg/default.nix   | 2 +-
 pkgs/games/beret/default.nix                   | 2 +-
 pkgs/games/bitsnbots/default.nix               | 2 +-
 pkgs/games/dwarf-fortress/default.nix          | 8 +++++---
 pkgs/games/extremetuxracer/default.nix         | 2 +-
 pkgs/games/hedgewars/default.nix               | 6 +++---
 pkgs/games/jamp/default.nix                    | 2 +-
 pkgs/games/liquidwar/default.nix               | 2 +-
 pkgs/games/quantumminigolf/default.nix         | 2 +-
 pkgs/games/rili/default.nix                    | 2 +-
 pkgs/games/thePenguinMachine/default.nix       | 2 +-
 pkgs/games/trackballs/default.nix              | 2 +-
 pkgs/games/ultrastardx/default.nix             | 2 +-
 pkgs/games/zdoom/default.nix                   | 4 ++--
 pkgs/misc/emulators/retroarch/cores.nix        | 2 +-
 pkgs/tools/graphics/quirc/default.nix          | 2 +-
 20 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/video/avidemux/default.nix b/pkgs/applications/video/avidemux/default.nix
index 96ead862e0e3c..3b48a447f6ff1 100644
--- a/pkgs/applications/video/avidemux/default.nix
+++ b/pkgs/applications/video/avidemux/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
 
   cmakeFlags = "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc.dev}/include" +
     " -DGETTEXT_INCLUDE_DIR=${gettext}/include" +
-    " -DSDL_INCLUDE_DIR=${SDL}/include/SDL";
+    " -DSDL_INCLUDE_DIR=${SDL.dev}/include/SDL";
 
   NIX_LDFLAGS="-lpthread";
 
diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix
index 615e0c7e568f6..0200b0c70f4e9 100644
--- a/pkgs/applications/video/gnash/default.nix
+++ b/pkgs/applications/video/gnash/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
 
   preConfigure =
     '' configureFlags="                                         \
-         --with-sdl-incl=${SDL}/include/SDL                     \
+         --with-sdl-incl=${SDL.dev}/include/SDL                     \
          --with-npapi-plugindir=$out/plugins                    \
          --enable-media=gst                                     \
          --without-gconf
diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/default.nix
index fc1f01cb3730c..b12c2c405780e 100644
--- a/pkgs/development/interpreters/love/default.nix
+++ b/pkgs/development/interpreters/love/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   '';
 
   NIX_CFLAGS_COMPILE = ''
-    -I${SDL}/include/SDL
+    -I${SDL.dev}/include/SDL
     -I${freetype}include/freetype2
   '';
 
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 070cf76da6d96..0a1e1a3e89afd 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
-  outputs = [ "out" "man" ];
+  outputs = [ "dev" "out" "man" ];
+  outputBin = "dev"; # sdl-config
 
   nativeBuildInputs = [ pkgconfig ];
 
@@ -64,6 +65,8 @@ stdenv.mkDerivation rec {
     sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
   }) ];
 
+  postFixup = ''_moveToOutput share/aclocal "$dev" '';
+
   crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
     patches = let
       f = rev: sha256: fetchurl {
diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix
index c2473ae2c5db5..2f300abebbf16 100644
--- a/pkgs/development/libraries/smpeg/default.nix
+++ b/pkgs/development/libraries/smpeg/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/smpeg-config \
       --prefix PATH ":" "${pkgconfig}/bin" \
-      --prefix PKG_CONFIG_PATH ":" "${SDL}/lib/pkgconfig"
+      --prefix PKG_CONFIG_PATH ":" "${SDL.dev}/lib/pkgconfig"
   '';
 
   meta = {
diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix
index b36ec6a43f69c..cfb276c0fb06e 100644
--- a/pkgs/games/beret/default.nix
+++ b/pkgs/games/beret/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ SDL SDL_image SDL_ttf SDL_mixer ];
 
-  NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
+  NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
   NIX_CFLAGS_LINK = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
     "-framework CoreFoundation -framework OpenGL -framework Cocoa";
diff --git a/pkgs/games/bitsnbots/default.nix b/pkgs/games/bitsnbots/default.nix
index 57cd67fbb7baf..82e5ddb06d4d8 100644
--- a/pkgs/games/bitsnbots/default.nix
+++ b/pkgs/games/bitsnbots/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   makefile = "Makefile.linux";
 
-  NIX_CFLAGS_COMPILE = "-I${SDL}/include/SDL";
+  NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL";
 
   NIX_LDFLAGS = "-lGL";
 
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 4ddc664ec1d43..b804adb562b2b 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
   sourceRoot = srcs.df_unfuck.name;
 
   cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
   ];
 
   permission = ./df_permission;
@@ -85,7 +85,9 @@ stdenv.mkDerivation rec {
       done
 
       # now run Dwarf Fortress!
-      export LD_LIBRARY_PATH=\${stdenv.cc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/
+      export LD_LIBRARY_PATH='${stdenv.lib.makeLibraryPath
+        [ stdenv.cc SDL SDL_image SDL_ttf gtk2 glib mesa openal libsndfile ]
+      }':\$DF_DIR/df_linux/libs/
 
       export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch.
       #export SDL_VIDEO_CENTERED=1    # Centre the screen.  Messes up resizing.
diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix
index af80467c960d3..f2417428880cc 100644
--- a/pkgs/games/extremetuxracer/default.nix
+++ b/pkgs/games/extremetuxracer/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-tcl=${tcl}/lib" ];
 
   preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
   '';
 
   meta = {
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index f5d4627c5c08d..9909c04281440 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -28,11 +28,11 @@ stdenv.mkDerivation rec {
                                      -rpath ${SDL_mixer}/lib
                                      -rpath ${SDL_net}/lib
                                      -rpath ${SDL_ttf}/lib
-                                     -rpath ${SDL}/lib
-                                     -rpath ${libpng}/lib
+                                     -rpath ${SDL.out}/lib
+                                     -rpath ${libpng.out}/lib
                                      -rpath ${lua5_1}/lib
                                      -rpath ${mesa}/lib
-                                     -rpath ${zlib}/lib
+                                     -rpath ${zlib.out}/lib
                                      "
   '';
 
diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix
index be7abc75915de..0fbd79e77b005 100644
--- a/pkgs/games/jamp/default.nix
+++ b/pkgs/games/jamp/default.nix
@@ -16,7 +16,7 @@ rec {
   preBuild = a.fullDepEntry (''
     sed -e "s@/usr/games@$out/bin@g" -i Makefile
     sed -e "s@/usr/@$out/@g" -i Makefile
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL.dev}/include/SDL"
   '') ["minInit" "addInputs" "doUnpack"];
 
   /* doConfigure should be removed if not needed */
diff --git a/pkgs/games/liquidwar/default.nix b/pkgs/games/liquidwar/default.nix
index 602daa1ee864b..a87c4dea0c374 100644
--- a/pkgs/games/liquidwar/default.nix
+++ b/pkgs/games/liquidwar/default.nix
@@ -30,7 +30,7 @@ rec {
   phaseNames = ["setVars" "doConfigure" "doMakeInstall"];
 
   setVars = a.noDepEntry (''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL.dev}/include/SDL"
   '');
 
   meta = {
diff --git a/pkgs/games/quantumminigolf/default.nix b/pkgs/games/quantumminigolf/default.nix
index 940351790166d..1b07550779655 100644
--- a/pkgs/games/quantumminigolf/default.nix
+++ b/pkgs/games/quantumminigolf/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     inherit (s) url sha256;
   };
   preBuild = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL.dev}/include/SDL"
 
     sed -re 's@"(gfx|fonts|tracks)/@"'"$out"'/share/quantumminigolf/\1/@g' -i *.cpp
   '';
diff --git a/pkgs/games/rili/default.nix b/pkgs/games/rili/default.nix
index fbf47653af99b..a1ca93a828b42 100644
--- a/pkgs/games/rili/default.nix
+++ b/pkgs/games/rili/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   patches = [ ./moderinze_cpp.patch ];
 
   preConfigure = ''
-    export CPPFLAGS="-I${SDL}/include -I${SDL}/include/SDL -I${SDL_mixer}/include"
+    export CPPFLAGS="-I${SDL.dev}/include -I${SDL.dev}/include/SDL -I${SDL_mixer}/include"
     autoreconf -i
   '';
   
diff --git a/pkgs/games/thePenguinMachine/default.nix b/pkgs/games/thePenguinMachine/default.nix
index 479004a9af4d7..9089b58bd533f 100644
--- a/pkgs/games/thePenguinMachine/default.nix
+++ b/pkgs/games/thePenguinMachine/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
   buildInputs = [python pil pygame SDL];
 
   configurePhase = ''
-		sed -e "/includes = /aincludes.append('${SDL}/include/SDL')" -i setup.py;
+		sed -e "/includes = /aincludes.append('${SDL.dev}/include/SDL')" -i setup.py;
 		sed -e "/includes = /aincludes.append('$(echo ${pygame}/include/python*)')" -i setup.py;
 		cat setup.py;
 		export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix
index 22d8c944fa8bf..7cf741f2faba1 100644
--- a/pkgs/games/trackballs/default.nix
+++ b/pkgs/games/trackballs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   postUnpack = optionalString debug
     "mkdir -p $out/src; cp -R * $out/src ; cd $out/src";
 
-  NIX_CFLAGS_COMPILE = "-iquote ${SDL}/include/SDL";
+  NIX_CFLAGS_COMPILE = "-iquote ${SDL.dev}/include/SDL";
   configureFlags = optionalString debug "--enable-debug";
 
   patchPhase = ''
diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix
index 3eabaa090bb06..5027abedcf4f4 100644
--- a/pkgs/games/ultrastardx/default.nix
+++ b/pkgs/games/ultrastardx/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   # The fpc is not properly wrapped to add -rpath. I add this manually.
   # I even do a trick on lib/lib64 for libgcc, that I expect it will work.
   preBuild = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc}/lib64 -rpath ${stdenv.cc.cc}/lib"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL.out}/lib -rpath ${SDL_image}/lib -rpath ${libpng.out}/lib -rpath ${freetype.out}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg.out}/lib -rpath ${zlib.out}/lib -rpath ${sqlite.out}/lib -rpath ${libX11.out}/lib -rpath ${pcre.out}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.cc.out}/lib64 -rpath ${stdenv.cc.cc.out}/lib"
 
     sed -i 414,424d Makefile
   '';
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index 0bc63855299e5..de0f9c4db831d 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -14,10 +14,10 @@ stdenv.mkDerivation {
 
   cmakeFlags = [
     "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so"
-    "-DSDL_INCLUDE_DIR=${SDL}/include"
+    "-DSDL_INCLUDE_DIR=${SDL.dev}/include"
   ];
 
-  NIX_CFLAGS_COMPILE = [ "-I ${SDL}/include/SDL" ];
+  NIX_CFLAGS_COMPILE = [ "-I ${SDL.dev}/include/SDL" ];
    
   preConfigure = ''
     sed s@zdoom.pk3@$out/share/zdoom.pk3@ -i src/version.h
diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 01670ca4688eb..f5e69a710bb99 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -182,7 +182,7 @@ in
 
     extraBuildInputs = [ libpng SDL ];
   }).override {
-    patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL}/bin/sdl-config\",' configure";
+    patchPhase = "sed -i -e 's,SDL_CONFIG=\".*\",SDL_CONFIG=\"${SDL.dev}/bin/sdl-config\",' configure";
     configurePhase = "./configure";
   };
 
diff --git a/pkgs/tools/graphics/quirc/default.nix b/pkgs/tools/graphics/quirc/default.nix
index d84989d4372b3..6da565b292f94 100644
--- a/pkgs/tools/graphics/quirc/default.nix
+++ b/pkgs/tools/graphics/quirc/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     inherit (s) url sha256 rev;
   };
-  NIX_CFLAGS_COMPILE="-I${SDL}/include/SDL";
+  NIX_CFLAGS_COMPILE="-I${SDL.dev}/include/SDL";
   configurePhase = ''
     sed -e 's/-[og] root//g' -i Makefile
   '';

From 493c947e4aad0406a8213f3bcd7c9011318ac087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 16:25:44 +0200
Subject: [PATCH 233/857] x264: split the lib output

---
 pkgs/development/libraries/x264/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 6c541f1aa6825..26e3231450344 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sed -i s,/bin/bash,${stdenv.shell}, configure version.sh
   '';
 
+  outputs = [ "out" "lib" ]; # leaving 52 kB of headers
+
   configureFlags = [ "--enable-shared" ]
     ++ stdenv.lib.optional (!stdenv.isi686) "--enable-pic"
     ++ stdenv.lib.optional (enable10bit) "--bit-depth=10";

From 4a571ba0dd489cf2eec01d070d9752d2ebd3262d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 16:34:23 +0200
Subject: [PATCH 234/857] ffmpeg: split into multiple outputs

Also fix some referrers.
---
 nixos/modules/services/misc/subsonic.nix          | 2 +-
 pkgs/applications/misc/get_iplayer/default.nix    | 2 +-
 pkgs/applications/misc/grass/default.nix          | 6 +++---
 pkgs/applications/video/clipgrab/default.nix      | 4 ++--
 pkgs/applications/video/dvd-slideshow/default.nix | 2 +-
 pkgs/applications/video/miro/default.nix          | 2 +-
 pkgs/development/libraries/ffmpeg/generic.nix     | 9 +++++++++
 pkgs/tools/misc/youtube-dl/default.nix            | 2 +-
 8 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 4d164ad8d65f4..b737a0b8e74f1 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -153,7 +153,7 @@ in
 
     users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
 
-    services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
+    services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg.bin}/bin/ffmpeg" ];
 
   };
 }
diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 08fad5a021d0b..d3dfd000c1052 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -12,7 +12,7 @@ buildPerlPackage {
     mkdir -p $out/bin
     cp get_iplayer $out/bin
     sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer
-    wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
+    wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg.bin}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
   '';  
   
   src = fetchurl {
diff --git a/pkgs/applications/misc/grass/default.nix b/pkgs/applications/misc/grass/default.nix
index 5ff14458840bf..467fcc21cdf69 100644
--- a/pkgs/applications/misc/grass/default.nix
+++ b/pkgs/applications/misc/grass/default.nix
@@ -106,14 +106,14 @@ a.composableDerivation.composableDerivation {} (fix: {
     name = "ffmpeg";
     enable = {
       configureFlags = [
-        "--with-ffmpeg-libs=${a.ffmpeg}/lib"
-        "--with-ffmpeg-includes=${a.ffmpeg}/include"
+        "--with-ffmpeg-libs=${a.ffmpeg.out}/lib"
+        "--with-ffmpeg-includes=${a.ffmpeg.dev}/include"
       ];
       # is there a nicer way to pass additional include directories?
       # this should work: --with-ffmpeg-includes=/usr/include/lib[av|sw]*
       # I did not try
       preConfigure = ''
-        for dir in ${a.ffmpeg}/include/*; do
+        for dir in ${a.ffmpeg.dev}/include/*; do
           if [ -d $dir ]; then
             NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$dir"
           fi
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index d4239685f7b15..f681c7e04b8b2 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
 
   postPatch = stdenv.lib.optionalString (ffmpeg != null) ''
   substituteInPlace converter_ffmpeg.cpp \
-    --replace '"ffmpeg"' '"${ffmpeg}/bin/ffmpeg"' \
-    --replace '"ffmpeg ' '"${ffmpeg}/bin/ffmpeg '
+    --replace '"ffmpeg"' '"${ffmpeg.bin}/bin/ffmpeg"' \
+    --replace '"ffmpeg ' '"${ffmpeg.bin}/bin/ffmpeg '
   '';
 
   configurePhase = ''
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index a6197c2e6e13b..96de3412ea061 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -4,7 +4,7 @@ let
   wrapper = writeScript "dvd-slideshow.sh" ''
       #!/bin/bash
       # wrapper script for dvd-slideshow programs
-      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbisTools}/bin:$PATH
+      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg.bin}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbisTools}/bin:$PATH
 
       dir=`dirname "$0"`
       exe=`basename "$0"`
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index f2e75c087c3dd..5209cce36a111 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     sed -i -e 's|/usr/bin/||' -e 's|/usr||' \
            -e 's/BUILD_TIME[^,]*/BUILD_TIME=0/' setup.py
 
-    sed -i -e 's|default="/usr/bin/ffmpeg"|default="${ffmpeg}/bin/ffmpeg"|' \
+    sed -i -e 's|default="/usr/bin/ffmpeg"|default="${ffmpeg.bin}/bin/ffmpeg"|' \
       plat/options.py
 
     sed -i -e 's|/usr/share/miro/themes|'"$out/share/miro/themes"'|' \
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 99d8fe679ab3e..a09df5f57ad66 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -67,6 +67,10 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''patchShebangs .'';
 
+  outputs = [ "dev" "out" "bin" ]
+    ++ optional (reqMin "1.0") "doc" ; # just dev-doc
+  setOutputFlags = false; # doesn't accept all and stores configureFlags in libs!
+
   configureFlags = [
     # License
       "--enable-gpl"
@@ -145,6 +149,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postFixup = ''
+    _moveToOutput bin "$bin"
+    _moveToOutput share/ffmpeg/examples "$doc"
+  '';
+
   /* Cross-compilation is untested, consider this an outline, more work
      needs to be done to portions of the build to get it to work correctly */
   crossAttrs = let
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index e9f7eadc9146c..1c9e19750849a 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -21,7 +21,7 @@ buildPythonPackage rec {
 
   # Ensure ffmpeg is available in $PATH for post-processing & transcoding support.
   postInstall = stdenv.lib.optionalString (ffmpeg != null)
-    ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
+    ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg.bin}/bin"'';
 
   meta = with stdenv.lib; {
     homepage = "http://rg3.github.com/youtube-dl/";

From a3c07f5e9e46db0414be383f2680b9cc6eb5d31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 17:09:12 +0200
Subject: [PATCH 235/857] audacity: fix build with gcc-5

It would be probably better to actually update the package.
/cc maintainer @the-kenny.
---
 pkgs/applications/audio/audacity/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix
index 67ec6b5a419e4..221955e2bf948 100644
--- a/pkgs/applications/audio/audacity/default.nix
+++ b/pkgs/applications/audio/audacity/default.nix
@@ -12,6 +12,12 @@ stdenv.mkDerivation rec {
     sha256 = "0y9bvc3a3zxsk31yg7bha029mzkjiw5i9m86kbyj7x8ps0fm91z2";
   };
 
+  # fix with gcc-5 from http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2012-December/245884.html
+  postPatch = ''
+    substituteInPlace lib-src/libnyquist/nyquist/ffts/src/fftlib.c \
+      --replace 'inline void' 'static inline void'
+  '';
+
   preConfigure = /* we prefer system-wide libs */ ''
     mv lib-src lib-src-rm
     mkdir lib-src
@@ -30,11 +36,11 @@ stdenv.mkDerivation rec {
   dontDisableStatic = true;
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Sound editor with graphical UI";
     homepage = http://audacity.sourceforge.net;
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.the-kenny ];
   };
 }

From 1a5d465395a28429a3331b25dc2955df3fbc75f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 17:11:19 +0200
Subject: [PATCH 236/857] openjdk: fix build with multiple outputs

It seems freetype can't be found by that flag anymore, after it has been
split, but pkgconfig is a better option anyway (tested it finds it).
---
 pkgs/development/compilers/openjdk/8.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index 0e9184e1c628a..1a280b1d542da 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cpio, file, which, unzip, zip, xorg, cups, freetype
+{ stdenv, fetchurl, cpio, pkgconfig, file, which, unzip, zip, xorg, cups, freetype
 , alsaLib, bootjdk, cacert, perl, liberation_ttf, fontconfig, zlib
 , setJavaClassPath
 , minimal ? false
@@ -62,6 +62,7 @@ let
 
     outputs = [ "out" "jre" ];
 
+    nativeBuildInputs = [ pkgconfig ];
     buildInputs = [
       cpio file which unzip zip
       xorg.libX11 xorg.libXt xorg.libXext xorg.libXrender xorg.libXtst
@@ -89,7 +90,6 @@ let
     '';
 
     configureFlags = [
-      "--with-freetype=${freetype}"
       "--with-boot-jdk=${bootjdk.home}"
       "--with-update-version=${update}"
       "--with-build-number=${build}"

From 194f0e880f564ff5f63be54e753d260c1131f688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 17:19:01 +0200
Subject: [PATCH 237/857] just add comments about outputs (cups, gdk-pixbuf)

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 2 +-
 pkgs/misc/cups/default.nix                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 626fb2627b334..ca0b773ed2866 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
   inherit (doCheck);
 
-  # propagate the bin output
+  # propagate the bin output TODO: use propagatedOutputs instead
   postPhases = "postPostFixup";
   postPostFixup = ''
     echo -n " $bin" >> "$dev"/nix-support/propagated-*build-inputs
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 82fe6299a7278..aa63fdaebc5ec 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   };
 
   # FIXME: the cups libraries contains some $out/share strings so can't be split.
-  outputs = [ "dev" "out" "doc" "man" ];
+  outputs = [ "dev" "out" "doc" "man" ]; # TODO: above
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
     ++ optionals stdenv.isLinux [ pam dbus.libs acl ];

From 2e2d39f31a3a6bbbb1c8d259eac1411462b1d9e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 18:00:04 +0200
Subject: [PATCH 238/857] qt4: fix patching dlopen paths after multiple outputs

Also another leftover fix.
---
 .../libraries/qt-4.x/4.8/default.nix            | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

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 e4d1bae636cf8..85ce97344a3a9 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -52,19 +52,24 @@ stdenv.mkDerivation rec {
     [ ./glib-2.32.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
-        inherit cups icu libXfixes;
-        glibc = stdenv.cc.libc;
+        cups = cups.out;
+        icu = icu.out;
+        libXfixes = libXfixes.out;
+        glibc = stdenv.cc.libc.out;
         openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
       })
     ] ++ stdenv.lib.optional gtkStyle (substituteAll {
         src = ./dlopen-gtkstyle.diff;
         # substituteAll ignores env vars starting with capital letter
-        gconf = GConf;
-        inherit gnome_vfs libgnomeui gtk;
+        gconf = GConf.out;
+        gtk = gtk.out;
+        libgnomeui = libgnomeui.out;
+        gnome_vfs = gnome_vfs.out;
       })
     ++ stdenv.lib.optional flashplayerFix (substituteAll {
         src = ./dlopen-webkit-nsplugin.diff;
-        inherit gtk gdk_pixbuf;
+        gtk = gtk.out;
+        gdk_pixbuf = gdk_pixbuf.out;
       })
     ++ [(fetchpatch {
         name = "fix-medium-font.patch";
@@ -129,7 +134,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = false;
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
-    "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
+    "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
 
   NIX_LDFLAGS = optionalString stdenv.isDarwin
     "-lglib-2.0";

From debdd33fc8c04f44c7eea7ae917b0420bcbd2c63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 18:46:55 +0200
Subject: [PATCH 239/857] qt5: lib location fixes, mainly due to multiple
 outputs

---
 .../qt-5/5.4/0008-dlopen-webkit-udev.patch    |  4 ++--
 .../5.4/0009-dlopen-serialport-udev.patch     |  4 ++--
 .../qt-5/5.4/0014-mkspecs-libgl.patch         |  4 ++--
 .../libraries/qt-5/5.4/default.nix            | 19 +++++++++++------
 .../development/libraries/qt-5/5.4/qtbase.nix | 20 ++++++++++--------
 .../qt-5/5.5/qtbase/0014-mkspecs-libgl.patch  |  4 ++--
 .../libraries/qt-5/5.5/qtbase/default.nix     | 21 +++++++++++--------
 .../0001-dlopen-serialport-udev.patch         |  4 ++--
 .../qt-5/5.5/qtserialport/default.nix         |  9 ++++++--
 .../qtwebkit/0003-dlopen-webkit-udev.patch    |  4 ++--
 .../libraries/qt-5/5.5/qtwebkit/default.nix   |  9 ++++----
 11 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch
index e8a4ba6a21510..fd226708a916c 100644
--- a/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.4/0008-dlopen-webkit-udev.patch
@@ -16,13 +16,13 @@ index 60ff317..da8ac69 100644
      {
          m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
 -        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
++        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
          m_loaded = m_libUdev.load();
          if (resolveMethods())
              return true;
  
 -        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
++        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
          m_loaded = m_libUdev.load();
          return resolveMethods();
      }
diff --git a/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch
index e1e66a3ce95a3..bb304392af4c8 100644
--- a/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.4/0009-dlopen-serialport-udev.patch
@@ -16,10 +16,10 @@ index 09940ab..45460f9 100644
  {
      if (!udevLibrary->isLoaded()) {
 -        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
++        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
          if (!udevLibrary->load()) {
 -            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
++            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
              if (!udevLibrary->load()) {
                  qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
                  return false;
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
index 1fc4bbd607652..4ec1947f6f95f 100644
--- a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch
+++ b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch
@@ -10,8 +10,8 @@ diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.co
  QMAKE_LIBDIR_X11        =
 -QMAKE_INCDIR_OPENGL     =
 -QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa@/lib
++QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
++QMAKE_LIBDIR_OPENGL     = @mesa_lib@/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/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 136c352d1aa5a..5807e6858723f 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -15,6 +15,7 @@
 
 , bison2
 , mesa_noglu
+, libudev
 , cups
 , gnome
 
@@ -214,13 +215,18 @@ let
 
       serialport = callPackage
         (
-          { qtSubmodule, base }:
+          { qtSubmodule, base, substituteAll }:
 
           qtSubmodule {
             name = "qtserialport";
             qtInputs = [ base ];
             patchFlags = "-p2"; # patches originally for monolithic build
-            patches = [ ./0009-dlopen-serialport-udev.patch ];
+            patches = [
+              (substituteAll {
+                src = ./0009-dlopen-serialport-udev.patch;
+                libudev = libudev.out;
+              })
+            ];
           }
         )
         {};
@@ -268,7 +274,7 @@ let
         (
           { qtSubmodule, declarative, location, multimedia, sensors
           , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt
-          , sqlite, udev
+          , sqlite, libudev
           , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby
           , substituteAll
           , flashplayerFix ? false
@@ -287,21 +293,22 @@ let
                 (substituteAll
                   {
                     src = ./0002-dlopen-webkit-nsplugin.patch;
-                    inherit gtk gdk_pixbuf;
+                    gtk = gtk.out;
+                    gdk_pixbuf = gdk_pixbuf.out;
                   }
                 )
               ++ optional flashplayerFix
                 (substituteAll
                   {
                     src = ./0007-dlopen-webkit-gtk.patch;
-                    inherit gtk;
+                    gtk = gtk.out;
                   }
                 )
               ++ [
                 (substituteAll
                   {
                     src = ./0008-dlopen-webkit-udev.patch;
-                    inherit udev;
+                    libudev = libudev.out;
                   }
                 )
               ];
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 30d53eb874bec..c333298e45830 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
     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
+        --replace /usr/share/X11/locale ${libX11.out}/share/X11/locale \
+        --replace /usr/lib/X11/locale ${libX11.out}/share/X11/locale
     sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
   '';
 
@@ -54,25 +54,27 @@ stdenv.mkDerivation {
       (substituteAll {
         src = ./0001-dlopen-gtkstyle.patch;
         # substituteAll ignores env vars starting with capital letter
-        gconf = GConf;
-        inherit gnome_vfs libgnomeui gtk;
+        gconf = GConf.out;
+        gtk = gtk.out;
+        libgnomeui = libgnomeui.out;
+        gnome_vfs = gnome_vfs.out;
       })
     ++ [
       (substituteAll {
         src = ./0004-dlopen-resolv.patch;
-        glibc = stdenv.cc.libc;
+        glibc = stdenv.cc.libc.out;
       })
       (substituteAll {
         src = ./0005-dlopen-gl.patch;
         openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path";
       })
       ./0006-tzdir.patch
-      (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; })
+      (substituteAll { src = ./0010-dlopen-libXcursor.patch; libXcursor = libXcursor.out; })
+      (substituteAll { src = ./0011-dlopen-openssl.patch; openssl = openssl.out; })
+      (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus.libs.out; })
       ./0013-xdg_config_dirs.patch
     ] ++ optional mesaSupported
-      (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; })
+      (substituteAll { src = ./0014-mkspecs-libgl.patch; mesa_inc = mesa.dev; mesa_lib = mesa.out; })
     ++ (optional decryptSslTraffic ./0100-ssl.patch);
 
   preConfigure = ''
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
index 1fc4bbd607652..4ec1947f6f95f 100644
--- 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
@@ -10,8 +10,8 @@ diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.co
  QMAKE_LIBDIR_X11        =
 -QMAKE_INCDIR_OPENGL     =
 -QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa@/lib
++QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
++QMAKE_LIBDIR_OPENGL     = @mesa_lib@/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
index a80810353ad4a..4137a83754baf 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -48,8 +48,8 @@ stdenv.mkDerivation {
     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
+        --replace /usr/share/X11/locale ${libX11.out}/share/X11/locale \
+        --replace /usr/lib/X11/locale ${libX11.out}/share/X11/locale
     sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
   '';
 
@@ -57,12 +57,14 @@ stdenv.mkDerivation {
     let dlopen-gtkstyle = substituteAll {
           src = ./0001-dlopen-gtkstyle.patch;
           # substituteAll ignores env vars starting with capital letter
-          gconf = GConf;
-          inherit gnome_vfs libgnomeui gtk;
+          gconf = GConf.out;
+          gtk = gtk.out;
+          libgnomeui = libgnomeui.out;
+          gnome_vfs = gnome_vfs.out;
         };
         dlopen-resolv = substituteAll {
           src = ./0002-dlopen-resolv.patch;
-          glibc = stdenv.cc.libc;
+          glibc = stdenv.cc.libc.out;
         };
         dlopen-gl = substituteAll {
           src = ./0003-dlopen-gl.patch;
@@ -71,21 +73,22 @@ stdenv.mkDerivation {
         tzdir = ./0004-tzdir.patch;
         dlopen-libXcursor = substituteAll {
           src = ./0005-dlopen-libXcursor.patch;
-          inherit libXcursor;
+          libXcursor = libXcursor.out;
         };
         dlopen-openssl = substituteAll {
           src = ./0006-dlopen-openssl.patch;
-          inherit openssl;
+          openssl = openssl.out;
         };
         dlopen-dbus = substituteAll {
           src = ./0007-dlopen-dbus.patch;
-          dbus_libs = dbus;
+          dbus_libs = dbus.libs.out;
         };
         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;
+          mesa_inc = mesa.dev;
+          mesa_lib = mesa.out;
         };
     in [
       dlopen-resolv dlopen-gl tzdir dlopen-libXcursor dlopen-openssl
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
index 6636cc9265a85..3a813dc800745 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/0001-dlopen-serialport-udev.patch
@@ -16,10 +16,10 @@ index 6f2cabd..81b9849 100644
  {
      if (!udevLibrary->isLoaded()) {
 -        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
++        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
          if (!udevLibrary->load()) {
 -            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
++            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
              if (!udevLibrary->load()) {
                  qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
                  return false;
diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
index fa7383fc1e767..32549c95344a1 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
@@ -1,7 +1,12 @@
-{ qtSubmodule, qtbase }:
+{ qtSubmodule, qtbase, substituteAll, libudev }:
 
 qtSubmodule {
   name = "qtserialport";
   qtInputs = [ qtbase ];
-  patches = [ ./0001-dlopen-serialport-udev.patch ];
+  patches = [
+    (substituteAll {
+      src = ./0001-dlopen-serialport-udev.patch;
+      libudev = libudev.out;
+    })
+  ];
 }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
index f3b9d407bd726..1c360cd81aa2d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/0003-dlopen-webkit-udev.patch
@@ -16,13 +16,13 @@ index 60ff317..da8ac69 100644
      {
          m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
 -        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1);
++        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
          m_loaded = m_libUdev.load();
          if (resolveMethods())
              return true;
  
 -        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0);
++        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
          m_loaded = m_libUdev.load();
          return resolveMethods();
      }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
index 596c02d39afb1..2e92391f4c085 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
@@ -1,6 +1,6 @@
 { qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors
 , fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt
-, sqlite, udev
+, sqlite, libudev
 , bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby
 , substituteAll
 , flashplayerFix ? false
@@ -18,15 +18,16 @@ qtSubmodule {
   patches =
     let dlopen-webkit-nsplugin = substituteAll {
           src = ./0001-dlopen-webkit-nsplugin.patch;
-          inherit gtk gdk_pixbuf;
+          gtk = gtk.out;
+          gdk_pixbuf = gdk_pixbuf.out;
         };
         dlopen-webkit-gtk = substituteAll {
           src = ./0002-dlopen-webkit-gtk.patch;
-          inherit gtk;
+          gtk = gtk.out;
         };
         dlopen-webkit-udev = substituteAll {
           src = ./0003-dlopen-webkit-udev.patch;
-          inherit udev;
+          libudev = libudev.out;
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
     ++ [ dlopen-webkit-udev ];

From 47305626ab5baa6ded42cdf870d45cbd08be252b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 21:24:05 +0200
Subject: [PATCH 240/857] xorg{xcb-util-keysyms,libxkbfile}: split the dev
 output

---
 pkgs/servers/x11/xorg/overrides.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5bf2648a2cd95..56abbb784e909 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -214,6 +214,10 @@ in
   libXpresent = attrs: attrs
     // { buildInputs = with xorg; attrs.buildInputs ++ [ libXext libXfixes libXrandr ]; };
 
+  libxkbfile = attrs: attrs // {
+    outputs = [ "dev" "out" ]; # mainly to avoid propagation
+  };
+
   setxkbmap = attrs: attrs // {
     postInstall =
       ''
@@ -238,6 +242,10 @@ in
     meta.maintainers = [ stdenv.lib.maintainers.lovek323 ];
   };
 
+  xcbutilkeysyms = attrs: attrs // {
+    outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
+  };
+
   xf86inputevdev = attrs: attrs // {
     preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
     installFlags = "sdkdir=\${out}/include/xorg";

From 333307d8b2f45ec11219d41212b95092273759be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 21:34:42 +0200
Subject: [PATCH 241/857] libxklavier: split dev and (gtk-)doc outputs

---
 pkgs/development/libraries/libxklavier/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index d69276a070bba..59445f0e89fb0 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+
   # TODO: enable xmodmap support, needs xmodmap DB
   propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
 

From 14332a282cae9ea6a115d653b4ff70c5f525cc5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 21:38:03 +0200
Subject: [PATCH 242/857] feh: fix with multiple outputs and split docs

---
 pkgs/applications/graphics/feh/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix
index 266f70e3008fc..ef43e87ea9ac1 100644
--- a/pkgs/applications/graphics/feh/default.nix
+++ b/pkgs/applications/graphics/feh/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1059mflgw8hl398lwy55fj50a98xryvdf23wkpbn4s0z9388hl46";
   };
 
+  outputs = [ "out" "doc" ];
+
   buildInputs = [ makeWrapper xlibsWrapper imlib2 libjpeg libpng libXinerama curl libexif ];
 
   preBuild = ''
@@ -16,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg}/bin" \
+    wrapProgram "$out/bin/feh" --prefix PATH : "${libjpeg.bin}/bin" \
                                --add-flags '--theme=feh'
   '';
 

From f8ce44d518a2d41d0a5105eb13ee1818e01bc130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 21:49:49 +0200
Subject: [PATCH 243/857] gpgme: split dev and info outputs

---
 pkgs/development/libraries/gpgme/default.nix | 11 +++++++----
 pkgs/top-level/python-packages.nix           |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 1657ceaeece69..8d8b9a9149433 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -18,17 +18,20 @@ stdenv.mkDerivation rec {
     sha256 = "17892sclz3yg45wbyqqrzzpq3l0icbnfl28f101b3062g8cy97dh";
   };
 
+  outputs = [ "dev" "out" "info" ];
+  outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
+
   propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
   configureFlags = "--with-gpg=${gpgPath}";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "http://www.gnupg.org/related_software/gpgme";
     description = "Library for making GnuPG easier to use";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.fuuzetsu ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3e816039388b..b1d5acb22224e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -395,7 +395,7 @@ let
 
     postInstall = ''
       wrapProgram $out/bin/alot \
-        --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file}/lib:${pkgs.gpgme}/lib
+        --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}'
     '';
 
     meta = {

From 12487536d2d06aaa29ee30bb7e7b2fee28f0d85b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 21:59:52 +0200
Subject: [PATCH 244/857] libgpgerror: split dev and info outputs

---
 nixos/modules/services/networking/dnscrypt-proxy.nix | 10 +++++-----
 pkgs/development/libraries/libassuan/default.nix     |  2 +-
 pkgs/development/libraries/libgcrypt/1.5.nix         |  4 ++--
 pkgs/development/libraries/libgcrypt/default.nix     |  4 ++--
 pkgs/development/libraries/libgpg-error/default.nix  | 11 +++++++----
 pkgs/servers/shishi/default.nix                      |  6 +++---
 pkgs/tools/admin/gtk-vnc/default.nix                 |  2 +-
 7 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 8acb2a1fc823f..9340be28205a4 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -121,12 +121,12 @@ in
         network inet dgram,
         network inet6 dgram,
 
-        ${pkgs.gcc.cc}/lib/libssp.so.* mr,
-        ${pkgs.libsodium}/lib/libsodium.so.* mr,
+        ${pkgs.gcc.cc.lib}/lib/libssp.so.* mr,
+        ${pkgs.libsodium.out}/lib/libsodium.so.* mr,
         ${pkgs.systemd}/lib/libsystemd.so.* mr,
-        ${pkgs.xz}/lib/liblzma.so.* mr,
-        ${pkgs.libgcrypt}/lib/libgcrypt.so.* mr,
-        ${pkgs.libgpgerror}/lib/libgpg-error.so.* mr,
+        ${pkgs.xz.out}/lib/liblzma.so.* mr,
+        ${pkgs.libgcrypt.out}/lib/libgcrypt.so.* mr,
+        ${pkgs.libgpgerror.out}/lib/libgpg-error.so.* mr,
 
         ${resolverListFile} r,
       }
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index 884924f643db7..cd374f2bab0ac 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # 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
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $out/include/assuan.h
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/libgcrypt/1.5.nix b/pkgs/development/libraries/libgcrypt/1.5.nix
index 990e73d0a63ee..d77946e5ec37a 100644
--- a/pkgs/development/libraries/libgcrypt/1.5.nix
+++ b/pkgs/development/libraries/libgcrypt/1.5.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   # 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
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/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
+    sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   doCheck = true;
diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index cc23d47e2bf2c..f88f4c5bdfb0b 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   # 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
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/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
+    sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la
   '';
 
   # TODO: figure out why this is even necessary and why the missing dylib only crashes
diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 19a6a8531bee1..3279bf3d9fbeb 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -10,6 +10,9 @@ stdenv.mkDerivation rec {
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";
 
+  outputs = [ "dev" "out" "info" ];
+  outputBin = "dev"; # deps want just the lib, most likely
+
   # If architecture-dependent MO files aren't available, they're generated
   # during build, so we need gettext for cross-builds.
   crossAttrs.buildInputs = [ gettext ];
@@ -25,7 +28,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://www.gnupg.org/related_software/libgpg-error/index.html";
     description = "A small library that defines common error values for all GnuPG components";
 
@@ -36,9 +39,9 @@ stdenv.mkDerivation rec {
       Daemon and possibly more in the future.
     '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    license = licenses.lgpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.fuuzetsu ];
   };
 }
 
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix
index 2e9e8bb5009e4..44db5895290b1 100644
--- a/pkgs/servers/shishi/default.nix
+++ b/pkgs/servers/shishi/default.nix
@@ -61,12 +61,12 @@ stdenv.mkDerivation rec {
   postInstall = ''
     sed -i $out/lib/libshi{sa,shi}.la \
   '' + optionalString (optLibidn != null) ''
-      -e 's,\(-lidn\),-L${optLibidn}/lib \1,' \
+      -e 's,\(-lidn\),-L${optLibidn.out}/lib \1,' \
   '' + optionalString (optGnutls != null) ''
       -e 's,\(-lgnutls\),-L${optGnutls.out}/lib \1,' \
   '' + ''
-      -e 's,\(-lgcrypt\),-L${libgcrypt}/lib \1,' \
-      -e 's,\(-lgpg-error\),-L${libgpgerror}/lib \1,' \
+      -e 's,\(-lgcrypt\),-L${libgcrypt.out}/lib \1,' \
+      -e 's,\(-lgpg-error\),-L${libgpgerror.out}/lib \1,' \
       -e 's,\(-ltasn1\),-L${libtasn1.out}/lib \1,'
   '';
 
diff --git a/pkgs/tools/admin/gtk-vnc/default.nix b/pkgs/tools/admin/gtk-vnc/default.nix
index fddb9505c9841..657d08026e4a8 100644
--- a/pkgs/tools/admin/gtk-vnc/default.nix
+++ b/pkgs/tools/admin/gtk-vnc/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   # Fix broken .la files
   preFixup = ''
-    sed 's,-lgpg-error,-L${libgpgerror}/lib -lgpg-error,' -i $out/lib/*.la
+    sed 's,-lgpg-error,-L${libgpgerror.out}/lib -lgpg-error,' -i $out/lib/*.la
   '';
 
   meta = with stdenv.lib; {

From ad824a6a30d346b1d9a2f7500858748445991436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 11 Oct 2015 22:09:01 +0200
Subject: [PATCH 245/857] libassuan: split dev and info outputs

---
 pkgs/development/libraries/libassuan/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index cd374f2bab0ac..c59fb39eb5a8c 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0lh4698pgb2wjrrrbdk14llizad5l74f8pdbg4ma4zq4fbsrkjc7";
   };
 
+  outputs = [ "dev" "out" "info" ];
+  outputBin = "dev"; # libassuan-config
+
   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.dev}/include/gpg-error.h",g' $out/include/assuan.h
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' $dev/include/assuan.h
   '';
 
   meta = {

From 783c40eb68bbbcb9cf6918255157ecab55eedb6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 14:33:08 +0200
Subject: [PATCH 246/857] dbus: split into multiple outputs and fix referrers

---
 .../services/x11/display-managers/default.nix |   2 +-
 pkgs/applications/misc/roxterm/default.nix    |   4 +-
 .../telepathy/kde/default.nix                 |   4 +-
 .../telepathy/logger/default.nix              |   2 +-
 .../virtualization/virtualbox/default.nix     |   2 +-
 .../virtualbox/guest-additions/default.nix    |   2 +-
 .../window-managers/weston/default.nix        |   2 +-
 pkgs/desktops/e19/efl.nix                     |   2 +-
 .../gnome-2/desktop/gnome-keyring/default.nix |   2 +-
 .../gnome-3/3.16/core/empathy/default.nix     |   4 +-
 .../3.16/core/gdm/3.16-wip/default.nix        |   2 +-
 .../core/gnome-online-accounts/default.nix    |   2 +-
 .../gnome-3/3.16/misc/gpaste/default.nix      |   2 +-
 .../gnome-3/3.18/core/empathy/default.nix     |   4 +-
 .../3.18/core/gdm/3.16-wip/default.nix        |   2 +-
 .../core/gnome-online-accounts/default.nix    |   2 +-
 .../gnome-3/3.18/misc/gpaste/default.nix      |   2 +-
 pkgs/desktops/plasma-5.3/default.nix          |   2 +-
 .../0001-startkde-NixOS-patches.patch         |   2 +-
 .../0001-startkde-NixOS-patches.patch         |   2 +-
 .../plasma-5.4/plasma-workspace/default.nix   |   5 +-
 .../libraries/dbus-glib/default.nix           |   2 +-
 pkgs/development/libraries/dbus/default.nix   | 122 +++++++-----------
 .../libraries/dbus/no-create-dirs.patch       |  26 ----
 .../libraries/dbus/ucred-dirty-hack.patch     |  18 ---
 pkgs/development/libraries/gvfs/default.nix   |   2 +-
 .../libraries/policykit/default.nix           |   2 +-
 .../libraries/qt-4.x/4.8/default.nix          |   2 +-
 .../development/libraries/qt-5/5.4/qtbase.nix |   4 +-
 .../libraries/qt-5/5.5/qtbase/default.nix     |   4 +-
 .../tools/misc/eggdbus/default.nix            |   2 +-
 pkgs/misc/cups/default.nix                    |   2 +-
 pkgs/os-specific/linux/bluez/bluez5.nix       |   2 +-
 pkgs/os-specific/linux/bluez/bluez5_28.nix    |   2 +-
 pkgs/os-specific/linux/bluez/default.nix      |   2 +-
 pkgs/os-specific/linux/systemd/default.nix    |   2 +-
 pkgs/servers/pulseaudio/default.nix           |   2 +-
 pkgs/servers/x11/xorg/overrides.nix           |   2 +-
 .../bluetooth/obex-data-server/default.nix    |   2 +-
 pkgs/tools/bluetooth/obexd/default.nix        |   2 +-
 pkgs/tools/system/thermald/default.nix        |   2 +-
 pkgs/top-level/all-packages.nix               |   4 +-
 42 files changed, 93 insertions(+), 168 deletions(-)
 delete mode 100644 pkgs/development/libraries/dbus/no-create-dirs.patch
 delete mode 100644 pkgs/development/libraries/dbus/ucred-dirty-hack.patch

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 997ab030af92c..c59777f525d10 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -52,7 +52,7 @@ let
 
       ${optionalString cfg.startDbusSession ''
         if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
-          exec ${pkgs.dbus.tools}/bin/dbus-launch --exit-with-session "$0" "$sessionType"
+          exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" "$sessionType"
         fi
       ''}
 
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 947d790c3bbae..c6145c9a294d8 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -25,8 +25,8 @@ in stdenv.mkDerivation rec {
     [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
-                         "-I${dbus_libs}/include/dbus-1.0"
-                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
+                         "-I${dbus_libs.dev}/include/dbus-1.0"
+                         "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
 
   # Fix up python path so the lockfile library is on it.
   PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.libPrefix}/site-packages" [
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
index 2bcb4d631b34d..84ced8f62c6ee 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@@ -12,10 +12,10 @@ let
       NIX_CFLAGS_COMPILE =
         "-I${telepathy_glib}/include/telepathy-1.0"
         + " -I${dbus_glib.dev}/include/dbus-1.0"
-        + " -I${dbus_libs}/include/dbus-1.0";
+        + " -I${dbus_libs.dev}/include/dbus-1.0";
     };
     telepathy_logger_qt = x : x // {
-      NIX_CFLAGS_COMPILE = "-I${dbus_libs}/include/dbus-1.0";
+      NIX_CFLAGS_COMPILE = "-I${dbus_libs.dev}/include/dbus-1.0";
     };
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 8341bef946e37..aaff39ccb44d1 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "18i00l8lnp5dghqmgmpxnn0is2a20pkisxy0sb78hnd2dz0z6xnl";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
 
   buildInputs = [ dbus_glib libxml2 sqlite telepathy_glib pkgconfig intltool
                   gobjectIntrospection dbus_libs ];
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index efb1ceeb09827..17ef89b36e66f 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -85,7 +85,7 @@ in stdenv.mkDerivation {
     ls kBuild/bin/linux.amd64/k* tools/linux.amd64/bin/* | xargs -n 1 patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux-x86-64.so.2
     find . -type f -iname '*makefile*' -exec sed -i -e 's/depmod -a/:/g' {} +
     sed -i -e '
-      s@"libdbus-1\.so\.3"@"${dbus.out}/lib/libdbus-1.so.3"@g
+      s@"libdbus-1\.so\.3"@"${dbus.lib}/lib/libdbus-1.so.3"@g
       s@"libasound\.so\.2"@"${alsaLib.out}/lib/libasound.so.2"@g
       ${optionalString pulseSupport ''
       s@"libpulse\.so\.0"@"${libpulseaudio.out}/lib/libpulse.so.0"@g
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 15b675c9a5d50..dcc6646f48ec7 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation {
 
     for i in lib/VBoxOGL*.so
     do
-        patchelf --set-rpath $out/lib:${dbus}/lib $i
+        patchelf --set-rpath $out/lib:${dbus.lib}/lib $i
     done
 
     # FIXME: Virtualbox 4.3.22 moved VBoxClient-all (required by Guest Additions
diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 862e8b0ea01ea..0720368222dcd 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
-    mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
+    mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva
     libwebp
   ];
 
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index 16c934b3b3af5..3afb76dccf108 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
     "ac_ct_CXX=foo" ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ];
+  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
 
   patches = [ ./efl-elua.patch ];
 
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
index f31875bed91c3..50f2cd0813323 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-keyring/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "02r9gv3a4a705jf3h7c0bizn33c73wz0iw2500m7z291nrnmqkmj";
   };
   
-  buildInputs = [ dbus.libs libgcrypt pam python gtk GConf libgnome_keyring ];
+  buildInputs = [ dbus libgcrypt pam python gtk GConf libgnome_keyring ];
 
   propagatedBuildInputs = [ glib libtasn1 ];
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
index 83f33fbc3c561..48b45f28522e1 100644
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
                   file libtool librsvg ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
-                         "-I${dbus_libs}/include/dbus-1.0"
-                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
+                         "-I${dbus_libs.dev}/include/dbus-1.0"
+                         "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
 
   preFixup = ''
     for f in $out/bin/* $out/libexec/*; do
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
index 51b67afb01fd7..b0e9652a9c51c 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
     substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
+    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}'
     substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
     sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
  '';
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
index 6cedbca61d707..8bb21feb54ab8 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
index 6563f79797005..0d6551216cf85 100644
--- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ intltool autoreconfHook pkgconfig vala glib
-                  gtk3 gnome3.gnome_control_center dbus.libs
+                  gtk3 gnome3.gnome_control_center dbus
                   clutter pango appstream-glib makeWrapper ];
 
   preConfigure = "intltoolize -f";
diff --git a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix
index 83f33fbc3c561..48b45f28522e1 100644
--- a/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/empathy/default.nix
@@ -36,8 +36,8 @@ stdenv.mkDerivation rec {
                   file libtool librsvg ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
-                         "-I${dbus_libs}/include/dbus-1.0"
-                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
+                         "-I${dbus_libs.dev}/include/dbus-1.0"
+                         "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
 
   preFixup = ''
     for f in $out/bin/* $out/libexec/*; do
diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix
index 51b67afb01fd7..b0e9652a9c51c 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
     substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
+    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}'
     substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
     sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
  '';
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
index b08aa1c999070..c6688fd30cd77 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-online-accounts/default.nix
@@ -7,7 +7,7 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
+  NIX_CFLAGS_COMPILE = "-I${dbus_glib.dev}/include/dbus-1.0 -I${dbus_libs.dev}/include/dbus-1.0";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
index dee9caf444c57..6c36f892bcc91 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ intltool autoreconfHook pkgconfig vala glib
-                  gtk3 gnome3.gnome_control_center dbus.libs
+                  gtk3 gnome3.gnome_control_center dbus
                   clutter pango appstream-glib makeWrapper ];
 
   preConfigure = "intltoolize -f";
diff --git a/pkgs/desktops/plasma-5.3/default.nix b/pkgs/desktops/plasma-5.3/default.nix
index 35c32829921bb..dec9fca04a5b1 100644
--- a/pkgs/desktops/plasma-5.3/default.nix
+++ b/pkgs/desktops/plasma-5.3/default.nix
@@ -236,7 +236,7 @@ let
       inherit (scope) bash coreutils gnused gnugrep socat;
       inherit (scope) kconfig kinit kservice qt5tools;
       inherit (scope.xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-      dbus_tools = scope.dbus.tools;
+      inherit (scope.dbus) dbus-launch;
       kde_workspace = kdeApps.kde-workspace;
       postPatch = ''
         substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
diff --git a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
index bef2867f3434a..5ab5d4585c060 100644
--- a/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
+++ b/pkgs/desktops/plasma-5.3/plasma-workspace/0001-startkde-NixOS-patches.patch
@@ -180,7 +180,7 @@ index 6f93108..26cc2fc 100644
 +# Make sure that D-Bus is running
 +# D-Bus autolaunch is broken
 +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-+    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
 +fi
 +if @qt5tools@/bin/qdbus >/dev/null 2>/dev/null; then
 +    : # ok
diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch
index 6752258112ef2..4c47e344e9fe8 100644
--- a/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch
+++ b/pkgs/desktops/plasma-5.4/plasma-workspace/0001-startkde-NixOS-patches.patch
@@ -180,7 +180,7 @@ index cfbe227..999dd8f 100644
 +# Make sure that D-Bus is running
 +# D-Bus autolaunch is broken
 +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-+    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
 +fi
 +if @qttools@/bin/qdbus >/dev/null 2>/dev/null; then
 +    : # ok
diff --git a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
index f9339f8080624..d6537b82dd6e7 100644
--- a/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5.4/plasma-workspace/default.nix
@@ -44,7 +44,7 @@
 , kinit
 , kservice
 , qttools
-, dbus_tools
+, dbus
 , mkfontdir
 , xmessage
 , xprop
@@ -101,7 +101,8 @@ plasmaPackage {
 
   inherit bash coreutils gnused gnugrep socat;
   inherit kconfig kinit kservice qttools;
-  inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot;
+  inherit mkfontdir xmessage xprop xrdb xset xsetroot;
+  inherit (dbus) dbus-launch;
   postPatch = ''
     substituteAllInPlace startkde/startkde.cmake
     substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 28df5593695c8..1d91faa681756 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ expat libiconv ];
 
-  propagatedBuildInputs = [ dbus.libs glib ];
+  propagatedBuildInputs = [ dbus glib ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 4a0f98d262a02..b569fc187e285 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoconf, automake, libtool
-, expat, systemd, glib, dbus_glib, python
+{ stdenv, lib, fetchurl, pkgconfig, expat, systemd, glib, dbus_glib, python
 , libX11 ? null, libICE ? null, libSM ? null, x11Support ? (stdenv.isLinux || stdenv.isDarwin) }:
 
 assert x11Support -> libX11 != null
@@ -10,107 +9,76 @@ let
   version = "1.8.20";
   sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
 
-  inherit (stdenv) lib;
-
-  buildInputsX = lib.optionals x11Support [ libX11 libICE libSM ];
-
-  # also other parts than "libs" need this statically linked lib
-  makeInternalLib = "(cd dbus && make libdbus-internal.la)";
-
-  systemdOrEmpty = lib.optional stdenv.isLinux systemd;
-
-  # A generic builder for individual parts (subdirs) of D-Bus
-  dbus_drv = name: subdirs: merge: stdenv.mkDerivation (lib.mergeAttrsByFuncDefaultsClean [{
-
-    name = "dbus-${name}-${version}";
+self =  stdenv.mkDerivation {
+    name = "dbus-${version}";
 
     src = fetchurl {
       url = "http://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.gz";
       inherit sha256;
     };
 
-    patches = [
-        ./ignore-missing-includedirs.patch
-        ./ucred-dirty-hack.patch
-        ./no-create-dirs.patch
-      ]
-      ++ lib.optional (stdenv.isSunOS || stdenv.isLinux) ./implement-getgrouplist.patch
-      ;
-
-    # build only the specified subdirs
-    postPatch = "sed '/SUBDIRS/s/=.*/=" + subdirs + "/' -i Makefile.am\n"
-      # use already packaged libdbus instead of trying to build it again
-      + lib.optionalString (name != "libs") ''
-          for mfile in */Makefile.am; do
-            sed 's,\$(top_builddir)/dbus/\(libdbus-[0-9]\),${libs}/lib/\1,g' -i "$mfile"
-          done
-        '';
+    patches = [ ./ignore-missing-includedirs.patch ]
+      ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+    postPatch = ''
+      substituteInPlace tools/Makefile.in \
+        --replace 'install-localstatelibDATA:' 'disabled:' \
+        --replace 'install-data-local:' 'disabled:' \
+        --replace 'installcheck-local:' 'disabled:'
+      substituteInPlace bus/Makefile.in \
+        --replace '$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus' ':'
+    '' + /* cleanup of runtime references */ ''
+      substituteInPlace ./dbus/dbus-sysdeps-unix.c \
+        --replace 'DBUS_BINDIR "/dbus-launch"' "\"$lib/bin/dbus-launch\""
+      substituteInPlace ./tools/dbus-launch.c \
+        --replace 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"'
+    '';
+
+    outputs = [ "dev" "out" "lib" "doc" ];
 
     nativeBuildInputs = [ pkgconfig ];
     propagatedBuildInputs = [ expat ];
-    buildInputs = [ autoconf automake libtool ]; # ToDo: optional selinux?
-
-    preConfigure = ''
-      patchShebangs .
-      substituteInPlace tools/Makefile.am --replace 'install-localstatelibDATA:' 'disabled:'
-      autoreconf -fi
-    '';
+    buildInputs = lib.optional stdenv.isLinux systemd
+      ++ lib.optionals x11Support [ libX11 libICE libSM ];
+    # ToDo: optional selinux?
 
     configureFlags = [
       "--localstatedir=/var"
       "--sysconfdir=/etc"
       "--with-session-socket-dir=/tmp"
       "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+      # this package installs nothing into those dirs and they create a dependency
+      "--datadir=/run/current-system/sw/share"
+      "--libexecdir=$(out)/libexec" # we don't need dbus-daemon-launch-helper
     ] ++ lib.optional (!x11Support) "--without-x";
 
-    enableParallelBuilding = true;
-
-    doCheck = true;
-
-    installFlags = "sysconfdir=$(out)/etc";
-
-  } merge ]);
-
-  libs = dbus_drv "libs" "dbus" {
     # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
     # (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 = stdenv.lib.platforms.all;
-  };
-
-
-  attrs = rec {
-  # If you change much fix indentation
+    NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
 
-  # This package has been split because most applications only need dbus.lib
-  # which serves as an interface to a *system-wide* daemon,
-  # see e.g. http://en.wikipedia.org/wiki/D-Bus#Architecture .
+    enableParallelBuilding = true;
 
-  inherit libs;
+    doCheck = true;
 
-  tools = dbus_drv "tools" "tools bus" {
-    preBuild = makeInternalLib;
-    buildInputs = buildInputsX ++ systemdOrEmpty ++ [ libs ];
-    NIX_CFLAGS_LINK =
-      stdenv.lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed "
-      + "-ldbus-1";
+    installFlags = "sysconfdir=$(out)/etc datadir=$(out)/share";
 
-    # don't provide another dbus-1.pc (with incorrect include and link dirs),
-    # also remove useless empty dirs
-    postInstall = ''
-      rm "$out"/lib/pkgconfig/dbus-1.pc
-      rmdir --parents --ignore-fail-on-non-empty "$out"/{lib/pkgconfig,share/dbus-1/*}
+    # it's executed from $lib by absolute path
+    postFixup = ''
+      _moveToOutput bin/dbus-launch "$lib"
+      ln -s "$lib/bin/dbus-launch" "$out/bin/"
     '';
 
-    meta.platforms = with stdenv.lib.platforms; allBut darwin;
-  };
-
-  daemon = tools;
+    passthru = {
+      dbus-launch = "${self.lib}/bin/dbus-launch";
+      daemon = self.out;
+    };
 
-  docs = dbus_drv "docs" "doc" {
-    postInstall = ''rm -r "$out/lib"'';
+    meta = with stdenv.lib; {
+      description = "Simple interprocess messaging system";
+      homepage = http://www.freedesktop.org/wiki/Software/dbus/;
+      license = licenses.gpl2Plus; # most is also under AFL-2.1
+      platforms = platforms.unix;
+    };
   };
-};
-in attrs.libs // attrs
+in self
 
diff --git a/pkgs/development/libraries/dbus/no-create-dirs.patch b/pkgs/development/libraries/dbus/no-create-dirs.patch
deleted file mode 100644
index cf10d97759918..0000000000000
--- a/pkgs/development/libraries/dbus/no-create-dirs.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/bus/Makefile.am b/bus/Makefile.am
-index 6cbc09a..be60bb8 100644
---- a/bus/Makefile.am
-+++ b/bus/Makefile.am
-@@ -212,7 +212,6 @@ clean-local:
- 	/bin/rm *.bb *.bbg *.da *.gcov || true
- 
- install-data-hook:
--	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
- 	$(mkinstalldirs) $(DESTDIR)$(configdir)/system.d
- 	$(mkinstalldirs) $(DESTDIR)$(configdir)/session.d
- 	$(mkinstalldirs) $(DESTDIR)$(datadir)/dbus-1/services
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index cfd54b8..b6e28f9 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -74,7 +74,7 @@ CLEANFILES = 				\
- 
- # create the /var/lib/dbus directory for dbus-uuidgen
- install-data-local:
--	$(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus
-+	:
- 
- installcheck-local:
--	test -d $(DESTDIR)$(localstatedir)/lib/dbus
-+	:
diff --git a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch b/pkgs/development/libraries/dbus/ucred-dirty-hack.patch
deleted file mode 100644
index a07abcc15fb0e..0000000000000
--- a/pkgs/development/libraries/dbus/ucred-dirty-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index b4ecc96..267984a 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -1635,6 +1635,13 @@ write_credentials_byte (int             server_fd,
-     }
- }
- 
-+struct ucred
-+{
-+  pid_t pid;			/* PID of sending process.  */
-+  uid_t uid;			/* UID of sending process.  */
-+  gid_t gid;			/* GID of sending process.  */
-+};
-+
- /**
-  * Reads a single byte which must be nul (an error occurs otherwise),
-  * and reads unix credentials if available. Clears the credentials
diff --git a/pkgs/development/libraries/gvfs/default.nix b/pkgs/development/libraries/gvfs/default.nix
index d2a958faed8bd..37403f50e2b10 100644
--- a/pkgs/development/libraries/gvfs/default.nix
+++ b/pkgs/development/libraries/gvfs/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool libtool ];
 
   buildInputs =
-    [ makeWrapper glib dbus.libs udev libgudev udisks2 libgcrypt
+    [ makeWrapper glib dbus 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/policykit/default.nix b/pkgs/development/libraries/policykit/default.nix
index f494710be638f..9f8b702f8975f 100644
--- a/pkgs/development/libraries/policykit/default.nix
+++ b/pkgs/development/libraries/policykit/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig glib dbus_glib pam intltool gettext libxslt ];
 
-  propagatedBuildInputs = [ expat dbus.libs ];
+  propagatedBuildInputs = [ expat dbus ];
 
   configureFlags = "--localstatedir=/var --sysconfdir=/etc";
 
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 85ce97344a3a9..ccc486692e241 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -117,7 +117,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs =
     [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi
-      libSM zlib libpng openssl dbus.libs freetype fontconfig glib ]
+      libSM zlib libpng openssl dbus freetype fontconfig glib ]
         # 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
     ++ optional mesaSupported mesa_glu
     ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index c333298e45830..652814a3fd1dd 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation {
       ./0006-tzdir.patch
       (substituteAll { src = ./0010-dlopen-libXcursor.patch; libXcursor = libXcursor.out; })
       (substituteAll { src = ./0011-dlopen-openssl.patch; openssl = openssl.out; })
-      (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus.libs.out; })
+      (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus.lib; })
       ./0013-xdg_config_dirs.patch
     ] ++ optional mesaSupported
       (substituteAll { src = ./0014-mkspecs-libgl.patch; mesa_inc = mesa.dev; mesa_lib = mesa.out; })
@@ -166,7 +166,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [
     xorg.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
+    fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
     zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 4137a83754baf..1aba5c98d9c16 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
         };
         dlopen-dbus = substituteAll {
           src = ./0007-dlopen-dbus.patch;
-          dbus_libs = dbus.libs.out;
+          dbus_libs = dbus.lib;
         };
         xdg-config-dirs = ./0008-xdg-config-dirs.patch;
         decrypt-ssl-traffic = ./0009-decrypt-ssl-traffic.patch;
@@ -187,7 +187,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
+    fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
     zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]
diff --git a/pkgs/development/tools/misc/eggdbus/default.nix b/pkgs/development/tools/misc/eggdbus/default.nix
index 97031a533fae9..9f04e28372225 100644
--- a/pkgs/development/tools/misc/eggdbus/default.nix
+++ b/pkgs/development/tools/misc/eggdbus/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "118hj63ac65zlg71kydv4607qcg1qpdlql4kvhnwnnhar421jnq4";
   };
   
-  buildInputs = [ pkgconfig glib dbus.libs dbus_glib ];
+  buildInputs = [ pkgconfig glib dbus dbus_glib ];
 
   meta = {
     homepage = http://hal.freedesktop.org/releases/;
diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index aa63fdaebc5ec..fba194aa15270 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   outputs = [ "dev" "out" "doc" "man" ]; # TODO: above
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls avahi libpaper ]
-    ++ optionals stdenv.isLinux [ pam dbus.libs acl ];
+    ++ optionals stdenv.isLinux [ pam dbus acl ];
 
   propagatedBuildInputs = [ gmp ];
 
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index b309b59f48ca5..ce30b553253e2 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     [ pythonDBus pygobject pygobject3 recursivePthLoader ];
 
   buildInputs =
-    [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython
+    [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix
index 7f5a30144c8bb..ba3f478ddc22c 100644
--- a/pkgs/os-specific/linux/bluez/bluez5_28.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     [ pythonDBus pygobject pygobject3 recursivePthLoader ];
 
   buildInputs =
-    [ pkgconfig dbus.libs glib alsaLib python pythonPackages.wrapPython
+    [ pkgconfig dbus glib alsaLib python pythonPackages.wrapPython
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 23e5171d17801..4f30bc19caf84 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ pkgconfig dbus.libs glib libusb alsaLib python makeWrapper
+    [ pkgconfig dbus glib libusb alsaLib python makeWrapper
       readline libsndfile
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index d6827c81b28d7..2d9f2070c2519 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod
+{ stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, kmod
 , zlib, xz, pam, acl, cryptsetup, libuuid, m4, utillinux, libffi
 , glib, kbd, libxslt, coreutils, libgcrypt
 , kexectools, libmicrohttpd, linuxHeaders, libseccomp
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 530f43fa81961..8ac37cef82f22 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ json_c libsndfile speexdsp fftwFloat ]
-    ++ lib.optionals stdenv.isLinux [ glib dbus.libs ]
+    ++ lib.optionals stdenv.isLinux [ glib dbus ]
     ++ lib.optionals (!libOnly) (
       [ libasyncns webrtc-audio-processing ]
       ++ lib.optional jackaudioSupport libjack2
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 56abbb784e909..68c6f79291702 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -328,7 +328,7 @@ in
       version = (builtins.parseDrvName attrs.name).version;
       commonBuildInputs = attrs.buildInputs ++ [ xtrans ];
       commonPropagatedBuildInputs = [
-        args.zlib args.mesa args.dbus.libs
+        args.zlib args.mesa args.dbus
         xf86bigfontproto glproto xf86driproto
         compositeproto scrnsaverproto resourceproto
         xf86dgaproto
diff --git a/pkgs/tools/bluetooth/obex-data-server/default.nix b/pkgs/tools/bluetooth/obex-data-server/default.nix
index 53e854c34ebc6..15167ee57b134 100644
--- a/pkgs/tools/bluetooth/obex-data-server/default.nix
+++ b/pkgs/tools/bluetooth/obex-data-server/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
   addToSearchPath PKG_CONFIG_PATH ${openobex}/lib64/pkgconfig
-  export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH"
+  export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
   '';
 
   meta = {
diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix
index f900a81caa0e8..a3486569b5180 100644
--- a/pkgs/tools/bluetooth/obexd/default.nix
+++ b/pkgs/tools/bluetooth/obexd/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1i20dnibvnq9lnkkhajr5xx3kxlwf9q5c4jm19kyb0q1klzgzlb8";
   };
 
-  buildInputs = [ glib dbus.libs openobex bluez libical ];
+  buildInputs = [ glib dbus openobex bluez libical ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index 9fe9adaedadb3..dd28d5b2b1dad 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am'';
 
   preConfigure = ''
-                   export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH"
+                   export PKG_CONFIG_PATH="${dbus_libs.dev}/lib/pkgconfig:$PKG_CONFIG_PATH"
                    ./autogen.sh #--prefix="$out"
                  '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84b984a713479..3af267d804706 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6073,8 +6073,8 @@ let
   };
 
   # Should we deprecate these? Currently there are many references.
-  dbus_tools = pkgs.dbus.tools;
-  dbus_libs = pkgs.dbus.libs;
+  dbus_tools = pkgs.dbus.out;
+  dbus_libs = pkgs.dbus;
   dbus_daemon = pkgs.dbus.daemon;
 
   dhex = callPackage ../applications/editors/dhex { };

From fa6ddd7fa6cda8c2f7e5b4d260895ff3e462a248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 14:50:31 +0200
Subject: [PATCH 247/857] xorg.{libICE,libSM}: split dev and doc outputs

---
 pkgs/development/libraries/wxGTK-2.8/default.nix |  6 +++---
 pkgs/servers/x11/xorg/overrides.nix              | 10 ++++++++--
 pkgs/top-level/python-packages.nix               |  4 ++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/wxGTK-2.8/default.nix b/pkgs/development/libraries/wxGTK-2.8/default.nix
index d7ca92f70d9b0..90cc1d995a5a9 100644
--- a/pkgs/development/libraries/wxGTK-2.8/default.nix
+++ b/pkgs/development/libraries/wxGTK-2.8/default.nix
@@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
 
   # These variables are used by configure to find some dependencies.
   SEARCH_INCLUDE =
-    "${libXinerama}/include ${libSM}/include ${libXxf86vm}/include";
+    "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include";
   SEARCH_LIB =
-    "${libXinerama}/lib ${libSM}/lib ${libXxf86vm}/lib "
-    + optionalString withMesa "${mesa}/lib ";
+    "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib "
+    + optionalString withMesa "${mesa.out}/lib ";
 
   # Work around a bug in configure.
   NIX_CFLAGS_COMPILE = "-DHAVE_X11_XLIB_H=1";
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 68c6f79291702..b4c15f0163700 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -140,6 +140,10 @@ in
     propagatedBuildInputs = [ xorg.fixesproto ];
   };
 
+  libICE = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ];
+  };
+
   libXcomposite = attrs: attrs // {
     outputs = [ "dev" "out" "man" ];
     propagatedBuildInputs = [ xorg.libXfixes ];
@@ -196,8 +200,10 @@ in
     propagatedBuildInputs = [xorg.libXrender];
   };
 
-  libSM = attrs: attrs
-    // { propagatedBuildInputs = [ xorg.libICE ]; };
+  libSM = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ];
+    propagatedBuildInputs = [ xorg.libICE ];
+  };
 
   libXrender = attrs: attrs // {
     outputs = [ "dev" "out" "doc" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b1d5acb22224e..1b1143e267c45 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13478,7 +13478,7 @@ let
 
     patchPhase = ''
       cp "${x_ignore_nofocus}/cpp/linux-specific/"* .
-      substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11}/lib/libX11.so.6"
+      substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xorg.libX11.out}/lib/libX11.so.6"
       gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o
       gcc -shared \
         -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \
@@ -14692,7 +14692,7 @@ let
     # I don't know why I need to add these libraries. Shouldn't they
     # be part of wxPython?
     postInstall = ''
-      libspaths=${pkgs.xorg.libSM}/lib:${pkgs.xorg.libXScrnSaver}/lib
+      libspaths=${with pkgs.xorg; lib.makeLibraryPath [ libSM libXScrnSaver ]}
       wrapProgram $out/bin/taskcoach.py \
         --prefix LD_LIBRARY_PATH : $libspaths
     '';

From f014217a553fe5fdc05d831a23891c6c69ff4396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 18:56:09 +0200
Subject: [PATCH 248/857] spidermonkey-{17,24}: split the dev and lib outputs

---
 pkgs/applications/editors/edbrowse/default.nix      |  2 +-
 pkgs/development/interpreters/spidermonkey/17.0.nix | 10 +++++++++-
 pkgs/development/interpreters/spidermonkey/24.2.nix | 10 ++++++++++
 pkgs/tools/misc/plowshare/default.nix               |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/edbrowse/default.nix b/pkgs/applications/editors/edbrowse/default.nix
index d969552ecde42..712ede2e316f0 100644
--- a/pkgs/applications/editors/edbrowse/default.nix
+++ b/pkgs/applications/editors/edbrowse/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     substituteInPlace src/ebjs.c --replace \"edbrowse-js\" \"$out/bin/edbrowse-js\"
   '';
 
-  NIX_CFLAGS_COMPILE = "-I${spidermonkey_24}/include/mozjs-24";
+  NIX_CFLAGS_COMPILE = "-I${spidermonkey_24.dev}/include/mozjs-24";
   makeFlags = "-C src prefix=$(out)";
 
   src = fetchurl {
diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix
index 9cbfde596c45c..8ef3d953bfa4b 100644
--- a/pkgs/development/interpreters/spidermonkey/17.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.0.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1fig2wf4f10v43mqx67y68z6h77sy900d1w0pz9qarrqx57rc7ij";
   };
 
+  outputs = [ "dev" "out" "lib" ];
+
   propagatedBuildInputs = [ nspr ];
 
   buildInputs = [ pkgconfig perl python zip libffi readline ];
@@ -25,7 +27,10 @@ stdenv.mkDerivation rec {
     export LIBXUL_DIST=$out
   '';
 
+  setOutputFlags = false;
   configureFlags = [
+    "--libdir=$(lib)/lib"
+    "--includedir=$(dev)/include"
     "--enable-threadsafe"
     "--with-system-nspr"
     "--with-system-ffi"
@@ -49,7 +54,10 @@ stdenv.mkDerivation rec {
     paxmark mr jsapi-tests/jsapi-tests
   '';
 
-  postInstall = ''rm "$out"/lib/*.a''; # halve the output size
+  postInstall = ''
+    rm "$lib"/lib/*.a # halve the output size
+    _moveToOutput "bin/js*-config" "$dev" # break the cycle
+  '';
 
   meta = with stdenv.lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix
index 2c59b2c435a94..d235ab04526be 100644
--- a/pkgs/development/interpreters/spidermonkey/24.2.nix
+++ b/pkgs/development/interpreters/spidermonkey/24.2.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1n1phk8r3l8icqrrap4czplnylawa0ddc2cc4cgdz46x3lrkybz6";
   };
 
+  outputs = [ "dev" "out" "lib" ];
+
   propagatedBuildInputs = [ nspr ];
 
   buildInputs = [ pkgconfig perl python zip libffi readline ];
@@ -25,7 +27,10 @@ stdenv.mkDerivation rec {
     export LIBXUL_DIST=$out
   '';
 
+  setOutputFlags = false;
   configureFlags = [
+    "--libdir=$(lib)/lib"
+    "--includedir=$(dev)/include"
     "--enable-threadsafe"
     "--with-system-nspr"
     "--with-system-ffi"
@@ -40,6 +45,11 @@ stdenv.mkDerivation rec {
   doCheck = true;
   preCheck = "rm jit-test/tests/sunspider/check-date-format-tofte.js"; # https://bugzil.la/600522
 
+  postInstall = ''
+    rm "$lib"/lib/*.a # halve the output size
+    _moveToOutput "bin/js*-config" "$dev" # break the cycle
+  '';
+
   meta = with stdenv.lib; {
     description = "Mozilla's JavaScript engine written in C/C++";
     homepage = https://developer.mozilla.org/en/SpiderMonkey;
diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 418a9a1b9a336..a1a12a82471d5 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     make PREFIX="$out" install
 
     for fn in plow{del,down,list,up}; do
-      wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.bin}/bin"
+      wrapProgram "$out/bin/$fn" --prefix PATH : "${curl.bin}/bin:${spidermonkey.out}/bin"
     done
   '';
 

From ef3f961610cf32238f7037ca668ba9b89d2de026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 19:04:34 +0200
Subject: [PATCH 249/857] ncurses: split also man output (3-4 MB)

---
 pkgs/development/libraries/ncurses/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 04fa1d4b81b94..8de0fd44d308b 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./clang.patch ];
 
-  outputs = [ "dev" "lib" "out" ];
+  outputs = [ "dev" "lib" "out" "man" ];
   setOutputFlags = false; # some aren't supported
 
   configureFlags = [
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     "--enable-overwrite"  # Needed for proper header installation
     "--enable-pc-files"
     "--enable-symlinks"
-    "--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--bindir=$(dev)/bin"
+    "--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--bindir=$(dev)/bin" "--mandir=$(man)/share/man"
   ] ++ lib.optional unicode "--enable-widec";
 
   nativeBuildInputs = [ pkgconfig libtool ];

From afc01cde320222bce53dcc75680c1eb499c08651 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 20:00:20 +0200
Subject: [PATCH 250/857] readline-6.3 (the default): split dev and doc outputs

---
 pkgs/desktops/gnome-3/3.16/core/gjs/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.18/core/gjs/default.nix | 2 +-
 pkgs/development/libraries/readline/6.3.nix     | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
index 792e34c7b1480..ac53726bc537a 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ spidermonkey_24 ];
 
   postInstall = ''
-    sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la
+    sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix
index 792e34c7b1480..ac53726bc537a 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gjs/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ spidermonkey_24 ];
 
   postInstall = ''
-    sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la
+    sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix
index f770fabb35d34..11d4271b168b6 100644
--- a/pkgs/development/libraries/readline/6.3.nix
+++ b/pkgs/development/libraries/readline/6.3.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0hzxr9jxqqx5sxsv9vmlxdnvlr9vi4ih1avjb869hbs6p5qn1fjn";
   };
 
+  outputs = [ "dev" "out" "doc" ];
+
   propagatedBuildInputs = [ncurses];
 
   patchFlags = "-p0";

From 5f429dffdafb952a70a65badbdded87887a45eab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 20:03:22 +0200
Subject: [PATCH 251/857] libgcrypt: split dev and info outputs

---
 pkgs/development/libraries/libgcrypt/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index f88f4c5bdfb0b..e03ed24e8fcd0 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -10,14 +10,17 @@ stdenv.mkDerivation rec {
     sha256 = "09k06gs27gxfha07sa9rpf4xh6mvphj9sky7n09ymx75w9zjrg69";
   };
 
+  outputs = [ "dev" "out" "info" ];
+  outputBin = "dev";
+
   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.dev}/include/gpg-error.h",g' $out/include/gcrypt.h
+  postFixup = ''
+    sed -i 's,#include <gpg-error.h>,#include "${libgpgerror.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
   '' + stdenv.lib.optionalString enableCapabilities ''
     sed -i 's,\(-lcap\),-L${libcap.out}/lib \1,' $out/lib/libgcrypt.la
   '';

From 9d477748705c92853e622d66eff999f7b96e48c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 20:16:44 +0200
Subject: [PATCH 252/857] libmicrohttpd: split dev and doc outputs

---
 pkgs/development/libraries/libmicrohttpd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index fb6ba1761b599..0a056518adbe5 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only, I think
+
   buildInputs = [ libgcrypt ];
 
   preCheck =

From c1768cc8efbafab6ff701954261a906ac0aa73f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 20:29:54 +0200
Subject: [PATCH 253/857] libmbim: split dev and doc outputs

---
 pkgs/development/libraries/libmbim/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix
index f910741c446e4..8baf4a77c362e 100644
--- a/pkgs/development/libraries/libmbim/default.nix
+++ b/pkgs/development/libraries/libmbim/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0abv0h9c3kbw4bq1b9270sg189jcjj3x3wa91bj836ynwg9m34wl";
   };
 
+  outputs = [ "dev" "out" "doc" ];
+
   preConfigure = ''
     patchShebangs .
   '';

From 8c25f3ecaa204fb31a523b55c5be3d10a0c79f8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 20:35:10 +0200
Subject: [PATCH 254/857] libqmi: split dev and doc outputs

---
 pkgs/development/libraries/libqmi/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 9699d67d7b87a..47cc353bbd9c7 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8";
   };
 
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+
   preBuild = ''
     patchShebangs .
   '';

From e25da7e5c8bceaccb15d25dd0fcce5a0104f376d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 21:51:53 +0200
Subject: [PATCH 255/857] xorg: split outputs of various libs

---
 pkgs/applications/graphics/xfig/default.nix   |  2 +-
 .../development/libraries/libsoup/default.nix |  2 ++
 pkgs/games/micropolis/default.nix             |  2 +-
 pkgs/games/xsokoban/default.nix               |  2 +-
 pkgs/servers/x11/xorg/overrides.nix           | 28 +++++++++++++++++++
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 9e53fe3efe2c6..ca1d5345fb6ac 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ imake makeWrapper ];
 
-  NIX_CFLAGS_COMPILE = "-I${libXpm}/include/X11";
+  NIX_CFLAGS_COMPILE = "-I${libXpm.dev}/include/X11";
 
   patches =
     let
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 053c7efebae3b..b9a6c8341efc0 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation {
     patchShebangs libsoup/
   '';
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = libintlOrEmpty ++ [ intltool python sqlite ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libxml2 gobjectIntrospection ]
diff --git a/pkgs/games/micropolis/default.nix b/pkgs/games/micropolis/default.nix
index 55a02e08003d4..a294128969c5d 100644
--- a/pkgs/games/micropolis/default.nix
+++ b/pkgs/games/micropolis/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   preConfigure =
     ''
       cd src
-      sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile
+      sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm.dev}/include/X11@" tk/makefile
       sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile
     '';
 
diff --git a/pkgs/games/xsokoban/default.nix b/pkgs/games/xsokoban/default.nix
index 9d442329a2453..af432fdb8833d 100644
--- a/pkgs/games/xsokoban/default.nix
+++ b/pkgs/games/xsokoban/default.nix
@@ -21,7 +21,7 @@ rec {
 
   preConfigure = a.fullDepEntry (''
     sed -e 's/getline/my_getline/' -i score.c
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm}/include/X11"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.libXpm.dev}/include/X11"
     for i in  $NIX_CFLAGS_COMPILE; do echo $i; ls ''${i#-I}; done
     chmod a+rw config.h
     echo '#define HERE "@nixos-packaged"' >> config.h
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b4c15f0163700..3b72494e8968e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -106,6 +106,7 @@ in
   };
 
   libXfont = attrs: attrs // {
+    outputs = [ "dev" "out" ];
     propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
     # prevents "misaligned_stack_error_entering_dyld_stub_binder"
     configureFlags = lib.optionals isDarwin [
@@ -150,6 +151,7 @@ in
   };
 
   libXaw = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ]; # just dev-doc
     propagatedBuildInputs = [ xorg.libXmu ];
   };
 
@@ -210,10 +212,19 @@ in
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
+  libXres = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ]; # just dev-doc
+  };
+
+  libXv = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ]; # just dev-doc
+  };
+
   libXvMC = attrs: attrs
     // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; };
 
   libXpm = attrs: attrs // {
+    outputs = [ "dev" "out" "bin" ]; # tiny man in $bin
     patchPhase = "sed -i '/USE_GETTEXT_TRUE/d' sxpm/Makefile.in cxpm/Makefile.in";
   };
 
@@ -224,6 +235,10 @@ in
     outputs = [ "dev" "out" ]; # mainly to avoid propagation
   };
 
+  libxshmfence = attrs: attrs // {
+    outputs = [ "dev" "out" ]; # mainly to avoid propagation
+  };
+
   setxkbmap = attrs: attrs // {
     postInstall =
       ''
@@ -248,10 +263,22 @@ in
     meta.maintainers = [ stdenv.lib.maintainers.lovek323 ];
   };
 
+  xcbutilimage = attrs: attrs // {
+    outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
+  };
+
   xcbutilkeysyms = attrs: attrs // {
     outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
   };
 
+  xcbutilrenderutil = attrs: attrs // {
+    outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
+  };
+
+  xcbutilwm = attrs: attrs // {
+    outputs = [ "dev" "out" ]; # mainly to get rid of propagating others
+  };
+
   xf86inputevdev = attrs: attrs // {
     preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c";
     installFlags = "sdkdir=\${out}/include/xorg";
@@ -361,6 +388,7 @@ in
     in
       if (!isDarwin)
       then {
+        outputs = [ "dev" "out" ];
         buildInputs = [ makeWrapper ] ++ commonBuildInputs;
         propagatedBuildInputs = [ libpciaccess ] ++ commonPropagatedBuildInputs ++ lib.optionals stdenv.isLinux [
           args.udev

From 90d5e87862fb1fea7e48159b6a50530a4bee9b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 22:30:30 +0200
Subject: [PATCH 256/857] sqlite: split dev and bin outputs

---
 pkgs/development/compilers/urweb/default.nix  |  4 +-
 .../development/interpreters/pypy/default.nix |  2 +-
 .../ruby/bundler-env/default-gem-config.nix   |  4 +-
 .../libraries/libdbi-drivers/default.nix      |  4 +-
 pkgs/development/libraries/sqlite/default.nix |  2 +
 .../perl-modules/DBD-SQLite/default.nix       |  4 ++
 .../DBD-SQLite/external-sqlite.patch          | 72 +++++++++----------
 pkgs/tools/misc/profile-cleaner/default.nix   |  2 +-
 pkgs/tools/system/storebrowse/default.nix     |  6 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            |  4 +-
 11 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index dc862940edf25..9bdc3131e6a3f 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -22,12 +22,12 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export PGHEADER="${postgresql}/include/libpq-fe.h";
     export MSHEADER="${mysql.lib}/include/mysql/mysql.h";
-    export SQHEADER="${sqlite}/include/sqlite3.h";
+    export SQHEADER="${sqlite.dev}/include/sqlite3.h";
 
     export CCARGS="-I$out/include \
                    -L${mysql.lib}/lib/mysql \
                    -L${postgresql}/lib \
-                   -L${sqlite}/lib";
+                   -L${sqlite.out}/lib";
   '';
 
   # Be sure to keep the statically linked libraries
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index 4f26a40b0ce7f..c6e2c5270d537 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -54,7 +54,7 @@ let
         --replace "linklibs = ['tcl' + _ver, 'tk' + _ver]" "linklibs=['${tcl.libPrefix}', '${tk.libPrefix}']" \
         --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']"
 
-      sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3_build.py
+      sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite.dev}/include'], library_dirs=['${sqlite.out}/lib']@" lib_pypy/_sqlite3_build.py
     '';
 
     setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
index cbb64bc12774b..29fa3454d1959 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default-gem-config.nix
@@ -89,8 +89,8 @@ in
 
   sqlite3 = attrs: {
     buildFlags = [
-      "--with-sqlite3-include=${sqlite}/include"
-      "--with-sqlite3-lib=${sqlite}/lib"
+      "--with-sqlite3-include=${sqlite.dev}/include"
+      "--with-sqlite3-lib=${sqlite.out}/lib"
     ];
   };
 
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index ccc0a19965499..da2919f6ee9b4 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
     "--with-pgsql_libdir=${postgresql}/lib"
   ] ++ optionals (sqlite != null) [
     "--with-sqlite3"
-    "--with-sqlite3-incdir=${sqlite}/include/sqlite"
-    "--with-sqlite3-libdir=${sqlite}/lib/sqlite"
+    "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
+    "--with-sqlite3-libdir=${sqlite.out}/lib/sqlite"
   ];
 
   installFlags = [ "DESTDIR=\${out}" ];
diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix
index f043a37033a8f..d1a6a341d872d 100644
--- a/pkgs/development/libraries/sqlite/default.nix
+++ b/pkgs/development/libraries/sqlite/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
     sha1 = "d0e22d7e361b6f50830a3cdeafe35311443f8f9a";
   };
 
+  outputs = [ "dev" "out" "bin" ];
+
   buildInputs = lib.optionals interactive [ readline ncurses ];
 
   configureFlags = [ "--enable-threadsafe" ];
diff --git a/pkgs/development/perl-modules/DBD-SQLite/default.nix b/pkgs/development/perl-modules/DBD-SQLite/default.nix
index 985e7946b6b4a..13b633f4704eb 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/default.nix
+++ b/pkgs/development/perl-modules/DBD-SQLite/default.nix
@@ -17,6 +17,10 @@ buildPerlPackage rec {
     ./external-sqlite.patch
   ];
 
+  sqlite_dev = sqlite.dev;
+  sqlite_out = sqlite.out;
+  postPatch = "substituteAllInPlace Makefile.PL; cat Makefile.PL";
+
   preBuild =
     ''
       substituteInPlace Makefile --replace -L/usr/lib ""
diff --git a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
index 9a20fa2503997..1f90546b252c1 100644
--- a/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
+++ b/pkgs/development/perl-modules/DBD-SQLite/external-sqlite.patch
@@ -1,39 +1,33 @@
-diff -rc DBD-SQLite-1.29/Makefile.PL DBD-SQLite-1.29-new/Makefile.PL
-*** DBD-SQLite-1.29/Makefile.PL	2010-01-08 10:08:29.000000000 +0100
---- DBD-SQLite-1.29-new/Makefile.PL	2010-08-05 11:42:53.000000000 +0200
-***************
-*** 123,129 ****
-  # a system sqlite is also sophisticated enough to have a patching system
-  # that can change the if ( 0 ) to if ( 1 )
-  my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-! if ( 0 ) {
-  	require File::Spec;
-  	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
-  		$sqlite_base =~ /=(.*)/;
---- 123,129 ----
-  # a system sqlite is also sophisticated enough to have a patching system
-  # that can change the if ( 0 ) to if ( 1 )
-  my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-! if ( 1 ) {
-  	require File::Spec;
-  	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
-  		$sqlite_base =~ /=(.*)/;
-***************
-*** 184,191 ****
-  } else {
-  	# Always the bundled one.
-  	# XXX: ... and this message should be more informative.
-! 	$sqlite_local = 1;
-! 	print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
-  }
-  
-  @ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
---- 184,191 ----
-  } else {
-  	# Always the bundled one.
-  	# XXX: ... and this message should be more informative.
-! #	$sqlite_local = 1;
-! #	print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
-  }
-  
-  @ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
+diff --git a/Makefile.PL b/Makefile.PL
+index 606b28d..0cea060 100644
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -128,24 +128,10 @@ SCOPE: {
+ # the system SQLite. We expect that anyone sophisticated enough to use
+ # a system sqlite is also sophisticated enough to have a patching system
+ # that can change the if ( 0 ) to if ( 1 )
+-my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
+-if ( 0 ) {
+-	require File::Spec;
+-	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
+-		$sqlite_base =~ /=(.*)/;
+-		$sqlite_base = $1;
+-		$sqlite_lib = File::Spec->catdir( $sqlite_base, 'lib'     );
+-		$sqlite_inc = File::Spec->catdir( $sqlite_base, 'include' );
+-	}
+-	if ( $sqlite_local = (grep(/USE_LOCAL_SQLITE=.*/, @ARGV))[0] ) {
+-		$sqlite_local =~ /=(.*)/;
+-		$sqlite_local = "$1" ? 1 : 0;
+-		if ( $sqlite_local ) {
+-			# Keep these from making into CFLAGS/LDFLAGS
+-			undef $sqlite_lib;
+-			undef $sqlite_inc;
+-		}
+-	}
++my ($sqlite_local, $sqlite_lib, $sqlite_inc);
++if ( 1 ) {
++		$sqlite_lib = '@sqlite_out@/lib';
++		$sqlite_inc = '@sqlite_dev@/include';
+ 
+ 	# Now check for a compatible sqlite3
+ 	unless ( $sqlite_local ) {
diff --git a/pkgs/tools/misc/profile-cleaner/default.nix b/pkgs/tools/misc/profile-cleaner/default.nix
index 55c44770c3e17..2c1f3d77def3f 100644
--- a/pkgs/tools/misc/profile-cleaner/default.nix
+++ b/pkgs/tools/misc/profile-cleaner/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     PREFIX=\"\" DESTDIR=$out make install
     wrapProgram $out/bin/profile-cleaner \
-      --prefix PATH : "${parallel}/bin:${sqlite}/bin"
+      --prefix PATH : "${parallel}/bin:${sqlite.bin}/bin"
   '';
 
   meta = {
diff --git a/pkgs/tools/system/storebrowse/default.nix b/pkgs/tools/system/storebrowse/default.nix
index 041dd96e1ca81..aa510a28c231b 100644
--- a/pkgs/tools/system/storebrowse/default.nix
+++ b/pkgs/tools/system/storebrowse/default.nix
@@ -28,9 +28,9 @@ stdenv.mkDerivation rec {
     GOSQLITE=$GOPATH/src/code.google.com/p/gosqlite
     mkdir -p $GOSQLITE
     cp -R $srcGoSqlite/* $GOSQLITE/
-    export CGO_CFLAGS=-I${sqlite}/include
-    export CGO_LDFLAGS=-L${sqlite}/lib
-    go build -ldflags "-r ${sqlite}/lib" -o storebrowse
+    export CGO_CFLAGS=-I${sqlite.dev}/include
+    export CGO_LDFLAGS=-L${sqlite.out}/lib
+    go build -ldflags "-r ${sqlite.out}/lib" -o storebrowse
   '';
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3af267d804706..2a6ef1ed9d0cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8208,7 +8208,7 @@ let
 
   sqlite-amalgamation = callPackage ../development/libraries/sqlite-amalgamation { };
 
-  sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; });
+  sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }).bin;
 
   sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher {
     readline = null;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b1143e267c45..2db3fd1d43249 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12294,8 +12294,8 @@ let
 
     patchPhase = ''
       substituteInPlace "setup.cfg"                                     \
-              --replace "/usr/local/include" "${pkgs.sqlite}/include"   \
-              --replace "/usr/local/lib" "${pkgs.sqlite}/lib"
+              --replace "/usr/local/include" "${pkgs.sqlite.dev}/include"   \
+              --replace "/usr/local/lib" "${pkgs.sqlite.out}/lib"
     '';
 
     # error: invalid command 'test'

From 86cc3d32ac4df74b68cbe0ff7649b5885c0346f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 13 Oct 2015 22:38:36 +0200
Subject: [PATCH 257/857] libsodium: split dev output, enableParallelBuilding

---
 pkgs/development/libraries/libsodium/default.nix          | 4 ++++
 pkgs/development/libraries/libtoxcore/new-api/default.nix | 4 ++--
 pkgs/development/libraries/libtoxcore/old-api/default.nix | 4 ++--
 pkgs/tools/networking/netsniff-ng/default.nix             | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 2a550e4f3d6ae..f127776fa6a63 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "120jkda2q58p0n68banh64vsfm3hgqnacagj425d218cr4ycdkyb";
   };
 
+  outputs = [ "dev" "out" ];
+
+  enableParallelBuilding = true;
+
   doCheck = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix
index 42f81cf6a9d23..0433d14668097 100644
--- a/pkgs/development/libraries/libtoxcore/new-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-libsodium-headers=${libsodium}/include"
-    "--with-libsodium-libs=${libsodium}/lib"
+    "--with-libsodium-headers=${libsodium.dev}/include"
+    "--with-libsodium-libs=${libsodium.out}/lib"
     "--enable-ntox"
     "--enable-daemon"
   ];
diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix
index 3ff2e1ad285d9..6bc69792b53af 100644
--- a/pkgs/development/libraries/libtoxcore/old-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/old-api/default.nix
@@ -31,8 +31,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-libsodium-headers=${libsodium}/include"
-    "--with-libsodium-libs=${libsodium}/lib"
+    "--with-libsodium-headers=${libsodium.dev}/include"
+    "--with-libsodium-libs=${libsodium.out}/lib"
     "--enable-ntox"
     "--enable-daemon"
   ];
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 9ccc91b7bc131..7176af696a94e 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   configurePhase = ''
     patchShebangs configure
     substituteInPlace configure --replace "which" "command -v"
-    NACL_INC_DIR=${libsodium}/include/sodium NACL_LIB=sodium ./configure
+    NACL_INC_DIR=${libsodium.dev}/include/sodium NACL_LIB=sodium ./configure
   '';
 
   enableParallelBuilding = true;

From 2490848627b43c8393563b8ee50042cc8356a7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 14 Oct 2015 06:03:25 +0200
Subject: [PATCH 258/857] polkit: split dev and bin outputs

---
 nixos/modules/security/polkit.nix             | 2 +-
 pkgs/development/libraries/polkit/default.nix | 2 ++
 pkgs/os-specific/linux/systemd/default.nix    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 95b659d96f0f2..d23a0baaed02e 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -90,7 +90,7 @@ in
         owner = "root";
         group = "root";
         setuid = true;
-        source = "${pkgs.polkit}/lib/polkit-1/polkit-agent-helper-1";
+        source = "${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1";
       }
     ];
 
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index cdeaa0cb1d96a..5744460008fd0 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "109w86kfqrgz83g9ivggplmgc77rz8kx8646izvm2jb57h4rbh71";
   };
 
+  outputs = [ "dev" "out" "bin" ]; # small man pages in $bin
+
   buildInputs =
     [ pkgconfig glib expat pam intltool spidermonkey gobjectIntrospection ]
     ++ [ libxslt docbook_xsl docbook_xml_dtd_412 ] # man pages
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 2d9f2070c2519..aa15f397f8ac7 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation rec {
   PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python
 
   NIX_CFLAGS_COMPILE =
-    [ # Can't say ${polkit}/bin/pkttyagent here because that would
+    [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would
       # lead to a cyclic dependency.
       "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\""
       "-fno-stack-protector"

From 04c7506f0f9f47f3f38c3d5dff7b8dabc36368b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 14 Oct 2015 13:23:37 +0200
Subject: [PATCH 259/857] xfce core: split into outputs, change style

- The split was only done where it seemed that some parts aren't really
  needed, which were mainly headers and gtk-doc.
- Update style to be closer with what's common in nixpkgs.
- Change explicit removal of icon theme cache into including the
  hicolor theme.
---
 pkgs/desktops/xfce/core/exo.nix               |  9 ++++--
 pkgs/desktops/xfce/core/garcon.nix            | 16 ++++++----
 pkgs/desktops/xfce/core/libxfce4ui.nix        | 31 ++++++++++---------
 pkgs/desktops/xfce/core/libxfce4util.nix      | 10 ++++--
 pkgs/desktops/xfce/core/libxfcegui4.nix       | 21 +++++++------
 pkgs/desktops/xfce/core/tumbler.nix           | 28 ++++++++++-------
 pkgs/desktops/xfce/core/xfce4-appfinder.nix   | 16 +++++-----
 pkgs/desktops/xfce/core/xfce4-dev-tools.nix   |  8 +++--
 pkgs/desktops/xfce/core/xfce4-panel.nix       | 25 ++++++++-------
 .../xfce/core/xfce4-power-manager.nix         | 22 ++++++-------
 pkgs/desktops/xfce/core/xfce4-session.nix     | 26 ++++++++--------
 pkgs/desktops/xfce/core/xfce4-settings.nix    | 22 ++++++-------
 pkgs/desktops/xfce/core/xfconf.nix            | 16 ++++++----
 pkgs/desktops/xfce/core/xfdesktop.nix         | 22 +++++++------
 pkgs/desktops/xfce/core/xfwm4.nix             | 16 +++++-----
 15 files changed, 161 insertions(+), 127 deletions(-)

diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
index 83610a4e4a652..c8fe6f063fd7d 100644
--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/pkgs/desktops/xfce/core/exo.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util }:
+{ stdenv, fetchurl, pkgconfig, intltool, URI, glib, gtk, libxfce4ui, libxfce4util
+, hicolor_icon_theme }:
 
 stdenv.mkDerivation rec {
   p_name  = "exo";
@@ -11,9 +12,11 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool URI glib gtk libxfce4ui libxfce4util ];
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+    # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ URI glib gtk libxfce4ui libxfce4util hicolor_icon_theme ];
 
   meta = with stdenv.lib; {
     homepage = "http://www.xfce.org/projects/${p_name}";
diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix
index 8f8cfff76cd45..3b57a2bb767d6 100644
--- a/pkgs/desktops/xfce/core/garcon.nix
+++ b/pkgs/desktops/xfce/core/garcon.nix
@@ -1,22 +1,26 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, libxfce4ui, gtk }:
-
-stdenv.mkDerivation rec {
+let
   p_name  = "garcon";
   ver_maj = "0.4";
   ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  outputs = [ "dev" "out" "doc" ];
 
   buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/;
     description = "Xfce menu support library";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
index be4ca5d17c094..807842218aa00 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui.nix
@@ -1,37 +1,38 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
-, libglade, libstartup_notification }:
-
-stdenv.mkDerivation rec {
+, libglade, libstartup_notification, hicolor_icon_theme }:
+let
   p_name  = "libxfce4ui";
   ver_maj = "4.12";
   ver_min = "1";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
-  #TODO: gladeui
-  # Install into our own prefix instead.
-  preConfigure =
-    ''
-      configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
-    '';
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util xfconf libglade
-      libstartup_notification
+      libstartup_notification hicolor_icon_theme
     ];
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+  #TODO: gladeui
+  # Install into our own prefix instead.
+  configureFlags = [
+    "--with-libglade-module-path=$(out)/lib/libglade/2.0"
+  ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/;
     description = "Basic GUI library for Xfce";
-    license = stdenv.lib.licenses.lgpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.lgpl2Plus;
+    platforms = platforms.linux;
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix
index 6893d7cfb20b2..2f5b7f880f2a0 100644
--- a/pkgs/desktops/xfce/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce/core/libxfce4util.nix
@@ -1,15 +1,18 @@
 { stdenv, fetchurl, pkgconfig, glib, intltool }:
-
-stdenv.mkDerivation rec {
+let
   p_name  = "libxfce4util";
   ver_maj = "4.12";
   ver_min = "1";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  outputs = [ "dev" "out" "doc" ]; # just dev-doc
 
   buildInputs = [ pkgconfig glib intltool ];
 
@@ -20,3 +23,4 @@ stdenv.mkDerivation rec {
     platforms = stdenv.lib.platforms.linux;
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix
index 32a320c779bf5..86c3bea176b2d 100644
--- a/pkgs/desktops/xfce/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce/core/libxfcegui4.nix
@@ -1,31 +1,32 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk
-, libxfce4util, xfconf, libglade, libstartup_notification }:
-
-stdenv.mkDerivation rec {
+, libxfce4util, xfconf, libglade, libstartup_notification, hicolor_icon_theme }:
+let
   p_name  = "libxfcegui4";
   ver_maj = "4.10";
   ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
 
   #TODO: gladeui
   # By default, libxfcegui4 tries to install into libglade's prefix.
   # Install into our own prefix instead.
-  preConfigure =
-    ''
-      configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
-    '';
+  configureFlags = [
+    "--with-libglade-module-path=$(out)/lib/libglade/2.0"
+  ];
   #NOTE: missing keyboard library support is OK according to the mailing-list
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util xfconf libglade
-      libstartup_notification
+      libstartup_notification hicolor_icon_theme
     ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   meta = {
     homepage = http://www.xfce.org/;
diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix
index 1fc895ea412ab..a09dfaa7a54fc 100644
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ b/pkgs/desktops/xfce/core/tumbler.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype,
-libgsf, poppler, bzip2 }:
-
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, pkgconfig, intltool, dbus_glib, gdk_pixbuf, curl, freetype
+, libgsf, poppler, bzip2 }:
+let
   p_name  = "tumbler";
   ver_maj = "0.1";
   ver_min = "31";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
-  buildInputs = [ pkgconfig intltool dbus_glib gdk_pixbuf curl freetype
-    poppler libgsf bzip2];
+  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+
+  buildInputs = [
+    pkgconfig intltool dbus_glib gdk_pixbuf curl freetype
+    poppler libgsf bzip2
+  ];
 
   configureFlags = [
     # Needs gst-tag
@@ -21,15 +26,16 @@ stdenv.mkDerivation rec {
 
     # Needs libffmpegthumbnailer
     # "--enable-ffmpeg-thumbnailer"
-    
+
     "--enable-odf-thumbnailer"
     "--enable-poppler-thumbnailer"
   ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://git.xfce.org/xfce/tumbler/;
     description = "A D-Bus thumbnailer service";
-    platforms = stdenv.lib.platforms.linux;
-    license = stdenv.lib.licenses.gpl2;
+    platforms = platforms.linux;
+    license = licenses.gpl2;
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix
index 25bd04f9ec400..d39708dd523fe 100644
--- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix
+++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix
@@ -1,27 +1,29 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, gtk, libxfce4util
 , libxfce4ui, garcon, xfconf }:
-
-stdenv.mkDerivation rec {
+let
   p_name  = "xfce4-appfinder";
   ver_maj = "4.12";
   ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "0ry5hin8xhgnkmm9vs7jq8blk1cnbyr0s18nm1j6nsm7360abm1a";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
     [ pkgconfig intltool glib gtk libxfce4util libxfce4ui garcon xfconf ];
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://docs.xfce.org/xfce/xfce4-appfinder/;
     description = "Xfce application finder, a tool to locate and launch programs on your system";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
index 5541011a50194..da7369decc46d 100644
--- a/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
+++ b/pkgs/desktops/xfce/core/xfce4-dev-tools.nix
@@ -1,15 +1,16 @@
 { stdenv, fetchurl, pkgconfig, glib, autoconf, automake, libtool, intltool }:
-
-stdenv.mkDerivation rec {
+let
   p_name  = "xfce4-dev-tools";
   ver_maj = "4.12";
   ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "1jxmyp80pwbfgmqmwpjxs7z5dmm6pyf3qj62z20xy44izraadqz2";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs = [ pkgconfig glib ];
 
@@ -22,3 +23,4 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2Plus;
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index 5a8cc9dc0e52e..5a46af4ce1785 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -1,24 +1,28 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
 , libwnck, exo, garcon, xfconf, libstartup_notification
-, makeWrapper, xfce4mixer }:
-
-stdenv.mkDerivation rec {
+, makeWrapper, xfce4mixer, hicolor_icon_theme
+}:
+let
   p_name  = "xfce4-panel";
   ver_maj = "4.12";
   ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "1c4p3ckghvsad1sj5v8wmar5mh9cbhail9mmhad2f9pwwb10z4ih";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
   patches = [ ./xfce4-panel-datadir.patch ];
   patchFlags = "-p1";
 
+  outputs = [ "dev" "out" "doc" ]; # just dev-doc
+
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util exo libwnck
-      garcon xfconf libstartup_notification makeWrapper
+      garcon xfconf libstartup_notification makeWrapper hicolor_icon_theme
     ] ++ xfce4mixer.gst_plugins;
   propagatedBuildInputs = [ libxfce4ui ];
 
@@ -27,15 +31,14 @@ stdenv.mkDerivation rec {
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
   '';
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/projects/xfce4-panel;
     description = "Xfce panel";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 9a3116463c63c..7695f906d317d 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -1,29 +1,29 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf
-, libxfce4ui, libxfce4util, libnotify, xfce4panel }:
-
-stdenv.mkDerivation rec {
+, libxfce4ui, libxfce4util, libnotify, xfce4panel, hicolor_icon_theme }:
+let
   p_name  = "xfce4-power-manager";
   ver_maj = "1.4";
   ver_min = "4";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "01rvqy1cif4s8lkidb7hhmsz7d9f2fwcwvc51xycaj3qgsmch3n5";
   };
 
-  name = "${p_name}-${ver_maj}.${ver_min}";
-
   buildInputs =
     [ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util
-      libnotify xfce4panel
+      libnotify xfce4panel hicolor_icon_theme
     ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
     description = "A power manager for the Xfce Desktop Environment";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfce4-session.nix b/pkgs/desktops/xfce/core/xfce4-session.nix
index 7599826e8f02b..a0568b0dd3954 100644
--- a/pkgs/desktops/xfce/core/xfce4-session.nix
+++ b/pkgs/desktops/xfce/core/xfce4-session.nix
@@ -1,25 +1,26 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, intltool, gtk, polkit
 , libxfce4util, libxfce4ui, xfce4panel, libwnck, dbus_glib, xfconf, libglade, xorg
+, hicolor_icon_theme
 }:
 
-#TODO: gnome stuff: gconf (assistive?), keyring
-
-stdenv.mkDerivation rec {
+let
   p_name  = "xfce4-session";
   ver_maj = "4.12";
   ver_min = "1";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "97d7f2a2d0af7f3623b68d1f04091e02913b28f9555dab8b0d26c8a1299d08fd";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck dbus_glib
-      xfconf xfce4panel libglade xorg.iceauth
-      polkit
-    ];
+      xfconf xfce4panel libglade xorg.iceauth xorg.libSM
+      polkit hicolor_icon_theme
+    ]; #TODO: upower-glib, gconf (assistive?), gnome keyring
 
   preBuild = ''
     sed '/^PATH=/d'        -i scripts/xflock4
@@ -28,13 +29,12 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-xsession-prefix=$(out)" ];
 
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/projects/xfce4-session;
     description = "Session manager for Xfce";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfce4-settings.nix b/pkgs/desktops/xfce/core/xfce4-settings.nix
index 4c2de64561d5c..f6f7c4c3a54b2 100644
--- a/pkgs/desktops/xfce/core/xfce4-settings.nix
+++ b/pkgs/desktops/xfce/core/xfce4-settings.nix
@@ -1,33 +1,33 @@
 { stdenv, fetchurl, pkgconfig, intltool, exo, gtk, libxfce4util, libxfce4ui
 , libglade, xfconf, xorg, libwnck, libnotify, libxklavier, garcon, upower }:
-
-#TODO: optional packages
-stdenv.mkDerivation rec {
+let
   p_name  = "xfce4-settings";
   ver_maj = "4.12";
   ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "108za1cmjslwzkdl76x9kwxkq8z734kg9nz8rxk057f10pqwxgh4";
   };
 
-  name = "${p_name}-${ver_maj}.${ver_min}";
-
   patches = [ ./xfce4-settings-default-icon-theme.patch ];
 
   buildInputs =
     [ pkgconfig intltool exo gtk libxfce4util libxfce4ui libglade upower
       xfconf xorg.libXi xorg.libXcursor libwnck libnotify libxklavier garcon
-    ];
+    ]; #TODO: optional packages
 
-  configureFlags = "--enable-pluggable-dialogs --enable-sound-settings";
+  configureFlags = [ "--enable-pluggable-dialogs" "--enable-sound-settings" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/projects/xfce4-settings;
     description = "Settings manager for Xfce";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
index f12f96895cd92..f17027f988409 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/pkgs/desktops/xfce/core/xfconf.nix
@@ -1,24 +1,28 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, libxfce4util, dbus_glib }:
-
-stdenv.mkDerivation rec {
+let
   p_name  = "xfconf";
   ver_maj = "4.12";
   ver_min = "0";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  outputs = [ "dev" "out" "doc" ]; # TODO: dev-doc only
 
   #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
   buildInputs = [ pkgconfig intltool glib libxfce4util ];
   propagatedBuildInputs = [ dbus_glib ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://docs.xfce.org/xfce/xfconf/start;
     description = "Simple client-server configuration storage and query system for Xfce";
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix
index e5d04879008e7..8802862edddea 100644
--- a/pkgs/desktops/xfce/core/xfdesktop.nix
+++ b/pkgs/desktops/xfce/core/xfdesktop.nix
@@ -1,30 +1,32 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify }:
-
-stdenv.mkDerivation rec {
+, libwnck, xfconf, libglade, xfce4panel, thunar, exo, garcon, libnotify
+, hicolor_icon_theme }:
+let
   p_name  = "xfdesktop";
   ver_maj = "4.12";
   ver_min = "3";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "a8a8d93744d842ca6ac1f9bd2c8789ee178937bca7e170e5239cbdbef30520ac";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util libxfce4ui libwnck xfconf
-      libglade xfce4panel thunar exo garcon libnotify
+      libglade xfce4panel thunar exo garcon libnotify hicolor_icon_theme
     ];
-  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/projects/xfdesktop;
     description = "Xfce desktop manager";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
+
diff --git a/pkgs/desktops/xfce/core/xfwm4.nix b/pkgs/desktops/xfce/core/xfwm4.nix
index dd18b1355f798..d861e5f2d5570 100644
--- a/pkgs/desktops/xfce/core/xfwm4.nix
+++ b/pkgs/desktops/xfce/core/xfwm4.nix
@@ -1,16 +1,17 @@
 { stdenv, fetchurl, pkgconfig, gtk, intltool, libglade, libxfce4util
 , libxfce4ui, xfconf, libwnck, libstartup_notification, xorg }:
-
-stdenv.mkDerivation rec {
+let
   p_name  = "xfwm4";
   ver_maj = "4.12";
   ver_min = "3";
+in
+stdenv.mkDerivation rec {
+  name = "${p_name}-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
     sha256 = "f4a988fbc4e0df7e8583c781d271559e56fd28696092f94ae052e9e6edb09eac";
   };
-  name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
     [ pkgconfig intltool gtk libglade libxfce4util libxfce4ui xfconf
@@ -20,11 +21,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.xfce.org/projects/xfwm4;
     description = "Window manager for Xfce";
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
+

From 261961c97dfe4085eec1f7b4a902198fc3d8ddeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 14 Oct 2015 05:47:54 +0200
Subject: [PATCH 260/857] postgresql: split and fixup some referrers

---
 pkgs/development/compilers/urweb/default.nix     |  2 +-
 .../libraries/libdbi-drivers/default.nix         |  2 +-
 pkgs/development/libraries/qt-5/5.4/qtbase.nix   |  2 +-
 .../libraries/qt-5/5.5/qtbase/default.nix        |  2 +-
 pkgs/servers/sql/postgresql/default.nix          | 16 ++++++++++++----
 pkgs/tools/security/thc-hydra/default.nix        |  2 +-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 9bdc3131e6a3f..e34d58efd0108 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     export CCARGS="-I$out/include \
                    -L${mysql.lib}/lib/mysql \
-                   -L${postgresql}/lib \
+                   -L${postgresql.lib}/lib \
                    -L${sqlite.out}/lib";
   '';
 
diff --git a/pkgs/development/libraries/libdbi-drivers/default.nix b/pkgs/development/libraries/libdbi-drivers/default.nix
index da2919f6ee9b4..f64174778b205 100644
--- a/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/pkgs/development/libraries/libdbi-drivers/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals (postgresql != null) [
     "--with-pgsql"
     "--with-pgsql_incdir=${postgresql}/include"
-    "--with-pgsql_libdir=${postgresql}/lib"
+    "--with-pgsql_libdir=${postgresql.lib}/lib"
   ] ++ optionals (sqlite != null) [
     "--with-sqlite3"
     "--with-sqlite3-incdir=${sqlite.dev}/include/sqlite"
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
index 652814a3fd1dd..2b7052e1ca625 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix
@@ -162,7 +162,7 @@ stdenv.mkDerivation {
   # 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";
+  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
     xorg.libXcomposite libX11 libxcb libXext libXrender libXi
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 1aba5c98d9c16..2bafa8deba4ee 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -183,7 +183,7 @@ stdenv.mkDerivation {
   # 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";
+  PSQL_LIBS = optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index cf4519a82327b..09f3997fa14b5 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -10,7 +10,8 @@ let
       inherit sha256;
     };
 
-    outputs = [ "out" "doc" ];
+    outputs = [ "out" "lib" "doc" ];
+    setOutputFlags = false; # $out retains configureFlags :-/
 
     buildInputs =
       [ zlib readline openssl ]
@@ -20,8 +21,11 @@ let
 
     makeFlags = [ "world" ];
 
-    configureFlags =
-      [ "--with-openssl" ]
+    configureFlags = [
+      "--with-openssl"
+      "--sysconfdir=/etc"
+      "--libdir=$(lib)/lib"
+    ]
       ++ lib.optional (stdenv.isDarwin)  "--with-uuid=e2fs"
       ++ lib.optional (!stdenv.isDarwin) "--with-ossp-uuid";
 
@@ -36,8 +40,12 @@ let
 
     postInstall =
       ''
+        _moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
+        _moveToOutput "lib/*.a" "$out"
+        _moveToOutput "lib/libecpg*" "$out"
+
         # Prevent a retained dependency on gcc-wrapper.
-        substituteInPlace $out/lib/pgxs/src/Makefile.global --replace ${stdenv.cc}/bin/ld ld
+        substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld
       '';
 
     disallowedReferences = [ stdenv.cc ];
diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 26afe5e29904f..71fbbf55a7ae5 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-   substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92}/lib"
+   substituteInPlace configure --replace "\$LIBDIRS" "${openssl.out}/lib ${pcre.out}/lib ${libssh.out}/lib ${postgresql92.lib}/lib"
    substituteInPlace configure --replace "\$INCDIRS" "${openssl.dev}/include ${pcre.dev}/include ${libssh.dev}/include ${postgresql92}/include"
   '';
 

From b95f26663819d482ad6431adf2a10d65893af6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 13:37:03 +0200
Subject: [PATCH 261/857] stdenv/multiple-outputs: mainly add $docdev

Packages often provide some developer documentation
which is useless to typical users (e.g. man3 and gtk-doc).
---
 .../setup-hooks/multiple-outputs.sh           | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index ef199ae9cb57e..74082cb474d70 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -25,6 +25,7 @@ _overrideFirst() {
 
 # Setup chains of sane default values with easy overridability.
 # The variables are global to be usable anywhere during the build.
+# Typical usage in package is defining outputBin = "dev";
 
 _overrideFirst outputDev "dev" "out"
 _overrideFirst outputBin "bin" "out"
@@ -35,6 +36,7 @@ _overrideFirst outputInclude "$outputDev"
 _overrideFirst outputLib "lib" "out"
 
 _overrideFirst outputDoc "doc" "out"
+_overrideFirst outputDocdev "docdev" "$outputDoc" # documentation for developers
 # man and info pages are small and often useful to distribute with binaries
 _overrideFirst outputMan "man" "doc" "$outputBin"
 _overrideFirst outputInfo "info" "doc" "$outputMan"
@@ -50,6 +52,7 @@ _multioutConfig() {
         --mandir=${!outputMan}/share/man --infodir=${!outputInfo}/share/info \
         --docdir=${!outputDoc}/share/doc \
         --libdir=${!outputLib}/lib --libexecdir=${!outputLib}/libexec \
+        --localedir=${!outputLib}/share/locale \
         $configureFlags"
 
     installFlags="\
@@ -64,7 +67,8 @@ NIX_NO_SELF_RPATH=1
 
 
 # Move subpaths that match pattern $1 from under any output/ to the $2 output/
-# Beware: only * ? [..] patterns are accepted.
+# Beware: only globbing patterns are accepted, e.g.: * ? {foo,bar}
+# TODO: maybe allow moving to "/dev/trash" or similar
 _moveToOutput() {
     local patt="$1"
     local dstOut="$2"
@@ -75,10 +79,14 @@ _moveToOutput() {
         for srcPath in ${!output}/$patt; do
             if [ ! -e "$srcPath" ]; then continue; fi
             local dstPath="$dstOut${srcPath#${!output}}"
-            echo "moving $srcPath to $dstPath"
+            echo "Moving $srcPath to $dstPath"
 
             if [ -d "$dstPath" ] && [ -d "$srcPath" ]
             then # attempt directory merge
+                # check the case of trying to move an empty directory
+                rmdir "$srcPath" --ignore-fail-on-non-empty
+                [ -d "$srcPath" ] || continue;
+
                 mv -t "$dstPath" "$srcPath"/*
                 rmdir "$srcPath"
             else # usual move
@@ -92,13 +100,13 @@ _moveToOutput() {
 # Move documentation to the desired outputs.
 _multioutDocs() {
     if [ "$outputs" = "out" ]; then return; fi;
-    echo "Looking for documentation to move between outputs"
-    _moveToOutput share/man "${!outputMan}"
     _moveToOutput share/info "${!outputInfo}"
     _moveToOutput share/doc "${!outputDoc}"
-    # outputs TODO: perhaps have outputDevDoc for developer docs
-    # and maybe allow _moveToOutput move to "/dev/trash" or similar
-    _moveToOutput share/gtk-doc "${!outputDoc}"
+    _moveToOutput share/gtk-doc "${!outputDocdev}"
+
+    # the default outputMan is in $bin
+    _moveToOutput share/man "${!outputMan}"
+    _moveToOutput share/man/man3 "${!outputDocdev}"
 
     # Remove empty share directory.
     if [ -d "$out/share" ]; then
@@ -109,13 +117,13 @@ _multioutDocs() {
 # Move development-only stuff to the desired outputs.
 _multioutDevs() {
     if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi;
-    echo "Looking for development-only stuff to move to $outputDev"
     _moveToOutput include "${!outputInclude}"
+    # these files are sometimes provided even without using the corresponding tool
     _moveToOutput lib/pkgconfig "${!outputDev}"
     _moveToOutput share/pkgconfig "${!outputDev}"
-
-    # don't move libtool files yet
-    #_moveToOutput "lib/*.la" "${!outputDev}"
+    _moveToOutput lib/cmake "${!outputDev}"
+    _moveToOutput share/aclocal "${!outputDev}"
+    # don't move *.la, as libtool needs them in the directory of the library
 
     for f in "${!outputDev}"/{lib,share}/pkgconfig/*.pc; do
         echo "Patching '$f' includedir to output ${!outputInclude}"
@@ -143,9 +151,11 @@ _multioutPropagateDev() {
             | tr -s ' ' '\n' | grep -v -F "$outputFirst" \
             | sort -u | tr '\n' ' ' `
         set -o pipefail
+    fi
 
-    elif [ -z "$propagatedOutputs" ]; then
-        return # variable was explicitly set to empty
+    # The variable was explicitly set to empty or we resolved it so
+    if [ -z "$propagatedOutputs" ]; then
+        return
     fi
 
     mkdir -p "${!outputFirst}"/nix-support

From b5636e9e71e56f0b868976d7aefcf848d0d1cc01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 14 Oct 2015 21:08:03 +0200
Subject: [PATCH 262/857] perl: get rid of various references

Discussed a little at #10244.
I didn't bother to port this to older perl versions,
and maybe it would be of no use anyway.
---
 .../interpreters/perl/5.22/default.nix        | 42 +++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index 14aa741b24679..78d11c0957761 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -15,7 +15,8 @@ assert enableThreading -> (stdenv ? glibc);
 let
 
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
-
+  libcInc = libc.dev or libc;
+  libcLib = libc.out or libc;
 in
 
 with stdenv.lib;
@@ -28,9 +29,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c";
   };
 
-  # TODO: Add a "dev" output containing the header files.
-  outputs = [ "out" "man" ];
-
+  outputs = [ "out" "man" "docdev" ];
   setOutputFlags = false;
 
   patches =
@@ -51,8 +50,8 @@ stdenv.mkDerivation rec {
       "-Uinstallusrbinperl"
       "-Dinstallstyle=lib/perl5"
       "-Duseshrplib"
-      "-Dlocincpth=${libc.dev or libc}/include"
-      "-Dloclibpth=${libc.out or libc}/lib"
+      "-Dlocincpth=${libcInc}/include"
+      "-Dloclibpth=${libcLib}/lib"
     ]
     ++ optional enableThreading "-Dusethreads";
 
@@ -62,14 +61,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preConfigure =
-    ''
-
+  preConfigure = ''
       configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-
-      ${optionalString stdenv.isArm ''
-        configureFlagsArray=(-Dldflags="-lm -lrt")
-      ''}
+    '' + optionalString stdenv.isArm ''
+      configureFlagsArray=(-Dldflags="-lm -lrt")
     '' + optionalString stdenv.isDarwin ''
       substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
     '' + optionalString (!enableThreading) ''
@@ -89,9 +84,9 @@ stdenv.mkDerivation rec {
 
   preCheck = ''
     # Try and setup a local hosts file
-    if [ -f "${libc}/lib/libnss_files.so" ]; then
+    if [ -f "${libcLib}/lib/libnss_files.so" ]; then
       mkdir $TMPDIR/fakelib
-      cp "${libc}/lib/libnss_files.so" $TMPDIR/fakelib
+      cp "${libcLib}/lib/libnss_files.so" $TMPDIR/fakelib
       sed -i 's,/etc/hosts,/dev/fd/3,g' $TMPDIR/fakelib/libnss_files.so
       export LD_LIBRARY_PATH=$TMPDIR/fakelib
     fi
@@ -101,15 +96,20 @@ stdenv.mkDerivation rec {
     unset LD_LIBRARY_PATH
   '';
 
+  # TODO: it seems like absolute paths to some coreutils is required.
   postInstall =
     ''
       # Remove dependency between "out" and "man" outputs.
-      rm $out/lib/perl5/*/*/.packlist
-
-      # Remove dependencies on glibc.dev and coreutils.
-      substituteInPlace $out/lib/perl5/*/*/Config_heavy.pl \
-        --replace ${stdenv.glibc.dev or "/blabla"} /no-such-path \
-        --replace $man /no-such-path
+      rm "$out"/lib/perl5/*/*/.packlist
+
+      # Remove dependencies on glibc and gcc
+      sed "/ *libpth =>/c    libpth => ' '," \
+        -i "$out"/lib/perl5/*/*/Config.pm
+      # TODO: removing those paths would be cleaner than overwriting with nonsense.
+      substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
+        --replace "${libcInc}" /no-such-path \
+        --replace "${stdenv.cc.cc or "/no-such-path"}" /no-such-path \
+        --replace "$man" /no-such-path
     ''; # */
 
   meta = {

From 302b27f64b329ee00ae64f9e76058c572cf774d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 11:00:37 +0200
Subject: [PATCH 263/857] zlib: don't split the tiny man page

---
 pkgs/development/libraries/zlib/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 2d3b10974f72f..4f2b9a594e52d 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -20,8 +20,9 @@ stdenv.mkDerivation rec {
       --replace 'ARFLAGS="-o"' 'ARFLAGS="-r"'
   '';
 
-  outputs = [ "dev" "out" "static" "man" ];
+  outputs = [ "dev" "out" "static" ];
   setOutputFlags = false;
+  outputDoc = "dev"; # single tiny man3 page
 
 
   preConfigure = ''

From daa543a45506133faba0744a2c68743c0a0df2e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 13:28:23 +0200
Subject: [PATCH 264/857] gzip: split man and info outputs

---
 pkgs/tools/compression/gzip/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index aad4eb481c936..009246b69a088 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ivqnbhiwd12q8hp3qw6rpsrpw2jg5y2mymk8cn22lsx90dfvprp";
   };
 
+  outputs = [ "out" "man" "info" ];
+
   enableParallelBuilding = true;
 
   buildInputs = [ xz.bin ];

From 6d6f8282f4583e0b1bde9ee8f5acda35050e71c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 13:39:24 +0200
Subject: [PATCH 265/857] bash: remove bashbug for non-interactive, refactor

---
 pkgs/shells/bash/default.nix | 35 +++++++++++++++++++++--------------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index a01d17d3b595b..e49e7ef5da49b 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -9,6 +9,8 @@ let
   shortName = "bash43";
   baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline";
   sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg";
+
+  inherit (stdenv.lib) optional optionalString;
 in
 
 stdenv.mkDerivation rec {
@@ -41,17 +43,17 @@ stdenv.mkDerivation rec {
         };
     in
       import ./bash-4.3-patches.nix patch) 
-      ++ stdenv.lib.optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
+      ++ optional stdenv.isCygwin ./cygwin-bash-4.3.33-1.src.patch;
 
   crossAttrs = {
     configureFlags = baseConfigureFlags +
       " bash_cv_job_control_missing=nomissing bash_cv_sys_named_pipes=nomissing" +
-      stdenv.lib.optionalString stdenv.isCygwin ''
+      optionalString stdenv.isCygwin ''
         --without-libintl-prefix --without-libiconv-prefix
         --with-installed-readline
         bash_cv_dev_stdin=present
         bash_cv_dev_fd=standard
-        bash_cv_termcap_lib=libncurses 
+        bash_cv_termcap_lib=libncurses
       '';
   };
 
@@ -59,24 +61,29 @@ stdenv.mkDerivation rec {
 
   # Note: Bison is needed because the patches above modify parse.y.
   nativeBuildInputs = [bison]
-    ++ stdenv.lib.optional (texinfo != null) texinfo
-    ++ stdenv.lib.optional interactive readline
-    ++ stdenv.lib.optional stdenv.isDarwin binutils;
+    ++ optional (texinfo != null) texinfo
+    ++ optional interactive readline
+    ++ optional stdenv.isDarwin binutils;
 
   # Bash randomly fails to build because of a recursive invocation to
   # build `version.h'.
   enableParallelBuilding = false;
 
   postInstall = ''
-    # Add an `sh' -> `bash' symlink.
     ln -s bash "$out/bin/sh"
-  ''
+  '';
+
+  postFixup = if interactive
+    then ''
+      substituteInPlace "$out/bin/bashbug" \
+        --replace '${stdenv.shell}' "$out/bin/bash"
+    ''
     # most space is taken by locale data
-    + stdenv.lib.optionalString (!interactive) ''
-      rm -r "$out/share"
+    else ''
+      rm -r "$out/share" "$out/bin/bashbug"
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/bash/;
     description =
       "GNU Bourne-Again Shell, the de facto standard shell on Linux" +
@@ -93,11 +100,11 @@ stdenv.mkDerivation rec {
       Bash without modification.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
-    platforms = stdenv.lib.platforms.all;
+    platforms = platforms.all;
 
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ maintainers.simons ];
   };
 
   passthru = {

From ad02a45af0cd9043337a424b76fb98cdb9488ba4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 13:40:58 +0200
Subject: [PATCH 266/857] gnugrep: re-split the documentation stuff

---
 pkgs/tools/text/gnugrep/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index bb7984b734e9b..8a96f2ca863cb 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   patches = [ ./cve-2015-1345.patch ];
 
-  #outputs = [ "out" "doc" ]; ToDo
+  outputs = [ "out" "info" ]; # the man pages are rather small
 
   buildInputs = [ pcre xz.bin libiconv ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
       chmod +x $out/bin/egrep $out/bin/fgrep
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/grep/;
     description = "GNU implementation of the Unix grep command";
 
@@ -47,10 +47,10 @@ stdenv.mkDerivation {
       prints the matching lines.
     '';
 
-    license = stdenv.lib.licenses.gpl3Plus;
+    license = licenses.gpl3Plus;
 
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.all;
   };
 
   passthru = {inherit pcre;};

From dd915f82e7ca180ad9adfef024e408e666e12c9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 13:57:38 +0200
Subject: [PATCH 267/857] expat: split dev output

---
 pkgs/applications/misc/roxterm/default.nix               | 2 +-
 pkgs/applications/misc/tilda/default.nix                 | 2 +-
 .../networking/instant-messengers/sflphone/default.nix   | 2 +-
 pkgs/development/interpreters/lua-5/expat.nix            | 2 +-
 pkgs/development/libraries/boost/generic.nix             | 4 ++--
 pkgs/development/libraries/expat/default.nix             | 4 ++++
 pkgs/development/libraries/gettext/expat.nix             | 2 +-
 pkgs/development/ocaml-modules/expat/default.nix         | 4 ++--
 pkgs/tools/networking/unbound/default.nix                | 9 ++++-----
 pkgs/top-level/lua-packages.nix                          | 2 +-
 pkgs/top-level/perl-packages.nix                         | 2 +-
 11 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index c6145c9a294d8..096ee9381c739 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
 
   buildPhase = ''
     # Fix up the LD_LIBRARY_PATH so that expat is on it
-    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat}/lib"
+    export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib"
 
     python mscript.py configure --prefix="$out"
     python mscript.py build
diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix
index c7a01f2ac1b9e..6cd2ea4cbebce 100644
--- a/pkgs/applications/misc/tilda/default.nix
+++ b/pkgs/applications/misc/tilda/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
 
-  LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build
+  LD_LIBRARY_PATH = "${expat.out}/lib"; # ugly hack for xgettext to work during build
 
   # The config locking scheme relies on the binary being called "tilda",
   # (`pgrep -C tilda`), so a simple `wrapProgram` won't suffice:
diff --git a/pkgs/applications/networking/instant-messengers/sflphone/default.nix b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
index 8b259c90fe508..7322ff2bb345a 100644
--- a/pkgs/applications/networking/instant-messengers/sflphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/sflphone/default.nix
@@ -40,7 +40,7 @@ rec {
       cd ..
     '';
 
-    configureFlags = "--with-expat --with-expat-inc=${expat}/include " +
+    configureFlags = "--with-expat --with-expat-inc=${expat.dev}/include " +
       "--with-expat-lib=-lexpat --with-opus ";
 
     buildInputs = [ libyaml alsaLib openssl libuuid pkgconfig libpulseaudio libsamplerate
diff --git a/pkgs/development/interpreters/lua-5/expat.nix b/pkgs/development/interpreters/lua-5/expat.nix
index 0dbbaf8a16143..243abae331a63 100644
--- a/pkgs/development/interpreters/lua-5/expat.nix
+++ b/pkgs/development/interpreters/lua-5/expat.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     makeFlagsArray=(
       LUA_LDIR="$out/share/lua/${lua5.luaversion}"
       LUA_INC="-I${lua5}/include" LUA_CDIR="$out/lib/lua/${lua5.luaversion}"
-      EXPAT_INC="-I${expat}/include");
+      EXPAT_INC="-I${expat.dev}/include");
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 1fd78761cd3b3..ebdd5e8ade9b0 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -64,8 +64,8 @@ let
   ] ++ optional (variant == "release") "debug-symbols=off";
 
   nativeB2Flags = [
-    "-sEXPAT_INCLUDE=${expat}/include"
-    "-sEXPAT_LIBPATH=${expat}/lib"
+    "-sEXPAT_INCLUDE=${expat.dev}/include"
+    "-sEXPAT_LIBPATH=${expat.out}/lib"
   ] ++ optional (toolset != null) "toolset=${toolset}"
     ++ optional (mpi != null) "--user-config=user-config.jam";
   nativeB2Args = concatStringsSep " " (genericB2Flags ++ nativeB2Flags);
diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 05cfeaee42320..082f651a3fc6f 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -10,6 +10,10 @@ stdenv.mkDerivation rec {
 
   patches = [ ./CVE-2015-1283.patch ];
 
+  outputs = [ "dev" "out" ]; # TODO: fix referrers
+  outputBin = "dev";
+  outputMan = "dev"; # tiny page for a dev tool
+
   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/gettext/expat.nix b/pkgs/development/libraries/gettext/expat.nix
index fc6116b391609..35d2e1a0950f2 100644
--- a/pkgs/development/libraries/gettext/expat.nix
+++ b/pkgs/development/libraries/gettext/expat.nix
@@ -5,6 +5,6 @@ runCommand "gettext-expat-${gettext.name}" { buildInputs = [ makeWrapper ]; } ''
   cp -rf ${gettext}/* $out/
   chmod a+w $out/bin
   for p in $out/bin/*; do
-    wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat}/lib
+    wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat.out}/lib
   done
 ''
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index f4837bd047f50..b6ee0d192e339 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation {
   postPatch = ''
     substituteInPlace "unittest.ml" \
       --replace "/home/maas/xml-samples/REC-xml-19980210.xml.txt" "${testcase}"
-    substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat}/lib" \
-    substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat}/include" \
+    substituteInPlace Makefile --replace "EXPAT_LIBDIR=/usr/local/lib" "EXPAT_LIBDIR=${expat.out}/lib" \
+    substituteInPlace Makefile --replace "EXPAT_INCDIR=/usr/local/include" "EXPAT_INCDIR=${expat.dev}/include" \
   '';
 
   configurePhase = "true";  	# Skip configure
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 1e1469d0010ec..c15b7a99fe132 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -24,11 +24,10 @@ stdenv.mkDerivation rec {
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
   # get rid of runtime dependencies on $dev outputs
-  postInstall = ''
-    substituteInPlace "$lib/lib/libunbound.la" \
-      --replace '-L${openssl.dev}/lib' "" \
-      --replace '-L${libevent.dev}/lib' ""
-  '';
+  postInstall = ''substituteInPlace "$lib/lib/libunbound.la" ''
+    + stdenv.lib.concatMapStrings
+      (pkg: " --replace '-L${pkg.dev}/lib' '-L${pkg.out}/lib' ")
+      [ openssl expat libevent ];
 
   meta = with stdenv.lib; {
     description = "Validating, recursive, and caching DNS resolver";
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index e4267fb4f3190..cf54513244ff6 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -99,7 +99,7 @@ let
       makeFlagsArray=(
         LUA_LDIR="$out/share/lua/${lua.luaversion}"
         LUA_INC="-I${lua}/include" LUA_CDIR="$out/lib/lua/${lua.luaversion}"
-        EXPAT_INC="-I${expat}/include");
+        EXPAT_INC="-I${expat.dev}/include");
     '';
 
     meta = {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ecd5f8d93cf21..5650e5debf366 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12451,7 +12451,7 @@ let self = _self // overrides; _self = with self; {
     patchPhase = if stdenv.isCygwin then ''
       sed -i"" -e "s@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. \$Config{_exe};@my \$compiler = File::Spec->catfile(\$path, \$cc\[0\]) \. (\$^O eq 'cygwin' ? \"\" : \$Config{_exe});@" inc/Devel/CheckLib.pm
     '' else null;
-    makeMakerFlags = "EXPATLIBPATH=${pkgs.expat}/lib EXPATINCPATH=${pkgs.expat}/include";
+    makeMakerFlags = "EXPATLIBPATH=${pkgs.expat.out}/lib EXPATINCPATH=${pkgs.expat.dev}/include";
   };
 
   XMLXPath = buildPerlPackage {

From 148e03b2f1cb48cd33f3fde078e2c28ebc3a9d65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 17:43:23 +0200
Subject: [PATCH 268/857] gmp: split into multiple outputs

---
 pkgs/applications/science/logic/yices/default.nix |  4 ++--
 pkgs/build-support/grsecurity/default.nix         |  6 +++---
 pkgs/development/compilers/ghc/6.10.2-binary.nix  | 10 +++++-----
 pkgs/development/compilers/ghc/6.10.4.nix         |  4 ++--
 pkgs/development/compilers/ghc/6.12.3.nix         |  4 ++--
 pkgs/development/compilers/ghc/7.0.4-binary.nix   |  6 +++---
 pkgs/development/compilers/ghc/7.0.4.nix          |  4 ++--
 pkgs/development/compilers/ghc/7.10.2.nix         |  6 +++---
 pkgs/development/compilers/ghc/7.2.2.nix          |  4 ++--
 pkgs/development/compilers/ghc/7.4.2.nix          |  4 ++--
 pkgs/development/compilers/ghc/7.6.3.nix          |  4 ++--
 pkgs/development/compilers/ghc/7.8.3.nix          |  4 ++--
 pkgs/development/compilers/ghc/7.8.4.nix          |  4 ++--
 pkgs/development/compilers/ghc/head.nix           |  6 +++---
 pkgs/development/compilers/ghc/nokinds.nix        |  6 +++---
 pkgs/development/compilers/ghcjs/default.nix      |  6 +++---
 pkgs/development/compilers/mkcl/default.nix       |  4 ++--
 pkgs/development/compilers/mlton/default.nix      |  6 +++---
 pkgs/development/libraries/gmp/6.x.nix            |  6 ++++--
 pkgs/development/libraries/gnutls/generic.nix     |  5 +++--
 pkgs/development/libraries/gtk+/3.x.nix           |  8 ++++++--
 pkgs/development/libraries/libmpc/default.nix     |  2 +-
 pkgs/development/libraries/nettle/generic.nix     |  2 +-
 pkgs/top-level/perl-packages.nix                  |  8 ++++----
 24 files changed, 65 insertions(+), 58 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index 5daaa444c1272..e1faac0fa41c7 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
   };
 
-  configureFlags = [ "--with-static-gmp=${gmp}/lib/libgmp.a"
-                     "--with-static-gmp-include-dir=${gmp}/include"
+  configureFlags = [ "--with-static-gmp=${gmp.static}/lib/libgmp.a"
+                     "--with-static-gmp-include-dir=${gmp.dev}/include"
                    ];
   buildInputs = [ gmp gperf autoreconfHook ];
 
diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index f26291e7daae9..f8c57eb7ee85f 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -126,9 +126,9 @@ let
       buildInputs = args.buildInputs ++ [ pkgs.gmp ];
       preConfigure = ''
         ${args.preConfigure or ""}
-        sed -i 's|-I|-I${pkgs.gmp}/include -I|' scripts/gcc-plugin.sh
-        sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${pkgs.gmp}/include|' tools/gcc/Makefile
-        sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${pkgs.gmp}/include|' tools/gcc/Makefile
+        sed -i 's|-I|-I${pkgs.gmp.dev}/include -I|' scripts/gcc-plugin.sh
+        sed -i 's|HOST_EXTRACFLAGS +=|HOST_EXTRACFLAGS += -I${pkgs.gmp.dev}/include|' tools/gcc/Makefile
+        sed -i 's|HOST_EXTRACXXFLAGS +=|HOST_EXTRACXXFLAGS += -I${pkgs.gmp.dev}/include|' tools/gcc/Makefile
         rm localversion-grsec
         echo ${localver grkern} > localversion-grsec
       '';
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index cafbe0e5a6cb6..5a3ddc97587ec 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -40,14 +40,14 @@ stdenv.mkDerivation rec {
     (if stdenv.isLinux then ''
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${libedit}/lib:${ncurses.lib}/lib:${gmp}/lib" {} \;
+          --set-rpath "${libedit}/lib:${ncurses.lib}/lib:${gmp.out}/lib" {} \;
       for prog in ld ar gcc strip ranlib; do
         find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
       done
      '' else "");
 
   configurePhase = ''
-    ./configure --prefix=$out --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include
+    ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include
   '';
 
   # Stripping combined with patchelf breaks the executables (they die
@@ -65,8 +65,8 @@ stdenv.mkDerivation rec {
     (if stdenv.isDarwin then
       ''
         mkdir -p $out/frameworks/GMP.framework/Versions/A
-        ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
-        ln -s ${gmp}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
+        ln -s ${gmp.out}/lib/libgmp.dylib $out/frameworks/GMP.framework/GMP
+        ln -s ${gmp.out}/lib/libgmp.dylib $out/frameworks/GMP.framework/Versions/A/GMP
         # !!! fix this
         mkdir -p $out/frameworks/GNUeditline.framework/Versions/A
         ln -s ${libedit}/lib/libeditline.dylib $out/frameworks/GNUeditline.framework/GNUeditline
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     +
       ''
         # bah, the passing gmp doesn't work, so let's add it to the final package.conf in a quick but dirty way
-        sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp}/lib\",\2@" $out/lib/ghc-${version}/package.conf
+        sed -i "s@^\(.*pkgName = PackageName \"rts\".*\libraryDirs = \\[\)\(.*\)@\\1\"${gmp.out}/lib\",\2@" $out/lib/ghc-${version}/package.conf
 
         # Sanity check, can ghc create executables?
         cd $TMP
diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix
index d8157673fbc39..d8d25ef8082c4 100644
--- a/pkgs/development/compilers/ghc/6.10.4.nix
+++ b/pkgs/development/compilers/ghc/6.10.4.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ghc libedit perl gmp];
 
   configureFlags = [
-    "--with-gmp-libraries=${gmp}/lib"
-    "--with-gmp-includes=${gmp}/include"
+    "--with-gmp-libraries=${gmp.out}/lib"
+    "--with-gmp-includes=${gmp.dev}/include"
     "--with-gcc=${stdenv.cc}/bin/gcc"
   ];
 
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index 1fa10f3ed0782..e8e9b55a88571 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ghc perl gmp ncurses];
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
   '';
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 73a589f44ba67..874cf627864e6 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     # We have to patch the GMP paths for the integer-gmp package.
      ''
       find . -name integer-gmp.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \;
+          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
      '' + stdenv.lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${ncurses.lib}/lib:${gmp}/lib" {} \;
+          --set-rpath "${ncurses.lib}/lib:${gmp.out}/lib" {} \;
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       for prog in ld ar gcc strip ranlib; do
@@ -89,7 +89,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     ./configure --prefix=$out \
-      --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \
+      --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \
       ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
   '';
 
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index 46605daee93d9..79b5f654ae9db 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 3dfd94eea7d66..7a1f7ec8c6bff 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -5,8 +5,8 @@
 let
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ];
 
   # required, because otherwise all symbols from HSffi.o are stripped, and
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index f8459cd2a13bd..20d80753afad0 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 68bc922e17679..46855e86d3363 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -15,8 +15,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index d14ecc32b8b4d..8e630641abfc3 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -22,8 +22,8 @@ in stdenv.mkDerivation rec {
   buildInputs = [ ghc perl gmp ncurses ];
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix
index 3cbc04f6d7f19..5d74af99dcaa1 100644
--- a/pkgs/development/compilers/ghc/7.8.3.nix
+++ b/pkgs/development/compilers/ghc/7.8.3.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
index 3ceea24b3dba1..9020df2f053a0 100644
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ b/pkgs/development/compilers/ghc/7.8.4.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation (rec {
   enableParallelBuilding = true;
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index adff7f12a3c45..43c32538b1a6f 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -3,8 +3,8 @@
 let
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 09dac0e951153..cad827060adf7 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -3,8 +3,8 @@
 let
 
   buildMK = ''
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
-    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
+    libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
     DYNAMIC_BY_DEFAULT = NO
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 0c270bfc09970..a73af47f9c4ea 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -113,12 +113,12 @@ in mkDerivation (rec {
     done
   '';
   postInstall = ''
-    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
+    PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp.out}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
       env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
         --dev \
         --with-cabal ${cabal-install}/bin/cabal \
-        --with-gmp-includes ${gmp}/include \
-        --with-gmp-libraries ${gmp}/lib
+        --with-gmp-includes ${gmp.dev}/include \
+        --with-gmp-libraries ${gmp.out}/lib
   '';
   passthru = {
     isGhcjs = true;
diff --git a/pkgs/development/compilers/mkcl/default.nix b/pkgs/development/compilers/mkcl/default.nix
index 2a34a5dc50b16..39196dba8cafa 100644
--- a/pkgs/development/compilers/mkcl/default.nix
+++ b/pkgs/development/compilers/mkcl/default.nix
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ gmp ];
 
   configureFlags = [
-    "GMP_CFLAGS=-I${gmp}/include"
-    "GMP_LDFLAGS=-L${gmp}/lib"
+    "GMP_CFLAGS=-I${gmp.dev}/include"
+    "GMP_LDFLAGS=-L${gmp.out}/lib"
   ];
 
   meta = {
diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix
index 9ff7620773898..c4890c1ca886e 100644
--- a/pkgs/development/compilers/mlton/default.nix
+++ b/pkgs/development/compilers/mlton/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     chmod u+x $(pwd)/../${usr_prefix}/bin/mlton
 
     # So the builder runs the binary compiler with gmp.
-    export LD_LIBRARY_PATH=${gmp}/lib:$LD_LIBRARY_PATH
+    export LD_LIBRARY_PATH=${gmp.out}/lib:$LD_LIBRARY_PATH
 
   '' + stdenv.lib.optionalString stdenv.isLinux ''
     # Patch ELF interpreter.
@@ -92,10 +92,10 @@ stdenv.mkDerivation rec {
     substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace '/${usr_prefix}/lib/mlton' $out/lib/mlton
 
     # Path to libgmp.
-    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp}/lib'"
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-link-opt '-lm -lgmp'" "-link-opt '-lm -lgmp -L${gmp.out}/lib'"
 
     # Path to gmp.h.
-    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp}/include'"
+    substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "-cc-opt '-O1 -fno-common'" "-cc-opt '-O1 -fno-common -I${gmp.dev}/include'"
 
     # Path to the same cc used in the build; needed at runtime.
     substituteInPlace $(pwd)/install/${usr_prefix}/bin/mlton --replace "gcc='gcc'" "gcc='"$(type -p cc)"'"
diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 171611e124986..1fc869e01074a 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -2,7 +2,7 @@
 
 with { inherit (stdenv.lib) optional optionalString; };
 
-stdenv.mkDerivation rec {
+let self = stdenv.mkDerivation rec {
   name = "gmp-6.0.0a";
 
   src = fetchurl { # we need to use bz2, others aren't in bootstrapping stdenv
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1bwsfmf0vrx3rwl4xmi5jhhy3v1qx1xj0m7p9hb0fvcw9f09m3kz";
   };
 
+  passthru.static = self.out;
   nativeBuildInputs = [ m4 ];
 
   configureFlags =
@@ -69,4 +70,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = [ maintainers.simons ];
   };
-}
+};
+  in self
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 7cbdd8c8ca94d..7b0d14b683539 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation {
 
   inherit src patches postPatch;
 
-  outputs = [ "dev" "out" "bin" "man" ];
+  outputs = [ "dev" "out" "bin" "man" "docdev" ];
+  outputInfo = "docdev";
 
   configureFlags =
     # FIXME: perhaps use $SSL_CERT_FILE instead
@@ -44,7 +45,7 @@ stdenv.mkDerivation {
   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,' \
+        -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \
         -i "$out/lib/libgnutls.la" "$dev/lib/pkgconfig/gnutls.pc"
   '';
 
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 0e8c058bf7d2c..2e8ac57ba9213 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, epoxy
+, xorg, wayland, epoxy, json_glib, libxkbcommon, gmp
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? stdenv.isLinux, cups ? null
 }:
@@ -40,7 +40,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = "rm -rf $out/share/gtk-doc";
+  postInstall = ''
+    rm -rf $out/share/gtk-doc
+    substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
+      --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
+  '';
 
   passthru = {
     gtkExeEnvPostBuild = ''
diff --git a/pkgs/development/libraries/libmpc/default.nix b/pkgs/development/libraries/libmpc/default.nix
index 1e8ea0ffa1380..2a4600f52045c 100644
--- a/pkgs/development/libraries/libmpc/default.nix
+++ b/pkgs/development/libraries/libmpc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gmp mpfr ];
 
-  CFLAGS = "-I${gmp}/include";
+  CFLAGS = "-I${gmp.dev}/include";
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/nettle/generic.nix b/pkgs/development/libraries/nettle/generic.nix
index 5dd990a70e8d0..1bfb739712f40 100644
--- a/pkgs/development/libraries/nettle/generic.nix
+++ b/pkgs/development/libraries/nettle/generic.nix
@@ -64,5 +64,5 @@ stdenv.lib.optionalAttrs stdenv.isSunOS {
   # /usr/include/mp.h from OpenSolaris.  See
   # <https://lists.gnu.org/archive/html/hydra-users/2012-08/msg00000.html>
   # for details.
-  configureFlags = [ "--with-include-path=${gmp}/include" ];
+  configureFlags = [ "--with-include-path=${gmp.dev}/include" ];
 })
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5650e5debf366..440bcbd8b8ebe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2193,8 +2193,8 @@ let self = _self // overrides; _self = with self; {
       sha256 = "0f5gdprcql4kwzgxl2s6ngcfg1jl45lzcqh7dkv5bkwlwmxa9rsi";
     };
     buildInputs = [ DevelChecklib TestRequires pkgs.gmp ];
-    NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp";
+    NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp";
   };
 
   CryptEksblowfish = buildPerlPackage rec {
@@ -6546,8 +6546,8 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ pkgs.gmp ];
     doCheck = false;
-    NIX_CFLAGS_COMPILE = "-I${pkgs.gmp}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.gmp}/lib -lgmp";
+    NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp";
   };
 
   MathBigRat = buildPerlPackage rec {

From 31d9263159b4689b29f1654c740eefe188199462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 18:59:39 +0200
Subject: [PATCH 269/857] some evaluation fixes

Not all multiple-output fixups were properly tested.
---
 .../networking/instant-messengers/blink/default.nix           | 2 +-
 pkgs/development/compilers/gcc-arm-embedded/default.nix       | 2 +-
 pkgs/development/libraries/qt-3/default.nix                   | 2 +-
 pkgs/top-level/python-packages.nix                            | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index e8ebd82d0bfbd..233eb38ae86e3 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -22,7 +22,7 @@ pythonPackages.buildPythonPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/blink \
-      --prefix LD_LIBRARY_PATH ":" ${gnutls.lib}/lib
+      --prefix LD_LIBRARY_PATH ":" ${gnutls.out}/lib
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index cfd6ecd713da5..3f9a2a1f2fbb9 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     for f in $(find $out); do
       if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
         patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
-                 --set-rpath $out/lib:${gcc.lib}/lib:${ncurses.lib}/lib \
+                 --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.lib}/lib \
                  "$f" || true
       fi
     done
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 82345b86e9603..40fa63d75caf9 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     ${if mysqlSupport then "-qt-sql-mysql -L${mysql.lib}/lib/mysql -I${mysql.lib}/include/mysql" else ""}
     ${if xftSupport then "-xft
       -L${libXft.out}/lib -I${libXft.dev}/include
-      -L${libXft.freetype.lib}/lib -I${libXft.freetype.dev}/include
+      -L${libXft.freetype.out}/lib -I${libXft.freetype.dev}/include
       -L${libXft.fontconfig.lib}/lib -I${libXft.fontconfig.dev}/include" else "-no-xft"}
   ";
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2db3fd1d43249..4da776a9b5083 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -395,7 +395,7 @@ let
 
     postInstall = ''
       wrapProgram $out/bin/alot \
-        --prefix LD_LIBRARY_PATH : '${lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}'
+        --prefix LD_LIBRARY_PATH : '${pkgs.lib.makeLibraryPath [ pkgs.notmuch pkgs.file pkgs.gpgme ]}'
     '';
 
     meta = {
@@ -14692,7 +14692,7 @@ let
     # I don't know why I need to add these libraries. Shouldn't they
     # be part of wxPython?
     postInstall = ''
-      libspaths=${with pkgs.xorg; lib.makeLibraryPath [ libSM libXScrnSaver ]}
+      libspaths=${with pkgs.xorg; pkgs.lib.makeLibraryPath [ libSM libXScrnSaver ]}
       wrapProgram $out/bin/taskcoach.py \
         --prefix LD_LIBRARY_PATH : $libspaths
     '';

From 74d4fc795921a57775739a38fa741afe8fa23ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 15 Oct 2015 19:00:25 +0200
Subject: [PATCH 270/857] graphviz: simplify and add a missing X library

---
 pkgs/tools/graphics/graphviz/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 993e6314fb8d9..0e83899f0b736 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw
+{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat
 , yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo
 , flex
 }:
@@ -22,21 +22,14 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex
-    ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ]
+    ] ++ stdenv.lib.optionals (xorg != null)
+      (with xorg; [ xlibsWrapper libXrender pango libXaw libXpm ])
     ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
 
   CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")
     "-I${cairo.dev}/include/cairo";
 
-  configureFlags =
-    [ "--with-pngincludedir=${libpng}/include"
-      "--with-pnglibdir=${libpng}/lib"
-      "--with-jpegincludedir=${libjpeg}/include"
-      "--with-jpeglibdir=${libjpeg}/lib"
-      "--with-expatincludedir=${expat}/include"
-      "--with-expatlibdir=${expat}/lib"
-    ]
-    ++ stdenv.lib.optional (xorg == null) "--without-x";
+  configureFlags = stdenv.lib.optional (xorg == null) "--without-x";
 
   preBuild = ''
     sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile

From 5d862db694c01643eb76b38953e9525acdd6f051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 16 Oct 2015 09:09:46 +0200
Subject: [PATCH 271/857] libmng: split dev and docdev outputs

---
 pkgs/development/libraries/libmng/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libmng/default.nix b/pkgs/development/libraries/libmng/default.nix
index 234f56863c099..b97ee6a4ced0b 100644
--- a/pkgs/development/libraries/libmng/default.nix
+++ b/pkgs/development/libraries/libmng/default.nix
@@ -8,13 +8,16 @@ stdenv.mkDerivation rec {
     sha256 = "0l5wa3b9rr4zl49zbbjpapqyccqjwzkzw1ph3p4pk9p5h73h9317";
   };
 
+  outputs = [ "dev" "out" "docdev" ];
+  outputMan= "docdev";
+
   propagatedBuildInputs = [ zlib libpng libjpeg lcms2 ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Reference library for reading, displaying, writing and examining Multiple-Image Network Graphics";
     homepage = http://www.libmng.com;
-    license = stdenv.lib.licenses.zlib;
-    maintainers = with stdenv.lib.maintainers; [ marcweber urkud ];
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    license = licenses.zlib;
+    maintainers = with maintainers; [ marcweber urkud ];
+    hydraPlatforms = platforms.linux;
   };
 }

From 689d9757c505258d500f178a473ea6d2460991ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 11:23:51 +0100
Subject: [PATCH 272/857] stdenv/multiple-outputs: autoremove empty directories

i.e. remove chains of empty dirs after moving contents out of them.
---
 pkgs/build-support/setup-hooks/multiple-outputs.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index 74082cb474d70..ae00b0bf13f25 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -93,6 +93,13 @@ _moveToOutput() {
                 mkdir -p $(readlink -m "$dstPath/..") # create the parent for $dstPath
                 mv "$srcPath" "$dstPath"
             fi
+
+            # remove empty directories, printing iff at least one gets removed
+            local srcParent="$(readlink -m "$srcPath/..")"
+            if rmdir "$srcParent"; then
+                echo "Removing empty $srcParent/ and (possibly) its parents"
+                rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")"
+            fi
         done
     done
 }
@@ -107,11 +114,6 @@ _multioutDocs() {
     # the default outputMan is in $bin
     _moveToOutput share/man "${!outputMan}"
     _moveToOutput share/man/man3 "${!outputDocdev}"
-
-    # Remove empty share directory.
-    if [ -d "$out/share" ]; then
-        rmdir "$out/share" --ignore-fail-on-non-empty
-    fi
 }
 
 # Move development-only stuff to the desired outputs.

From 64cdc48d1d603d85b9987a9087a83b2be88244cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 11:26:51 +0100
Subject: [PATCH 273/857] stdenv/multiple-outputs: add REMOVE target, use for
 docdev

Now any developer docs are removed by default, unless "docdev"
is in $outputs or $outputDocdev is defined.
Currently devdoc consists of just man3 and gtk-doc.
---
 .../setup-hooks/multiple-outputs.sh           | 48 +++++++++++--------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index ae00b0bf13f25..d8a9763a0c2fa 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -1,5 +1,4 @@
 # The base package for automatic multiple-output splitting. Used in stdenv as well.
-
 preConfigureHooks+=(_multioutConfig)
 preFixupHooks+=(_multioutDocs)
 preFixupHooks+=(_multioutDevs)
@@ -8,11 +7,13 @@ postFixupHooks+=(_multioutPropagateDev)
 # Assign the first string containing nonempty variable to the variable named $1
 _assignFirst() {
     local varName="$1"
+    local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name)
     shift
     while [ $# -ge 1 ]; do
         if [ -n "${!1}" ]; then eval "${varName}"="$1"; return; fi
         shift
     done
+    echo "Error: _assignFirst found no valid variant!"
     return 1 # none found
 }
 # Same as _assignFirst, but only if "$1" = ""
@@ -36,7 +37,7 @@ _overrideFirst outputInclude "$outputDev"
 _overrideFirst outputLib "lib" "out"
 
 _overrideFirst outputDoc "doc" "out"
-_overrideFirst outputDocdev "docdev" "$outputDoc" # documentation for developers
+_overrideFirst outputDocdev "docdev" REMOVE # documentation for developers
 # man and info pages are small and often useful to distribute with binaries
 _overrideFirst outputMan "man" "doc" "$outputBin"
 _overrideFirst outputInfo "info" "doc" "$outputMan"
@@ -68,7 +69,7 @@ NIX_NO_SELF_RPATH=1
 
 # Move subpaths that match pattern $1 from under any output/ to the $2 output/
 # Beware: only globbing patterns are accepted, e.g.: * ? {foo,bar}
-# TODO: maybe allow moving to "/dev/trash" or similar
+# A special target "REMOVE" is allowed: _moveToOutput foo REMOVE
 _moveToOutput() {
     local patt="$1"
     local dstOut="$2"
@@ -76,29 +77,36 @@ _moveToOutput() {
     for output in $outputs; do
         if [ "${!output}" = "$dstOut" ]; then continue; fi
         local srcPath
-        for srcPath in ${!output}/$patt; do
+        for srcPath in "${!output}"/$patt; do
             if [ ! -e "$srcPath" ]; then continue; fi
-            local dstPath="$dstOut${srcPath#${!output}}"
-            echo "Moving $srcPath to $dstPath"
-
-            if [ -d "$dstPath" ] && [ -d "$srcPath" ]
-            then # attempt directory merge
-                # check the case of trying to move an empty directory
-                rmdir "$srcPath" --ignore-fail-on-non-empty
-                [ -d "$srcPath" ] || continue;
-
-                mv -t "$dstPath" "$srcPath"/*
-                rmdir "$srcPath"
-            else # usual move
-                mkdir -p $(readlink -m "$dstPath/..") # create the parent for $dstPath
-                mv "$srcPath" "$dstPath"
+
+            if [ "$dstOut" = REMOVE ]; then
+                echo "Removing $srcPath"
+                rm -r "$srcPath"
+            else
+                local dstPath="$dstOut${srcPath#${!output}}"
+                echo "Moving $srcPath to $dstPath"
+
+                if [ -d "$dstPath" ] && [ -d "$srcPath" ]
+                then # attempt directory merge
+                    # check the case of trying to move an empty directory
+                    rmdir "$srcPath" --ignore-fail-on-non-empty
+                    if [ -d "$srcPath" ]; then
+                      mv -t "$dstPath" "$srcPath"/*
+                      rmdir "$srcPath"
+                    fi
+                else # usual move
+                    mkdir -p "$(readlink -m "$dstPath/..")"
+                    mv "$srcPath" "$dstPath"
+                fi
             fi
 
             # remove empty directories, printing iff at least one gets removed
             local srcParent="$(readlink -m "$srcPath/..")"
             if rmdir "$srcParent"; then
                 echo "Removing empty $srcParent/ and (possibly) its parents"
-                rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")"
+                rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \
+                    > /dev/null || true # doesn't ignore failure for some reason
             fi
         done
     done
@@ -107,6 +115,8 @@ _moveToOutput() {
 # Move documentation to the desired outputs.
 _multioutDocs() {
     if [ "$outputs" = "out" ]; then return; fi;
+    local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo}
+
     _moveToOutput share/info "${!outputInfo}"
     _moveToOutput share/doc "${!outputDoc}"
     _moveToOutput share/gtk-doc "${!outputDocdev}"

From cd7a78d7e421d2623f186ad1bdf9c220e5a055d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 11:30:53 +0100
Subject: [PATCH 274/857] cc-wrapper: fix typo ignoring flags; fixes #10574

---
 pkgs/build-support/cc-wrapper/add-flags | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags b/pkgs/build-support/cc-wrapper/add-flags
index d483615390477..59d9614fd21fc 100644
--- a/pkgs/build-support/cc-wrapper/add-flags
+++ b/pkgs/build-support/cc-wrapper/add-flags
@@ -5,7 +5,7 @@ if [ -e @out@/nix-support/libc-cflags ]; then
     export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
-if [ -e @out@/nix-support/gcc-cflags ]; then
+if [ -e @out@/nix-support/cc-cflags ]; then
     export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
@@ -17,7 +17,7 @@ if [ -e @out@/nix-support/libc-ldflags ]; then
     export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)"
 fi
 
-if [ -e @out@/nix-support/gcc-ldflags ]; then
+if [ -e @out@/nix-support/cc-ldflags ]; then
     export NIX_LDFLAGS+=" $(cat @out@/nix-support/cc-ldflags)"
 fi
 

From 55d129609ddbf667e7a93a9fd0638336a348a647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 11:33:39 +0100
Subject: [PATCH 275/857] cc-wrapper: correct ccLDFlags with multiple outputs

Note: -B argument seems more like for gcc's main output,
though it's used in a bit strange way here.
(Upstream default is /usr/lib/gcc/ which we don't move.)
---
 pkgs/build-support/cc-wrapper/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index e46b67db2f103..8bb215947b0c7 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -29,6 +29,7 @@ let
   libc_bin = if nativeLibc then null else libc.bin or libc;
   libc_dev = if nativeLibc then null else libc.dev or libc;
   libc_lib = if nativeLibc then null else libc.out or libc;
+  cc_solib = cc.lib or cc;
   binutils_bin = if nativeTools then null else binutils.bin or binutils;
   # The wrapper scripts use 'cat', so we may need coreutils.
   coreutils_bin = if nativeTools then null else coreutils.bin or coreutils;
@@ -105,14 +106,14 @@ stdenv.mkDerivation {
       # $cc/lib64 (even though it does actually search there...)..
       # This confuses libtool.  So add it to the compiler tool search
       # path explicitly.
-      if [ -e "$cc/lib64" -a ! -L "$cc/lib64" ]; then
-        ccLDFlags+=" -L$cc/lib64"
-        ccCFlags+=" -B$cc/lib64"
+      if [ -e "${cc.out}/lib64" -a ! -L "${cc.out}/lib64" ]; then
+        ccLDFlags+=" -L${cc_solib}/lib64"
+        ccCFlags+=" -B${cc.out}/lib64"
       fi
-      ccLDFlags+=" -L$cc/lib"
+      ccLDFlags+=" -L${cc_solib}/lib"
 
       ${optionalString cc.langVhdl or false ''
-        ccLDFlags+=" -L${zlib}/lib"
+        ccLDFlags+=" -L${zlib.out}/lib"
       ''}
 
       # Find the gcc libraries path (may work only without multilib).

From efcad4c910a271e846f1d274fe297a83ba97b3cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 11:38:07 +0100
Subject: [PATCH 276/857] gcc5: split $doc into $man and $info

... because cc-wrapper is meant to propagate man pages into user envs,
and info pages are rather large.

Also replace the duplicate g++ and gcc man1 pages by a symlink.
---
 pkgs/build-support/cc-wrapper/default.nix    |  2 +-
 pkgs/development/compilers/gcc/5/default.nix |  2 +-
 pkgs/development/compilers/gcc/builder.sh    | 19 ++++++++++---------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 8bb215947b0c7..0c7bf5b667f35 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -140,7 +140,7 @@ stdenv.mkDerivation {
       # Propagate the wrapped cc so that if you install the wrapper,
       # you get tools like gcov, the manpages, etc. as well (including
       # for binutils and Glibc).
-      echo ${cc} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages
+      echo ${cc} ${cc.man or ""} ${binutils_bin} ${libc_bin} > $out/nix-support/propagated-user-env-packages
 
       echo ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index a02a59c434730..2a5b43a871ff4 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -215,7 +215,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "lib" "doc" ];
+  outputs = [ "out" "lib" "man" "info" ];
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index bfe3b6a559f3d..2f19f4219da6a 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -211,16 +211,14 @@ preInstall() {
 
 postInstall() {
     # Move runtime libraries to $lib.
-    mkdir -p $lib/lib
-    ln -s lib $lib/lib64
-    mv -v $out/lib/lib*.so $out/lib/lib*.so.*[0-9] $out/lib/*.la $lib/lib/
-    for i in $lib/lib/*.la; do
-        substituteInPlace $i --replace $out $lib
-    done
+    _moveToOutput "lib/lib*.so*" "$lib"
+    _moveToOutput "lib/lib*.la"  "$lib"
+    ln -s lib "$lib/lib64" # for *.la
+    _moveToOutput "share/gcc-*/python" "$lib"
 
-    # Remove precompiled headers for now.  They are very big and
-    # probably not very useful yet.
-    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
+    for i in "$lib"/lib/*.{la,py}; do
+        substituteInPlace "$i" --replace "$out" "$lib"
+    done
 
     # Remove `fixincl' to prevent a retained dependency on the
     # previous gcc.
@@ -266,6 +264,9 @@ postInstall() {
     paxmark r $out/libexec/gcc/*/*/{cc1,cc1plus}
 
     eval "$postInstallGhdl"
+
+    # Two identical man pages are shipped (moving and compressing is done later)
+    ln -sf gcc.1 "$out"/share/man/man1/g++.1
 }
 
 genericBuild

From 8adabe6679c51df5d4cd40b52c2f639324ad645e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 12:03:37 +0100
Subject: [PATCH 277/857] gawk: split $doc into $man and $info

Info files are rather large and not much used anymore, AFAIK.
(We include $man or $doc in the system closure by default.)
---
 pkgs/tools/text/gawk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 2712aa14d60f6..e62b18a4c4364 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "09d6pmx6h3i2glafm0jd1v1iyrs03vcyv2rkz12jisii3vlmbkz3";
   };
 
-  # When we do build separate interactive version, it makes sense to always include docs.
-  outputs = [ "out" ] ++ stdenv.lib.optional (!interactive) "doc"; #ToDo
+  # When we do build separate interactive version, it makes sense to always include man.
+  outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man";
 
   doCheck = !(
        stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1

From 6c75f4c9aa7bd5df0dc4aecc4185b200a34ba115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 17:43:02 +0100
Subject: [PATCH 278/857] imagemagick, soxr, fftw, libraw: remove explicit
 gcc.lib

It is no longer needed after cc-wrapper fixes.
---
 pkgs/applications/graphics/ImageMagick/default.nix | 1 -
 pkgs/applications/misc/audio/soxr/default.nix      | 3 ---
 pkgs/development/libraries/fftw/default.nix        | 2 --
 pkgs/development/libraries/libraw/default.nix      | 2 +-
 4 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 9483809bf6626..c25cc11c203c1 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
       openexr libpng librsvg libtiff libxml2
-    libxml2 (stdenv.cc.cc.lib or null)
     ];
 
   propagatedBuildInputs =
diff --git a/pkgs/applications/misc/audio/soxr/default.nix b/pkgs/applications/misc/audio/soxr/default.nix
index dd2e560c00f81..941e1a393b158 100644
--- a/pkgs/applications/misc/audio/soxr/default.nix
+++ b/pkgs/applications/misc/audio/soxr/default.nix
@@ -17,9 +17,6 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ (stdenv.cc.cc.lib or null) ];
-  # outputs TODO: gcc.lib might become a problem;
-  # here -out/lib/*.a got found and -lib/lib/*.so didn't
 
   meta = {
     description = "An audio resampling library";
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 020d07dcc0f65..0e07519da1166 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -17,8 +17,6 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
   outputBin = "dev"; # fftw-wisdom
 
-  buildInputs = [ (stdenv.cc.cc.lib or null) ];
-
   configureFlags =
     [ "--enable-shared" "--disable-static"
       "--enable-threads"
diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index 928b251b3af01..031886d345168 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "043kckxjqanw8dl3m9f6kvsf0l20ywxmgxd1xb0slj6m8l4w4hz6";
   };
 
-  buildInputs = [ lcms2 jasper (stdenv.cc.cc.lib or null) ] ;
+  buildInputs = [ lcms2 jasper ];
 
   nativeBuildInputs = [ pkgconfig ];
 

From 06eba7d3202c361457d53d270d2d5538beab78f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 25 Oct 2015 19:34:30 +0100
Subject: [PATCH 279/857] xorg: remove $man where it was only man3

Now man3 is deleted if not specified otherwise,
and I don't really see a reason for X libs to produce them.
(This fixes failures due to not producing $man outputs.)

The $doc outputs are also development docs (all probably),
but I left those for now.
---
 pkgs/servers/x11/xorg/overrides.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 3b72494e8968e..0999605b91c28 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -73,7 +73,7 @@ in
   libxcb = attrs : attrs // {
     nativeBuildInputs = [ args.python ];
     configureFlags = "--enable-xkb --enable-xinput";
-    outputs = [ "dev" "out" "doc" "man" ];
+    outputs = [ "dev" "out" "doc" ];
   };
 
   xcbproto = attrs : attrs // {
@@ -98,7 +98,7 @@ in
   };
 
   libXau = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXdmcp = attrs: attrs // {
@@ -115,7 +115,7 @@ in
   };
 
   libXxf86vm = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
@@ -146,7 +146,7 @@ in
   };
 
   libXcomposite = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     propagatedBuildInputs = [ xorg.libXfixes ];
   };
 
@@ -156,7 +156,7 @@ in
   };
 
   libXcursor = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXdamage = attrs: attrs // {
@@ -164,7 +164,7 @@ in
   };
 
   libXft = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     # the include files need ft2build.h, and Requires.private isn't enough for us
@@ -174,21 +174,21 @@ in
   };
 
   libXext = attrs: attrs // {
-    outputs = [ "dev" "out" "man" "doc" ];
+    outputs = [ "dev" "out" "doc" ];
     propagatedBuildInputs = [ xorg.xproto xorg.libXau ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
 
   libXfixes = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXi = attrs: attrs // {
-    outputs = [ "dev" "out" "man" "doc" ];
+    outputs = [ "dev" "out" "doc" ];
   };
 
   libXinerama = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
   };
 
   libXmu = attrs: attrs // {
@@ -197,7 +197,7 @@ in
   };
 
   libXrandr = attrs: attrs // {
-    outputs = [ "dev" "out" "man" ];
+    outputs = [ "dev" "out" ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
     propagatedBuildInputs = [xorg.libXrender];
   };

From 0eadc53b4b082f6212a1e95679461196bdeb2534 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 11 Oct 2015 01:32:07 +0300
Subject: [PATCH 280/857] wget: Remove runtime dependency on OpenSSL headers

It collects compilation and linking flags that are displayed on
`wget --version`. Setting to 0 (NULL) is safe.
---
 pkgs/tools/networking/wget/default.nix          |  2 ++
 .../remove-runtime-dep-on-openssl-headers.patch | 17 +++++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch

diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix
index f7fcfdf0f26e5..db30562babed4 100644
--- a/pkgs/tools/networking/wget/default.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0dzv5xf9qxc2bp4cyifmaghh3h464wbm73xiwcrvckf1ynqbgxv7";
   };
 
+  patches = [ ./remove-runtime-dep-on-openssl-headers.patch ];
+
   preConfigure = ''
     for i in "doc/texi2pod.pl" "util/rmold.pl"; do
       sed -i "$i" -e 's|/usr/bin.*perl|${perl}/bin/perl|g'
diff --git a/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch b/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
new file mode 100644
index 0000000000000..a6a1fcfcb37b1
--- /dev/null
+++ b/pkgs/tools/networking/wget/remove-runtime-dep-on-openssl-headers.patch
@@ -0,0 +1,17 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 1a36a9b..e279c84 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -2211,10 +2211,9 @@ version.c:  $(wget_SOURCES) ../lib/libgnu.a
+ 	echo '' >> $@
+ 	echo '#include "version.h"' >> $@
+ 	echo 'const char *version_string = "@VERSION@";' >> $@
+-	echo 'const char *compilation_string = "'$(COMPILE)'";' \
++	echo 'const char *compilation_string = 0;' \
+ 	    | $(ESCAPEQUOTE) >> $@
+-	echo 'const char *link_string = "'$(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+-	$(AM_LDFLAGS) $(LDFLAGS) $(LIBS) $(wget_LDADD)'";' \
++	echo 'const char *link_string = 0;' \
+ 	    | $(ESCAPEQUOTE) >> $@
+ 
+ css.c: $(srcdir)/css.l

From fab7d6ea69ff9c8f3e910d4d219d27f066e1ff70 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 11 Oct 2015 13:34:28 +0300
Subject: [PATCH 281/857] nixos/upower: Reference correct output of glib

---
 nixos/modules/services/hardware/upower.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/upower.nix b/nixos/modules/services/hardware/upower.nix
index 0b6a101efa0bd..46481a86a1423 100644
--- a/nixos/modules/services/hardware/upower.nix
+++ b/nixos/modules/services/hardware/upower.nix
@@ -50,7 +50,7 @@ in
 
     systemd.services.upower =
       { description = "Power Management Daemon";
-        path = [ pkgs.glib ]; # needed for gdbus
+        path = [ pkgs.glib.out ]; # needed for gdbus
         serviceConfig =
           { Type = "dbus";
             BusName = "org.freedesktop.UPower";

From 464350aa0107705570c9c2cb293d291808458307 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 12 Oct 2015 23:39:34 +0300
Subject: [PATCH 282/857] grub2: Patch out GCC reference from modinfo.sh

---
 pkgs/tools/misc/grub/2.0x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 2880666e8db25..e0a811a61e75f 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -98,6 +98,9 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     paxmark pms $out/sbin/grub-{probe,bios-setup}
+
+    # Avoid a runtime reference to gcc
+    sed -i $out/lib/grub/*/modinfo.sh -e "/grub_target_cppflags=/ s|'.*'|' '|"
   '';
 
   meta = with stdenv.lib; {

From e5e2e6aba213d993f650f15d3cb407930c39483b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 15 Oct 2015 02:07:37 +0300
Subject: [PATCH 283/857] libarchive: Reference correct output of openssl.

---
 pkgs/development/libraries/libarchive/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index ff33043dbaeac..467dd87f43e94 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     sed -i $out/lib/libarchive.la \
-      -e 's|-lcrypto|-L${openssl}/lib -lcrypto|' \
+      -e 's|-lcrypto|-L${openssl.out}/lib -lcrypto|' \
       -e 's|-llzo2|-L${lzo}/lib -llzo2|'
   '';
 

From 934a6ddef6ee14874170d41fee3f0345460bf8d4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 15 Oct 2015 02:08:31 +0300
Subject: [PATCH 284/857] mariadb: Reference correct outputs of zlib and
 openssl

---
 pkgs/servers/sql/mariadb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index e051813b7a011..20a02b51369cf 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -96,8 +96,8 @@ stdenv.mkDerivation rec {
 
     # Fix the mysql_config
     sed -i $out/bin/mysql_config \
-      -e 's,-lz,-L${zlib}/lib -lz,g' \
-      -e 's,-lssl,-L${openssl}/lib -lssl,g'
+      -e 's,-lz,-L${zlib.out}/lib -lz,g' \
+      -e 's,-lssl,-L${openssl.out}/lib -lssl,g'
 
     # Add mysql_config to libs since configure scripts use it
     mkdir -p $lib/bin

From d100218bd260c55a12cff0094c157c6a65e9a6a5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 15 Oct 2015 22:02:04 +0300
Subject: [PATCH 285/857] uwimap: Avoid reference to OpenSSL headers

Default value of SSLCERTS was ${openssl.dev}/certs.
Adjust SSLLIB as well for good measure.
---
 pkgs/tools/networking/uwimap/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/uwimap/default.nix b/pkgs/tools/networking/uwimap/default.nix
index 1da9ca9698414..e2c83bcb975cf 100644
--- a/pkgs/tools/networking/uwimap/default.nix
+++ b/pkgs/tools/networking/uwimap/default.nix
@@ -18,8 +18,9 @@ stdenv.mkDerivation {
     ++ stdenv.lib.optional (!stdenv.isDarwin) pam;
 
   patchPhase = ''
-    sed -i -e s,/usr/local/ssl,${openssl}, \
-      src/osdep/unix/Makefile
+    sed -i src/osdep/unix/Makefile -e 's,/usr/local/ssl,${openssl},'
+    sed -i src/osdep/unix/Makefile -e 's,^SSLCERTS=.*,SSLCERTS=/etc/ssl/certs,'
+    sed -i src/osdep/unix/Makefile -e 's,^SSLLIB=.*,SSLLIB=${openssl.out}/lib,'
   '';
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin

From 1a66da9757d12c9361792152cebfaa9a575ac1b9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 16 Oct 2015 19:15:36 +0300
Subject: [PATCH 286/857] apr-util: Fix path to expat in .la file

---
 pkgs/development/libraries/apr-util/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index a1d63274ddffc..2832bc724c845 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
 
   # Give apr1 access to sed for runtime invocations
   postInstall = ''
+    substituteInPlace $out/lib/libaprutil-1.la --replace "${expat}/lib" "${expat.out}/lib"
     wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin"
   '';
 

From d5c9e1aebe1e172a42ca70cddd3e59b686b9500b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 16 Oct 2015 19:28:55 +0300
Subject: [PATCH 287/857] nixos/polkit: Reference correct output of polkit

---
 nixos/modules/security/polkit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index d23a0baaed02e..300dc600d8848 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -79,7 +79,7 @@ in
         ${cfg.extraConfig}
       ''; #TODO: validation on compilation (at least against typos)
 
-    services.dbus.packages = [ pkgs.polkit ];
+    services.dbus.packages = [ pkgs.polkit.out ];
 
     security.pam.services.polkit-1 = {};
 

From ca2cb493fa9e49e62f22dd5ebd429852cc6b11dc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 16 Oct 2015 19:34:39 +0300
Subject: [PATCH 288/857] fontconfig_210: Split into multiple outputs

---
 pkgs/development/libraries/fontconfig/2.10.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/fontconfig/2.10.nix b/pkgs/development/libraries/fontconfig/2.10.nix
index 2951dbb44d4f4..fea9efde1cfd2 100644
--- a/pkgs/development/libraries/fontconfig/2.10.nix
+++ b/pkgs/development/libraries/fontconfig/2.10.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
       }
     ;
 
+  outputs = [ "dev" "lib" "bin" "out" ]; # $out contains all the config
+
   propagatedBuildInputs = [ freetype ];
   buildInputs = [ pkgconfig expat ];
 

From fb4c2eb4383a79cd0612feb59ec9b4614e97e74c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 17 Oct 2015 23:53:54 +0300
Subject: [PATCH 289/857] gnutls: More hacks to .la files

Some .la files contain '-lgmp' without a corresponding -L entry,
breaking e.g. glib-networking and NetworkManager.
---
 pkgs/development/libraries/gnutls/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index 7b0d14b683539..cf1e0f9d578cf 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -46,7 +46,8 @@ stdenv.mkDerivation {
     sed ${lib.optionalString tpmSupport "-e 's,-ltspi,-L${trousers}/lib -ltspi,'"} \
         -e 's,-lz,-L${zlib.out}/lib -lz,' \
         -e 's,-L${gmp.dev}/lib,-L${gmp.out}/lib,' \
-        -i "$out/lib/libgnutls.la" "$dev/lib/pkgconfig/gnutls.pc"
+        -e 's,-lgmp,-L${gmp.out}/lib -lgmp,' \
+        -i $out/lib/*.la "$dev/lib/pkgconfig/gnutls.pc"
   '';
 
   meta = with lib; {

From 796e36afeb545bcf3c10876ad507f5d9728ad019 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 00:16:42 +0300
Subject: [PATCH 290/857] libpng12: Split into multiple outputs

---
 pkgs/development/libraries/libpng/12.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/libpng/12.nix b/pkgs/development/libraries/libpng/12.nix
index 3071aa3fdfca2..9585884f8e7b4 100644
--- a/pkgs/development/libraries/libpng/12.nix
+++ b/pkgs/development/libraries/libpng/12.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "02jwfqk1ahqfvbs9gdyb5v0123by9ws6m7jnfvainig7i7v4jpml";
   };
 
+  outputs = [ "dev" "out" "man" ];
+
   propagatedBuildInputs = [ zlib ];
 
   passthru = { inherit zlib; };
@@ -21,6 +23,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--enable-static";
 
+  postInstall = ''mv "$out/bin" "$dev/bin"'';
+
   meta = {
     description = "The official reference implementation for the PNG file format";
     homepage = http://www.libpng.org/pub/png/libpng.html;

From d24bc080f76662621c6b61fb7d2bb03d9cb35362 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 00:24:10 +0300
Subject: [PATCH 291/857] libmtp: Split into multiple outputs

---
 nixos/modules/services/desktops/gnome3/gvfs.nix |  2 +-
 pkgs/development/libraries/libmtp/default.nix   | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix
index c4f41a6125c71..a07cdadbb12bf 100644
--- a/nixos/modules/services/desktops/gnome3/gvfs.nix
+++ b/nixos/modules/services/desktops/gnome3/gvfs.nix
@@ -37,7 +37,7 @@ in
 
     services.dbus.packages = [ gnome3.gvfs ];
 
-    services.udev.packages = [ pkgs.libmtp ];
+    services.udev.packages = [ pkgs.libmtp.bin ];
 
   };
 
diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index 13b4050193367..671169b9ab3a9 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -3,17 +3,19 @@
 stdenv.mkDerivation rec {
   name = "libmtp-1.1.9";
 
-  propagatedBuildInputs = [ libusb1 ];
-  buildInputs = [ pkgconfig ];
-
-  # tried to install files to /lib/udev, hopefully OK
-  configureFlags = [ "--with-udev=$$out/lib/udev" ];
-
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
     sha256 = "12dinqic0ljnhrwx3rc61jc7q24ybr0mckc2ya5kh1s1np0d7w93";
   };
 
+  outputs = [ "dev" "bin" "out" ];
+
+  propagatedBuildInputs = [ libusb1 ];
+  buildInputs = [ pkgconfig ];
+
+  # tried to install files to /lib/udev, hopefully OK
+  configureFlags = [ "--with-udev=$$bin/lib/udev" ];
+
   meta = {
     homepage = http://libmtp.sourceforge.net;
     description = "An implementation of Microsoft's Media Transfer Protocol";

From c7e3ee41533152ac5aa159bc187fa3dd24a9602e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 01:49:37 +0300
Subject: [PATCH 292/857] libXvMC: Split into multiple outputs

---
 pkgs/servers/x11/xorg/overrides.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0999605b91c28..ff755ff73925e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -220,8 +220,10 @@ in
     outputs = [ "dev" "out" "doc" ]; # just dev-doc
   };
 
-  libXvMC = attrs: attrs
-    // { buildInputs = attrs.buildInputs ++ [xorg.renderproto]; };
+  libXvMC = attrs: attrs // {
+    outputs = [ "dev" "out" "doc" ];
+    buildInputs = attrs.buildInputs ++ [xorg.renderproto];
+  };
 
   libXpm = attrs: attrs // {
     outputs = [ "dev" "out" "bin" ]; # tiny man in $bin

From bff9b546e4722923e86afc99ccacace31f70ee77 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 01:49:51 +0300
Subject: [PATCH 293/857] nix-prefetch-scripts: Reference correct output of
 curl

---
 pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 07cbd99a10bac..7a862de02b8a0 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion}
     copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar}
     copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs}
-    copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl}
+    copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl.bin}
   '';
 
   meta = with stdenv.lib; {

From db81e221487e8f97018b15c20270044c24c6e918 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 01:53:13 +0300
Subject: [PATCH 294/857] treewide: Mass-replace 'xorgserver}/bin' with correct
 output

vcunat added one fix in xdummy.
---
 nixos/modules/services/x11/display-managers/default.nix  | 2 +-
 nixos/modules/services/x11/display-managers/sddm.nix     | 2 +-
 nixos/modules/services/x11/terminal-server.nix           | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gdm/default.nix          | 2 +-
 pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix | 2 +-
 pkgs/desktops/gnome-3/3.18/core/gdm/default.nix          | 2 +-
 pkgs/servers/x11/xorg/overrides.nix                      | 2 +-
 pkgs/tools/X11/xlaunch/default.nix                       | 2 +-
 pkgs/tools/X11/xpra/default.nix                          | 4 ++--
 pkgs/tools/X11/xpra/gtk3.nix                             | 4 ++--
 pkgs/tools/misc/xdummy/default.nix                       | 4 ++--
 pkgs/tools/misc/xvfb-run/default.nix                     | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index c59777f525d10..4f6d490bd91d4 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -322,7 +322,7 @@ in
 
   config = {
 
-    services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X";
+    services.xserver.displayManager.xserverBin = "${xorg.xorgserver.out}/bin/X";
 
   };
 
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index c44383cc6117c..3f1d190ae66b0 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -31,7 +31,7 @@ let
     [XDisplay]
     MinimumVT=${toString xcfg.tty}
     ServerPath=${xserverWrapper}
-    XephyrPath=${pkgs.xorg.xorgserver}/bin/Xephyr
+    XephyrPath=${pkgs.xorg.xorgserver.out}/bin/Xephyr
     SessionCommand=${dmcfg.session.script}
     SessionDir=${dmcfg.session.desktops}
     XauthPath=${pkgs.xorg.xauth}/bin/xauth
diff --git a/nixos/modules/services/x11/terminal-server.nix b/nixos/modules/services/x11/terminal-server.nix
index a036e085b0bfe..810cc0c4688df 100644
--- a/nixos/modules/services/x11/terminal-server.nix
+++ b/nixos/modules/services/x11/terminal-server.nix
@@ -17,7 +17,7 @@ let
       #! ${pkgs.stdenv.shell}
       export XKB_BINDIR=${pkgs.xorg.xkbcomp}/bin
       export XORG_DRI_DRIVER_PATH=${pkgs.mesa}/lib/dri
-      exec ${pkgs.xorg.xorgserver}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb
+      exec ${pkgs.xorg.xorgserver.out}/bin/Xvfb "$@" -xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb
     '';
 
 in
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
index b0e9652a9c51c..3749be2de27f7 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
     substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
     substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}'
     substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
index d3d6f4e471c45..7759d21960cb0 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   # Only needed to make it build
   preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
   '';
 
   configureFlags = [ "--sysconfdir=/etc"
diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix
index b0e9652a9c51c..3749be2de27f7 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gdm/3.16-wip/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
     substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
     substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.dbus-launch}'
     substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
diff --git a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
index 1db969651317c..a13370e5c9a9d 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gdm/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   # Only needed to make it build
   preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
+    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver.out}/bin/X"
   '';
 
   configureFlags = [ "--sysconfdir=/etc"
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ff755ff73925e..f366b3c6d4fcf 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -485,7 +485,7 @@ in
     stdenv = if isDarwin then args.clangStdenv else stdenv;
     buildInputs = attrs.buildInputs ++ lib.optional isDarwin args.bootstrap_cmds;
     configureFlags = [
-      "--with-xserver=${xorg.xorgserver}/bin/X"
+      "--with-xserver=${xorg.xorgserver.out}/bin/X"
     ] ++ lib.optionals isDarwin [
       "--with-bundle-id-prefix=org.nixos.xquartz"
       "--with-launchdaemons-dir=\${out}/LaunchDaemons"
diff --git a/pkgs/tools/X11/xlaunch/default.nix b/pkgs/tools/X11/xlaunch/default.nix
index 06dfd28b7399c..ccf998951a341 100644
--- a/pkgs/tools/X11/xlaunch/default.nix
+++ b/pkgs/tools/X11/xlaunch/default.nix
@@ -45,7 +45,7 @@ EOF
       else
         RESET_OPTION=\"-noreset\"
       fi;
-      XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" 
+      XCMD=\"\$(egrep \"^Environment=\" /etc/systemd/system/display-manager.service | sed -e \"s/Environment=/ export /\" | sed -e '\\''s/#.*//'\\'' ; echo export _XARGS_=\\\$\\( grep xserver_arguments \\\$SLIM_CFGFILE \\| sed -e s/xserver_arguments// \\| sed -e s/:0/:\${_display}/ \\| sed -e s/vt7/vt\$((7+_display))/ \\) ; echo ${xorgserver.out}/bin/X \\\$_XARGS_ \$RESET_OPTION )\" 
       PRE_XCMD=\"\$(egrep \"^ExecStartPre=\" /etc/systemd/system/display-manager.service | sed -e \"\s/ExecStartPre=//\")\"
       echo \"\$PRE_XCMD\" 
       echo \"\$PRE_XCMD\" | bash
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index 5ef80e887cf6f..fe95b2b685e70 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -53,14 +53,14 @@ buildPythonPackage rec {
       --set XKB_BINDIR "${xkbcomp}/bin" \
       --set FONTCONFIG_FILE "${fontsConf}" \
       --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-      --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
+      --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
   '';
 
   #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
   #postFixup = ''
   #  sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra
   #  sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
-  #  sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra
+  #  sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra
   #'';
 
 
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 04bcd1195147c..de65897130a8a 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -54,14 +54,14 @@ buildPythonPackage rec {
       --set XKB_BINDIR "${xkbcomp}/bin" \
       --set FONTCONFIG_FILE "${fontsConf}" \
       --prefix LD_LIBRARY_PATH : ${libfakeXinerama}/lib \
-      --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
+      --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
   '';
 
   #TODO: replace postInstall with postFixup to avoid double wrapping of xpra; needs more work though
   #postFixup = ''
   #  sed -i '2iexport XKB_BINDIR="${xkbcomp}/bin"' $out/bin/xpra
   #  sed -i '3iexport FONTCONFIG_FILE="${fontsConf}"' $out/bin/xpra
-  #  sed -i '4iexport PATH=${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra
+  #  sed -i '4iexport PATH=${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin\${PATH:+:}\$PATH' $out/bin/xpra
   #'';
 
 
diff --git a/pkgs/tools/misc/xdummy/default.nix b/pkgs/tools/misc/xdummy/default.nix
index 30aba19930c70..1f4dbc8633270 100644
--- a/pkgs/tools/misc/xdummy/default.nix
+++ b/pkgs/tools/misc/xdummy/default.nix
@@ -18,7 +18,7 @@ let
     EndSection
 
     Section "Files"
-      ModulePath "${xorg.xorgserver}/lib/xorg/modules"
+      ModulePath "${xorg.xorgserver.out}/lib/xorg/modules"
       ModulePath "${xorg.xf86videodummy}/lib/xorg/modules"
       XkbDir "${xkeyboard_config}/share/X11/xkb"
       FontPath "${xorg.fontadobe75dpi}/lib/X11/fonts/75dpi"
@@ -75,7 +75,7 @@ let
 in writeScriptBin "xdummy" ''
   #!${stdenv.shell}
   export XKB_BINDIR="${xorg.xkbcomp}/bin"
-  exec ${xorg.xorgserver}/bin/Xorg \
+  exec ${xorg.xorgserver.out}/bin/Xorg \
     -noreset \
     -logfile /dev/null \
     "$@" \
diff --git a/pkgs/tools/misc/xvfb-run/default.nix b/pkgs/tools/misc/xvfb-run/default.nix
index 162fb73b3f00e..f1cf044243496 100644
--- a/pkgs/tools/misc/xvfb-run/default.nix
+++ b/pkgs/tools/misc/xvfb-run/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/xvfb-run \
       --set XKB_BINDIR "${xkbcomp}/bin" \
       --set FONTCONFIG_FILE "${fontsConf}" \
-      --prefix PATH : ${getopt}/bin:${xorgserver}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
+      --prefix PATH : ${getopt}/bin:${xorgserver.out}/bin:${xauth}/bin:${which}/bin:${utillinux}/bin
   '';
 }

From 8ec6f85c4eb91d70f6c371dbaf4a6edf60d15201 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 16 Oct 2015 21:49:59 +0300
Subject: [PATCH 295/857] gobject-introspection: Don't delete
 $out/share/gobject-introspection-1.0/tests

Otherwise breaks pygobject3 compilation.
vcunat added comment. (Commit reordering changed this a bit.)
---
 .../libraries/gobject-introspection/default.nix      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 226fbd2835b93..2de0d23d21373 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -23,13 +23,17 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional stdenv.isDarwin otool;
   propagatedBuildInputs = [ libffi glib ];
 
-  # Tests depend on cairo, which is undesirable (it pulls in lots of
-  # other dependencies).
-  configureFlags = [ "--disable-tests" ];
-
   preConfigure = ''
     sed 's|/usr/bin/env ||' -i tools/g-ir-tool-template.in
   '';
+  configureFlags = [
+    # Tests depend on cairo, which is undesirable (it pulls in lots of
+    # other dependencies).
+    "--disable-tests"
+  ];
+
+  # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
+  # by pygobject3 (and maybe others), but it's only searched in $out
 
   setupHook = ./setup-hook.sh;
 

From e153b68fce249dc5a1ef1cb236535efee4558f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 26 Oct 2015 10:59:20 +0100
Subject: [PATCH 296/857] xorg-server: avoid runtime references to
 xorgserver-dev

---
 pkgs/servers/x11/xorg/overrides.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f366b3c6d4fcf..9f84009a55f72 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -409,6 +409,12 @@ in
           wrapProgram $out/bin/Xephyr \
             --set XKB_BINDIR "${xorg.xkbcomp}/bin" \
             --add-flags "-xkbdir ${xorg.xkeyboardconfig}/share/X11/xkb"
+          ( # assert() keeps runtime reference xorgserver-dev in xf86-video-intel and others
+            cd "$dev"
+            for f in include/xorg/*.h; do
+              sed "1i#line 1 \"${attrs.name}/$f\"" -i "$f"
+            done
+          )
         '';
         passthru.version = version; # needed by virtualbox guest additions
       } else {

From 55b0097c4c78ff0b527df9e6cfc3164593896903 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 13:18:13 +0300
Subject: [PATCH 297/857] nixos/virtualbox-guest: Reference correct output of
 xorgserver

---
 nixos/modules/virtualisation/virtualbox-guest.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix
index a025aee7cfeb6..9733bd6fac462 100644
--- a/nixos/modules/virtualisation/virtualbox-guest.nix
+++ b/nixos/modules/virtualisation/virtualbox-guest.nix
@@ -66,7 +66,7 @@ in
 
     services.xserver.displayManager.sessionCommands =
       ''
-        PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver ]}:$PATH \
+        PATH=${makeSearchPath "bin" [ pkgs.gnugrep pkgs.which pkgs.xorg.xorgserver.out ]}:$PATH \
           ${kernel.virtualboxGuestAdditions}/bin/VBoxClient-all
       '';
 

From 44742f836d5bc57c1df0bbde3411e5425ed7afb9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 14:29:23 +0300
Subject: [PATCH 298/857] apr-util: Split into multiple outputs

Also fixup more .la files to avoid unnecessary -dev dependencies.
---
 pkgs/development/libraries/apr-util/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/apr-util/default.nix b/pkgs/development/libraries/apr-util/default.nix
index 2832bc724c845..f1c0807144bec 100644
--- a/pkgs/development/libraries/apr-util/default.nix
+++ b/pkgs/development/libraries/apr-util/default.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "0bn81pfscy9yjvbmyx442svf43s6dhrdfcsnkpxz43fai5qk5kx6";
   };
 
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
+
   configureFlags = ''
     --with-apr=${apr} --with-expat=${expat}
     ${optionalString (!stdenv.isCygwin) "--with-crypto"}
@@ -37,8 +40,10 @@ stdenv.mkDerivation rec {
 
   # Give apr1 access to sed for runtime invocations
   postInstall = ''
-    substituteInPlace $out/lib/libaprutil-1.la --replace "${expat}/lib" "${expat.out}/lib"
-    wrapProgram $out/bin/apu-1-config --prefix PATH : "${gnused}/bin"
+    for f in $out/lib/*.la $out/lib/apr-util-1/*.la; do
+      substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib"
+    done
+    wrapProgram $dev/bin/apu-1-config --prefix PATH : "${gnused}/bin"
   '';
 
   enableParallelBuilding = true;

From c471cb866f92ce6463eeaa9d3c9ba30d13b97d94 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 14:20:14 +0300
Subject: [PATCH 299/857] subversion: Split into multiple outputs

---
 .../version-management/subversion/default.nix            | 9 +++++++++
 .../package-management/nix-prefetch-scripts/default.nix  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index f563bebd9db83..30af36b4880ff 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation (rec {
     inherit (config.${branch}) sha1;
   };
 
+  # Can't do separate $lib and $bin, as libs reference bins
+  outputs = [ "dev" "out" "man" ];
+
   buildInputs = [ zlib apr aprutil sqlite ]
     ++ stdenv.lib.optional httpSupport serf
     ++ stdenv.lib.optional pythonBindings python
@@ -77,6 +80,12 @@ stdenv.mkDerivation (rec {
 
     mkdir -p $out/share/bash-completion/completions
     cp tools/client-side/bash_completion $out/share/bash-completion/completions/subversion
+
+    for f in $out/lib/*.la; do
+      substituteInPlace $f --replace "${expat.dev}/lib" "${expat.out}/lib"
+      substituteInPlace $f --replace "${zlib.dev}/lib" "${zlib.out}/lib"
+      substituteInPlace $f --replace "${sqlite.dev}/lib" "${sqlite.out}/lib"
+    done
   '';
 
   inherit perlBindings pythonBindings;
diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 7a862de02b8a0..0d36dbc804bfb 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
     copyScript "hg" ${../../../build-support/fetchhg/nix-prefetch-hg} ${mercurial}
     copyScript "git" ${../../../build-support/fetchgit/nix-prefetch-git} ${git}
-    copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion}
+    copyScript "svn" ${../../../build-support/fetchsvn/nix-prefetch-svn} ${subversion.out}
     copyScript "bzr" ${../../../build-support/fetchbzr/nix-prefetch-bzr} ${bazaar}
     copyScript "cvs" ${../../../build-support/fetchcvs/nix-prefetch-cvs} ${cvs}
     copyScript "zip" ${../../../build-support/fetchzip/nix-prefetch-zip} ${unzip} ${curl.bin}

From c5579c91846d3bda0ed1f137da50f197094f0c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 26 Oct 2015 11:30:48 +0100
Subject: [PATCH 300/857] subversion: fixup some referrers after splitting

---
 nixos/modules/services/misc/svnserve.nix                  | 2 +-
 .../services/web-servers/apache-httpd/phabricator.nix     | 2 +-
 pkgs/applications/misc/ikiwiki/default.nix                | 2 +-
 .../git-and-tools/svn2git-kde/default.nix                 | 2 +-
 .../applications/version-management/rabbitvcs/default.nix | 2 +-
 pkgs/applications/version-management/rapidsvn/default.nix | 4 ++--
 pkgs/tools/filesystems/svnfs/default.nix                  | 4 ++--
 pkgs/top-level/python-packages.nix                        | 8 +++++---
 8 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index 848905ca457f7..601d50a3e268b 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
@@ -40,7 +40,7 @@ in
 
       preStart = "mkdir -p ${cfg.svnBaseDir}";
 
-      exec = "${pkgs.subversion}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
+      exec = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/var/run/svnserve.pid";
     };
   };
 }
diff --git a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
index e4e3aac8d411a..efd4a7b5f0fb9 100644
--- a/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/phabricator.nix
@@ -39,7 +39,7 @@ in {
       "${pkgs.diffutils}"
       ] ++
       (if config.mercurial then ["${pkgs.mercurial}"] else []) ++
-      (if config.subversion then ["${pkgs.subversion}"] else []) ++
+      (if config.subversion then ["${pkgs.subversion.out}"] else []) ++
       (if config.git then ["${pkgs.git}"] else []);
 
   startupScript = pkgs.writeScript "activatePhabricator" ''
diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix
index 1f78355ca3a1a..3e35b7bde4b84 100644
--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
       ${lib.optionalString bazaarSupport ''--prefix PATH : ${bazaar}/bin \''}
       ${lib.optionalString cvsSupport ''--prefix PATH : ${cvs}/bin \''}
       ${lib.optionalString cvsSupport ''--prefix PATH : ${cvsps}/bin \''}
-      ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion}/bin \''}
+      ${lib.optionalString subversionSupport ''--prefix PATH : ${subversion.out}/bin \''}
       ${lib.optionalString mercurialSupport ''--prefix PATH : ${mercurial}/bin \''}
       ${lib.concatMapStrings (x: "--prefix PATH : ${x}/bin ") extraUtils}
     done
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
index 91fe1662efec8..f282fa6635b81 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     sed -i 's|/bin/cat|cat|' ./src/repository.cpp
     qmake
-    make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""'
+    make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion.dev}/include/subversion-1 -DVER="\"${src.rev}\""'
   '';
 
   installPhase = ''
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
index 100e854f29b87..9f817a397f0e1 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -17,7 +17,7 @@ python2Packages.buildPythonPackage rec {
       sed -ie 's|if sys\.argv\[1\] == "install":|if False:|' ./setup.py
       sed -ie "s|PREFIX = sys.prefix|PREFIX = \"$out\"|" ./setup.py
       sed -ie 's|/usr/bin/meld|${meld}/bin/meld|' ./rabbitvcs/util/configspec/configspec.ini
-      sed -ie 's|/usr/bin/svnadmin|${subversion}/bin/svnadmin|' ./rabbitvcs/ui/create.py
+      sed -ie 's|/usr/bin/svnadmin|${subversion.out}/bin/svnadmin|' ./rabbitvcs/ui/create.py
       sed -ie "s|/usr/share/doc|$out/share/doc|" ./rabbitvcs/ui/about.py
       sed -ie "s|gnome-open|xdg-open|" ./rabbitvcs/util/helper.py
     '';
diff --git a/pkgs/applications/version-management/rapidsvn/default.nix b/pkgs/applications/version-management/rapidsvn/default.nix
index 843fe9ad3230d..9397aa8a1e19c 100644
--- a/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/pkgs/applications/version-management/rapidsvn/default.nix
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ wxGTK subversion apr aprutil python ];
 
-  configureFlags = [ "--with-svn-include=${subversion}/include" 
-    "--with-svn-lib=${subversion}/lib" ];
+  configureFlags = [ "--with-svn-include=${subversion.dev}/include"
+    "--with-svn-lib=${subversion.out}/lib" ];
 
   meta = {
     description = "Multi-platform GUI front-end for the Subversion revision system";
diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix
index fba066d0f4cb4..3337141821770 100644
--- a/pkgs/tools/filesystems/svnfs/default.nix
+++ b/pkgs/tools/filesystems/svnfs/default.nix
@@ -12,10 +12,10 @@ stdenv.mkDerivation {
 
   # why is this required?
   preConfigure=''
-    export LD_LIBRARY_PATH=${subversion}/lib
+    export LD_LIBRARY_PATH=${subversion.out}/lib
   '';
 
-  NIX_CFLAGS_COMPILE="-I ${subversion}/include/subversion-1";
+  NIX_CFLAGS_COMPILE="-I ${subversion.dev}/include/subversion-1";
   NIX_LDFLAGS="-lsvn_client-1";
 
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4da776a9b5083..a65d7a68b22c3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12351,9 +12351,11 @@ let
       cd Source
       python setup.py backport
       python setup.py configure \
-        --apr-inc-dir=${pkgs.apr}/include/apr-1 \
-        --apu-inc-dir=${pkgs.aprutil}/include/apr-1 \
-        --apr-lib-dir=${pkgs.apr}/lib \
+        --apr-inc-dir=${pkgs.apr.dev}/include \
+        --apu-inc-dir=${pkgs.aprutil.dev}/include \
+        --apr-lib-dir=${pkgs.apr.out}/lib \
+        --svn-lib-dir=${pkgs.subversion.out}/lib \
+        --svn-bin-dir=${pkgs.subversion.out}/bin \
         --svn-root-dir=${pkgs.subversion}
     '' + (if !stdenv.isDarwin then "" else ''
       sed -i -e 's|libpython2.7.dylib|lib/libpython2.7.dylib|' Makefile

From 366c1e88fc811e1ceb03e897d883b7bd765e7627 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 15:47:06 +0300
Subject: [PATCH 301/857] openldap: Remove dontPatchELF

Everything still seems to build fine.
---
 pkgs/development/libraries/openldap/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 253f74ecc6a87..c1ff70e3dad6d 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     ] ++ stdenv.lib.optional (openssl == null) "--without-tls"
       ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl";
 
-  dontPatchELF = 1; # !!!
-
   # Fixup broken libtool
   preFixup = ''
     sed -e 's,-lsasl2,-L${cyrus_sasl}/lib -lsasl2,' \

From 75300c334addfe1ba61b0b179c1c05acd16f9b4c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 15:48:14 +0300
Subject: [PATCH 302/857] cyrus-sasl: Split into multiple outputs

Also fixup .la files to avoid unnecessary -dev dependencies.
---
 pkgs/development/libraries/cyrus-sasl/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/cyrus-sasl/default.nix b/pkgs/development/libraries/cyrus-sasl/default.nix
index 2be98f3d5e87b..b7155f286c5cb 100644
--- a/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1hvvbcsg21nlncbgs0cgn3iwlnb3vannzwsp6rwvnn9ba4v53g4g";
   };
 
+  outputs = [ "dev" "bin" "out" "man" "docdev" ];
+
   buildInputs =
     [ openssl db gettext kerberos ]
     ++ lib.optional stdenv.isLinux pam
@@ -32,6 +34,12 @@ stdenv.mkDerivation rec {
 
   installFlags = lib.optional stdenv.isDarwin [ "framedir=$(out)/Library/Frameworks/SASL2.framework" ];
 
+  postInstall = ''
+    for f in $out/lib/*.la $out/lib/sasl2/*.la; do
+      substituteInPlace $f --replace "${openssl.dev}/lib" "${openssl.out}/lib"
+    done
+  '';
+
   meta = {
     homepage = "http://cyrusimap.web.cmu.edu/";
     description = "library for adding authentication support to connection-based protocols";

From b4118c7f0429a4f0d96fc5f67a4b254429b6e915 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 16:07:03 +0300
Subject: [PATCH 303/857] openldap: Split into multiple outputs

Also fix the incorrect .la file fixups.
---
 nixos/modules/services/databases/openldap.nix   | 10 +++++-----
 pkgs/development/libraries/openldap/default.nix |  7 ++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix
index 29bdb20175231..7eecf5d8e446a 100644
--- a/nixos/modules/services/databases/openldap.nix
+++ b/nixos/modules/services/databases/openldap.nix
@@ -28,10 +28,10 @@ in
         example = literalExample ''
           openldap.enable = true;
           openldap.extraConfig = '''
-            include ''${pkgs.openldap}/etc/openldap/schema/core.schema
-            include ''${pkgs.openldap}/etc/openldap/schema/cosine.schema
-            include ''${pkgs.openldap}/etc/openldap/schema/inetorgperson.schema
-            include ''${pkgs.openldap}/etc/openldap/schema/nis.schema
+            include ''${pkgs.openldap.out}/etc/openldap/schema/core.schema
+            include ''${pkgs.openldap.out}/etc/openldap/schema/cosine.schema
+            include ''${pkgs.openldap.out}/etc/openldap/schema/inetorgperson.schema
+            include ''${pkgs.openldap.out}/etc/openldap/schema/nis.schema
 
             database bdb 
             suffix dc=example,dc=org 
@@ -89,7 +89,7 @@ in
         mkdir -p ${cfg.dataDir}
         chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir}
       '';
-      serviceConfig.ExecStart = "${openldap}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}";
+      serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -f ${configFile}";
     };
 
     users.extraUsers.openldap =
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index c1ff70e3dad6d..e9895ff56a025 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
   # Should be removed with >=2.4.43
   patches = [ ./CVE-2015-6908.patch ];
 
-  outputs = [ "out" "man" ];
+  # TODO: separate "out" and "bin"
+  outputs = [ "dev" "out" "man" "docdev" ];
 
   buildInputs = [ openssl cyrus_sasl db groff ];
 
@@ -23,8 +24,8 @@ stdenv.mkDerivation rec {
 
   # Fixup broken libtool
   preFixup = ''
-    sed -e 's,-lsasl2,-L${cyrus_sasl}/lib -lsasl2,' \
-        -e 's,-lssl,-L${openssl}/lib -lssl,' \
+    sed -e 's,-lsasl2,-L${cyrus_sasl.out}/lib -lsasl2,' \
+        -e 's,-lssl,-L${openssl.out}/lib -lssl,' \
         -i $out/lib/libldap.la -i $out/lib/libldap_r.la
   '';
 

From 0fe3e37946379d2f5e428dcc5e4648964842a355 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 16:41:03 +0300
Subject: [PATCH 304/857] php: Apply brute force to locate openldap

Needed after the split to multiple outputs :(. But that's what you get
for not providing pkg-config files...
---
 pkgs/development/interpreters/php/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 6247663e3f404..9dc570cc2a584 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -42,7 +42,13 @@ let
         };
 
         ldap = {
-          configureFlags = ["--with-ldap=${openldap}"];
+          configureFlags = [
+            "--with-ldap"
+            "LDAP_DIR=${openldap.dev}"
+            "LDAP_INCDIR=${openldap.dev}/include"
+            "LDAP_LIBDIR=${openldap.out}/lib"
+            "--with-ldap-sasl=${cyrus_sasl.dev}"
+            ];
           buildInputs = [openldap cyrus_sasl openssl];
         };
 

From e649ac36dafb0f0caea1adba5a612b912a9d1535 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 18 Oct 2015 21:49:41 +0300
Subject: [PATCH 305/857] libnl: Split into multiple outputs

---
 pkgs/os-specific/linux/libnl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index afd9695420e3c..1e1ed0a6112c0 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation {
     owner = "thom311";
   };
 
+  outputs = [ "dev" "bin" "out" "man" ];
+
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
 
   meta = {

From cb720e4c94b720c95acf9ea1276868820ce7a920 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 20 Oct 2015 23:49:30 +0300
Subject: [PATCH 306/857] webkitgtk: Add libXt

It's missing in the multiple-outputs branch for some reason.
---
 pkgs/development/libraries/webkitgtk/2.4.nix     | 4 ++--
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.4.nix b/pkgs/development/libraries/webkitgtk/2.4.nix
index 8ad3fcd0428de..607c706fdb598 100644
--- a/pkgs/development/libraries/webkitgtk/2.4.nix
+++ b/pkgs/development/libraries/webkitgtk/2.4.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, perl, python, ruby, bison, gperf, flex
 , pkgconfig, which, gettext, gobjectIntrospection
 , gtk2, gtk3, wayland, libwebp, enchant, sqlite
-, libxml2, libsoup, libsecret, libxslt, harfbuzz
+, libxml2, libsoup, libsecret, libxslt, harfbuzz, xorg
 , gst-plugins-base
 , withGtk2 ? false
 , enableIntrospection ? true
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk2 wayland libwebp enchant
     libxml2 libsecret libxslt
-    gst-plugins-base sqlite
+    gst-plugins-base sqlite xorg.libXt
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index d60fbca61414d..f7372dfe8501e 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gettext, gobjectIntrospection, libnotify
 , gtk2, gtk3, wayland, libwebp, enchant
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
-, enableGeoLocation ? true, geoclue2, sqlite
+, enableGeoLocation ? true, geoclue2, sqlite, xorg
 , gst-plugins-base
 }:
 
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk2 wayland libwebp enchant libnotify
     libxml2 libsecret libxslt harfbuzz libpthreadstubs
-    gst-plugins-base
+    gst-plugins-base xorg.libXt
   ] ++ optional enableGeoLocation geoclue2;
 
   propagatedBuildInputs = [

From 4bd5f08bd3c1e7ca766a427b6ace03b7acd7f0c1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Tue, 20 Oct 2015 23:54:12 +0300
Subject: [PATCH 307/857] gnome-control-center: Add libgudev

Probably needed after the systemd update.
---
 .../gnome-3/3.16/core/gnome-control-center/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
index 1dfc76a2dd54c..463d962de3e9e 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
 , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libxkbfile, libnotify
+, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.vino udev libcanberra_gtk3
+      gnome3.vino udev libcanberra_gtk3 libgudev
       networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
 
   preBuild = ''

From 311ac81337df766e4b3fbdca92833b5df5b4ff8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 27 Oct 2015 09:46:06 +0100
Subject: [PATCH 308/857] gnome-3.18: port missing libgudev dependencies

---
 .../gnome-3/3.18/core/gnome-control-center/default.nix        | 4 ++--
 .../gnome-3/3.18/core/gnome-settings-daemon/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix
index e7ed0c6bade85..eab991f90a22f 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-control-center/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
 , libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libxkbfile, libnotify
+, gdk_pixbuf, librsvg, libxkbfile, libnotify, libgudev
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , cracklib, python, libkrb5, networkmanagerapplet, networkmanager
 , libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
       accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
       shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
       gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.vino udev libcanberra_gtk3
+      gnome3.vino udev libcanberra_gtk3 libgudev
       networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
 
   preBuild = ''
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix
index 18a6bdf43bf13..99e1f596f184f 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-settings-daemon/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
 , libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libwacom, libxslt, libtool, networkmanager
+, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
 , docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
       libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
       libcanberra_gtk3 upower colord libgweather xkeyboard_config
-      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libwacom libxslt
+      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
       libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
 
   preFixup = ''

From b81515c2d422868de745ebb8989b67a243e674a4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 00:22:12 +0300
Subject: [PATCH 309/857] apacheHttpd_2_2: Fix setting installbuilddir

Otherwise mod_dnssd doesn't build.

Also move apxs to $dev.
---
 pkgs/servers/http/apache-httpd/2.2.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 515446bc9b9ec..9974e901a0245 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
     sha256 = "1b165zi7jrrlz5wmyy3b34lcs3dl4g0dymfb0qxwdnimylcrsbzk";
   };
 
+  # FIXME: -dev depends on -doc
   outputs = [ "dev" "out" "doc" ];
 
   buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++
@@ -33,6 +34,10 @@ stdenv.mkDerivation rec {
   # Required for ‘pthread_cancel’.
   NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s");
 
+  patchPhase = ''
+    sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
+  '';
+
   configureFlags = ''
     --with-z=${zlib}
     --with-pcre=${pcre}
@@ -48,11 +53,6 @@ stdenv.mkDerivation rec {
     --enable-mem-cache
   '';
 
-  preConfigure =
-    ''
-      makeFlagsArray+=("installbuilddir=$dev/share/build")
-    '';
-
   enableParallelBuilding = true;
 
   stripDebugList = "lib modules bin";
@@ -60,7 +60,8 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $doc/share/doc/httpd
     mv $out/manual $doc/share/doc/httpd
-    mkdir -p $out/share # FIXME, hack
+    mkdir -p $dev/bin
+    mv $out/sbin/apxs $dev/bin/apxs
   '';
 
   passthru = {

From 7a68c25baf2f4dfe64008bf3aae470429ca06055 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 00:34:54 +0300
Subject: [PATCH 310/857] apacheHttpd_2_2: Remove obsolete cruft

---
 pkgs/servers/http/apache-httpd/2.2.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 9974e901a0245..88e1475342c6e 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -26,11 +26,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++
     stdenv.lib.optional sslSupport openssl;
 
-  # An apr-util header file includes an apr header file
-  # through #include "" (quotes)
-  # passing simply CFLAGS did not help, then I go by NIX_CFLAGS_COMPILE
-  NIX_CFLAGS_COMPILE = "-iquote ${apr}/include/apr-1";
-
   # Required for ‘pthread_cancel’.
   NIX_LDFLAGS = (if stdenv.isDarwin then "" else "-lgcc_s");
 

From f302d78d6c8cbbcac418b8374445368931320c24 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 00:43:49 +0300
Subject: [PATCH 311/857] apacheHttpd_2_4: Port multiple-output changes from
 2.2

---
 pkgs/servers/http/apache-httpd/2.4.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 1ab3eaf03824f..aa155978ea33e 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -22,11 +22,18 @@ stdenv.mkDerivation rec {
     sha256 = "0hrpy6gjwma0kba7p7m61vwh82qcnkf08123lrwpg257m93hnrmc";
   };
 
+  # FIXME: -dev depends on -doc
+  outputs = [ "dev" "out" "doc" ];
+
   buildInputs = [perl] ++
     optional sslSupport openssl ++
     optional ldapSupport openldap ++    # there is no --with-ldap flag
     optional libxml2Support libxml2;
 
+  patchPhase = ''
+    sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
+  '';
+
   # Required for ‘pthread_cancel’.
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
@@ -48,13 +55,15 @@ stdenv.mkDerivation rec {
     ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
   '';
 
+  enableParallelBuilding = true;
+
   postInstall = ''
-    echo "removing manual"
-    rm -rf $out/manual
+    mkdir -p $doc/share/doc/httpd
+    mv $out/manual $doc/share/doc/httpd
+    mkdir -p $dev/bin
+    mv $out/bin/apxs $dev/bin/apxs
   '';
 
-  enableParallelBuilding = true;
-
   passthru = {
     inherit apr aprutil sslSupport proxySupport ldapSupport;
   };

From 58dfef27920780f83192987b46d8b47e2b045762 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 00:49:32 +0300
Subject: [PATCH 312/857] treewide: Fix references to apacheHttpd_2_*

---
 nixos/modules/services/web-servers/apache-httpd/default.nix  | 2 +-
 pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix | 4 ++--
 pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix | 4 ++--
 pkgs/top-level/perl-packages.nix                             | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 7350a6a68c707..9908aea1a66f1 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -6,7 +6,7 @@ let
 
   mainCfg = config.services.httpd;
 
-  httpd = mainCfg.package;
+  httpd = mainCfg.package.out;
 
   version24 = !versionOlder httpd.version "2.4";
 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
index 381f7d7c41685..cd02dcb821f84 100644
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
@@ -21,8 +21,8 @@ in stdenv.mkDerivation rec {
     sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
   '';
 
-  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd_2_2}/modules"
+  configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd"
+                     "--with-modules-path=${apacheHttpd_2_2.out}/modules"
                      "--disable-bluetooth"
                      "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix
index 49ad40912c66b..e8f6498350627 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-user-share/default.nix
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
     sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
   '';
 
-  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd_2_2}/modules"
+  configureFlags = [ "--with-httpd=${apacheHttpd_2_2.out}/bin/httpd"
+                     "--with-modules-path=${apacheHttpd_2_2.out}/modules"
                      "--disable-bluetooth"
                      "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 440bcbd8b8ebe..8b20ba12a231a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5956,7 +5956,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ ApacheTest ExtUtilsXSBuilder mod_perl2 pkgs.apacheHttpd pkgs.apr pkgs.aprutil ];
     propagatedBuildInputs = [ mod_perl2 ];
-    makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config";
+    makeMakerFlags = "--with-apache2-src=${pkgs.apacheHttpd} --with-apache2-apxs=${pkgs.apacheHttpd}/bin/apxs --with-apache2-httpd=${pkgs.apacheHttpd.out}/bin/httpd --with-apr-config=${pkgs.apr}/bin/apr-1-config --with-apu-config=${pkgs.aprutil}/bin/apu-1-config";
     preConfigure = ''
       # override broken prereq check
       substituteInPlace configure --replace "prereq_check=\"\$PERL \$PERL_OPTS build/version_check.pl\"" "prereq_check=\"echo\""

From 636b823cc1be6185b3361c3d86d64eca19837041 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 01:10:42 +0300
Subject: [PATCH 313/857] libcaca: Split into multiple outputs

---
 pkgs/development/libraries/libcaca/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/libcaca/default.nix b/pkgs/development/libraries/libcaca/default.nix
index c3059642382a9..7a905d9c82a64 100644
--- a/pkgs/development/libraries/libcaca/default.nix
+++ b/pkgs/development/libraries/libcaca/default.nix
@@ -11,10 +11,17 @@ stdenv.mkDerivation rec {
     sha256 = "1x3j6yfyxl52adgnabycr0n38j9hx2j74la0hz0n8cnh9ry4d2qj";
   };
 
+  outputs = [ "dev" "bin" "out" "man" ];
+
   configureFlags = "--disable-x11 --disable-imlib2 --disable-doc";
 
   propagatedBuildInputs = [ ncurses zlib ];
 
+  postInstall = ''
+    mkdir -p $dev/bin
+    mv $bin/bin/caca-config $dev/bin/caca-config
+  '';
+
   meta = {
     homepage = http://libcaca.zoy.org/;
     description = "A graphics library that outputs text instead of pixels";

From 31e1034800bff9f69d09d62a478252f314415f7d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 01:20:52 +0300
Subject: [PATCH 314/857] aalib: Split into multiple outputs

---
 pkgs/development/libraries/aalib/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index d7dcbeba330b6..fb8edd27bf8b6 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -8,16 +8,30 @@ stdenv.mkDerivation {
     sha256 = "1vkh19gb76agvh4h87ysbrgy82hrw88lnsvhynjf4vng629dmpgv";
   };
 
+  outputs = [ "dev" "out" "bin" "doc" ];
+  setOutputFlags = false; # Doesn't support all the flags
+
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+
   # The fuloong2f is not supported by aalib still
   preConfigure = ''
     cp ${automake}/share/automake*/config.{sub,guess} .
+    configureFlagsArray+=(
+      "--bindir=$bin/bin"
+      "--includedir=$dev/include"
+      "--libdir=$out/lib"
+    )
   '';
 
   buildInputs = [ ncurses ];
 
   configureFlags = "--without-x --with-ncurses=${ncurses}";
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin.patch ];
+  postInstall = ''
+    mkdir -p $dev/bin
+    mv $bin/bin/aalib-config $dev/bin/aalib-config
+    substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.lib}/lib"
+  '';
 
   meta = {
     description = "ASCII art graphics library";

From 3d59a8e1a8341d09689d4ace8765ae134c264fe7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 02:25:42 +0300
Subject: [PATCH 315/857] ncurses: Fix multiple-output flags

The old way resuts in literal '$(lib)' etc. in the pkg-config files.
---
 pkgs/development/libraries/ncurses/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 8de0fd44d308b..74b2156efd6be 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
     "--enable-overwrite"  # Needed for proper header installation
     "--enable-pc-files"
     "--enable-symlinks"
-    "--libdir=$(lib)/lib" "--includedir=$(dev)/include" "--bindir=$(dev)/bin" "--mandir=$(man)/share/man"
   ] ++ lib.optional unicode "--enable-widec";
 
   nativeBuildInputs = [ pkgconfig libtool ];
@@ -36,7 +35,13 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
-    configureFlagsArray+=("--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR")
+    configureFlagsArray+=(
+      "--libdir=$lib/lib"
+      "--includedir=$dev/include"
+      "--bindir=$dev/bin"
+      "--mandir=$man/share/man"
+      "--with-pkg-config-libdir=$PKG_CONFIG_LIBDIR"
+    )
   '' + lib.optionalString stdenv.isCygwin ''
     sed -i -e 's,LIB_SUFFIX="t,LIB_SUFFIX=",' configure
   '';

From 5f43846d238b726cde23b140b6a640f082c80868 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 21 Oct 2015 01:51:05 +0300
Subject: [PATCH 316/857] gst-plugins-good: Avoid ncurses headers reference

Incredibly, the package doesn't even directly depend on it!
---
 .../gstreamer/legacy/gst-plugins-good/default.nix          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 deca854008a04..25f530ecfef61 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, gst_plugins_base, aalib, cairo
 , flac, libjpeg, zlib, speex, libpng, libdv, libcaca, libvpx
 , libiec61883, libavc1394, taglib, libpulseaudio, gdk_pixbuf, orc
-, glib, gstreamer, bzip2, libsoup, libintlOrEmpty
+, glib, gstreamer, bzip2, libsoup, libintlOrEmpty, ncurses
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
   minimalDeps ? false
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \
+      --replace "${ncurses.dev}/lib" "${ncurses.lib}/lib"
+  '';
+
   meta = {
     homepage = http://gstreamer.freedesktop.org;
 

From 40a973f9623ffe75b103212d18412fd2e4ce83db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 11:34:02 +0100
Subject: [PATCH 317/857] gmp: split dev and info outputs, and disable static

Referrers should have been fixed in previous commits already.
---
 pkgs/development/libraries/gmp/6.x.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gmp/6.x.nix b/pkgs/development/libraries/gmp/6.x.nix
index 1fc869e01074a..bcb5ebbc141b5 100644
--- a/pkgs/development/libraries/gmp/6.x.nix
+++ b/pkgs/development/libraries/gmp/6.x.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, m4, cxx ? true, withStatic ? true }:
+{ stdenv, fetchurl, m4, cxx ? true, withStatic ? false }:
 
 with { inherit (stdenv.lib) optional optionalString; };
 
@@ -10,7 +10,12 @@ let self = stdenv.mkDerivation rec {
     sha256 = "1bwsfmf0vrx3rwl4xmi5jhhy3v1qx1xj0m7p9hb0fvcw9f09m3kz";
   };
 
+  #outputs TODO: split $cxx due to libstdc++ dependency; maybe port to gmp5;
+  # maybe let ghc use a version with *.so shared with rest of nixpkgs and *.a added
+  # - see #5855 for related discussion
+  outputs = [ "dev" "out" "info" ];
   passthru.static = self.out;
+
   nativeBuildInputs = [ m4 ];
 
   configureFlags =

From fd1619cf605fa2d9986ceac9d9e70fb0ca4817bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 11:48:50 +0100
Subject: [PATCH 318/857] yices: use correct static gmp

It still won't build due to trying to use /sbin/ldconfig,
but gmp-related things do seem OK.
---
 pkgs/applications/science/logic/yices/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix                   | 4 +++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix
index e1faac0fa41c7..f495ee257ff05 100644
--- a/pkgs/applications/science/logic/yices/default.nix
+++ b/pkgs/applications/science/logic/yices/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gmp, gperf, autoreconfHook }:
+{ stdenv, fetchurl, gmp-static, gperf, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name    = "yices-${version}";
@@ -10,10 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "1da70n0cah0dh3pk7fcrvjkszx9qmhc0csgl15jqa7bdh707k2zs";
   };
 
-  configureFlags = [ "--with-static-gmp=${gmp.static}/lib/libgmp.a"
-                     "--with-static-gmp-include-dir=${gmp.dev}/include"
+  configureFlags = [ "--with-static-gmp=${gmp-static.out}/lib/libgmp.a"
+                     "--with-static-gmp-include-dir=${gmp-static.dev}/include"
                    ];
-  buildInputs = [ gmp gperf autoreconfHook ];
+  buildInputs = [ gmp-static gperf autoreconfHook ];
 
   meta = {
     description = "A high-performance theorem prover and SMT solver";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a6ef1ed9d0cd..ffa1b6326aa9e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14474,7 +14474,9 @@ let
 
   why3 = callPackage ../applications/science/logic/why3 {};
 
-  yices = callPackage ../applications/science/logic/yices {};
+  yices = callPackage ../applications/science/logic/yices {
+    gmp-static = gmp.override { withStatic = true; };
+  };
 
   z3 = callPackage ../applications/science/logic/z3 {};
   z3_opt = callPackage ../applications/science/logic/z3_opt {};

From 30845d07d8110c034156407c71d71e22f92d194a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 11:45:32 +0100
Subject: [PATCH 319/857] pcre: separate variants of the library

- don't include the cxx variant in the default build,
  as it depends on libstdc++ (and it seems rarely used anyway)
- allow building pcre16 and pcre32 variants;
  pcre16 is the one needed by qt*, I think
- share the basic libs with all of the variants
---
 pkgs/development/libraries/pcre/default.nix | 30 ++++++++++++---------
 pkgs/top-level/all-packages.nix             |  8 ++----
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index cc6555792899d..fa4a640bd0b03 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -1,9 +1,11 @@
-{ stdenv, fetchurl, unicodeSupport ? true, cplusplusSupport ? true
-, windows ? null
+{ stdenv, fetchurl
+, windows ? null, variant ? null, pcre
 }:
 
 with stdenv.lib;
 
+assert elem variant [ null "cpp" "pcre16" "pcre32" ];
+
 stdenv.mkDerivation rec {
   name = "pcre-8.37";
 
@@ -19,26 +21,28 @@ stdenv.mkDerivation rec {
 
   outputs = [ "dev" "out" "bin" "doc" "man" ];
 
-  configureFlags = ''
-    --enable-jit
-    ${if unicodeSupport then "--enable-unicode-properties" else ""}
-    ${if !cplusplusSupport then "--disable-cpp" else ""}
-  '';
+  configureFlags = [
+    "--enable-jit"
+    "--enable-unicode-properties"
+    "--disable-cpp"
+  ]
+    ++ optional (variant != null) "--enable-${variant}";
 
   doCheck = with stdenv; !(isCygwin || isFreeBSD);
     # XXX: test failure on Cygwin
     # we are running out of stack on both freeBSDs on Hydra
 
+  postFixup = ''
+    _moveToOutput bin/pcre-config "$dev"
+  ''
+    + optionalString (variant != null) ''
+    ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.so.*.*.*
+  '';
+
   crossAttrs = optionalAttrs (stdenv.cross.libc == "msvcrt") {
     buildInputs = [ windows.mingw_w64_pthreads.crossDrv ];
   };
 
-  postInstall =
-    ''
-      mkdir $dev/bin
-      mv $bin/bin/pcre-config $dev/bin/
-    '';
-
   meta = {
     homepage = "http://www.pcre.org/";
     description = "A library for Perl Compatible Regular Expressions";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ffa1b6326aa9e..f5936c47889b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7800,9 +7800,7 @@ let
     vtk = vtkWithQt4;
   };
 
-  pcre = callPackage ../development/libraries/pcre {
-    unicodeSupport = config.pcre.unicode or true;
-  };
+  pcre = callPackage ../development/libraries/pcre { };
 
   pdf2xml = callPackage ../development/libraries/pdf2xml {} ;
 
@@ -11545,9 +11543,7 @@ let
 
   inherit (gnome3) gitg;
 
-  giv = callPackage ../applications/graphics/giv {
-    pcre = pcre.override { unicodeSupport = true; };
-  };
+  giv = callPackage ../applications/graphics/giv { };
 
   gmrun = callPackage ../applications/misc/gmrun {};
 

From 55b7d3a181f644586bfc4c6ee5be0dd2a213a733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 11:52:23 +0100
Subject: [PATCH 320/857] glib: fixup output paths and use system pcre

Now pcre costs us <0.5 MB and using internal one would cost ~0.2 MB,
so if we take into account that pcre is often used, e.g. by grep...
---
 pkgs/development/libraries/glib/default.nix   | 15 +++++----
 pkgs/development/libraries/glib/setup-hook.sh | 32 ++++++-------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index ae64f1f68e086..6b6b39848e200 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -31,12 +31,12 @@ let
   # This is intended to be run in postInstall of any package
   # which has $out/include/ containing just some disjunct directories.
   flattenInclude = ''
-    for dir in "$out"/include/*; do
-      cp -r "$dir"/* "$out/include/"
+    for dir in "''${!outputInclude}"/include/*; do
+      cp -r "$dir"/* "''${!outputInclude}/include/"
       rm -r "$dir"
       ln -s . "$dir"
     done
-    ln -sr -t "$out/include/" "$out"/lib/*/include/* 2>/dev/null || true
+    ln -sr -t "''${!outputInclude}/include/" "''${!outputInclude}"/lib/*/include/* 2>/dev/null || true
   '';
 
   ver_maj = "2.46";
@@ -53,20 +53,21 @@ stdenv.mkDerivation rec {
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" "docdev" ];
   outputBin = "dev";
 
   setupHook = ./setup-hook.sh;
 
-  buildInputs = [ libelf setupHook/*get the gtk-doc hook*/ ]
+  buildInputs = [ libelf setupHook pcre ]
     ++ optionals doCheck [ tzdata libxml2 desktop_file_utils shared_mime_info ];
 
   nativeBuildInputs = [ pkgconfig gettext perl python ];
 
-  propagatedBuildInputs = [ zlib libffi libiconv /*pcre*/ ]
+  propagatedBuildInputs = [ zlib libffi libiconv ]
     ++ libintlOrEmpty;
 
-  configureFlags = [ ] # [ "--with-pcre=system" ] # internal pcre only adds <200kB
+  # internal pcre would only add <200kB, but it's relatively common
+  configureFlags = [ "--with-pcre=system" ]
     ++ optional stdenv.isDarwin "--disable-compile-warnings"
     ++ optional stdenv.isSunOS "--disable-modular-tests";
 
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh
index 5ead702f00698..c5cf293902cd4 100644
--- a/pkgs/development/libraries/glib/setup-hook.sh
+++ b/pkgs/development/libraries/glib/setup-hook.sh
@@ -1,5 +1,3 @@
-# Install gschemas, if any, in a package-specific directory
-installFlagsArray+=("gsettingsschemadir=$out/share/gsettings-schemas/$name/glib-2.0/schemas/")
 
 make_glib_find_gsettings_schemas() {
     # For packages that need gschemas of other packages (e.g. empathy)
@@ -7,32 +5,22 @@ make_glib_find_gsettings_schemas() {
         addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"*
     fi
 }
-
 envHooks+=(make_glib_find_gsettings_schemas)
 
+# Install gschemas, if any, in a package-specific directory
+glibPreInstallPhase() {
+  installFlagsArray+=("gsettingsschemadir=${!outputLib}/share/gsettings-schemas/$name/glib-2.0/schemas/")
+}
+preInstallPhases+=(glibPreInstallPhase)
+
 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/"
+    if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then
+        mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0"
+        mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/"
     fi
 
-    addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name"
+    addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name"
 }
-
 preFixupPhases+=(glibPreFixupPhase)
 
-
-preFixupHooks+=(_multioutGtkDocs)
-
-# Move documentation to the desired outputs.
-_multioutGtkDocs() {
-    if [ "$outputs" = "out" ]; then return; fi;
-    _moveToOutput share/gtk-doc "${!outputDoc}"
-
-    # Remove empty share directory.
-    if [ -d "$out/share" ]; then
-        rmdir "$out/share" 2> /dev/null || true
-    fi
-}
-

From dd6912a95e63dcedf1f84f2051ee9c597163fa48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 11:59:42 +0100
Subject: [PATCH 321/857] gobject-introspection: auto-move *.gir into $dev

---
 .../libraries/gobject-introspection/default.nix          | 9 +++++----
 .../libraries/gobject-introspection/setup-hook.sh        | 7 +++++++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 2de0d23d21373..1a2ba3db29a96 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -15,10 +15,13 @@ stdenv.mkDerivation rec {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
     sha256 = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233";
   };
+  patches = [ ./absolute_shlib_path.patch ];
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
+  outputMan = "dev"; # tiny pages
 
-  buildInputs = [ flex bison pkgconfig python ]
+  buildInputs = [ flex bison pkgconfig python setupHook/*move .gir*/ ]
     ++ libintlOrEmpty
     ++ stdenv.lib.optional stdenv.isDarwin otool;
   propagatedBuildInputs = [ libffi glib ];
@@ -37,8 +40,6 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  patches = [ ./absolute_shlib_path.patch ];
-
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
     homepage    = http://live.gnome.org/GObjectIntrospection;
diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
index d411ad69dc43f..78a8ccf19d34e 100644
--- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh
+++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
@@ -12,3 +12,10 @@ make_gobject_introspection_find_gir_files() {
 }
 
 envHooks+=(make_gobject_introspection_find_gir_files)
+
+_multioutMoveGlibGir() {
+  _moveToOutput share/gir-1.0 "${!outputDev}"
+}
+
+preFixupHooks+=(_multioutMoveGlibGir)
+

From a0ce1b48ed9666d62b65806d21a0b40aaba7af38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 12:02:01 +0100
Subject: [PATCH 322/857] dbus: fix build of dbus without x11Support

---
 pkgs/development/libraries/dbus/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index b569fc187e285..7dbc76456fdb2 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -53,7 +53,8 @@ self =  stdenv.mkDerivation {
 
     # Enable X11 autolaunch support in libdbus. This doesn't actually depend on X11
     # (it just execs dbus-launch in dbus.tools), contrary to what the configure script demands.
-    NIX_CFLAGS_COMPILE = "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
+    # problems building without x11Support so disabled in that case for now
+    NIX_CFLAGS_COMPILE = lib.optionalString x11Support "-DDBUS_ENABLE_X11_AUTOLAUNCH=1";
     NIX_CFLAGS_LINK = lib.optionalString (!stdenv.isDarwin) "-Wl,--as-needed";
 
     enableParallelBuilding = true;

From 91329b5c0ab279bb428ad5fb6b3057010194fcdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 12:05:37 +0100
Subject: [PATCH 323/857] gdk-pixbuf: reduce unnecessary outputs

Also some other minor changes.
---
 .../libraries/gdk-pixbuf/default.nix          | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index ca0b773ed2866..7ff8eae646041 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -13,16 +13,17 @@ stdenv.mkDerivation rec {
     sha256 = "0rqvj5gcs2zfyyg9llm289b0xkj4mrhzxfjpjja0wx1m6vn5axjk";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "docdev" ];
+  outputBin = "dev";
 
   setupHook = ./setup-hook.sh;
 
   enableParallelBuilding = true;
 
   # !!! We might want to factor out the gdk-pixbuf-xlib subpackage.
-  buildInputs = [ libX11 libintlOrEmpty ];
+  buildInputs = [ libX11 gobjectIntrospection ] ++ libintlOrEmpty;
 
-  nativeBuildInputs = [ pkgconfig gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ glib libtiff libjpeg libpng jasper ];
 
@@ -33,16 +34,11 @@ stdenv.mkDerivation rec {
   # The tests take an excessive amount of time (> 1.5 hours) and memory (> 6 GB).
   inherit (doCheck);
 
-  # propagate the bin output TODO: use propagatedOutputs instead
-  postPhases = "postPostFixup";
-  postPostFixup = ''
-    echo -n " $bin" >> "$dev"/nix-support/propagated-*build-inputs
-  '';
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A library for image loading and manipulation";
     homepage = http://library.gnome.org/devel/gdk-pixbuf/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ maintainers.eelco ];
+    platforms = platforms.unix;
   };
 }
+

From 8e73a7bf53ae140c245f0857590767ece548a357 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 12:07:52 +0100
Subject: [PATCH 324/857] gtk3: revise dependencies, xlibs -> xorg

---
 pkgs/development/libraries/gtk+/3.x.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 2e8ac57ba9213..a28fc84a7fe15 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -5,7 +5,6 @@
 , cupsSupport ? stdenv.isLinux, cups ? null
 }:
 
-assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 let
@@ -26,14 +25,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
 
-  buildInputs = [ libxkbcommon epoxy ];
-  propagatedBuildInputs = with xlibs; with stdenv.lib;
-    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk libXrandr libXrender libXcomposite libXi libXcursor ]
+  buildInputs = [ libxkbcommon epoxy json_glib ];
+  propagatedBuildInputs = with xorg; with stdenv.lib;
+    [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
+      libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
     ++ optionals stdenv.isLinux [ wayland ]
     ++ optional xineramaSupport libXinerama
     ++ optional cupsSupport cups;
+  #TODO: colord?
 
-  NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 
   # demos fail to install, no idea where's the problem
   preConfigure = "sed '/^SRC_SUBDIRS /s/demos//' -i Makefile.in";
@@ -41,7 +42,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    rm -rf $out/share/gtk-doc
     substituteInPlace "$out/lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la" \
       --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
   '';
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     ''; # workaround for bug of nix-mode for Emacs */ '';
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A multi-platform toolkit for creating graphical user interfaces";
 
     longDescription = ''
@@ -69,9 +69,9 @@ stdenv.mkDerivation rec {
 
     homepage = http://www.gtk.org/;
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = licenses.lgpl2Plus;
 
-    maintainers = with stdenv.lib.maintainers; [ urkud raskin vcunat lethalman ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with maintainers; [ urkud raskin vcunat lethalman ];
+    platforms = platforms.all;
   };
 }

From deda7f46c74b5a9c785b6798e3a3d95879345197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 12:43:35 +0100
Subject: [PATCH 325/857] libunwind: fix bad liblzma.la reference, split dev
 output

---
 pkgs/development/libraries/libunwind/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libunwind/default.nix b/pkgs/development/libraries/libunwind/default.nix
index 3fc8b50855901..da09e2fcbe25d 100644
--- a/pkgs/development/libraries/libunwind/default.nix
+++ b/pkgs/development/libraries/libunwind/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sed -i -e '/LIBLZMA/s:-lzma:-llzma:' configure
   '';
 
+  outputs = [ "dev" "out" ];
+
   propagatedBuildInputs = [ xz ];
 
   NIX_CFLAGS_COMPILE = if stdenv.system == "x86_64-linux" then "-fPIC" else "";
@@ -30,7 +32,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     find $out -name \*.la | while read file; do
-      sed -i 's,-llzma,${xz}/lib/liblzma.la,' $file
+      sed -i 's,-llzma,${xz.out}/lib/liblzma.la,' $file
     done
   '';
 

From 1d921ad3a7dfd8b3edd2e8005acfe170a6d41603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 13:30:50 +0100
Subject: [PATCH 326/857] cmake-2.8: fix build with multiple outputs

---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index 60a941a66375f..80fdce59607be 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -47,8 +47,9 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = optional wantPS ps;
 
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":" buildInputs;
-  
+  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":"
+    (concatMap (p: [ p p.out ]) buildInputs);
+
   configureFlags =
     "--docdir=/share/doc/${name} --mandir=/share/man --system-libs"
     + stdenv.lib.optionalString useQt4 " --qt-gui";

From 17b86fef1efb6c0939d1acee2078d2f24dffb8cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 14:15:44 +0100
Subject: [PATCH 327/857] libva: build a lighter version by default

Mesa, X etc. are not very light dependencies.
This will also allow us to break the cycle with mesa.
---
 pkgs/development/libraries/gstreamer/default.nix   |  7 +++++--
 .../libraries/gstreamer/vaapi/default.nix          |  8 +++++---
 pkgs/development/libraries/libav/default.nix       |  2 +-
 pkgs/development/libraries/libva/default.nix       | 13 ++++++++++---
 pkgs/top-level/all-packages.nix                    | 14 +++++++++-----
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 7d349f31e044c..07ce30d631955 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -1,4 +1,4 @@
-{ callPackage }:
+{ callPackage, libva-full }:
 
 rec {
   gstreamer = callPackage ./core { };
@@ -17,5 +17,8 @@ rec {
 
   gst-editing-services = callPackage ./ges { inherit gnonlin; };
 
-  gst-vaapi = callPackage ./vaapi { inherit gst-plugins-base gstreamer gst-plugins-bad; };
+  gst-vaapi = callPackage ./vaapi {
+    inherit gst-plugins-base gstreamer gst-plugins-bad;
+    libva = libva-full; # looks also for libva-{x11,wayland}
+  };
 }
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 349b5093a3b16..93c9b9a59b99d 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva
+{ stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland
 , libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm
 , libvpx
 }:
@@ -14,8 +14,10 @@ stdenv.mkDerivation rec {
 
   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 ];
+  buildInputs = [
+    gstreamer gst-plugins-base gst-plugins-bad libva wayland 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
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index 5b1aa2f42846c..a3d2d3fde3039 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -7,7 +7,7 @@
 , x264Support   ? false,  x264      ? null
 , xvidSupport   ? true,   xvidcore  ? null
 , faacSupport   ? false,  faac      ? null
-, vaapiSupport  ? false,  libva     ? null # ToDo: it has huge closure
+, vaapiSupport  ? true,   libva     ? null
 , vdpauSupport  ? true,   libvdpau  ? null
 , freetypeSupport ? true, freetype  ? null # it's small and almost everywhere
 , SDL # only for avplay in $bin, adds nontrivial closure to it
diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 12de07ced32d8..ff44b157eaff5 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
-, mesa ? null
+, mesa_noglu
+, minimal ? true, libva
 }:
 
 stdenv.mkDerivation rec {
@@ -10,9 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz";
   };
 
-  buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];
+  outputs = [ "dev" "out" "bin" ];
 
-  configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx";
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libdrm ]
+    ++ stdenv.lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ];
+  # TODO: share libs between minimal and !minimal - perhaps just symlink them
+
+  #configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx";
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5936c47889b1..76de3c302648a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6365,9 +6365,7 @@ let
 
   gperftools = callPackage ../development/libraries/gperftools { };
 
-  gst_all_1 = recurseIntoAttrs(callPackage ../development/libraries/gstreamer {
-    callPackage = pkgs.newScope (pkgs // { inherit (pkgs) libav; });
-  });
+  gst_all_1 = recurseIntoAttrs (callPackage ../development/libraries/gstreamer { });
 
   gst_all = {
     inherit (pkgs) gstreamer gnonlin gst_python qt_gstreamer;
@@ -7430,6 +7428,7 @@ let
   });
 
   libva = callPackage ../development/libraries/libva { };
+  libva-full = libva.override { minimal = false; };
 
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
@@ -8350,9 +8349,13 @@ let
     inherit (pythonPackages) gyp;
   };
 
-  vaapiIntel = callPackage ../development/libraries/vaapi-intel { };
+  vaapiIntel = callPackage ../development/libraries/vaapi-intel {
+    libva = libva-full; # also wants libva-{x11,drm,wayland}
+  };
 
-  vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau { };
+  vaapiVdpau = callPackage ../development/libraries/vaapi-vdpau {
+    libva = libva-full; # needs libva-{x11,glx}
+  };
 
   vamp = callPackage ../development/libraries/audio/vamp { };
 
@@ -13092,6 +13095,7 @@ let
 
   vlc = callPackage ../applications/video/vlc {
     ffmpeg = ffmpeg_2;
+    libva = libva-full; # also wants libva-x11
   };
 
   vlc_qt5 = qt5Libs.vlc;

From 787f322540cf37c871454d14f8498b71027355dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 18:56:00 +0100
Subject: [PATCH 328/857] $docdev fixups: mostly to avoid empty output

... after auto-removing some kinds of files by default.
In some cases I let them be removed and in others I let them be put into
$docdev. That was more due to general indecisiveness on this question
than any reasons in the particular cases.
---
 pkgs/desktops/xfce/core/exo.nix                       | 2 +-
 pkgs/desktops/xfce/core/garcon.nix                    | 2 +-
 pkgs/desktops/xfce/core/libxfce4ui.nix                | 2 +-
 pkgs/desktops/xfce/core/libxfce4util.nix              | 2 +-
 pkgs/desktops/xfce/core/libxfcegui4.nix               | 2 +-
 pkgs/desktops/xfce/core/tumbler.nix                   | 2 +-
 pkgs/desktops/xfce/core/xfce4-panel.nix               | 2 +-
 pkgs/desktops/xfce/core/xfconf.nix                    | 2 +-
 pkgs/development/compilers/orc/default.nix            | 2 +-
 pkgs/development/libraries/SDL/default.nix            | 2 +-
 pkgs/development/libraries/at-spi2-core/default.nix   | 2 +-
 pkgs/development/libraries/atk/default.nix            | 2 +-
 pkgs/development/libraries/dbus-glib/default.nix      | 2 +-
 pkgs/development/libraries/gmime/default.nix          | 2 +-
 pkgs/development/libraries/gtk+/2.x.nix               | 4 ++--
 pkgs/development/libraries/harfbuzz/default.nix       | 2 +-
 pkgs/development/libraries/libidn/default.nix         | 4 +---
 pkgs/development/libraries/libmicrohttpd/default.nix  | 2 +-
 pkgs/development/libraries/liboil/default.nix         | 2 +-
 pkgs/development/libraries/libqmi/default.nix         | 2 +-
 pkgs/development/libraries/libssh2/default.nix        | 2 +-
 pkgs/development/libraries/libtasn1/default.nix       | 2 +-
 pkgs/development/libraries/libtheora/default.nix      | 3 ++-
 pkgs/development/libraries/libxklavier/default.nix    | 2 +-
 pkgs/development/libraries/p11-kit/default.nix        | 2 +-
 pkgs/development/libraries/pango/default.nix          | 2 +-
 pkgs/development/libraries/poppler/default.nix        | 2 +-
 pkgs/development/libraries/schroedinger/default.nix   | 2 +-
 pkgs/development/perl-modules/generic/builder.sh      | 6 ------
 pkgs/development/perl-modules/generic/default.nix     | 2 +-
 pkgs/development/python-modules/pygobject/default.nix | 2 +-
 pkgs/servers/x11/xorg/overrides.nix                   | 8 ++++----
 pkgs/tools/networking/curl/default.nix                | 2 +-
 33 files changed, 37 insertions(+), 44 deletions(-)

diff --git a/pkgs/desktops/xfce/core/exo.nix b/pkgs/desktops/xfce/core/exo.nix
index c8fe6f063fd7d..4d3f09105433c 100644
--- a/pkgs/desktops/xfce/core/exo.nix
+++ b/pkgs/desktops/xfce/core/exo.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
     # lib/xfce4/exo-1/exo-compose-mail-1 is a perl script :-/
 
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/xfce/core/garcon.nix b/pkgs/desktops/xfce/core/garcon.nix
index 3b57a2bb767d6..4fffc9e1ec9f8 100644
--- a/pkgs/desktops/xfce/core/garcon.nix
+++ b/pkgs/desktops/xfce/core/garcon.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0wm9pjbwq53s3n3nwvsyf0q8lbmhiy2ln3bn5ncihr9vf5cwhzbq";
   };
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" ];
 
   buildInputs = [ pkgconfig intltool glib libxfce4util gtk libxfce4ui ];
 
diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
index 807842218aa00..87a7ada9e480c 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "3d619811bfbe7478bb984c16543d980cadd08586365a7bc25e59e3ca6384ff43";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util xfconf libglade
diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix
index 2f5b7f880f2a0..cab904f551070 100644
--- a/pkgs/desktops/xfce/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce/core/libxfce4util.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "07c8r3xwx5is298zk77m3r784gmr5y4mh8bbca5zdjqk5vxdwsw7";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # just dev-doc
+  outputs = [ "dev" "out" "docdev" ];
 
   buildInputs = [ pkgconfig glib intltool ];
 
diff --git a/pkgs/desktops/xfce/core/libxfcegui4.nix b/pkgs/desktops/xfce/core/libxfcegui4.nix
index 86c3bea176b2d..d9e5cce25e852 100644
--- a/pkgs/desktops/xfce/core/libxfcegui4.nix
+++ b/pkgs/desktops/xfce/core/libxfcegui4.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0cs5im0ib0cmr1lhr5765yliqjfyxvk4kwy8h1l8bn3mj6bzk0ib";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   #TODO: gladeui
   # By default, libxfcegui4 tries to install into libglade's prefix.
diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix
index a09dfaa7a54fc..132003d3fc920 100644
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ b/pkgs/desktops/xfce/core/tumbler.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0wvip28gm2w061hn84zp2q4dv947ihylrppahn4cjspzff935zfh";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   buildInputs = [
     pkgconfig intltool dbus_glib gdk_pixbuf curl freetype
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index 5a46af4ce1785..eb3c0fb83349f 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   patches = [ ./xfce4-panel-datadir.patch ];
   patchFlags = "-p1";
 
-  outputs = [ "dev" "out" "doc" ]; # just dev-doc
+  outputs = [ "dev" "out" "docdev" ];
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util exo libwnck
diff --git a/pkgs/desktops/xfce/core/xfconf.nix b/pkgs/desktops/xfce/core/xfconf.nix
index f17027f988409..13902fa4428c7 100644
--- a/pkgs/desktops/xfce/core/xfconf.nix
+++ b/pkgs/desktops/xfce/core/xfconf.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mmi0g30aln3x98y5p507g17pipq0dj0bwypshan8cq5hkmfl44r";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # TODO: dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   #TODO: no perl bingings yet (ExtUtils::Depends, ExtUtils::PkgConfig, Glib)
   buildInputs = [ pkgconfig intltool glib libxfce4util ];
diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix
index 763b161aa9ec7..22fb400a1ea59 100644
--- a/pkgs/development/compilers/orc/default.nix
+++ b/pkgs/development/compilers/orc/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn";
   };
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" ];
   outputBin = "dev"; # compilation tools
 
   postInstall = ''
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 0a1e1a3e89afd..0d0ed70bc1e3b 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     sha256 = "005d993xcac8236fpvd1iawkz4wqjybkpn8dbwaliqz5jfkidlyn";
   };
 
-  outputs = [ "dev" "out" "man" ];
+  outputs = [ "dev" "out" ];
   outputBin = "dev"; # sdl-config
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/at-spi2-core/default.nix b/pkgs/development/libraries/at-spi2-core/default.nix
index 256865aefb9d9..a4707ef433428 100644
--- a/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/pkgs/development/libraries/at-spi2-core/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "0xna0gnlqvzy6209klirywcm7ianazshg6pkk828g07bnrywgvhs";
   };
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" ];
 
   buildInputs = [
     python pkgconfig popt  intltool dbus_glib
diff --git a/pkgs/development/libraries/atk/default.nix b/pkgs/development/libraries/atk/default.nix
index fbfb5765996b6..14e2e71c0bd0b 100644
--- a/pkgs/development/libraries/atk/default.nix
+++ b/pkgs/development/libraries/atk/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" ];
 
   buildInputs = libintlOrEmpty;
 
diff --git a/pkgs/development/libraries/dbus-glib/default.nix b/pkgs/development/libraries/dbus-glib/default.nix
index 1d91faa681756..59d227f0e8689 100644
--- a/pkgs/development/libraries/dbus-glib/default.nix
+++ b/pkgs/development/libraries/dbus-glib/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # "dev-doc" only
+  outputs = [ "dev" "out" "docdev" ];
   outputBin = "dev";
 
   nativeBuildInputs = [ pkgconfig gettext ];
diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 93bad0059b74c..ee81aec07976d 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0rfzbgsh8ira5p76kdghygl5i3fvmmx4wbw5rp7f8ajc4vxp18g0";
   };
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" ];
 
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib zlib libgpgerror ];
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index c04a1e0b4cc50..daa2cb1efb4c5 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mj6xn40py9r9lvzg633fal81xfwfm89d9mvz7jk4lmwk0g49imj";
   };
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" "docdev" ];
   outputBin = "dev";
 
   enableParallelBuilding = true;
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     else "--with-xinput=yes";
 
   postInstall = ''
-    _moveToOutput share/gtk-2.0/demo "$doc"
+    _moveToOutput share/gtk-2.0/demo "$docdev"
   '';
 
   passthru = {
diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 6ee88f6ea4fb8..789a584d1ef9e 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
     sha256 = "1xrxlrvgyr6mm9qjxmkif2kvcah082y94gf1vqi0f0bdl1g8gp7b";
   };
 
-  outputs = [ "dev" "out" "doc" ];
+  outputs = [ "dev" "out" ];
   outputBin = "dev";
 
   configureFlags = [
diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix
index 625da63084c3e..19e8f38b3735c 100644
--- a/pkgs/development/libraries/libidn/default.nix
+++ b/pkgs/development/libraries/libidn/default.nix
@@ -8,12 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "1xf4hphhahcjm2xwx147lfpsavjwv9l4c2gf6hx71zxywbz5lpds";
   };
 
-  outputs = [ "dev" "out" "bin" "info" "doc" ]; # $doc has just man3
+  outputs = [ "dev" "out" "bin" "info" "docdev" ];
 
   doCheck = ! stdenv.isDarwin;
 
-  postFixup = ''_moveToOutput share/man/man1 "$bin" '';
-
   meta = {
     homepage = http://www.gnu.org/software/libidn/;
     description = "Library for internationalized domain names";
diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix
index 0a056518adbe5..f6cd283d424d1 100644
--- a/pkgs/development/libraries/libmicrohttpd/default.nix
+++ b/pkgs/development/libraries/libmicrohttpd/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "17q6v5q0jpg57vylby6rx1qkil72bdx8gij1g9m694gxf5sb6js1";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only, I think
+  outputs = [ "dev" "out" "docdev" ];
 
   buildInputs = [ libgcrypt ];
 
diff --git a/pkgs/development/libraries/liboil/default.nix b/pkgs/development/libraries/liboil/default.nix
index 597d96e187c37..754e308ac15ba 100644
--- a/pkgs/development/libraries/liboil/default.nix
+++ b/pkgs/development/libraries/liboil/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./x86_64-cpuid.patch ];
 
-  outputs = [ "dev" "out" "doc" ]; # just dev-doc
+  outputs = [ "dev" "out" "docdev" ];
   outputBin = "dev"; # oil-bugreport
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix
index 47cc353bbd9c7..82768cd350dd9 100644
--- a/pkgs/development/libraries/libqmi/default.nix
+++ b/pkgs/development/libraries/libqmi/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "101ppan2q1h4pyp2zbn9b8sdwy2c7fk9rp91yykxz3afrvzbymq8";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   preBuild = ''
     patchShebangs .
diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 4d66654c9a8fb..884109ea6db4e 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # it's dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   buildInputs = [ openssl zlib ];
 
diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix
index a7007da3a0163..5ac8cc94d044b 100644
--- a/pkgs/development/libraries/libtasn1/default.nix
+++ b/pkgs/development/libraries/libtasn1/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1j8iixynchziw1y39lnibyl5h81m4p78w3i4f28q2vgwjgf801x4";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # it's dev-doc only, lots of it
+  outputs = [ "dev" "out" "docdev" ];
   outputBin = "dev";
 
   buildInputs = [ perl texinfo ];
diff --git a/pkgs/development/libraries/libtheora/default.nix b/pkgs/development/libraries/libtheora/default.nix
index 2f2a85d670e66..129dface2d938 100644
--- a/pkgs/development/libraries/libtheora/default.nix
+++ b/pkgs/development/libraries/libtheora/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0swiaj8987n995rc7hw0asvpwhhzpjiws8kr3s6r44bqqib2k5a0";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
+  outputDoc = "docdev";
 
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs = [ libogg libvorbis ];
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 59445f0e89fb0..f074b31bb6820 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     sha256 = "016lpdv35z0qsw1cprdc2k5qzkdi5waj6qmr0a2q6ljn9g2kpv7b";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   # TODO: enable xmodmap support, needs xmodmap DB
   propagatedBuildInputs = with xorg; [ libX11 libXi xkeyboard_config libxml2 libICE glib libxkbfile isocodes ];
diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix
index e3bb518cf2054..f2a9bdc123097 100644
--- a/pkgs/development/libraries/p11-kit/default.nix
+++ b/pkgs/development/libraries/p11-kit/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1i3a1wdpagm0p3y1bwaz5x5rjhcpqbcrnhkcp10p259vkxk72wz5";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # only dev-doc
+  outputs = [ "dev" "out" "docdev" ];
   outputBin = "dev";
 
   buildInputs = [ pkgconfig libffi libtasn1 libiconv ];
diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index cfa5aadd0f916..e213fa56a7cc4 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     sha256 = "0v12gi7f01iq3z852pclpnmkbcksbvpcmiazmklkx1dd9fbpakhx";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "bin" "docdev" ];
 
   buildInputs = [ gobjectIntrospection ];
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 92777f001695c..ebcdcc2b3efdf 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  outputs = [ "out" ] ++ lib.optional (!minimal) "doc";
+  outputs = [ "dev" "out" ];
 
   patches = [ ./datadir_env.patch ];
 
diff --git a/pkgs/development/libraries/schroedinger/default.nix b/pkgs/development/libraries/schroedinger/default.nix
index f47ce4e2e46ca..2df7d05189425 100644
--- a/pkgs/development/libraries/schroedinger/default.nix
+++ b/pkgs/development/libraries/schroedinger/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "04prr667l4sn4zx256v1z36a0nnkxfdqyln48rbwlamr6l3jlmqy";
   };
 
-  outputs = [ "dev" "out" "doc" ]; # dev-doc only
+  outputs = [ "dev" "out" "docdev" ];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ orc ];
diff --git a/pkgs/development/perl-modules/generic/builder.sh b/pkgs/development/perl-modules/generic/builder.sh
index d657a6ccc988e..9ee8be87c028d 100644
--- a/pkgs/development/perl-modules/generic/builder.sh
+++ b/pkgs/development/perl-modules/generic/builder.sh
@@ -28,12 +28,6 @@ preConfigure() {
     perl Makefile.PL PREFIX=$out INSTALLDIRS=site $makeMakerFlags
 }
 
-preFixup() {
-    if [ -n "$man" ]; then
-        mkdir -p $man/share
-        if [ -d $out/man ]; then mv $out/man $man/share/; fi
-    fi
-}
 
 postFixup() {
     # If a user installs a Perl package, she probably also wants its
diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix
index bf41f4d394595..91a004a7f686f 100644
--- a/pkgs/development/perl-modules/generic/default.nix
+++ b/pkgs/development/perl-modules/generic/default.nix
@@ -4,7 +4,7 @@ perl:
 
 perl.stdenv.mkDerivation (
   {
-    outputs = [ "out" "man" ];
+    outputs = [ "out" "docdev" ];
 
     doCheck = true;
 
diff --git a/pkgs/development/python-modules/pygobject/default.nix b/pkgs/development/python-modules/pygobject/default.nix
index 6f71393304079..897210a4046c9 100644
--- a/pkgs/development/python-modules/pygobject/default.nix
+++ b/pkgs/development/python-modules/pygobject/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "1f5dfxjnil2glfwxnqr14d2cjfbkghsbsn8n04js2c2icr7iv2pv";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" "docdev" ];
 
   configureFlags = "--disable-introspection";
 
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 9f84009a55f72..c4f386b18d402 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -128,7 +128,7 @@ in
     '';
     propagatedBuildInputs = [ xorg.libSM ];
     CPP = stdenv.lib.optionalString stdenv.isDarwin "clang -E -";
-    outputs = [ "dev" "out" "doc" ]; # "dev-doc" only (incl. man pages)
+    outputs = [ "dev" "out" "docdev" ];
   };
 
   # See https://bugs.freedesktop.org/show_bug.cgi?id=47792
@@ -151,7 +151,7 @@ in
   };
 
   libXaw = attrs: attrs // {
-    outputs = [ "dev" "out" "doc" ]; # just dev-doc
+    outputs = [ "dev" "out" "docdev" ];
     propagatedBuildInputs = [ xorg.libXmu ];
   };
 
@@ -213,11 +213,11 @@ in
   };
 
   libXres = attrs: attrs // {
-    outputs = [ "dev" "out" "doc" ]; # just dev-doc
+    outputs = [ "dev" "out" "docdev" ];
   };
 
   libXv = attrs: attrs // {
-    outputs = [ "dev" "out" "doc" ]; # just dev-doc
+    outputs = [ "dev" "out" "docdev" ];
   };
 
   libXvMC = attrs: attrs // {
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 5a134e572ae95..288b2d0863d53 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     sha256 = "050q6i20lbh7dyyhva2sbp8dbyp6sghlkbpvq2bvcasqwsx4298y";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" ]; # man3 is "dev-doc"
+  outputs = [ "dev" "out" "bin" "man" "docdev" ];
 
   nativeBuildInputs = [ pkgconfig ];
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains

From 21eb255af9fdc49770f6b1b35d236927bf393d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 19:20:11 +0100
Subject: [PATCH 329/857] libwnck*: split "dev" and "docdev" outputs

---
 pkgs/development/libraries/libwnck/3.x.nix     | 3 +++
 pkgs/development/libraries/libwnck/default.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
index 6c6c0812c43c3..a763af96667b8 100644
--- a/pkgs/development/libraries/libwnck/3.x.nix
+++ b/pkgs/development/libraries/libwnck/3.x.nix
@@ -8,6 +8,9 @@ stdenv.mkDerivation {
     sha256 = "d48ac9c7f50c0d563097f63d07bcc83744c7d92a1b4ef65e5faeab32b5ccb723";
   };
 
+  outputs = [ "dev" "out" "docdev" ];
+  outputBin = "dev";
+
   patches = [ ./install_introspection_to_prefix.patch ];
 
   buildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/development/libraries/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
index 6a4479bdda38c..bb5258120494d 100644
--- a/pkgs/development/libraries/libwnck/default.nix
+++ b/pkgs/development/libraries/libwnck/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "17isfjvrzgj5znld2a7zsk9vd39q9wnsysnw5jr8iz410z935xw3";
   };
 
+  outputs = [ "dev" "out" "docdev" ];
+  outputBin = "dev";
+
   buildInputs = [ pkgconfig gtk intltool xorg.libX11 xorg.libXres ];
   # ?another optional: startup-notification
 

From f9e9c7242aa2715c2d9cb2aad3881e04d2dbab92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 19:36:40 +0100
Subject: [PATCH 330/857] djvulibre: split dev and bin outputs

---
 pkgs/applications/misc/djvulibre/default.nix | 2 ++
 pkgs/applications/search/recoll/default.nix  | 4 ++--
 pkgs/tools/graphics/pdfread/default.nix      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index b0f89cc5ea036..910b24358b484 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0psh3zl9dj4n4r3lx25390nx34xz0bg0ql48zdskhq354ljni5p6";
   };
 
+  outputs = [ "dev" "out" "bin" ];
+
   buildInputs = [ libjpeg libtiff librsvg ] ++ libintlOrEmpty;
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 059c5eacc496d..b8f4dbd771793 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -27,8 +27,8 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace antiword      ${antiword}/bin/antiword
       substituteInPlace  $f --replace awk           ${gawk}/bin/awk
       substituteInPlace  $f --replace catppt        ${catdoc}/bin/catppt
-      substituteInPlace  $f --replace djvused       ${djvulibre}/bin/djvused
-      substituteInPlace  $f --replace djvutxt       ${djvulibre}/bin/djvutxt
+      substituteInPlace  $f --replace djvused       ${djvulibre.bin}/bin/djvused
+      substituteInPlace  $f --replace djvutxt       ${djvulibre.bin}/bin/djvutxt
       substituteInPlace  $f --replace grep          ${gnugrep}/bin/grep
       substituteInPlace  $f --replace groff         ${groff}/bin/groff
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
diff --git a/pkgs/tools/graphics/pdfread/default.nix b/pkgs/tools/graphics/pdfread/default.nix
index f35553ea168f0..13f9e30c8da75 100644
--- a/pkgs/tools/graphics/pdfread/default.nix
+++ b/pkgs/tools/graphics/pdfread/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     cp -R *.py pylrs $PYDIR
 
     wrapProgram $out/bin/pdfread.py --prefix PYTHONPATH : $PYTHONPATH:${pil}/$LIBSUFFIX/PIL:$PYDIR \
-      --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre}/bin:${unrar}/bin:${optipng}/bin
+      --prefix PATH : ${ghostscript}/bin:${pngnq}/bin:${djvulibre.bin}/bin:${unrar}/bin:${optipng}/bin
   '';
 
   meta = with stdenv.lib; {

From 436bf848b9b71a07ea15dc0eebcb1a706c12a26a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 19:38:17 +0100
Subject: [PATCH 331/857] cairo: reduce bin output, and fixup a reference

---
 pkgs/development/libraries/cairo/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 7dce7d49b9624..5550708800e60 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
     sha1 = "c8da68aa66ca0855b5d0ff552766d3e8679e1d24";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" ];
+  outputs = [ "dev" "out" "docdev" ];
+  outputBin = "dev"; # very small
 
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
@@ -50,7 +51,7 @@ stdenv.mkDerivation rec {
     # Work around broken `Requires.private' that prevents Freetype
     # `-I' flags to be propagated.
     sed -i "src/cairo.pc.in" \
-        -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype}/include/freetype2 -I${freetype}/include|g'
+        -es'|^Cflags:\(.*\)$|Cflags: \1 -I${freetype.dev}/include/freetype2 -I${freetype.dev}/include|g'
     '';
 
   enableParallelBuilding = true;

From 34e47d2079f27179bdb0d7dc86cd9dc6037af0d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 19:41:26 +0100
Subject: [PATCH 332/857] rdkafka: work around a build problem, probably gcc-5

---
 pkgs/development/libraries/rdkafka/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix
index 0ab4f21f2d880..d8ef878db2c29 100644
--- a/pkgs/development/libraries/rdkafka/default.nix
+++ b/pkgs/development/libraries/rdkafka/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib perl ];
 
+  NIX_CFLAGS_COMPILE = "-Wno-error=strict-overflow";
+
   postPatch = ''
     patchShebangs .
   '';

From bdbbfa0d4247e203ffe3171621b614374da05f70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 28 Oct 2015 19:44:40 +0100
Subject: [PATCH 333/857] perlPackages.Socket6: work around a build problem

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 8b20ba12a231a..3a5abf334f456 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9566,6 +9566,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/U/UM/UMEMOTO/${name}.tar.gz";
       sha256 = "1ads4k4vvq6pnxkdw0s8gaj03w4h9snxyw7zyikfzd20fy76yx6s";
     };
+    setOutputFlags = false;
     buildInputs = [ pkgs.which ];
   };
 

From 12384683cb9ce3d4dfb6f510c3ed79b807cf7e0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 20 Nov 2015 14:52:11 +0100
Subject: [PATCH 334/857] libcroco*: split $dev output

That also fixes build, as $doc is no longer produced (it would be $docdev).
---
 pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix | 3 ++-
 pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
index e8ddf7096e622..76d9118c4b956 100644
--- a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
 
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
diff --git a/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix
index e8ddf7096e622..76d9118c4b956 100644
--- a/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/libcroco/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" ];
+  outputBin = "dev";
 
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 

From 8a664fd5bc6b170bdf809030de6871fd6a454f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 25 Nov 2015 09:47:56 +0100
Subject: [PATCH 335/857] nixos/xserver: fix missing modules after splitting

... xorg-server in e25da7e5.
---
 nixos/modules/services/x11/xserver.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 0339ba2f71fc1..3860b50f24972 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -458,7 +458,7 @@ in
         ]);
 
     environment.systemPackages =
-      [ xorg.xorgserver
+      [ xorg.xorgserver.out
         xorg.xrandr
         xorg.xrdb
         xorg.setxkbmap
@@ -525,7 +525,7 @@ in
 
     services.xserver.modules =
       concatLists (catAttrs "modules" cfg.drivers) ++
-      [ xorg.xorgserver
+      [ xorg.xorgserver.out
         xorg.xf86inputevdev
       ];
 

From cab1cb5af434ecb1afa8771d95a5f594d8517daa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 30 Oct 2015 01:48:54 +0200
Subject: [PATCH 336/857] glib: Fix path to gettext_dir in glib-gettextize

Otherwise e.g. epiphany doesn't build.
---
 pkgs/development/libraries/glib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index aabf351890e87..5fc574ededb01 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -85,6 +85,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     _moveToOutput "share/glib-2.0" "$dev"
     substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
+    sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
   '';
 
   inherit doCheck;

From 07a0204282224891492e7e1cfe72830a1fc32355 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 26 Nov 2015 18:14:22 +0100
Subject: [PATCH 337/857] nixos/polkit: fix systemd service after spiltting

---
 nixos/modules/security/polkit.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 300dc600d8848..507f81bbf0737 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -59,9 +59,9 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.polkit ];
+    environment.systemPackages = [ pkgs.polkit.bin pkgs.polkit.out ];
 
-    systemd.packages = [ pkgs.polkit ];
+    systemd.packages = [ pkgs.polkit.out ];
 
     systemd.services.polkit.restartTriggers = [ config.system.path ];
     systemd.services.polkit.unitConfig.X-StopIfChanged = false;

From 31ed92f65f4e117718dc5a963920fdf5f489a24f Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 27 Nov 2015 14:49:54 +0100
Subject: [PATCH 338/857] Fix system-path with multiout

---
 nixos/modules/config/system-path.nix    | 20 +++++++++-----------
 nixos/modules/security/polkit.nix       |  2 +-
 pkgs/build-support/buildenv/default.nix |  8 +-------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index da558a25d99b7..6b4cc9ebb7d8a 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -75,7 +75,7 @@ in
 
       outputsToLink = mkOption {
         type = types.listOf types.str;
-        default = [];
+        default = [ ];
         example = [ "doc" ];
         description = "List of package outputs to be symlinked into <filename>/run/current-system/sw</filename>.";
       };
@@ -120,18 +120,16 @@ in
         "/share/vim-plugins"
       ];
 
+    environment.outputsToLink = [ "bin" "lib" "out" ];
+
     system.path = pkgs.buildEnv {
       name = "system-path";
-      paths = let
-      inherit (config.environment) pathsToLink outputsToLink;
-        #outputs TODO: some code already merged by Eelco? make it user-customizable?
-        pkgOutputFun = pkg: lib.filter (p: p!=null) [
-          (pkg.bin or (pkg.out or pkg))
-          (pkg.man or null)
-          (pkg.info or null)
-          (pkg.doc or null)
-        ];
-        in lib.concatMap pkgOutputFun config.environment.systemPackages;
+      paths =
+        lib.filter (drv: drv != null && drv != (drv.dev or null))
+          (lib.concatMap (drv:
+            [ drv ] ++ map (outputName: drv.${outputName}.outPath or null) config.environment.outputsToLink)
+           config.environment.systemPackages);
+      inherit (config.environment) pathsToLink;
       ignoreCollisions = true;
       # !!! Hacky, should modularise.
       postBuild =
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 507f81bbf0737..70e5e8b9fa741 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -59,7 +59,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.polkit.bin pkgs.polkit.out ];
+    environment.systemPackages = [ pkgs.polkit ];
 
     systemd.packages = [ pkgs.polkit.out ];
 
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 5bcc1708e7fd3..6009abd9e3701 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -21,10 +21,6 @@
   # directories in the list is not symlinked.
   pathsToLink ? ["/"]
 
-, # The package outputs to include. By default, only the default
-  # output is included.
-  outputsToLink ? []
-
 , # Root the result in directory "$out${extraPrefix}", e.g. "/share".
   extraPrefix ? ""
 
@@ -40,9 +36,7 @@
 runCommand name
   rec { inherit manifest ignoreCollisions passthru pathsToLink extraPrefix postBuild buildInputs;
     pkgs = builtins.toJSON (map (drv: {
-      paths =
-        [ drv ]
-        ++ lib.concatMap (outputName: lib.optional (drv.${outputName}.outPath or null != null) drv.${outputName}) outputsToLink;
+      paths = [ drv ];
       priority = drv.meta.priority or 5;
     }) paths);
     preferLocalBuild = true;

From 87b2e1e16af4b03adf96d75f5ba0bbb010641d16 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Tue, 1 Dec 2015 23:11:16 +0100
Subject: [PATCH 339/857] pythonPackages.pillow: fix for multiple outputs

---
 pkgs/top-level/python-packages.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6dda39de319ff..97f79692e5871 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13189,13 +13189,15 @@ in modules // {
       ++ optionals (isPyPy) [ pkgs.tk pkgs.xorg.libX11 ];
 
     # NOTE: we use LCMS_ROOT as WEBP root since there is not other setting for webp.
-    preConfigure = ''
+    preConfigure = let
+      libinclude = pkg: ''"${pkg.out}/lib", "${pkg.dev}/include"'';
+    in ''
       sed -i "setup.py" \
-          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = _lib_include("${pkgs.freetype}")|g ;
-              s|^JPEG_ROOT =.*$|JPEG_ROOT = _lib_include("${pkgs.libjpeg}")|g ;
-              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = _lib_include("${pkgs.zlib}")|g ;
+          -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = ${libinclude pkgs.freetype}|g ;
+              s|^JPEG_ROOT =.*$|JPEG_ROOT = ${libinclude pkgs.libjpeg}|g ;
+              s|^ZLIB_ROOT =.*$|ZLIB_ROOT = ${libinclude pkgs.zlib}|g ;
               s|^LCMS_ROOT =.*$|LCMS_ROOT = _lib_include("${pkgs.libwebp}")|g ;
-              s|^TIFF_ROOT =.*$|TIFF_ROOT = _lib_include("${pkgs.libtiff}")|g ;
+              s|^TIFF_ROOT =.*$|TIFF_ROOT = ${libinclude pkgs.libtiff}|g ;
               s|^TCL_ROOT=.*$|TCL_ROOT = _lib_include("${pkgs.tcl}")|g ;'
     ''
     # Remove impurities

From e289717414ae4e730586563122591a68820f7c25 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Wed, 2 Dec 2015 10:03:23 +0100
Subject: [PATCH 340/857] rename moveToOutput and propagatedBuildInputs

---
 .../setup-hooks/multiple-outputs.sh           | 32 +++++++++----------
 pkgs/development/compilers/gcc/builder.sh     |  6 ++--
 .../interpreters/spidermonkey/17.0.nix        |  2 +-
 .../interpreters/spidermonkey/24.2.nix        |  2 +-
 pkgs/development/libraries/SDL/default.nix    |  2 +-
 pkgs/development/libraries/dbus/default.nix   |  2 +-
 pkgs/development/libraries/ffmpeg/generic.nix |  4 +--
 pkgs/development/libraries/glib/default.nix   |  2 +-
 .../gobject-introspection/setup-hook.sh       |  2 +-
 pkgs/development/libraries/gtk+/2.x.nix       |  2 +-
 pkgs/development/libraries/icu/default.nix    |  2 +-
 pkgs/development/libraries/libav/default.nix  |  2 +-
 pkgs/development/libraries/libvpx/default.nix |  2 +-
 pkgs/development/libraries/libvpx/git.nix     |  2 +-
 .../development/libraries/libxml2/default.nix |  8 ++---
 .../development/libraries/libxslt/default.nix |  6 ++--
 pkgs/development/libraries/nspr/default.nix   |  2 +-
 pkgs/development/libraries/nss/default.nix    |  6 ++--
 pkgs/development/libraries/pcre/default.nix   |  2 +-
 pkgs/development/libraries/zlib/default.nix   |  2 +-
 .../tools/build-managers/cmake/default.nix    |  2 +-
 .../linux/kernel/manual-config.nix            |  2 +-
 pkgs/os-specific/linux/systemd/default.nix    |  2 +-
 pkgs/servers/pulseaudio/default.nix           |  2 +-
 pkgs/servers/sql/postgresql/default.nix       |  6 ++--
 pkgs/tools/networking/curl/default.nix        |  2 +-
 26 files changed, 53 insertions(+), 53 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index d8a9763a0c2fa..ad2e5253ea07e 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -69,8 +69,8 @@ NIX_NO_SELF_RPATH=1
 
 # Move subpaths that match pattern $1 from under any output/ to the $2 output/
 # Beware: only globbing patterns are accepted, e.g.: * ? {foo,bar}
-# A special target "REMOVE" is allowed: _moveToOutput foo REMOVE
-_moveToOutput() {
+# A special target "REMOVE" is allowed: moveToOutput foo REMOVE
+moveToOutput() {
     local patt="$1"
     local dstOut="$2"
     local output
@@ -117,24 +117,24 @@ _multioutDocs() {
     if [ "$outputs" = "out" ]; then return; fi;
     local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo}
 
-    _moveToOutput share/info "${!outputInfo}"
-    _moveToOutput share/doc "${!outputDoc}"
-    _moveToOutput share/gtk-doc "${!outputDocdev}"
+    moveToOutput share/info "${!outputInfo}"
+    moveToOutput share/doc "${!outputDoc}"
+    moveToOutput share/gtk-doc "${!outputDocdev}"
 
     # the default outputMan is in $bin
-    _moveToOutput share/man "${!outputMan}"
-    _moveToOutput share/man/man3 "${!outputDocdev}"
+    moveToOutput share/man "${!outputMan}"
+    moveToOutput share/man/man3 "${!outputDocdev}"
 }
 
 # Move development-only stuff to the desired outputs.
 _multioutDevs() {
     if [ "$outputs" = "out" ] || [ -z "${moveToDev-1}" ]; then return; fi;
-    _moveToOutput include "${!outputInclude}"
+    moveToOutput include "${!outputInclude}"
     # these files are sometimes provided even without using the corresponding tool
-    _moveToOutput lib/pkgconfig "${!outputDev}"
-    _moveToOutput share/pkgconfig "${!outputDev}"
-    _moveToOutput lib/cmake "${!outputDev}"
-    _moveToOutput share/aclocal "${!outputDev}"
+    moveToOutput lib/pkgconfig "${!outputDev}"
+    moveToOutput share/pkgconfig "${!outputDev}"
+    moveToOutput lib/cmake "${!outputDev}"
+    moveToOutput share/aclocal "${!outputDev}"
     # don't move *.la, as libtool needs them in the directory of the library
 
     for f in "${!outputDev}"/{lib,share}/pkgconfig/*.pc; do
@@ -156,22 +156,22 @@ _multioutPropagateDev() {
     done
 
     # Default value: propagate binaries, includes and libraries
-    if [ -z "${propagatedOutputs+1}" ]; then
+    if [ -z "${propagatedBuildOutputs+1}" ]; then
         local po_dirty="$outputBin $outputInclude $outputLib"
         set +o pipefail
-        propagatedOutputs=`echo "$po_dirty" \
+        propagatedBuildOutputs=`echo "$po_dirty" \
             | tr -s ' ' '\n' | grep -v -F "$outputFirst" \
             | sort -u | tr '\n' ' ' `
         set -o pipefail
     fi
 
     # The variable was explicitly set to empty or we resolved it so
-    if [ -z "$propagatedOutputs" ]; then
+    if [ -z "$propagatedBuildOutputs" ]; then
         return
     fi
 
     mkdir -p "${!outputFirst}"/nix-support
-    for output in $propagatedOutputs; do
+    for output in $propagatedBuildOutputs; do
         echo -n " ${!output}" >> "${!outputFirst}"/nix-support/propagated-native-build-inputs
     done
 }
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index 2f19f4219da6a..8d33f88de1711 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -211,10 +211,10 @@ preInstall() {
 
 postInstall() {
     # Move runtime libraries to $lib.
-    _moveToOutput "lib/lib*.so*" "$lib"
-    _moveToOutput "lib/lib*.la"  "$lib"
+    moveToOutput "lib/lib*.so*" "$lib"
+    moveToOutput "lib/lib*.la"  "$lib"
     ln -s lib "$lib/lib64" # for *.la
-    _moveToOutput "share/gcc-*/python" "$lib"
+    moveToOutput "share/gcc-*/python" "$lib"
 
     for i in "$lib"/lib/*.{la,py}; do
         substituteInPlace "$i" --replace "$out" "$lib"
diff --git a/pkgs/development/interpreters/spidermonkey/17.0.nix b/pkgs/development/interpreters/spidermonkey/17.0.nix
index 8ef3d953bfa4b..5cc71b59d5123 100644
--- a/pkgs/development/interpreters/spidermonkey/17.0.nix
+++ b/pkgs/development/interpreters/spidermonkey/17.0.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm "$lib"/lib/*.a # halve the output size
-    _moveToOutput "bin/js*-config" "$dev" # break the cycle
+    moveToOutput "bin/js*-config" "$dev" # break the cycle
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/interpreters/spidermonkey/24.2.nix b/pkgs/development/interpreters/spidermonkey/24.2.nix
index d235ab04526be..5c4fc85081551 100644
--- a/pkgs/development/interpreters/spidermonkey/24.2.nix
+++ b/pkgs/development/interpreters/spidermonkey/24.2.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     rm "$lib"/lib/*.a # halve the output size
-    _moveToOutput "bin/js*-config" "$dev" # break the cycle
+    moveToOutput "bin/js*-config" "$dev" # break the cycle
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 92d7779ba3474..fbc446bcabcc0 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
   }) ];
 
-  postFixup = ''_moveToOutput share/aclocal "$dev" '';
+  postFixup = ''moveToOutput share/aclocal "$dev" '';
 
   crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
     patches = let
diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 7dbc76456fdb2..83635d9739f18 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -65,7 +65,7 @@ self =  stdenv.mkDerivation {
 
     # it's executed from $lib by absolute path
     postFixup = ''
-      _moveToOutput bin/dbus-launch "$lib"
+      moveToOutput bin/dbus-launch "$lib"
       ln -s "$lib/bin/dbus-launch" "$out/bin/"
     '';
 
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 0b45851cc9301..d2da77c7b0d64 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -153,8 +153,8 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postFixup = ''
-    _moveToOutput bin "$bin"
-    _moveToOutput share/ffmpeg/examples "$doc"
+    moveToOutput bin "$bin"
+    moveToOutput share/ffmpeg/examples "$doc"
   '';
 
   /* Cross-compilation is untested, consider this an outline, more work
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 5fc574ededb01..d7f40a3bf3095 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
   DETERMINISTIC_BUILD = 1;
 
   postInstall = ''
-    _moveToOutput "share/glib-2.0" "$dev"
+    moveToOutput "share/glib-2.0" "$dev"
     substituteInPlace "$dev/bin/gdbus-codegen" --replace "$out" "$dev"
     sed -i "$dev/bin/glib-gettextize" -e "s|^gettext_dir=.*|gettext_dir=$dev/share/glib-2.0/gettext|"
   '';
diff --git a/pkgs/development/libraries/gobject-introspection/setup-hook.sh b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
index 78a8ccf19d34e..583d8475ec3b4 100644
--- a/pkgs/development/libraries/gobject-introspection/setup-hook.sh
+++ b/pkgs/development/libraries/gobject-introspection/setup-hook.sh
@@ -14,7 +14,7 @@ make_gobject_introspection_find_gir_files() {
 envHooks+=(make_gobject_introspection_find_gir_files)
 
 _multioutMoveGlibGir() {
-  _moveToOutput share/gir-1.0 "${!outputDev}"
+  moveToOutput share/gir-1.0 "${!outputDev}"
 }
 
 preFixupHooks+=(_multioutMoveGlibGir)
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index daa2cb1efb4c5..bc129d9f1fb68 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     else "--with-xinput=yes";
 
   postInstall = ''
-    _moveToOutput share/gtk-2.0/demo "$docdev"
+    moveToOutput share/gtk-2.0/demo "$docdev"
   '';
 
   passthru = {
diff --git a/pkgs/development/libraries/icu/default.nix b/pkgs/development/libraries/icu/default.nix
index bc8c62230acf8..58eb2e22781d6 100644
--- a/pkgs/development/libraries/icu/default.nix
+++ b/pkgs/development/libraries/icu/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
     sed -i 's/INSTALL_CMD=.*install/INSTALL_CMD=install/' $out/lib/icu/${version}/pkgdata.inc
   '';
 
-  postFixup = ''_moveToOutput lib/icu "$dev" '';
+  postFixup = ''moveToOutput lib/icu "$dev" '';
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index a3d2d3fde3039..78b1eef2ccfc7 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -81,7 +81,7 @@ let
     setOutputFlags = false;
 
     # move tools away to lighten runtime deps and size
-    postInstall = ''_moveToOutput bin "$bin" '';
+    postInstall = ''moveToOutput bin "$bin" '';
 
     doInstallCheck = false; # fails randomly
     installCheckTarget = "check"; # tests need to be run *after* installation
diff --git a/pkgs/development/libraries/libvpx/default.nix b/pkgs/development/libraries/libvpx/default.nix
index c33c5d9ad01e2..5c593dd1f75ee 100644
--- a/pkgs/development/libraries/libvpx/default.nix
+++ b/pkgs/development/libraries/libvpx/default.nix
@@ -149,7 +149,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = ''_moveToOutput bin "$bin" '';
+  postInstall = ''moveToOutput bin "$bin" '';
 
   crossAttrs = let
     isCygwin = stdenv.cross.libc == "msvcrt";
diff --git a/pkgs/development/libraries/libvpx/git.nix b/pkgs/development/libraries/libvpx/git.nix
index bfe1f9424cd56..064fb807a214e 100644
--- a/pkgs/development/libraries/libvpx/git.nix
+++ b/pkgs/development/libraries/libvpx/git.nix
@@ -150,7 +150,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = ''_moveToOutput bin "$bin" '';
+  postInstall = ''moveToOutput bin "$bin" '';
 
   crossAttrs = let
     isCygwin = stdenv.cross.libc == "msvcrt";
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index af71c05a1c870..2b2b1d81a16df 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" "bin" "doc" "py" ];
-  propagatedOutputs = "out bin py";
+  propagatedBuildOutputs = "out bin py";
 
   buildInputs = [ python ]
     # Libxml2 has an optional dependency on liblzma.  However, on impure
@@ -32,9 +32,9 @@ stdenv.mkDerivation rec {
   installFlags = ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"'';
 
   postFixup = ''
-    _moveToOutput bin/xml2-config "$dev"
-    _moveToOutput lib/xml2Conf.sh "$dev"
-    _moveToOutput share/man/man1 "$bin"
+    moveToOutput bin/xml2-config "$dev"
+    moveToOutput lib/xml2Conf.sh "$dev"
+    moveToOutput share/man/man1 "$bin"
   '';
 
   passthru = { inherit version; pythonSupport = true; };
diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index dc74d8e95eeb8..2784093d50aa9 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
   ];
 
   postFixup = ''
-    _moveToOutput bin/xslt-config "$dev"
-    _moveToOutput lib/xsltConf.sh "$dev"
-    _moveToOutput share/man/man1 "$bin"
+    moveToOutput bin/xslt-config "$dev"
+    moveToOutput lib/xsltConf.sh "$dev"
+    moveToOutput share/man/man1 "$bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix
index ef4dde42597a6..b026119441482 100644
--- a/pkgs/development/libraries/nspr/default.nix
+++ b/pkgs/development/libraries/nspr/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
 
   postInstall = ''
     find $out -name "*.a" -delete
-    _moveToOutput share "$dev" # just aclocal
+    moveToOutput share "$dev" # just aclocal
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 20290b4c87a23..12c44c4cae0c1 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -77,9 +77,9 @@ in stdenv.mkDerivation rec {
       LD_LIBRARY_PATH=$out/lib $out/bin/shlibsign -v -i "$libfile"
     done
 
-    _moveToOutput bin "$tools"
-    _moveToOutput bin/nss-config "$dev"
-    _moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
+    moveToOutput bin "$tools"
+    moveToOutput bin/nss-config "$dev"
+    moveToOutput lib/libcrmf.a "$dev" # needed by firefox, for example
     rm "$out"/lib/*.a
   '';
 
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index fa4a640bd0b03..0056ac3ffac66 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     # we are running out of stack on both freeBSDs on Hydra
 
   postFixup = ''
-    _moveToOutput bin/pcre-config "$dev"
+    moveToOutput bin/pcre-config "$dev"
   ''
     + optionalString (variant != null) ''
     ln -sf -t "$out/lib/" '${pcre.out}'/lib/libpcre{,posix}.so.*.*.*
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 4f2b9a594e52d..9fe45996b1073 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   configureFlags = stdenv.lib.optional (!static) "--shared";
 
   postInstall = ''
-    _moveToOutput lib/libz.a "$static"
+    moveToOutput lib/libz.a "$static"
   ''
     # jww (2015-01-06): Sometimes this library install as a .so, even on
     # Darwin; others time it installs as a .dylib.  I haven't yet figured out
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 196d709447dd2..f97b7b432ea3d 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
   preInstall = ''mkdir "$doc" '';
 
-  postInstall = ''_moveToOutput "share/cmake-*/Help" "$doc" '';
+  postInstall = ''moveToOutput "share/cmake-*/Help" "$doc" '';
 
   meta = with stdenv.lib; {
     homepage = http://www.cmake.org/;
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 49b93b1a10ea8..3882638ee9542 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -74,7 +74,7 @@ let
 
       installsFirmware = (config.isEnabled "FW_LOADER") &&
         (isModular || (config.isDisabled "FIRMWARE_IN_KERNEL"));
-    in (optionalAttrs isModular { outputs = [ "out" "dev" ]; propagatedOutputs = ""; }) // {
+    in (optionalAttrs isModular { outputs = [ "out" "dev" ]; propagatedBuildOutputs = ""; }) // {
       passthru = {
         inherit version modDirVersion config kernelPatches configfile;
       };
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 780b906729749..0af936aa7039d 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "libudev" "doc" ]; # maybe: "dev"
   # note: there are many references to ${systemd}/...
   outputDev = "out";
-  propagatedOutputs = "libudev";
+  propagatedBuildOutputs = "libudev";
   */
   outputs = [ "out" "man" ];
 
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 47edd751887ce..66ed31bab7b98 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
     sed 's|-lltdl|-L${libtool.lib}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
   ''
-    + ''_moveToOutput lib/cmake "$dev" '';
+    + ''moveToOutput lib/cmake "$dev" '';
 
   meta = {
     description = "Sound server for POSIX and Win32 systems";
diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 1743aa2df4be6..fdd35637e5704 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -40,9 +40,9 @@ let
 
     postInstall =
       ''
-        _moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
-        _moveToOutput "lib/*.a" "$out"
-        _moveToOutput "lib/libecpg*" "$out"
+        moveToOutput "lib/pgxs" "$out" # looks strange, but not deleting it
+        moveToOutput "lib/*.a" "$out"
+        moveToOutput "lib/libecpg*" "$out"
 
         # Prevent a retained dependency on gcc-wrapper.
         substituteInPlace "$out/lib/pgxs/src/Makefile.global" --replace ${stdenv.cc}/bin/ld ld
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index ed650b87b212c..8fe3b85d633db 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
   CXXCPP = "g++ -E";
 
   postInstall = ''
-    _moveToOutput bin/curl-config "$dev"
+    moveToOutput bin/curl-config "$dev"
     sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
   '';
 

From 883109b36aebcd27aba5fe60de1e23d830c11e14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Dec 2015 11:59:29 +0100
Subject: [PATCH 341/857] pythonPackages.reportlab: fix #11405 build

That freetype override was done in a rather silly way,
overriding *all* configure options.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 97f79692e5871..6cb1ad5df1642 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15478,7 +15478,7 @@ in modules // {
 
 
   reportlab =
-   let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; });
+   let freetype = overrideDerivation pkgs.freetype (args: { dontDisableStatic = true; });
    in buildPythonPackage rec {
     name = "reportlab-3.2.0";
 

From 8c8aba5d36104669b8cc27e0893530e54491fc35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Dec 2015 12:52:36 +0100
Subject: [PATCH 342/857] kde-runtime: fix with multiple outputs after 7477a7cd

---
 pkgs/desktops/kde-4.14/kde-runtime.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix
index 655555cd140ab..495ea242e0d0a 100644
--- a/pkgs/desktops/kde-4.14/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.14/kde-runtime.nix
@@ -16,7 +16,7 @@ kde {
 
   nativeBuildInputs = [ shared_mime_info ];
 
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
 
   passthru.propagatedUserEnvPackages = [ virtuoso ];
 

From 96fea82e93efc467136fc31b5ea9bb8c9b4fda51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Dec 2015 14:07:50 +0100
Subject: [PATCH 343/857] e19.efl: fix build with multiple outputs

(What an ugly expression this is!)
---
 pkgs/desktops/e19/efl.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index 3afb76dccf108..86530fecb59b4 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput }:
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl, libinput, systemd }:
 
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
     giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
     gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
-    xorg.libX11 udev utillinuxCurses ];
+    xorg.libX11 udev utillinuxCurses systemd ];
 
   propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite
     xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
     "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
     "ac_ct_CXX=foo" ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
+  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst.dev}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
 
   patches = [ ./efl-elua.patch ];
 
   preConfigure = ''
-    export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
+    export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
     export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
   '';
 

From e142107242cc26aa8c6b1e73ce3fed7b39c41a3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Dec 2015 14:33:33 +0100
Subject: [PATCH 344/857] libxml2Python: fix not finding XML catalogs

---
 pkgs/top-level/all-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 753c56a5ad530..ac04a3af5d2d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7658,6 +7658,11 @@ let
     name = "libxml2+py-${pkgs.libxml2.version}";
     paths = with libxml2; [ dev bin py ];
     inherit (pkgs.libxml2) passthru;
+    # the hook to find catalogs is hidden by buildEnv
+    postBuild = ''
+      mkdir "$out/nix-support"
+      cp '${libxml2.dev}/nix-support/propagated-native-build-inputs' "$out/nix-support/"
+    '';
   };
 
   libxmlxx = callPackage ../development/libraries/libxmlxx { };

From b6bbe9c42ac5d92620f4c3a6b3bfd1950a19bdba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Dec 2015 14:42:32 +0100
Subject: [PATCH 345/857] x265: hack-fix build with multiple outputs

---
 pkgs/development/libraries/x265/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 1598fec619482..1feba886764ca 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake yasm ];
 
+  NIX_LDFLAGS = "-L${stdenv.cc.libc.out}/lib"; #outputs TODO: this is strange
+
   meta = with stdenv.lib; {
     description = "Library for encoding h.265/HEVC video streams";
     homepage    = http://x265.org;

From 231fa2b5e2f18c6b1e15c0fd7ba1577127fc9d40 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Fri, 4 Dec 2015 14:58:23 +0100
Subject: [PATCH 346/857] e19.efl: fix build for multiple-outputs

---
 pkgs/desktops/e19/efl.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index 86530fecb59b4..dc153fd7b3892 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
     "--disable-tslib" "--with-systemdunitdir=$out/systemd/user"
     "ac_ct_CXX=foo" ];
 
-  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst.dev}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
+  NIX_CFLAGS_COMPILE = [ "-I${xorg.libXtst}" "-I${dbus_libs.dev}/include/dbus-1.0" "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
 
   patches = [ ./efl-elua.patch ];
 
   preConfigure = ''
-    export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base.dev}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
+    export PKG_CONFIG_PATH="${gst_all_1.gst-plugins-base}/lib/pkgconfig/gstreamer-video-0.10.pc:$PKG_CONFIG_PATH"
     export LD_LIBRARY_PATH="$(pwd)/src/lib/eina/.libs:$LD_LIBRARY_PATH"
   '';
 

From 34b5d193c0c0c02bd0f17b8af9d8fa9422c75782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 4 Dec 2015 15:26:06 +0100
Subject: [PATCH 347/857] apache*: don't change layout in $out WRT master

---
 pkgs/servers/http/apache-httpd/2.2.nix | 3 +++
 pkgs/servers/http/apache-httpd/2.4.nix | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 88e1475342c6e..250c1c97ced3c 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
 
   # FIXME: -dev depends on -doc
   outputs = [ "dev" "out" "doc" ];
+  setOutputFlags = false; # it would move $out/modules, etc.
 
   buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++
     stdenv.lib.optional sslSupport openssl;
@@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
     --enable-disk-cache
     --enable-file-cache
     --enable-mem-cache
+    --includedir=$(dev)/include
+    --docdir=$(doc)/share/doc
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 780eae8132d45..9049b0122fd7c 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
 
   # FIXME: -dev depends on -doc
   outputs = [ "dev" "out" "doc" ];
+  setOutputFlags = false; # it would move $out/modules, etc.
 
   buildInputs = [perl] ++
     optional sslSupport openssl ++
@@ -54,6 +55,8 @@ stdenv.mkDerivation rec {
     ${optionalString sslSupport "--enable-ssl"}
     ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
     ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
+    --includedir=$(dev)/include
+    --docdir=$(doc)/share/doc
   '';
 
   enableParallelBuilding = true;

From fb3c062e5412f77418dd95f621acdc7fc9e46c7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Dec 2015 08:59:30 +0100
Subject: [PATCH 348/857] glibc-info: fix #11476 build with multiple outputs

---
 pkgs/development/libraries/glibc/info.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/glibc/info.nix b/pkgs/development/libraries/glibc/info.nix
index e4cdb42dd6892..f57e52f7b7ad1 100644
--- a/pkgs/development/libraries/glibc/info.nix
+++ b/pkgs/development/libraries/glibc/info.nix
@@ -8,6 +8,8 @@ build null {
 
   inherit fetchurl stdenv;
 
+  outputs = [ "out" ];
+
   configureFlags = [ "--enable-add-ons" ];
 
   buildInputs = [ texinfo perl ];

From 2709a815e54795efd38508a3e4db66502e742d55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Dec 2015 11:59:10 +0100
Subject: [PATCH 349/857] apache-httpd-2.2: fix build

It was broken by interaction with b81515c2.
I should've tested both versions before pushing 34b5d193c0.
---
 pkgs/servers/http/apache-httpd/2.2.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 250c1c97ced3c..5ae4cfdaaf1f0 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     mkdir -p $doc/share/doc/httpd
     mv $out/manual $doc/share/doc/httpd
     mkdir -p $dev/bin
-    mv $out/sbin/apxs $dev/bin/apxs
+    mv $out/bin/apxs $dev/bin/apxs
   '';
 
   passthru = {

From 6cc57be289c32fb6a8b5859a9d46ed2d1c5e9c27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Dec 2015 13:15:41 +0100
Subject: [PATCH 350/857] apache modules: fix build problems

pkgs.mod_evasive was removed, because that combination isn't supported
(according to an assertion).
---
 pkgs/servers/http/apache-httpd/2.2.nix                   | 7 +++++--
 pkgs/servers/http/apache-httpd/2.4.nix                   | 4 +++-
 pkgs/servers/http/apache-modules/mod_fastcgi/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                          | 1 -
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index 5ae4cfdaaf1f0..bb4fa9782d6a2 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
   outputs = [ "dev" "out" "doc" ];
   setOutputFlags = false; # it would move $out/modules, etc.
 
-  buildInputs = [ pkgconfig perl apr aprutil pcre zlib ] ++
+  propagatedBuildInputs = [ apr ]; # otherwise mod_* fail to find includes often
+  buildInputs = [ pkgconfig perl aprutil pcre zlib ] ++
     stdenv.lib.optional sslSupport openssl;
 
   # Required for ‘pthread_cancel’.
@@ -34,6 +35,9 @@ stdenv.mkDerivation rec {
     sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|"
   '';
 
+  preConfigure = ''
+    configureFlags="$configureFlags --includedir=$dev/include"
+  '';
   configureFlags = ''
     --with-z=${zlib}
     --with-pcre=${pcre}
@@ -47,7 +51,6 @@ stdenv.mkDerivation rec {
     --enable-disk-cache
     --enable-file-cache
     --enable-mem-cache
-    --includedir=$(dev)/include
     --docdir=$(doc)/share/doc
   '';
 
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index 9049b0122fd7c..fe60fe2c87dc2 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
   # Required for ‘pthread_cancel’.
   NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
+  preConfigure = ''
+    configureFlags="$configureFlags --includedir=$dev/include"
+  '';
   configureFlags = ''
     --with-apr=${apr}
     --with-apr-util=${aprutil}
@@ -55,7 +58,6 @@ stdenv.mkDerivation rec {
     ${optionalString sslSupport "--enable-ssl"}
     ${optionalString luaSupport "--enable-lua --with-lua=${lua5}"}
     ${optionalString libxml2Support "--with-libxml2=${libxml2.dev}/include/libxml2"}
-    --includedir=$(dev)/include
     --docdir=$(doc)/share/doc
   '';
 
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index e70c3105408fc..178900570d07b 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     cp Makefile.AP2 Makefile
-    makeFlags="top_dir=${apacheHttpd} prefix=$out"
+    makeFlags="top_dir=${apacheHttpd}/share prefix=$out"
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac04a3af5d2d2..03c384e1e87da 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9239,7 +9239,6 @@ let
 
   # Backwards compatibility.
   mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;
-  mod_evasive = pkgs.apacheHttpdPackages.mod_evasive;
   mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi;
   mod_python = pkgs.apacheHttpdPackages.mod_python;
   mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi;

From 9054ddefeb988f28637749a834d884dac2d2f62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Dec 2015 13:27:24 +0100
Subject: [PATCH 351/857] kde4.plasma-nm: fix build with multiple outputs

---
 pkgs/tools/networking/plasma-nm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/plasma-nm/default.nix b/pkgs/tools/networking/plasma-nm/default.nix
index 0c10e6655b8e1..f0f379d382951 100644
--- a/pkgs/tools/networking/plasma-nm/default.nix
+++ b/pkgs/tools/networking/plasma-nm/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
     sha256 = "0xj14isvjq8ll70b6q66n8adm8ff4j9ng195ndk2gmavjf6bb751";
   };
 
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";
+  NIX_CFLAGS_COMPILE = "-I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
 
   nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
 

From e2f5ba1937ff14a76360ce06480d752b8ea0bc11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Dec 2015 13:59:05 +0100
Subject: [PATCH 352/857] treewide: fix invocations of installBin command

I've removed the trivial command in 4e72b61de.
I think `install -Dt "$out/bin"` is a better replacement anyway,
as it can be easily used to other directories than $out/bin.

/cc @ehmry who seems to maintain many packages with this usage.
(BTW, it would be better to have maintainer attribute same as github
username, as it makes pinging maintainers much easier.)
---
 pkgs/applications/misc/monero/default.nix     | 2 +-
 pkgs/development/compilers/nim/default.nix    | 2 +-
 pkgs/tools/archivers/unrar/default.nix        | 2 +-
 pkgs/tools/networking/cjdns/default.nix       | 4 ++--
 pkgs/tools/networking/zerotierone/default.nix | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix
index 6af9b7dc267d6..65483c808233c 100644
--- a/pkgs/applications/misc/monero/default.nix
+++ b/pkgs/applications/misc/monero/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   checkTarget = "test-release"; # this would be the target
 
   installPhase = ''
-    installBin \
+    install -Dt "$out/bin/" \
         src/bitmonerod \
         src/connectivity_tool \
         src/simpleminer \
diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 142167e337365..20f7a87c254fb 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildPhase   = "sh build.sh";
   installPhase =
     ''
-      installBin bin/nim
+      install -Dt "$out/bin" bin/nim
       substituteInPlace install.sh --replace '$1/nim' "$out"
       sh install.sh $out
     '';
diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index eb0d3a3bd8330..e0716a1b1d348 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   '';
 
   installPhase = ''
-    installBin unrar
+    install -Dt "$out/bin" unrar
 
     mkdir -p $out/share/doc/unrar
     cp acknow.txt license.txt \
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 86c3ea4f919be..45155cf306fa5 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -16,13 +16,13 @@ stdenv.mkDerivation {
 
   buildInputs = [ which python27 nodejs ] ++
     # for flock
-    stdenv.lib.optional stdenv.isLinux [ utillinux ];
+    stdenv.lib.optional stdenv.isLinux utillinux;
 
   buildPhase =
     stdenv.lib.optionalString stdenv.isArm "Seccomp_NO=1 "
     + "bash do";
   installPhase = ''
-    installBin cjdroute makekeys privatetopublic publictoip6
+    install -Dt "$out/bin/" cjdroute makekeys privatetopublic publictoip6
     sed -i 's,/usr/bin/env node,'$(type -P node), \
       $(find contrib -name "*.js")
     sed -i 's,/usr/bin/env python,'$(type -P python), \
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index d9a50d7dc696a..63531a85ffc11 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ openssl lzo zlib gcc iproute ];
 
   installPhase = ''
-    installBin zerotier-one
+    install -Dt "$out/bin/" zerotier-one
     ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool
     ln -s $out/bin/zerotier-one $out/bin/zerotier-cli
   '';

From 244f98546191fe9d9bfcb57a26462cd95a5d6825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 5 Dec 2015 17:40:37 +0100
Subject: [PATCH 353/857] glibc-multi: fix with multiple outputs

---
 pkgs/development/libraries/glibc/multi.nix | 36 +++++++++-------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/glibc/multi.nix b/pkgs/development/libraries/glibc/multi.nix
index b5b4eabe9c74b..0d7bed99f22f0 100644
--- a/pkgs/development/libraries/glibc/multi.nix
+++ b/pkgs/development/libraries/glibc/multi.nix
@@ -3,32 +3,26 @@
 
 let
   nameVersion = builtins.parseDrvName glibc.name;
+  glibc64 = glibc;
 in
 runCommand "${nameVersion.name}-multi-${nameVersion.version}"
-  { inherit glibc32;
-   glibc64 = glibc;
-  }
+  { outputs = [ "dev" "out" "bin" ]; } # TODO: no static version here (yet)
   ''
-    mkdir -p $out
-    ln -s $glibc64/* $out/
-
-    rm $out/lib $out/lib64
-    mkdir -p $out/lib
-    ln -s $glibc64/lib/* $out/lib
-    ln -s $glibc32/lib $out/lib/32
-    ln -s lib $out/lib64
+    mkdir -p "$out/lib"
+    ln -s '${glibc64.out}'/lib/* "$out/lib"
+    ln -s '${glibc32.out}/lib' "$out/lib/32"
+    ln -s lib "$out/lib64"
 
     # fixing ldd RLTDLIST
-    rm $out/bin
-    cp -rs $glibc64/bin $out
-    chmod u+w $out/bin
-    rm $out/bin/ldd
+    mkdir -p "$bin/bin"
+    cp -s '${glibc64.bin}'/bin/* "$bin/bin/"
+    rm "$bin/bin/ldd"
     sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-linux-x86-64.so.2 $out/lib/32/ld-linux.so.2\"|g" \
-        $glibc64/bin/ldd > $out/bin/ldd
-    chmod 555 $out/bin/ldd
+        '${glibc64.bin}/bin/ldd' > "$bin/bin/ldd"
+    chmod +x "$bin/bin/ldd"
 
-    rm $out/include
-    cp -rs $glibc32/include $out
-    chmod -R u+w $out/include
-    cp -rsf $glibc64/include $out
+    mkdir "$dev"
+    cp -rs '${glibc32}'/include "$dev/"
+    chmod +w -R "$dev"
+    cp -rsf '${glibc64}'/include "$dev/"
   ''

From cf4b5036924d4f5cecf045b0e711a3e03ae8c033 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 7 Dec 2015 16:32:30 +0100
Subject: [PATCH 354/857] net-snmp: fix references to openssl in
 multiple-outputs

---
 pkgs/servers/monitoring/net-snmp/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/servers/monitoring/net-snmp/default.nix b/pkgs/servers/monitoring/net-snmp/default.nix
index efc61b9fd6b2f..9e3b6a749c5b3 100644
--- a/pkgs/servers/monitoring/net-snmp/default.nix
+++ b/pkgs/servers/monitoring/net-snmp/default.nix
@@ -31,6 +31,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    for f in $out/lib/*.la $out/bin/net-snmp-config $out/bin/net-snmp-create-v3-user; do
+      sed 's|-L${openssl}|-L${openssl.out}|g' -i $f
+    done
+  '';
+
   meta = with stdenv.lib; {
     description = "Clients and server for the SNMP network monitoring protocol";
     homepage = http://net-snmp.sourceforge.net/;

From 2f0fe05543ce594eacf0310966914d6e19a42f88 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Thu, 10 Dec 2015 13:19:25 +0100
Subject: [PATCH 355/857] docker: use glibc.static with multiple-outputs for
 dockerinit

---
 pkgs/applications/virtualization/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 3380306e165c2..d66ce67ca8dff 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     makeWrapper go sqlite iproute bridge-utils devicemapper btrfsProgs
-    iptables e2fsprogs
+    iptables e2fsprogs stdenv.glibc stdenv.glibc.static
   ];
 
   dontStrip = true;

From bbcf127c7c9029cba43493d7d25a9d1c65d59152 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Mon, 14 Dec 2015 10:29:29 +0100
Subject: [PATCH 356/857] Fix evaluation after merge in multi-outputs

---
 pkgs/desktops/kde-4.14/kdenetwork/kopete.nix                   | 1 +
 .../development/libraries/phonon-backend-gstreamer/qt5/old.nix | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
index 267c2b7821294..f5750d60045f3 100644
--- a/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
+++ b/pkgs/desktops/kde-4.14/kdenetwork/kopete.nix
@@ -9,6 +9,7 @@ kde {
 
   patches = [
     (fetchurl {
+      name = "kopete.patch";
       url = "https://bugs.kde.org/attachment.cgi?id=91567";
       sha256 = "0a44rjiqzn6v3sywm17d1741sygbvlfnbqadq7qbdj3amny014m1";
     })
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
index 08bce2b68eba3..9d1e6e7285396 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/old.nix
@@ -22,6 +22,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [
     # This flag should be picked up through pkgconfig, but it isn't.
     "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include"
+    "-fPIC"
   ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -32,8 +33,6 @@ stdenv.mkDerivation rec {
   ]
   ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
 
-  NIX_CFLAGS_COMPILE = "-fPIC";
-
   meta = with stdenv.lib; {
     homepage = http://phonon.kde.org/;
     description = "GStreamer backend for Phonon";

From ab65fe023d167146c28323fd86c105d8b63cd752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 31 Dec 2015 10:07:02 +0100
Subject: [PATCH 357/857] perl: synchronize changes done to 5.20 and 5.22

Some multiple-output changes were previously only in 5.22,
but since master is still using 5.20, let's stick with that version
on closure-size as well.
https://github.com/NixOS/nixpkgs/commit/741bf840dad05cd1728481045466811ae8ae8281#commitcomment-14784970
---
 .../interpreters/perl/5.20/default.nix        | 58 +++++++++----------
 .../interpreters/perl/5.22/default.nix        |  3 +
 2 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
index 0113912148152..60e0fa273a2fc 100644
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ b/pkgs/development/interpreters/perl/5.20/default.nix
@@ -15,7 +15,8 @@ assert enableThreading -> (stdenv ? glibc);
 let
 
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
-
+  libcInc = libc.dev or libc;
+  libcLib = libc.out or libc;
 in
 
 with stdenv.lib;
@@ -29,8 +30,7 @@ stdenv.mkDerivation rec {
   };
 
   # TODO: Add a "dev" output containing the header files.
-  outputs = [ "out" "man" ];
-
+  outputs = [ "out" "man" "docdev" ];
   setOutputFlags = false;
 
   patches =
@@ -40,17 +40,6 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isSunOS ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ];
 
-  # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
-  # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
-  # while at the same time erasing the PATH environment variable so it unconditionally
-  # fails. The code in question is guarded by a check for Mac OS, but the patch below
-  # doesn't have any runtime effect on other platforms.
-  postPatch = stdenv.lib.optional stdenv.isDarwin ''
-    pwd="$(type -P pwd)"
-    substituteInPlace dist/PathTools/Cwd.pm \
-      --replace "/bin/pwd" "$pwd"
-  '';
-
   sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem";
 
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
@@ -64,8 +53,8 @@ stdenv.mkDerivation rec {
       "-Uinstallusrbinperl"
       "-Dinstallstyle=lib/perl5"
       "-Duseshrplib"
-      "-Dlocincpth=${libc.dev or libc}/include"
-      "-Dloclibpth=${libc.out or libc}/lib"
+      "-Dlocincpth=${libcInc}/include"
+      "-Dloclibpth=${libcLib}/lib"
     ]
     ++ optional stdenv.isSunOS "-Dcc=gcc"
     ++ optional enableThreading "-Dusethreads";
@@ -76,13 +65,17 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postPatch = ''
+    pwd="$(type -P pwd)"
+    substituteInPlace dist/PathTools/Cwd.pm \
+      --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
+  '';
+
   preConfigure =
     ''
       configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-
-      ${optionalString stdenv.isArm ''
-        configureFlagsArray=(-Dldflags="-lm -lrt")
-      ''}
+    '' + optionalString stdenv.isArm ''
+      configureFlagsArray=(-Dldflags="-lm -lrt")
     '' + optionalString stdenv.isDarwin ''
       substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
     '' + optionalString (!enableThreading) ''
@@ -96,21 +89,26 @@ stdenv.mkDerivation rec {
       substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
     '';
 
+  setupHook = ./setup-hook.sh;
+
+  passthru.libPrefix = "lib/perl5/site_perl";
+
+  # TODO: it seems like absolute paths to some coreutils is required.
   postInstall =
     ''
       # Remove dependency between "out" and "man" outputs.
-      rm $out/lib/perl5/*/*/.packlist
-
-      # Remove dependencies on glibc.dev and coreutils.
-      substituteInPlace $out/lib/perl5/*/*/Config_heavy.pl \
-        --replace ${stdenv.glibc.dev or "/blabla"} /no-such-path \
-        --replace $man /no-such-path
+      rm "$out"/lib/perl5/*/*/.packlist
+
+      # Remove dependencies on glibc and gcc
+      sed "/ *libpth =>/c    libpth => ' '," \
+        -i "$out"/lib/perl5/*/*/Config.pm
+      # TODO: removing those paths would be cleaner than overwriting with nonsense.
+      substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
+        --replace "${libcInc}" /no-such-path \
+        --replace "${stdenv.cc.cc or "/no-such-path"}" /no-such-path \
+        --replace "$man" /no-such-path
     ''; # */
 
-  setupHook = ./setup-hook.sh;
-
-  passthru.libPrefix = "lib/perl5/site_perl";
-
   meta = {
     homepage = https://www.perl.org/;
     description = "The standard implementation of the Perl 5 programmming language";
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
index c4635fd71e19c..21100cc8eac3a 100644
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ b/pkgs/development/interpreters/perl/5.22/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
     sha256 = "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c";
   };
 
+  # TODO: Add a "dev" output containing the header files.
   outputs = [ "out" "man" "docdev" ];
   setOutputFlags = false;
 
@@ -39,6 +40,8 @@ stdenv.mkDerivation rec {
     ++ optional stdenv.isSunOS ./ld-shared.patch
     ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ];
 
+  sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem";
+
   # Build a thread-safe Perl with a dynamic libperls.o.  We need the
   # "installstyle" option to ensure that modules are put under
   # $out/lib/perl5 - this is the general default, but because $out

From 9d1343414a2032f41dc6799ed46b27a5caaddc14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 31 Dec 2015 10:34:58 +0100
Subject: [PATCH 358/857] gcc: switch back to 4.9

Also sync a tiny difference in docs outputs from gcc-5.
I originally assumed that people will push gcc-5 support to master
long before closure-size gets there, but I overestimated the situation.
We haven't really settled even the issue of ABI switch,
so let's use the same gcc version on closure-size and master.
---
 pkgs/development/compilers/gcc/4.9/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 2b87c8ac43060..15cff14107065 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -215,7 +215,7 @@ stdenv.mkDerivation ({
 
   inherit patches;
 
-  outputs = [ "out" "lib" "doc" ];
+  outputs = [ "out" "lib" "man" "info" ];
   setOutputFlags = false;
   NIX_NO_SELF_RPATH = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b6c75b8a61946..e3957a6d95b2e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3865,7 +3865,7 @@ let
 
   gambit = callPackage ../development/compilers/gambit { };
 
-  gcc = gcc5;
+  gcc = gcc49;
 
   gcc_multi =
     if system == "x86_64-linux" then lowPrio (

From e22d26bedbeef32dd133fb7bc5e203e195cafbf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 11:14:09 +0100
Subject: [PATCH 359/857] cc-wrapper: small changes, mostly just cosmetic ones

---
 pkgs/build-support/cc-wrapper/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index f1dfd8cb666b1..4aeac5d75aae2 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation {
     '')
 
     + optionalString (!nativeLibc) ''
-      # The "-B$libc/lib/" flag is a quick hack to force gcc to link
+      # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
       # against the crt1.o from our own glibc, rather than the one in
       # /usr/lib.  (This is only an issue when using an `impure'
       # compiler/linker, i.e., one that searches /usr/lib and so on.)
@@ -89,7 +89,7 @@ stdenv.mkDerivation {
       # compile, because it uses "#include_next <limits.h>" to find the
       # limits.h file in ../includes-fixed. To remedy the problem,
       # another -idirafter is necessary to add that directory again.
-      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter $cc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
+      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
 
       echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
 
@@ -102,13 +102,13 @@ stdenv.mkDerivation {
     '' else ''
       echo $cc > $out/nix-support/orig-cc
 
-      # GCC shows $cc/lib in `gcc -print-search-dirs', but not
-      # $cc/lib64 (even though it does actually search there...)..
+      # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
+      # ${cc_solib}/lib64 (even though it does actually search there...)..
       # This confuses libtool.  So add it to the compiler tool search
       # path explicitly.
-      if [ -e "${cc.out}/lib64" -a ! -L "${cc.out}/lib64" ]; then
+      if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
         ccLDFlags+=" -L${cc_solib}/lib64"
-        ccCFlags+=" -B${cc.out}/lib64"
+        ccCFlags+=" -B${cc_solib}/lib64"
       fi
       ccLDFlags+=" -L${cc_solib}/lib"
 
@@ -118,7 +118,7 @@ stdenv.mkDerivation {
 
       # Find the gcc libraries path (may work only without multilib).
       ${optionalString cc.langAda or false ''
-        basePath=`echo $cc/lib/*/*/*`
+        basePath=`echo ${cc_solib}/lib/*/*/*`
         ccCFlags+=" -B$basePath -I$basePath/adainclude"
         gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
         echo "$gnatCFlags" > $out/nix-support/gnat-cflags
@@ -134,7 +134,7 @@ stdenv.mkDerivation {
       echo "$ccLDFlags" > $out/nix-support/cc-ldflags
       echo "$ccCFlags" > $out/nix-support/cc-cflags
 
-      ccPath="$cc/bin"
+      ccPath="${cc}/bin"
       ldPath="${binutils_bin}/bin"
 
       # Propagate the wrapped cc so that if you install the wrapper,

From 19d22184d3b1b74be5ecb9eb5c9a1630c9dd4b57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Jan 2016 11:18:27 +0100
Subject: [PATCH 360/857] stdenv/multiple-outputs.sh: small tweaks

- fix in silencing some moveToOutput messages
- allow removing (developer) documentation even without defining outputs
  (note: some paths are auto-removed by default, e.g. gtk-doc and man3)
---
 pkgs/build-support/setup-hooks/multiple-outputs.sh       | 3 +--
 pkgs/development/tools/documentation/gtk-doc/default.nix | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/multiple-outputs.sh b/pkgs/build-support/setup-hooks/multiple-outputs.sh
index ad2e5253ea07e..2cf08d42ae04b 100644
--- a/pkgs/build-support/setup-hooks/multiple-outputs.sh
+++ b/pkgs/build-support/setup-hooks/multiple-outputs.sh
@@ -106,7 +106,7 @@ moveToOutput() {
             if rmdir "$srcParent"; then
                 echo "Removing empty $srcParent/ and (possibly) its parents"
                 rmdir -p --ignore-fail-on-non-empty "$(readlink -m "$srcParent/..")" \
-                    > /dev/null || true # doesn't ignore failure for some reason
+                    2> /dev/null || true # doesn't ignore failure for some reason
             fi
         done
     done
@@ -114,7 +114,6 @@ moveToOutput() {
 
 # Move documentation to the desired outputs.
 _multioutDocs() {
-    if [ "$outputs" = "out" ]; then return; fi;
     local REMOVE=REMOVE # slightly hacky - we expand ${!outputFoo}
 
     moveToOutput share/info "${!outputInfo}"
diff --git a/pkgs/development/tools/documentation/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
index 6d93dc6def00a..22a0278384afb 100644
--- a/pkgs/development/tools/documentation/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "12xmmcnq4138dlbhmqa45wqza8dky4lf856sp80h6xjwl2g7a85l";
   };
 
+  outputDocdev = "out";
+
   # maybe there is a better way to pass the needed dtd and xsl files
   # "-//OASIS//DTD DocBook XML V4.1.2//EN" and "http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl"
   preConfigure = ''

From c0518e6777d85b30f1dc3e711214d730a345061f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 4 Jan 2016 11:18:38 +0100
Subject: [PATCH 361/857] ghc: fixup recent changes with multiple outputs

---
 pkgs/development/compilers/ghc/7.10.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 88d1bec4d42bf..68ac1a9d99e4f 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -39,8 +39,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
-    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib"
+    "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.lib}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];

From 4858f3307e47f94e6e7f3a4dfcbae1f5d5b746a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 09:18:24 +0100
Subject: [PATCH 362/857] R: fix build after splitting gfortran.lib

The extra flag was causing static libraries to be found (and used)
before dynamic ones. /cc #12085
---
 pkgs/applications/science/math/R/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix
index 183a1f5037539..6fac7dc969dcf 100644
--- a/pkgs/applications/science/math/R/default.nix
+++ b/pkgs/applications/science/math/R/default.nix
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
       CXX=$(type -p g++)
       FC="${gfortran}/bin/gfortran" F77="${gfortran}/bin/gfortran"
       JAVA_HOME="${jdk}"
-      LDFLAGS="-L${gfortran.cc}/lib"
       RANLIB=$(type -p ranlib)
       R_SHELL="${stdenv.shell}"
     )

From f8472457a440de3c44f6f604142d678b6ae2a762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 10 Jan 2016 09:21:25 +0100
Subject: [PATCH 363/857] pypy: fix build with multiple outputs

---
 pkgs/development/interpreters/pypy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index 2b74aaa94415c..b0410681a511b 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -25,9 +25,9 @@ let
       ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
-    C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs);
-    LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs);
-    LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib")
+    C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
+    LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") buildInputs);
+    LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib")
       (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs));
 
     preConfigure = ''

From f90e5ae3ba6214f712acd73d653ff5a323f4e5a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Jan 2016 10:00:35 +0100
Subject: [PATCH 364/857] mdadm: fixup build with multiple-outputs

Needed after 011c149ed5e5.
---
 pkgs/os-specific/linux/mdadm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index dc1697b9e9b2e..128f0d1aafcef 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   # This is to avoid self-references, which causes the initrd to explode
   # in size and in turn prevents mdraid systems from booting.
-  allowedReferences = [ stdenv.glibc ];
+  allowedReferences = [ stdenv.glibc.out ];
 
   patches = [ ./no-self-references.patch ];
 

From d1301160bbeb62755d64529297e2c28476e77c8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Jan 2016 11:48:12 +0100
Subject: [PATCH 365/857] chntpw: fix #11474, build with multiple-output glibc

---
 pkgs/tools/security/chntpw/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix
index 814fb0ea0ecc5..1f999e9d726d0 100644
--- a/pkgs/tools/security/chntpw/default.nix
+++ b/pkgs/tools/security/chntpw/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln";
   };
 
-  buildInputs = [ unzip ];
+  buildInputs = [ unzip ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ stdenv.glibc.out stdenv.glibc.static ];
 
   patches = [
     ./00-chntpw-build-arch-autodetect.patch

From 2b76df28b066edd52f874b95ec22628851ad6ee2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 07:03:11 -0600
Subject: [PATCH 366/857] qt54.qtbase: fix evaluation error

---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 36bd3822bf730..5cee55398ccd3 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -176,7 +176,7 @@ stdenv.mkDerivation {
 
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre
+    fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
     zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]

From 21bebe15920dbcab0c9a068a05ec137e82f5740e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 07:52:29 -0600
Subject: [PATCH 367/857] qt55.qtbase: fix syntax error

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 8f771f1f621a5..a4e9e57ca9e58 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -53,8 +53,6 @@ stdenv.mkDerivation {
       substituteInPlace qtbase/configure --replace /bin/pwd pwd
       substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
       sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
-          libgnomeui = libgnomeui.out;
-          gnome_vfs = gnome_vfs.out;
 
       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"
@@ -83,8 +81,8 @@ stdenv.mkDerivation {
       substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}"
       substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
         --replace "@gtk@" "${gtk}" \
-        --replace "@gnome_vfs@" "${gnome_vfs}" \
-        --replace "@libgnomeui@" "${libgnomeui}" \
+        --replace "@gnome_vfs@" "${gnome_vfs.out}" \
+        --replace "@libgnomeui@" "${libgnomeui.out}" \
         --replace "@gconf@" "${GConf}"
     ''
     + lib.optionalString mesaSupported ''
@@ -188,7 +186,7 @@ stdenv.mkDerivation {
   ++ lib.optional (cups != null) cups
   ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
-  ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
+  ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]

From e865a647f49c5fde4a2f64734b4891cf8fba291b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:56:58 +0200
Subject: [PATCH 368/857] brackets: Fix udev reference in multiple-outputs
 branch

---
 pkgs/applications/editors/brackets/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 131675486bada..127ed981a6c85 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
-, cups, libgcrypt_1_5, makeWrapper, dbus, udev }:
+, cups, libgcrypt_1_5, libudev, makeWrapper, dbus }:
 let
   bracketsEnv = buildEnv {
     name = "env-brackets";
     paths = [
       gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
-      dbus udev
+      dbus libudev.out
     ];
   };
 in
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     rmdir $out/usr
     ln -sf $out/opt/brackets/brackets $out/bin/brackets
 
-    ln -s ${udev}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
+    ln -s ${libudev.out}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \

From f412f5f3ee1ccfe909cb925fba92a4567f686869 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:28:56 +0200
Subject: [PATCH 369/857] treewide: Mass replace 'attr}/lib' to refer the 'out'
 output

---
 nixos/modules/security/apparmor-suid.nix    | 2 +-
 pkgs/tools/filesystems/xtreemfs/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index 3da6a81158d02..c2dc84e6a75c8 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -30,7 +30,7 @@ with lib;
 
         ${pkgs.glibc.out}/lib/*.so mr,
         ${pkgs.libcap}/lib/libcap.so* mr,
-        ${pkgs.attr}/lib/libattr.so* mr,
+        ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,
         /var/setuid-wrappers/ping.real r,
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 8f090c2978135..556cb674212d9 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       --replace "/usr/local" "${valgrind}"
 
     substituteInPlace cpp/CMakeLists.txt \
-      --replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"'
+      --replace '"/lib64" "/usr/lib64"' '"${attr.out}/lib" "${fuse}/lib"'
 
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include"
     export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib"

From c2ceed1ad143bf231402a8e010bcc5270a1930aa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:28:57 +0200
Subject: [PATCH 370/857] treewide: Mass replace 'binutils}/lib' to refer the
 'out' output

---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 2 +-
 pkgs/top-level/python-packages.nix               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index ed2154d00d2ec..a56d744ab8d4d 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -213,7 +213,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils}/bin/$i $out/bin
         done
-        cp -d ${binutils}/lib/lib*.so* $out/lib
+        cp -d ${binutils.out}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
         
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index b1a824983a3e7..117346eb4edc9 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -121,7 +121,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils}/bin/$i $out/bin
         done
-        cp -d ${binutils}/lib/lib*.so* $out/lib
+        cp -d ${binutils.out}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5fa5974cbf3b..48db91f155752 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15067,7 +15067,7 @@ in modules // {
     preConfigure = ''
       substituteInPlace setup.py \
         --replace '"/usr/include"' '"${pkgs.gdb}/include"' \
-        --replace '"/usr/lib"' '"${pkgs.binutils}/lib"'
+        --replace '"/usr/lib"' '"${pkgs.binutils.out}/lib"'
     '';
 
     meta = {

From 79738a639a5d93fc85ec73e382183af98499830a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:28:58 +0200
Subject: [PATCH 371/857] treewide: Mass replace 'binutils-raw}/lib' to refer
 the 'out' output

---
 pkgs/os-specific/darwin/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index abe4aa67b143f..d671c7c723038 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
     # FIXME: this will give us incorrect man pages for bits of cctools
     ln -s ${binutils-raw}/share $out/share
-    ln -s ${binutils-raw}/lib $out/lib
+    ln -s ${binutils-raw.out}/lib $out/lib
 
     ln -s ${cctools}/libexec $out/libexec
   '';

From d0058081272f58025693581e751facc388b46c86 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:00 +0200
Subject: [PATCH 372/857] treewide: Mass replace 'boehmgc}/lib' to refer the
 'out' output

---
 pkgs/development/compilers/gcc/4.3/default.nix | 2 +-
 pkgs/development/compilers/opendylan/bin.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
index 3db8ee5f3ea7d..e97ae93cd5311 100644
--- a/pkgs/development/compilers/gcc/4.3/default.nix
+++ b/pkgs/development/compilers/gcc/4.3/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation ({
   postConfigure = ''
     make configure-gcc
     sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib}/lib@'
-    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc}/lib -lgc@'
+    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc.out}/lib -lgc@'
   '';
 } else {})
 // (if langVhdl then rec {
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index 4d18b8d328d60..492b1c4b33381 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation {
     interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
     for a in "$out"/bin/*; do 
       patchelf --set-interpreter "$interpreter" "$a"
-      patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
+      patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
     for a in "$out"/lib/*.so; do 
-      patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
+      patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
     sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam
     wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin

From 51bf60b33e0c85e1d3beb5d7a12efe702efae864 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:00 +0200
Subject: [PATCH 373/857] treewide: Mass replace 'bzip2}/lib' to refer the
 'out' output

---
 pkgs/applications/editors/sublime3/default.nix       | 2 +-
 pkgs/development/libraries/tokyo-cabinet/default.nix | 2 +-
 pkgs/top-level/perl-packages.nix                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 49c30a1f6d606..c6cc813d6b113 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -57,7 +57,7 @@ in let
         --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
 
       # Without this, plugin_host crashes, even though it has the rpath
-      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so
+      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
     '';
   };
 in stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index 0b210a589d417..7512e085449cb 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   postInstall =
     '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \
            -e 's|-lz|-L${zlib}/lib -lz|g;
-               s|-lbz2|-L${bzip2}/lib -lbz2|g'
+               s|-lbz2|-L${bzip2.out}/lib -lbz2|g'
     '';
 
   meta = {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index de1fcc4e27ecd..516b42a0274ff 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1940,7 +1940,7 @@ let self = _self // overrides; _self = with self; {
 
     # Don't build a private copy of bzip2.
     BUILD_BZIP2 = false;
-    BZIP2_LIB = "${pkgs.bzip2}/lib";
+    BZIP2_LIB = "${pkgs.bzip2.out}/lib";
     BZIP2_INCLUDE = "${pkgs.bzip2}/include";
 
     meta = {

From 96372f2edb4b00a71a0aa9a97679853ffb95e3c6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:01 +0200
Subject: [PATCH 374/857] treewide: Mass replace 'cairo}/lib' to refer the
 'out' output

---
 nixos/modules/services/monitoring/graphite.nix | 2 +-
 pkgs/top-level/python-packages.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 976fd253a7cdd..e59be1ea6c319 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -490,7 +490,7 @@ in {
             "${cfg.api.package}/lib/python2.7/site-packages:" +
             concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders;
           GRAPHITE_API_CONFIG = graphiteApiConfig;
-          LD_LIBRARY_PATH = "${pkgs.cairo}/lib";
+          LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
         };
         serviceConfig = {
           ExecStart = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48db91f155752..e0b4223f6f431 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2565,7 +2565,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py
     '';
 
     meta = {

From dc8e939dbc9816a7b2c85bfd05a2f690f71fe2c8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:02 +0200
Subject: [PATCH 375/857] treewide: Mass replace 'cups}/lib' to refer the 'out'
 output

---
 nixos/modules/services/printing/cupsd.nix               | 8 ++++----
 pkgs/applications/networking/browsers/opera/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 0fe25b66da083..ba288a5d06111 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -11,21 +11,21 @@ let
   additionalBackends = pkgs.runCommand "additional-cups-backends" { }
     ''
       mkdir -p $out
-      if [ ! -e ${cups}/lib/cups/backend/smb ]; then
+      if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then
         mkdir -p $out/lib/cups/backend
         ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
       fi
 
       # Provide support for printing via HTTPS.
-      if [ ! -e ${cups}/lib/cups/backend/https ]; then
+      if [ ! -e ${cups.out}/lib/cups/backend/https ]; then
         mkdir -p $out/lib/cups/backend
-        ln -sv ${cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
+        ln -sv ${cups.out}/lib/cups/backend/ipp $out/lib/cups/backend/https
       fi
     '';
 
   # Here we can enable additional backends, filters, etc. that are not
   # part of CUPS itself, e.g. the SMB backend is part of Samba.  Since
-  # we can't update ${cups}/lib/cups itself, we create a symlink tree
+  # we can't update ${cups.out}/lib/cups itself, we create a symlink tree
   # here and add the additional programs.  The ServerBin directive in
   # cupsd.conf tells cupsd to use this tree.
   bindir = pkgs.buildEnv {
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index ab199ff97cdfe..de7240d3a83bd 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
-    patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
+    patchelf --set-rpath $oldRPATH:${cups.out}/lib $out/lib/opera/opera
 
     # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
     # It have no reasons to exist in a redistribuable package

From f12f6c86076618354f020f3b6634e46115794b40 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:06 +0200
Subject: [PATCH 376/857] treewide: Mass replace 'dbus_daemon}/lib' to refer
 the 'lib' output

---
 nixos/modules/services/system/dbus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 77427ce9606e4..2e29ef6a8f537 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -121,7 +121,7 @@ in
 
     security.setuidOwners = singleton
       { program = "dbus-daemon-launch-helper";
-        source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper";
+        source = "${pkgs.dbus_daemon.lib}/libexec/dbus-daemon-launch-helper";
         owner = "root";
         group = "messagebus";
         setuid = true;

From f9bf203837469eb7184c24ce9934d6f3b997c785 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:09 +0200
Subject: [PATCH 377/857] treewide: Mass replace 'expat}/lib' to refer the
 'out' output

---
 pkgs/tools/graphics/graphviz/2.0.nix  | 2 +-
 pkgs/tools/graphics/graphviz/2.32.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
index 04fff8053819a..263a3d965f842 100644
--- a/pkgs/tools/graphics/graphviz/2.0.nix
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg}/lib"
       "--with-expatincludedir=${expat}/include"
-      "--with-expatlibdir=${expat}/lib"
+      "--with-expatlibdir=${expat.out}/lib"
     ]
     ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
 
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index 6eb8b5bceb2e9..c8da74d02226e 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg}/lib"
       "--with-expatincludedir=${expat}/include"
-      "--with-expatlibdir=${expat}/lib"
+      "--with-expatlibdir=${expat.out}/lib"
       "--with-cgraph=no"
       "--with-sparse=no"
     ]

From bb5660e873b8c888558abe37157ce9860c13a174 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:10 +0200
Subject: [PATCH 378/857] treewide: Mass replace 'fftw}/lib' to refer the 'out'
 output

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e0b4223f6f431..0ec3fd5336047 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15427,11 +15427,11 @@ in modules // {
     doCheck = false;
 
     preConfigure = ''
-      export LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
+      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
       export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
     '';
     #+ optionalString isDarwin ''
-    #  export DYLD_LIBRARY_PATH="${pkgs.fftw}/lib"
+    #  export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib"
     #'';
 
     meta = {

From fc6acf7a8791f88e11f3be37313828391dcd4a39 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:11 +0200
Subject: [PATCH 379/857] treewide: Mass replace 'fftwLongDouble}/lib' to refer
 the 'out' output

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0ec3fd5336047..2834ef96b7818 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15427,7 +15427,7 @@ in modules // {
     doCheck = false;
 
     preConfigure = ''
-      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
+      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble.out}/lib"
       export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
     '';
     #+ optionalString isDarwin ''

From 7a7cc31076be891e800dbf5fe2bc30118c810d92 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:12 +0200
Subject: [PATCH 380/857] treewide: Mass replace 'fftwFloat}/lib' to refer the
 'out' output

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2834ef96b7818..12af1e32832e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15427,7 +15427,7 @@ in modules // {
     doCheck = false;
 
     preConfigure = ''
-      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble.out}/lib"
+      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
       export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
     '';
     #+ optionalString isDarwin ''

From b56b24f72909aaf156aae78390d8b4e5d21014ca Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:13 +0200
Subject: [PATCH 381/857] treewide: Mass replace 'freetype}/lib' to refer the
 'out' output

---
 pkgs/games/warsow/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index b525e3cb0f894..9f2dfbab2ecdc 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     cp -rv basewsw libs $dest
     # Since 1.03 some modules are _always_ downloaded from server, thus
     makeWrapper $dest/warsow $out/bin/warsow \
-      --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib"
+      --suffix-each LD_LIBRARY_PATH ':' "${freetype.out}/lib"
     makeWrapper $dest/wsw_server $out/bin/wsw_server
     makeWrapper $dest/wswtv_server $out/bin/wswtv_server
   '';

From a1909d73800a520b34640693343da7b68d5b7294 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:16 +0200
Subject: [PATCH 382/857] treewide: Mass replace 'glibc}/lib' to refer the
 'out' output

---
 nixos/modules/system/boot/initrd-network.nix | 2 +-
 pkgs/applications/audio/baudline/default.nix | 2 +-
 pkgs/applications/editors/idea/common.nix    | 2 +-
 pkgs/applications/misc/kiwix/default.nix     | 2 +-
 pkgs/development/compilers/ponyc/default.nix | 2 +-
 pkgs/games/dwarf-fortress/default.nix        | 2 +-
 pkgs/misc/cups/drivers/mfcj470dw/default.nix | 4 ++--
 pkgs/os-specific/linux/fusionio/util.nix     | 2 +-
 pkgs/servers/plex/default.nix                | 4 ++--
 pkgs/top-level/python-packages.nix           | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 6c6e2fafad433..d01222243f5d7 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -102,7 +102,7 @@ in
     '' + optionalString cfg.ssh.enable ''
       copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
 
-      cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib
+      cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
     '';
 
     boot.initrd.extraUtilsCommandsTest = optionalString cfg.ssh.enable ''
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index 543329ef679b1..2d6b0434d6a1c 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     cp -r . "$out/libexec/baudline/"
 
-    interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)"
+    interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)"
     for prog in "$out"/libexec/baudline/baudline*; do
         patchelf --interpreter "$interpreter" "$prog"
         ln -sr "$prog" "$out/bin/"
diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix
index 96689fa75ad6c..979a374701f8e 100644
--- a/pkgs/applications/editors/idea/common.nix
+++ b/pkgs/applications/editors/idea/common.nix
@@ -37,7 +37,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
         truncate --size=$size $fname
       }
 
-      interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+      interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
       if [ "${stdenv.system}" == "x86_64-linux" ]; then
         target_size=$(get_file_size bin/fsnotifier64)
         patchelf --set-interpreter "$interpreter" bin/fsnotifier64
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 30db6a45ea1b9..d29e4fca3b29e 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     make install
     cp -r src/dependencies/xulrunner $out/lib/kiwix
 
-    patchelf --set-interpreter ${glibc}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner
 
     rm $out/bin/kiwix
     makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index c94ba203c0ff9..f05555003f982 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   checkTarget = "test";
 
   patchPhase = ''
-    sed 's|/usr/lib/x86_64-linux-gnu/|${glibc}/lib/|g' -i src/libponyc/codegen/genexe.c
+    sed 's|/usr/lib/x86_64-linux-gnu/|${glibc.out}/lib/|g' -i src/libponyc/codegen/genexe.c
     sed 's|/lib/x86_64-linux-gnu/|${stdenv.cc.cc}/lib/|g' -i src/libponyc/codegen/genexe.c
   '';
 
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 317981cd88771..97c793b8a39fc 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -194,7 +194,7 @@ stdenv.mkDerivation rec {
     # Fix rpath
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
 
-    patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
 
     # Store new hash
     patched_hash=$(md5sum $out/share/df_linux/libs/Dwarf_Fortress | awk '{ print $1 }')
diff --git a/pkgs/misc/cups/drivers/mfcj470dw/default.nix b/pkgs/misc/cups/drivers/mfcj470dw/default.nix
index d1a1b239371ad..b61344d1280e7 100644
--- a/pkgs/misc/cups/drivers/mfcj470dw/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dw/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
 
     sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1
 
     mkdir -p $out/lib/cups/filter/
     ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw
diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix
index e2f8d423a61d6..e77d596dc6f8b 100644
--- a/pkgs/os-specific/linux/fusionio/util.nix
+++ b/pkgs/os-specific/linux/fusionio/util.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out
     for BIN in $(find $out/bin -type f); do
       echo Patching $BIN
-      patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN
+      patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc.out}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN
 
       # Test our binary to see if it was correctly patched
       set +e
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 2aeb9379e10fd..d88f7a89493de 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
     # Now we need to patch up the executables and libraries to work on Nix.
     # Side note: PLEASE don't put spaces in your binary names. This is stupid.
     for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do
-      patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
+      patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
       patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
     done
 
     find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \
-        -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \;
+        -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \;
 
     # executables need libstdc++.so.6
     ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12af1e32832e0..64afc8d0b9451 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11339,7 +11339,7 @@ in modules // {
 
     patchPhase = optionalString stdenv.isLinux ''
       substituteInPlace monotonic.py --replace \
-        "ctypes.util.find_library('c')" "'${stdenv.glibc}/lib/libc.so.6'"
+        "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
     '';
   };
 

From df8495fb18305bfd926a4e7b4dbf5c27edb70400 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:17 +0200
Subject: [PATCH 383/857] treewide: Mass replace 'gmp}/lib' to refer the 'out'
 output

---
 pkgs/development/compilers/ghc/7.4.2-binary.nix | 6 +++---
 pkgs/development/compilers/ghc/8.0.1.nix        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index a57aff4d864f6..70cd7d21c4775 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     # We have to patch the GMP paths for the integer-gmp package.
      ''
       find . -name integer-gmp.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \;
+          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
      '' + stdenv.lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
       ln -sv "${ncurses.lib}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "$out/lib:${gmp}/lib" {} \;
+          --set-rpath "$out/lib:${gmp.out}/lib" {} \;
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       for prog in ld ar gcc strip ranlib; do
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     ./configure --prefix=$out \
-      --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \
+      --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \
       ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
   '';
 
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 7f337c019531e..b262a448d4da5 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"

From 8707bf4a3ca5459cc4d3cec5880df6f55fe73067 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:25 +0200
Subject: [PATCH 384/857] treewide: Mass replace 'libcap}/lib' to refer the
 'out' output

---
 nixos/modules/security/apparmor-suid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index c2dc84e6a75c8..d766f6badfc7e 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -29,7 +29,7 @@ with lib;
         network inet raw,
 
         ${pkgs.glibc.out}/lib/*.so mr,
-        ${pkgs.libcap}/lib/libcap.so* mr,
+        ${pkgs.libcap.out}/lib/libcap.so* mr,
         ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,

From 493349f82aac9aecebb9264ef2748fc32d8aa266 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:29 +0200
Subject: [PATCH 385/857] treewide: Mass replace 'libjpeg}/lib' to refer the
 'out' output

---
 pkgs/applications/video/avxsynth/default.nix | 2 +-
 pkgs/tools/graphics/graphviz/2.0.nix         | 2 +-
 pkgs/tools/graphics/graphviz/2.32.nix        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index d8ec715a38cb6..06dcaf31b443f 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--enable-subtitle"
     "--enable-ffms2"
     (enableFeature avxeditSupport "avxedit")
-    "--with-jpeg=${libjpeg}/lib"
+    "--with-jpeg=${libjpeg.out}/lib"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
index 263a3d965f842..0e261837c8da0 100644
--- a/pkgs/tools/graphics/graphviz/2.0.nix
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     [ "--with-pngincludedir=${libpng}/include"
       "--with-pnglibdir=${libpng}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
-      "--with-jpeglibdir=${libjpeg}/lib"
+      "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"
       "--with-expatlibdir=${expat.out}/lib"
     ]
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index c8da74d02226e..3642f83b7fb92 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     [ "--with-pngincludedir=${libpng}/include"
       "--with-pnglibdir=${libpng}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
-      "--with-jpeglibdir=${libjpeg}/lib"
+      "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"
       "--with-expatlibdir=${expat.out}/lib"
       "--with-cgraph=no"

From 377e942f71753ba040f137c354a2bfd8c2a20a9f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:34 +0200
Subject: [PATCH 386/857] treewide: Mass replace 'libpng}/lib' to refer the
 'out' output

---
 pkgs/tools/graphics/graphviz/2.0.nix  | 2 +-
 pkgs/tools/graphics/graphviz/2.32.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
index 0e261837c8da0..02b700111de3e 100644
--- a/pkgs/tools/graphics/graphviz/2.0.nix
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
-      "--with-pnglibdir=${libpng}/lib"
+      "--with-pnglibdir=${libpng.out}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index 3642f83b7fb92..8da3ea0a17499 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
-      "--with-pnglibdir=${libpng}/lib"
+      "--with-pnglibdir=${libpng.out}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"

From 035fdf61c6e15d1df42fce4835b83e6828ad3821 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:36 +0200
Subject: [PATCH 387/857] treewide: Mass replace 'libpulseaudio}/lib' to refer
 the 'out' output

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 64afc8d0b9451..cc7232f235d0d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5576,7 +5576,7 @@ in modules // {
 
     propagatedBuildInputs = with self; [ keyring colour netifaces praw psutil
       basiciw pkgs.libpulseaudio ];
-    ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio}/lib\"";
+    ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio.out}/lib\"";
     makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
 
     postInstall = ''

From 3e87411733cd311d0d30cc428a4a74fa111b6602 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:37 +0200
Subject: [PATCH 388/857] treewide: Mass replace 'libsamplerate}/lib' to refer
 the 'out' output

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cc7232f235d0d..7132e8076aec1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6742,7 +6742,7 @@ in modules // {
     preConfigure = ''
        cat > site.cfg << END
        [samplerate]
-       library_dirs=${pkgs.libsamplerate}/lib
+       library_dirs=${pkgs.libsamplerate.out}/lib
        include_dirs=${pkgs.libsamplerate}/include
        END
     '';

From 052ce8112445710515f756e58b60ca3c1f0e0934 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:38 +0200
Subject: [PATCH 389/857] treewide: Mass replace 'libsndfile}/lib' to refer the
 'out' output

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7132e8076aec1..171a5f8b8ad88 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14360,7 +14360,7 @@ in modules // {
     };
 
     prePatch = ''
-      substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile}/lib/libsndfile.so'"
+      substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'"
     '';
 
     # https://github.com/bastibe/PySoundFile/issues/157

From 3916cf476b363e072b27b25b86f5c8f706222e86 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:42 +0200
Subject: [PATCH 390/857] treewide: Mass replace 'libtiff}/lib' to refer the
 'out' output

---
 pkgs/tools/graphics/netpbm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index e69a73ff321e4..b39ae1dfd08fe 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp config.mk.in config.mk
     echo "STATICLIB_TOO = n" >> config.mk
     substituteInPlace "config.mk" \
-        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \
+        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
         --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include"
   '';
 

From 69498299dd681fe773b474c3dec2d9b5bec468f0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:44 +0200
Subject: [PATCH 391/857] treewide: Mass replace 'libusb1}/lib' to refer the
 'out' output

---
 pkgs/applications/graphics/digikam/default.nix | 2 +-
 pkgs/development/mobile/flashtool/default.nix  | 2 +-
 pkgs/top-level/python-packages.nix             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index bdf8077624db2..bc3678811a5b7 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   # Help digiKam find libusb, otherwise gphoto2 support is disabled
   cmakeFlags = [
-    "-DLIBUSB_LIBRARIES=${libusb1}/lib"
+    "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
     "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"
     "-DDIGIKAMSC_COMPILE_LIBKFACE=ON"
   ];
diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index d22eeb6c21383..b33fc13224a39 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux
     ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux
-    ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
+    ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
 
     chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 171a5f8b8ad88..289fec567f576 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22018,7 +22018,7 @@ in modules // {
 
     # Fix the USB backend library lookup
     postPatch = ''
-      libusb=${pkgs.libusb1}/lib/libusb-1.0.so
+      libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so
       test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
       sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py
     '';

From 91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:45 +0200
Subject: [PATCH 392/857] treewide: Mass replace 'libusb}/lib' to refer the
 'out' output

---
 pkgs/applications/misc/nut/default.nix         | 2 +-
 pkgs/development/libraries/scmccid/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 3e972f672cc25..25c9048809237 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   
   postInstall = ''
     wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
-      "$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib"
+      "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index f9845d60b4903..f88bd64f597be 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ patchelf ];
 
   installPhase = ''
-    RPATH=${libusb}/lib:${stdenv.cc.libc.out}/lib
+    RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
 
     for a in proprietary/*/Contents/Linux/*.so*; do
         if ! test -L $a; then

From 5d52f5542604fad210a1b16484f31d2f8bb5ed39 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:49 +0200
Subject: [PATCH 393/857] treewide: Mass replace 'xorg.libX11}/lib' to refer
 the 'out' output

---
 nixos/modules/services/x11/window-managers/metacity.nix | 2 +-
 pkgs/applications/graphics/gimp/2.8.nix                 | 2 +-
 pkgs/development/tools/selenium/server/default.nix      | 2 +-
 pkgs/os-specific/linux/ati-drivers/default.nix          | 2 +-
 pkgs/top-level/perl-packages.nix                        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
index 3e5229be634f1..866bb441de45f 100644
--- a/nixos/modules/services/x11/window-managers/metacity.nix
+++ b/nixos/modules/services/x11/window-managers/metacity.nix
@@ -20,7 +20,7 @@ in
     services.xserver.windowManager.session = singleton
       { name = "metacity";
         start = ''
-          env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/lib:/usr/lib/
           # !!! Hack: load the schemas for Metacity.
           GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
             --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 954a1d4c19c9b..82c4bcbdc369e 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   #configureFlags = [ "--disable-print" ];
 
   # "screenshot" needs this.
-  NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"
+  NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"
     + stdenv.lib.optionalString stdenv.isDarwin " -lintl";
 
   meta = {
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 2efd85f840101..66d9668fe82d6 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \
+      --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11.out}/lib" \
       launchers/launcher-linux-${arch}
     ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
   '';
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index bb08888550953..e9eba11513bdc 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
     [ "${xorg.libXrandr}/lib"
       "${xorg.libXrender}/lib"
       "${xorg.libXext}/lib"
-      "${xorg.libX11}/lib"
+      "${xorg.libX11.out}/lib"
       "${xorg.libXinerama}/lib"
     ];
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 516b42a0274ff..c4a4640a8b820 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12777,7 +12777,7 @@ let self = _self // overrides; _self = with self; {
       url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz";
       sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa";
     };
-    makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib";
+    makeMakerFlags = "X11LIB=${pkgs.xorg.libX11.out}/lib";
     buildInputs = with pkgs; [ xorg.libX11 libpng ];
     configurePhase = ''
       perl Makefile.PL PREFIX=$out $makeMakerFlags
@@ -13219,7 +13219,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ];
     propagatedBuildInputs = [ InlineC ];
-    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
+    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
     meta = {
       description = "Get the idle time of X11";
     };

From eec609fcc191857a44a200bc401d6c7f8a51d97f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:50 +0200
Subject: [PATCH 394/857] treewide: Mass replace 'xorg.libxcb}/lib' to refer
 the 'out' output

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 289fec567f576..581e2834d8fdf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23731,7 +23731,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py
     '';
 
     propagatedBuildInputs = [ self.cffi self.six ];

From 40ef23e7ed521abb7161dde01806ca62c9ed25ba Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:51 +0200
Subject: [PATCH 395/857] treewide: Mass replace 'xorg.libXext}/lib' to refer
 the 'out' output

---
 nixos/modules/services/x11/window-managers/metacity.nix | 2 +-
 pkgs/os-specific/linux/ati-drivers/default.nix          | 2 +-
 pkgs/top-level/perl-packages.nix                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
index 866bb441de45f..2957ad91be453 100644
--- a/nixos/modules/services/x11/window-managers/metacity.nix
+++ b/nixos/modules/services/x11/window-managers/metacity.nix
@@ -20,7 +20,7 @@ in
     services.xserver.windowManager.session = singleton
       { name = "metacity";
         start = ''
-          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/lib:/usr/lib/
+          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/
           # !!! Hack: load the schemas for Metacity.
           GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
             --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index e9eba11513bdc..277da6f6e4b57 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
     [ "${xorg.libXrandr}/lib"
       "${xorg.libXrender}/lib"
-      "${xorg.libXext}/lib"
+      "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"
       "${xorg.libXinerama}/lib"
     ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c4a4640a8b820..053198bde2a4d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13219,7 +13219,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ];
     propagatedBuildInputs = [ InlineC ];
-    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
+    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
     meta = {
       description = "Get the idle time of X11";
     };

From 555292017e361206952acffda2641a59f7c8ae4b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:53 +0200
Subject: [PATCH 396/857] treewide: Mass replace 'xorg.libXft}/lib' to refer
 the 'out' output

---
 pkgs/development/r-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 261529fd5239d..7a7b603b449b3 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -2383,7 +2383,7 @@ let
     });
 
     devEMF = old.devEMF.overrideDerivation (attrs: {
-      NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft";
+      NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft";
     });
 
     slfm = old.slfm.overrideDerivation (attrs: {

From 5a6a8213ebefade42f08bfba9ec94652631e0eb1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:54 +0200
Subject: [PATCH 397/857] treewide: Mass replace 'xorg.libXinerama}/lib' to
 refer the 'out' output

---
 pkgs/os-specific/linux/ati-drivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 277da6f6e4b57..7bc56a45fc4bb 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
       "${xorg.libXrender}/lib"
       "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"
-      "${xorg.libXinerama}/lib"
+      "${xorg.libXinerama.out}/lib"
     ];
 
   # without this some applications like blender don't start, but they start

From 474f921bacefadaa7f123f7531adfa86062f4b0d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:57 +0200
Subject: [PATCH 398/857] treewide: Mass replace 'xorg.libXrandr}/lib' to refer
 the 'out' output

---
 pkgs/os-specific/linux/ati-drivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 7bc56a45fc4bb..67b98211099de 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
   inherit glibc /* glibc only used for setting interpreter */;
 
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
-    [ "${xorg.libXrandr}/lib"
+    [ "${xorg.libXrandr.out}/lib"
       "${xorg.libXrender}/lib"
       "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"

From 1894615f64502d66c2f5c4ad85e8ee50ee75cbf7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:57 +0200
Subject: [PATCH 399/857] treewide: Mass replace 'xorg.libXrender}/lib' to
 refer the 'out' output

---
 pkgs/os-specific/linux/ati-drivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 67b98211099de..c1e524e224bb8 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
 
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
     [ "${xorg.libXrandr.out}/lib"
-      "${xorg.libXrender}/lib"
+      "${xorg.libXrender.out}/lib"
       "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"
       "${xorg.libXinerama.out}/lib"

From 04c5830432165e60d5ef7bc77ea13618d9943fc5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:00 +0200
Subject: [PATCH 400/857] treewide: Mass replace 'mpfr}/lib' to refer the 'out'
 output

---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index a56d744ab8d4d..ed7314878a6fb 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -199,7 +199,7 @@ rec {
         rm -rf $out/include/c++/*/ext/parallel
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
-        cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
+        cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 117346eb4edc9..abcba396c371e 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -112,7 +112,7 @@ rec {
         rm -rf $out/include/c++/*/ext/parallel
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
-        cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
+        cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib

From 8eb5d7d037a484b6c33f035687a0cf22f2600128 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:01 +0200
Subject: [PATCH 401/857] treewide: Mass replace 'ncurses}/lib' to refer the
 'lib' output

---
 pkgs/applications/editors/emacs-24/macport-24.5.nix   | 4 ++--
 pkgs/development/compilers/ghc/8.0.1.nix              | 2 +-
 pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 +-
 pkgs/servers/sql/mariadb/default.nix                  | 2 +-
 pkgs/tools/system/gptfdisk/default.nix                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index c778c42de8576..ae0a66b30feef 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "LDFLAGS=-L${ncurses}/lib"
+    "LDFLAGS=-L${ncurses.lib}/lib"
     "--with-xml2=yes"
     "--with-gnutls=yes"
     "--with-mac"
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   ];
 
   CFLAGS = "-O3";
-  LDFLAGS = "-O3 -L${ncurses}/lib";
+  LDFLAGS = "-O3 -L${ncurses.lib}/lib";
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index b262a448d4da5..6e9f4691f73b9 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
-    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib"
+    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.lib}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index d3f66c918ec77..ee649eb89b47d 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
+                          --set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
     do
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index f23a8f422b3bc..340e29e94b3ef 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
     "-DWITHOUT_TOKUDB=1"
-    "-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib"
+    "-DCURSES_LIBRARY=${ncurses.lib}/lib/libncurses.dylib"
   ];
 
   # fails to find lex_token.h sometimes
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 9306b0e84ccac..18baf289e8cf2 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile.mac --replace \
       " -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
     substituteInPlace Makefile.mac --replace \
-      "/opt/local/lib/libncurses.a" "${ncurses}/lib/libncurses.dylib"
+      "/opt/local/lib/libncurses.a" "${ncurses.lib}/lib/libncurses.dylib"
   '';
 
   buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac";

From 2258aecaa5e1b03b2f6def3bd79b769ee306ab9c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:03 +0200
Subject: [PATCH 402/857] treewide: Mass replace 'nss}/lib' to refer the 'out'
 output

---
 pkgs/development/libraries/liboauth/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 479a187cf87c9..f62fb400199f0 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/lib/liboauth.la \
-      --replace "-lnss3" "-L${nss}/lib -lnss3"
+      --replace "-lnss3" "-L${nss.out}/lib -lnss3"
   '';
 
   meta = with stdenv.lib; {

From d91c7347d1f51ec0282a286e4eae69c13edd506a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:05 +0200
Subject: [PATCH 403/857] treewide: Mass replace 'openssl}/lib' to refer the
 'out' output

---
 nixos/modules/system/boot/luksroot.nix                 |  2 +-
 pkgs/applications/editors/sublime3/default.nix         |  2 +-
 pkgs/applications/networking/ike/default.nix           |  2 +-
 .../networking/instant-messengers/fuze/default.nix     |  4 ++--
 .../instant-messengers/pybitmessage/default.nix        |  2 +-
 pkgs/development/compilers/ponyc/default.nix           |  4 ++--
 pkgs/servers/nosql/arangodb/default.nix                |  2 +-
 pkgs/servers/shellinabox/default.nix                   |  2 +-
 pkgs/tools/system/monit/default.nix                    |  2 +-
 pkgs/top-level/perl-packages.nix                       | 10 +++++-----
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 59bff5472e844..6ea11e60b263b 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -438,7 +438,7 @@ in
         copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
         copy_bin_and_libs ${pkgs.openssl}/bin/openssl
 
-        cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
+        cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
         strip -s pbkdf2-sha512
         copy_bin_and_libs pbkdf2-sha512
 
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index c6cc813d6b113..5a1d10a1468cb 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -57,7 +57,7 @@ in let
         --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
 
       # Without this, plugin_host crashes, even though it has the rpath
-      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
+      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
     '';
   };
 in stdenv.mkDerivation {
diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix
index afb8c22272e43..5ea0975e15f37 100644
--- a/pkgs/applications/networking/ike/default.nix
+++ b/pkgs/applications/networking/ike/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install
     for file in "$out"/bin/* "$out"/sbin/*; do
-        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
+        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
     done
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix
index 33ffe87a4ffb4..9ea2b5a56d1bd 100644
--- a/pkgs/applications/networking/instant-messengers/fuze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
         $f
     done
 
-    ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8
-    ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8
+    ln -s ${openssl.out}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8
+    ln -s ${openssl.out}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8
 
     ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze
   '';
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index c19b5ff31f9d1..17462cb75ad57 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     substituteInPlace $out/bin/pybitmessage \
       --replace "exec python2" "exec ${python}/bin/python" \
-      --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl}/lib/"
+      --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/"
     wrapProgram $out/bin/pybitmessage \
       --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
   '';
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index f05555003f982..076146095196a 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     '';
 
   preCheck = ''
-    export LIBRARY_PATH="$out/lib:${openssl}/lib:${pcre2}/lib"
+    export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib"
   '';
 
   installPhase = ''
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     mv $out/bin/ponyc $out/bin/ponyc.wrapped
     makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \
       --prefix LIBRARY_PATH : "$out/lib" \
-      --prefix LIBRARY_PATH : "${openssl}/lib" \
+      --prefix LIBRARY_PATH : "${openssl.out}/lib" \
       --prefix LIBRARY_PATH : "${pcre2}/lib"
   '';
 
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 4ff12f630c9bc..473b5d717dea7 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     openssl zlib python gyp go readline
   ];
 
-  configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ];
+  configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ];
 
   patchPhase = ''
     substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 0a651762f185f..6df4905af2cd3 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/shellinaboxd \
-      --prefix LD_LIBRARY_PATH : ${openssl}/lib
+      --prefix LD_LIBRARY_PATH : ${openssl.out}/lib
     mkdir -p $out/lib
     cp shellinabox/* $out/lib
   '';
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 1b15fbbb62814..0ee32a49c07bf 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-ssl-incl-dir=${openssl}/include"
-    "--with-ssl-lib-dir=${openssl}/lib"
+    "--with-ssl-lib-dir=${openssl.out}/lib"
   ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ];
 
   meta = {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 053198bde2a4d..fb8bba33f3745 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2491,7 +2491,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
     meta = with stdenv.lib; {
       homepage = https://metacpan.org/release/Crypt-OpenSSL-AES;
       description = "Perl wrapper around OpenSSL's AES library";
@@ -2508,7 +2508,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
   CryptOpenSSLRandom = buildPerlPackage rec {
@@ -2518,7 +2518,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
   CryptOpenSSLRSA = buildPerlPackage rec {
@@ -2529,7 +2529,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ CryptOpenSSLRandom ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
   CryptSSLeay = buildPerlPackage rec {
@@ -2538,7 +2538,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz";
       sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
     };
-    makeMakerFlags = "--libpath=${pkgs.openssl}/lib --incpath=${pkgs.openssl}/include";
+    makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl}/include";
     buildInputs = [ PathClass TryTiny ];
   };
 

From ba87da9fd12a7fce91fa08f32dc2ebb6933eac1c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:07 +0200
Subject: [PATCH 404/857] treewide: Mass replace 'pcre}/lib' to refer the 'out'
 output

---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index abcba396c371e..1011ae6689ad2 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -86,7 +86,7 @@ rec {
         cp ${curlMinimal}/bin/curl $out/bin
         cp -d ${curlMinimal}/lib/libcurl* $out/lib
 
-        cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
+        cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep
 
         # Copy what we need of GCC.
         cp -d ${gcc.cc}/bin/gcc $out/bin

From 619710268d1e0581f70d4d7c504b05e2d0b989a9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:09 +0200
Subject: [PATCH 405/857] treewide: Mass replace 'poppler}/lib' to refer the
 'out' output

---
 pkgs/applications/misc/pdfmod/default.nix        | 2 +-
 pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 +-
 pkgs/tools/typesetting/tex/texlive/default.nix   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index f23238b2dc614..12e3e696777dd 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \
       --prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \
       --prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \
-      --prefix LD_LIBRARY_PATH : ${poppler}/lib
+      --prefix LD_LIBRARY_PATH : ${poppler.out}/lib
   '';
 
   dontStrip = true;
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index 56b093f921d11..550870b0a6a99 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -66,7 +66,7 @@ rec {
     # did the same thing in texLive, but couldn't get it to carry to the
     # binaries installed by texLiveFull
     for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib"
     done
   '' ) [ "minInit" "defEnsureDir" "addInputs" ];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 008de2d252091..48a5ae8d6499b 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -30,7 +30,7 @@ rec {
   setupHook = ./setup-hook.sh;
 
   doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
-    export DYLD_LIBRARY_PATH="${poppler}/lib"
+    export DYLD_LIBRARY_PATH="${poppler.out}/lib"
   '' + ''
     mkdir -p $out
     mkdir -p $out/nix-support
@@ -106,7 +106,7 @@ rec {
     PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib"
     done
   '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];
 

From 0f4244f51f1703132d9205a216180902a75bf33e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:11 +0200
Subject: [PATCH 406/857] treewide: Mass replace 'poppler_utils}/lib' to refer
 the 'out' output

---
 pkgs/applications/misc/calibre/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 62da092470ab1..f464c3ccd0279 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     export HOME=$TMPDIR/fakehome
     export POPPLER_INC_DIR=${poppler_utils}/include/poppler
-    export POPPLER_LIB_DIR=${poppler_utils}/lib
+    export POPPLER_LIB_DIR=${poppler_utils.out}/lib
     export MAGICK_INC=${imagemagick}/include/ImageMagick
     export MAGICK_LIB=${imagemagick}/lib
     export FC_INC_DIR=${fontconfig.dev}/include/fontconfig

From ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:24 +0200
Subject: [PATCH 407/857] treewide: Mass replace 'zlib}/lib' to refer the 'out'
 output

---
 pkgs/applications/audio/milkytracker/default.nix            | 2 +-
 pkgs/applications/editors/texmacs/default.nix               | 2 +-
 pkgs/development/compilers/gcc/4.3/default.nix              | 2 +-
 pkgs/development/libraries/tokyo-cabinet/default.nix        | 2 +-
 pkgs/development/mobile/androidenv/androidndk_r8e.nix       | 2 +-
 pkgs/development/ocaml-modules/camlzip/default.nix          | 2 +-
 pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 2 +-
 pkgs/development/tools/build-managers/cargo/snapshot.nix    | 2 +-
 pkgs/games/openttd/default.nix                              | 2 +-
 pkgs/servers/meteor/default.nix                             | 4 ++--
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix            | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix                  | 2 +-
 pkgs/tools/filesystems/yandex-disk/default.nix              | 2 +-
 pkgs/tools/graphics/pngcheck/default.nix                    | 2 +-
 pkgs/tools/networking/p2p/gtk-gnutella/default.nix          | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 8bc0aebba5a84..f22ccd08a8e87 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild=''
-    export CPATH=${zlib}/lib
+    export CPATH=${zlib.out}/lib
   '';
 
   buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ];
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index e415239d76fb0..e51813459c6f5 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     bin="$out/libexec/TeXmacs/bin/texmacs.bin"
     rpath=$(patchelf --print-rpath "$bin")
-    patchelf --set-rpath "$rpath:${zlib}/lib" "$bin"
+    patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin"
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
index e97ae93cd5311..317bd5eb3ed53 100644
--- a/pkgs/development/compilers/gcc/4.3/default.nix
+++ b/pkgs/development/compilers/gcc/4.3/default.nix
@@ -142,7 +142,7 @@ stdenv.mkDerivation ({
 } // (if langJava then {
   postConfigure = ''
     make configure-gcc
-    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib}/lib@'
+    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib.out}/lib@'
     sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc.out}/lib -lgc@'
   '';
 } else {})
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index 7512e085449cb..b8969588b3c55 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \
-           -e 's|-lz|-L${zlib}/lib -lz|g;
+           -e 's|-lz|-L${zlib.out}/lib -lz|g;
                s|-lbz2|-L${bzip2.out}/lib -lbz2|g'
     '';
 
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index ee649eb89b47d..a38d2d6b33cfc 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \;
+                          --set-rpath ${zlib.out}/lib:${ncurses.lib}/lib {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
     do
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 2024f5a5ab8fd..60590c6c1d5fe 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   postPatch = ''
     substitute ${./META} META --subst-var-by VERSION "${version}"
     substituteInPlace Makefile \
-      --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \
+      --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
       --subst-var-by ZLIB_INCLUDE "${zlib}/include"
   '';
 
diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 20362a51a7be3..9314481cbcfe8 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -12,7 +12,7 @@ buildPerlPackage rec {
     cat > config.in <<EOF
       BUILD_ZLIB   = False
       INCLUDE      = ${zlib}/include
-      LIB          = ${zlib}/lib
+      LIB          = ${zlib.out}/lib
       OLD_ZLIB     = False
       GZIP_OS_CODE = AUTO_DETECT
     EOF
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index 8f5467f631125..5a061e4b7c8d4 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     ./install.sh "--prefix=$out"
   '' + (if stdenv.isLinux then ''
     patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
+             --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \
              "$out/bin/cargo"
   '' else "") + postInstall;
 }
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 65fab09d04ddf..4713873205632 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   prefixKey = "--prefix-dir=";
 
   configureFlags = [
-    "--with-zlib=${zlib}/lib/libz.a"
+    "--with-zlib=${zlib.out}/lib/libz.a"
     "--without-liblzo2"
   ];
 
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 5e13b4520c9b6..7412378f3dec9 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     popd
     substituteInPlace $out/tools/cli/main.js \
       --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib}/lib" \
+      --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib.out}/lib" \
       --replace "@PATCHELF@" "${patchelf}/bin/patchelf"
 
     # Patch node.
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     for p in $devBundle/mongodb/bin/mongo{,d}; do
       patchelf \
         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib}/lib" \
+        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib.out}/lib" \
         $p
     done
 
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index ed7314878a6fb..6b562eef53c23 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -201,7 +201,7 @@ rec {
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
-        cp -d ${zlib}/lib/libz.so* $out/lib
+        cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
         
         # TBD: Why are these needed for cross but not native tools?
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 1011ae6689ad2..d33d8f9fb663f 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -114,7 +114,7 @@ rec {
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
-        cp -d ${zlib}/lib/libz.so* $out/lib
+        cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
 
         # Copy binutils.
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 42308947c07b9..df3cca854ed04 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
     ${patchelf}/bin/patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${zlib}/lib:${p.gcclib}" \
+      --set-rpath "${zlib.out}/lib:${p.gcclib}" \
       $out/bin/yandex-disk
   '';
 
diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix
index 160badaf668bf..d288e7018e604 100644
--- a/pkgs/tools/graphics/pngcheck/default.nix
+++ b/pkgs/tools/graphics/pngcheck/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   # '';
 
   makefile = "Makefile.unx";
-  makeFlags = "ZPATH=${zlib}/lib";
+  makeFlags = "ZPATH=${zlib.out}/lib";
 
   buildInputs = [ zlib ];
 
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index 5f335c8f76a9e..ec2821f4d8186 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ bison pkgconfig ];
   buildInputs = [ glib gtk libxml2 gettext zlib ];
 
-  NIX_LDFLAGS = "-rpath ${zlib}/lib";
+  NIX_LDFLAGS = "-rpath ${zlib.out}/lib";
   configureScript = "./Configure";
   dontAddPrefix = true;
   configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true";

From fdae7816e3c68306cf48e59145f8b2d5dc6e811c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:34:42 +0200
Subject: [PATCH 408/857] openttd: Fixup static zlib path

---
 pkgs/games/openttd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 4713873205632..7411c161146e8 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   prefixKey = "--prefix-dir=";
 
   configureFlags = [
-    "--with-zlib=${zlib.out}/lib/libz.a"
+    "--with-zlib=${zlib.static}/lib/libz.a"
     "--without-liblzo2"
   ];
 

From dc1f06bc47a74f2755a5d6e0a854462d9c08bfb3 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 5 Dec 2015 18:13:36 +0200
Subject: [PATCH 409/857] Use "out", not "dev" for  dlopen'able libraries

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5fa5974cbf3b..443a4ab5cf97d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2565,7 +2565,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py
     '';
 
     meta = {
@@ -23731,7 +23731,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py
     '';
 
     propagatedBuildInputs = [ self.cffi self.six ];

From f07a7fc5fde030ac4262324fde94983da385fb80 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 5 Dec 2015 18:14:35 +0200
Subject: [PATCH 410/857] qtile: dlopen'able path now are in "out", not "dev"

---
 pkgs/applications/window-managers/qtile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 19434da711761..8af46f52354af 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -24,9 +24,9 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace libqtile/manager.py --subst-var-by out $out
-    substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib}
-    substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango}
-    substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor}
+    substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out}
+    substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out}
+    substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor.out}
   '';
 
   buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];

From c53e932e5b77cea445cb4716768394ca5e04d4b7 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 5 Dec 2015 18:15:20 +0200
Subject: [PATCH 411/857] fvwm: Missing libXt build input

---
 pkgs/applications/window-managers/fvwm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index aded77a466da0..77263293847c4 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -1,7 +1,7 @@
 { gestures ? false
 , stdenv, fetchurl, pkgconfig
 , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
-, libXpm, librsvg, libpng, fribidi, perl
+, libXpm, libXt, librsvg, libpng, fribidi, perl
 , libstroke ? null
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig cairo fontconfig freetype
-    libXft libXcursor libXinerama libXpm
+    libXft libXcursor libXinerama libXpm libXt
     librsvg libpng fribidi perl
   ] ++ stdenv.lib.optional gestures libstroke;
 

From 61020943d1f8fcbffc39a5a9ee3b2357b1784e59 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 27 Jan 2016 15:33:50 +0200
Subject: [PATCH 412/857] syslog-ng: add explicit pcre build dependency

---
 pkgs/tools/system/syslog-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 4fcc0680ada65..d98f05c6aabb5 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
-, riemann_c_client, protobufc, yacc }:
+, riemann_c_client, protobufc, pcre, yacc }:
 
 stdenv.mkDerivation rec {
   name = "syslog-ng-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
   };
 
-  buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ];
+  buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];
 
   configureFlags = [
     "--enable-dynamic-linking"

From a33fcc873110a6ded62f3286d9850ac5a445df89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 Jan 2016 06:57:12 +0100
Subject: [PATCH 413/857] cc-wrapper: attempt to fix on darwin

This fixes evaluation at least. I'm unable to test this myself and noone steps up;
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-174448705
however, Hydra's macs are idling so let's employ them for that.
---
 pkgs/build-support/cc-wrapper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 4aeac5d75aae2..2eadb89e0c163 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -30,7 +30,7 @@ let
   libc_dev = if nativeLibc then null else libc.dev or libc;
   libc_lib = if nativeLibc then null else libc.out or libc;
   cc_solib = cc.lib or cc;
-  binutils_bin = if nativeTools then null else binutils.bin or binutils;
+  binutils_bin = if nativeTools then "$binutils" else binutils.bin or binutils;
   # The wrapper scripts use 'cat', so we may need coreutils.
   coreutils_bin = if nativeTools then null else coreutils.bin or coreutils;
 in

From ab8a691d059b364c435a1871ae2ef70a578685d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 Jan 2016 11:24:18 +0100
Subject: [PATCH 414/857] nixos systemPackages: rework default outputs

- Now `pkg.outputUnspecified = true` but this attribute is missing in
  every output, so we can recognize whether the user chose or not.
  If (s)he didn't choose, we put `pkg.bin or pkg.out or pkg` into
  `systemPackages`.
- `outputsToLink` is replaced by `extraOutputsToLink`.
  We add extra outputs *regardless* of whether the user chose anything.
  It's mainly meant for outputs with docs and debug symbols.
- Note that as a result, some libraries will disappear from system path.
---
 lib/customisation.nix                   |  2 +-
 nixos/modules/config/debug-info.nix     |  2 +-
 nixos/modules/config/system-path.nix    | 19 +++++++++----------
 nixos/modules/programs/man.nix          |  2 +-
 nixos/modules/security/polkit.nix       |  2 +-
 pkgs/build-support/buildenv/default.nix |  9 ++++++++-
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 585495469b249..efe82d7866001 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -129,7 +129,7 @@ rec {
         };
 
       outputsList = map outputToAttrListElement outputs;
-  in commonAttrs.${drv.outputName};
+  in commonAttrs // { outputUnspecified = true; };
 
 
   /* Strip a derivation of all non-essential attributes, returning
diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix
index a096a9809ceee..777ae71eebfb6 100644
--- a/nixos/modules/config/debug-info.nix
+++ b/nixos/modules/config/debug-info.nix
@@ -38,7 +38,7 @@ with lib;
     # environment.pathsToLink, and we can't have both.
     #environment.pathsToLink = [ "/lib/debug/.build-id" ];
 
-    environment.outputsToLink =
+    environment.extraOutputsToLink =
       optional config.environment.enableDebugInfo "debug";
 
   };
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 3df7d7cdac4ff..eb5eba7a042fe 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -73,11 +73,11 @@ in
         description = "List of directories to be symlinked in <filename>/run/current-system/sw</filename>.";
       };
 
-      outputsToLink = mkOption {
+      extraOutputsToLink = mkOption {
         type = types.listOf types.str;
         default = [ ];
-        example = [ "doc" ];
-        description = "List of package outputs to be symlinked into <filename>/run/current-system/sw</filename>.";
+        example = [ "doc" "info" "docdev" ];
+        description = "List of additional package outputs to be symlinked into <filename>/run/current-system/sw</filename>.";
       };
 
     };
@@ -120,18 +120,17 @@ in
         "/share/vim-plugins"
       ];
 
-    environment.outputsToLink = [ "bin" "lib" "out" ];
-
     system.path = pkgs.buildEnv {
       name = "system-path";
       paths =
-        lib.filter (drv: drv != null && drv != (drv.dev or null))
-          (lib.concatMap (drv:
-            [ drv ] ++ map (outputName: drv.${outputName}.outPath or null) config.environment.outputsToLink)
-           config.environment.systemPackages);
-      inherit (config.environment) pathsToLink;
+        # The default output probably shouldn't be globally configurable.
+        # Services and users should specify them explicitly unless they want this default.
+        map (p: if p.outputUnspecified or false then p.bin or p.out or p else p)
+          config.environment.systemPackages;
+      inherit (config.environment) pathsToLink extraOutputsToLink;
       ignoreCollisions = true;
       # !!! Hacky, should modularise.
+      # outputs TODO: note that the tools will often not be linked by default
       postBuild =
         ''
           if [ -x $out/bin/update-mime-database -a -w $out/share/mime ]; then
diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix
index b285065380496..94d026fdaef0a 100644
--- a/nixos/modules/programs/man.nix
+++ b/nixos/modules/programs/man.nix
@@ -23,7 +23,7 @@ with lib;
 
     environment.pathsToLink = [ "/share/man" ];
 
-    environment.outputsToLink = [ "man" ];
+    environment.extraOutputsToLink = [ "man" ];
 
   };
 
diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix
index 70e5e8b9fa741..507f81bbf0737 100644
--- a/nixos/modules/security/polkit.nix
+++ b/nixos/modules/security/polkit.nix
@@ -59,7 +59,7 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.polkit ];
+    environment.systemPackages = [ pkgs.polkit.bin pkgs.polkit.out ];
 
     systemd.packages = [ pkgs.polkit.out ];
 
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 1a0726d15437d..bcfa2dd1c5a8d 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -21,6 +21,10 @@
   # directories in the list is not symlinked.
   pathsToLink ? ["/"]
 
+, # The package outputs to include. By default, only the default
+  # output is included.
+  extraOutputsToLink ? []
+
 , # Root the result in directory "$out${extraPrefix}", e.g. "/share".
   extraPrefix ? ""
 
@@ -37,7 +41,10 @@
 runCommand name
   rec { inherit manifest ignoreCollisions passthru meta pathsToLink extraPrefix postBuild buildInputs;
     pkgs = builtins.toJSON (map (drv: {
-      paths = [ drv ];
+      paths =
+        [ drv ]
+        ++ lib.filter (p: p!=null)
+          (builtins.map (outName: drv.${outName} or null) extraOutputsToLink);
       priority = drv.meta.priority or 5;
     }) paths);
     preferLocalBuild = true;

From 363f667e8b9cb60ad3def1854d868d0ecfdbe7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 Jan 2016 13:24:26 +0100
Subject: [PATCH 415/857] qt5*.qtbase: fixup output references

Hopefully I haven't missed any references in qt5*.
---
 .../libraries/qt-5/5.4/qtbase/default.nix     | 24 ++++++++++---------
 .../libraries/qt-5/5.4/qtbase/dlopen-gl.patch |  2 +-
 .../qt-5/5.4/qtbase/dlopen-resolv.patch       |  2 +-
 .../qt-5/5.4/qtbase/mkspecs-libgl.patch       |  4 ++--
 .../libraries/qt-5/5.5/qtbase/default.nix     | 22 +++++++++--------
 .../libraries/qt-5/5.5/qtbase/dlopen-gl.patch |  2 +-
 .../qt-5/5.5/qtbase/dlopen-resolv.patch       |  2 +-
 .../qt-5/5.5/qtbase/mkspecs-libgl.patch       |  4 ++--
 8 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 5cee55398ccd3..af9b3feb6df01 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -60,27 +60,27 @@ stdenv.mkDerivation {
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
       substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
       substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
 
       substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor}"
+        --replace "@libXcursor@" "${libXcursor.out}"
 
       substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl}"
+        --replace "@openssl@" "${openssl.out}"
 
       substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus}"
+        --replace "@dbus_libs@" "${dbus.lib}"
 
       substituteInPlace \
         qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11}"
+        --replace "@libX11@" "${libX11.out}"
     ''
     + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}"
+      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
       substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk}" \
+        --replace "@gtk@" "${gtk.out}" \
         --replace "@gnome_vfs@" "${gnome_vfs}" \
         --replace "@libgnomeui@" "${libgnomeui}" \
         --replace "@gconf@" "${GConf}"
@@ -88,8 +88,10 @@ stdenv.mkDerivation {
     + lib.optionalString mesaSupported ''
       substituteInPlace \
         qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \
-        --replace "@mesa@" "${mesa}"
-      substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}"
+        --replace "@mesa_lib@" "${mesa.out}"
+      substituteInPlace qtbase/mkspecs/common/linux.conf \
+        --replace "@mesa_lib@" "${mesa.out}" \
+        --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
   preConfigure = ''
@@ -172,7 +174,7 @@ stdenv.mkDerivation {
   # 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 = lib.optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
index d6e08cd24106c..d5c4c2b97cb60 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
@@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxi
                  QLibrary lib(QLatin1String("GL"));
 +                if (!lib.load()) {
 +                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa@/lib/libGL"));
++                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
 +                }
                  glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
              }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
index a79c806462f8a..20e56bf3149ea 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
@@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc/lib/resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
          if (!lib.load())
              return;
      }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
index 10115e8144ad3..56ee0a411d4d8 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
@@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
  QMAKE_LIBDIR_X11        =
 -QMAKE_INCDIR_OPENGL     =
 -QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa@/lib
++QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
++QMAKE_LIBDIR_OPENGL     = @mesa_lib@/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
index a4e9e57ca9e58..73fe320769cd4 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -60,27 +60,27 @@ stdenv.mkDerivation {
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
       substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
       substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
 
       substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor}"
+        --replace "@libXcursor@" "${libXcursor.out}"
 
       substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl}"
+        --replace "@openssl@" "${openssl.out}"
 
       substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus}"
+        --replace "@dbus_libs@" "${dbus.lib}"
 
       substituteInPlace \
         qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11}"
+        --replace "@libX11@" "${libX11.out}"
     ''
     + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}"
+      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
       substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk}" \
+        --replace "@gtk@" "${gtk.out}" \
         --replace "@gnome_vfs@" "${gnome_vfs.out}" \
         --replace "@libgnomeui@" "${libgnomeui.out}" \
         --replace "@gconf@" "${GConf}"
@@ -88,8 +88,10 @@ stdenv.mkDerivation {
     + lib.optionalString mesaSupported ''
       substituteInPlace \
         qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
-        --replace "@mesa@" "${mesa}"
-      substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}"
+        --replace "@mesa_lib@" "${mesa.out}"
+      substituteInPlace qtbase/mkspecs/common/linux.conf \
+        --replace "@mesa_lib@" "${mesa.out}" \
+        --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
index 14411a95f3ac2..59f510ac54dab 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
@@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_in
                  QLibrary lib(QLatin1String("GL"));
 +                if (!lib.load()) {
 +                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa@/lib/libGL"));
++                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
 +                }
                  glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
              }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
index a79c806462f8a..20e56bf3149ea 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
@@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc/lib/resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
          if (!lib.load())
              return;
      }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
index 10115e8144ad3..56ee0a411d4d8 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
@@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
  QMAKE_LIBDIR_X11        =
 -QMAKE_INCDIR_OPENGL     =
 -QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa@/lib
++QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
++QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
  QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
  QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
  QMAKE_INCDIR_EGL        =

From c9790126312119ce5a2a8ac946d9f086e7ea9f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 Jan 2016 13:55:37 +0100
Subject: [PATCH 416/857] man-only packages: fixup after stdenv changes

Thanks to @avnik for notification.
The stdenv now auto-removes developer-only documentation
unless explicitly indicated, which wasn't a good fit for these packages.
---
 pkgs/data/documentation/man-pages/default.nix     | 3 +++
 pkgs/data/documentation/std-man-pages/default.nix | 4 +++-
 pkgs/data/documentation/stdman/default.nix        | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 5800b429ae4de..2635de05a26c3 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0v8zxq4scfixy3pjpw9ankvv5v8frv62khv4xm1jpkswyq6rbqcg";
   };
 
+  # keep developer docs separately (man2 and man3)
+  outputs = [ "out" "docdev" ];
   makeFlags = [ "MANDIR=$(out)/share/man" ];
+  postFixup = ''moveToOutput share/man/man2 "$docdev" '';
 
   meta = with stdenv.lib; {
     inherit version;
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index 3b45da914d25a..c438f839dbdaa 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "std-man-pages-4.4.0";
-  
+
   src = fetchurl {
     url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2;
     sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v";
   };
 
+  outputDocdev = "out";
+
   installPhase = ''
     mkdir -p $out/share/man
     cp -R * $out/share/man
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix
index 33c002e980132..249e5b6841bf8 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -11,13 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l";
   };
 
+  outputDocdev = "out";
+
   preConfigure = "
     patchShebangs ./configure
     patchShebangs ./do_install
   ";
 
   buildInputs = [ curl ];
-  
+
   meta = with stdenv.lib; {
     description = "Formatted C++11/14 stdlib man pages (cppreference)";
     longDescription = "stdman is a tool that parses archived HTML

From 66d76f8b5b9a071bd29fc907a799568cfe3424fc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:23:56 -0600
Subject: [PATCH 417/857] qt54.qtbase: don't rever to .dev outputs at runtime

---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index af9b3feb6df01..b22f90d5daf77 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -98,8 +98,11 @@ stdenv.mkDerivation {
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
-    export configureFlags+=" -docdir $out/share/doc/qt5"
+    configureFlags+=" -plugindir $out/lib/qt5/plugins"
+    configureFlags+=" -importdir $out/lib/qt5/imports"
+    configureFlags+=" -qmldir $out/lib/qt5/qml"
+    configureFlags+=" -docdir $out/share/doc/qt5"
+    export configureFlags
   '';
 
   prefixKey = "-prefix ";

From c1f0f62a9cf916b579fa7d8be1a98ffd5b266d44 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:30:57 -0600
Subject: [PATCH 418/857] qt54.qtbase: don't propagate cups dependency

It is not necessary to propagate the cups buildInput if Qt is configured
with cups enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index b22f90d5daf77..088cf8fd48fe1 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -188,14 +188,14 @@ stdenv.mkDerivation {
   # 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
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (cups != null) cups
   ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
-    ++ lib.optional developerBuild gdb;
+    ++ lib.optional developerBuild gdb
+    ++ lib.optional (cups != null) cups;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 5fb4e3b3388d124a561ae4943433a691ba198809 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:32:11 -0600
Subject: [PATCH 419/857] qt54.qtbase: don't propagate mysql dependency

It is not necessary to propagate the mysql buildInput if Qt is configure
with MySQL enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 088cf8fd48fe1..ab86f95ece91e 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -188,14 +188,14 @@ stdenv.mkDerivation {
   # 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
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups;
+    ++ lib.optional (cups != null) cups
+    ++ lib.optional (mysql != null) mysql.lib;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From b0753cec2a56e04a5bc834c1b10c41b0ccbc1cd7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:32:55 -0600
Subject: [PATCH 420/857] qt54.qtbase: don't propagate postgresql dependency

It is not necessary to propagate the postgresql buildInput if Qt is
configured with PostgreSQL enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index ab86f95ece91e..4ec93242e1f36 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -188,14 +188,14 @@ stdenv.mkDerivation {
   # 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
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib;
+    ++ lib.optional (mysql != null) mysql.lib
+    ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From a6fd9e9be6754180abc9ec1854b80586e7d66d05 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:33:45 -0600
Subject: [PATCH 421/857] qt54.qtbase: don't propagate gtk dependencies

It is not necessary to propagate the GTK dependencies if Qt is
configured with the GTK Style enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 4ec93242e1f36..e7a1fba906233 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -187,15 +187,15 @@ stdenv.mkDerivation {
   ]
   # 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
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
+  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql;
+    ++ lib.optional (postgresql != null) postgresql
+    ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 4ed8d5d1251e63abc44dcfb540a4594268c499f3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 10:51:22 -0600
Subject: [PATCH 422/857] qt54.qtbase: don't propagate extra Mesa dependency

The note accompanying this dependency says "it's small and doesn't
remain a runtime-dep if not used," but *neither* of those statements is
true.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index e7a1fba906233..eabc03b2b327f 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -14,7 +14,7 @@
 , mysql ? null, postgresql ? null
 
 # options
-, mesaSupported, mesa, mesa_glu
+, mesaSupported, mesa
 , buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
@@ -185,9 +185,7 @@ stdenv.mkDerivation {
     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
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
+  ++ lib.optional mesaSupported mesa;
 
   buildInputs =
     [ bison flex gperf ruby ]

From 67d5a026caa2c9153304ba757c0743604fc61450 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 10:53:41 -0600
Subject: [PATCH 423/857] qt54.qtbase: don't propagate makeWrapper dependency

I have no idea how it even got here; it's certainly not necessary!
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index eabc03b2b327f..689ae17379401 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -197,8 +197,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ python perl pkgconfig ];
 
-  propagatedNativeBuildInputs = [ makeWrapper ];
-
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 

From d8a08fff90890838e5cb07ce97070ecf98560e87 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 12:28:36 -0600
Subject: [PATCH 424/857] qt54: disable documentation

The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 689ae17379401..5a5cbe8875d4e 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -15,7 +15,6 @@
 
 # options
 , mesaSupported, mesa
-, buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
@@ -204,9 +203,6 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-    ''
-    + lib.optionalString buildDocs ''
-      make docs && make install_docs
     '';
 
   inherit lndir;

From 0055c6aa94484ef30d9541c3b21bc2b653561c84 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:55:21 -0600
Subject: [PATCH 425/857] qt54: use multiple outputs

---
 .../libraries/qt-5/5.4/default.nix            |   3 +
 .../libraries/qt-5/5.4/qtbase/default.nix     |  37 +++++--
 .../libraries/qt-5/5.4/qtbase/setup-hook.sh   | 103 ++++++++++++------
 3 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 9b1324d11373f..d0e09c6b10f74 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -43,6 +43,9 @@ let
       dontFixLibtool = args.dontFixLibtool or true;
       configureScript = args.configureScript or "qmake";
 
+      outputs = args.outputs or [ "dev" "out" ];
+      setOutputFlags = false;
+
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 5a5cbe8875d4e..e08640ae86952 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
 
   sourceRoot = "qt-everywhere-opensource-src-${version}";
 
+  outputs = [ "dev" "out" ];
+
   postUnpack = ''
     mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
   '';
@@ -93,15 +95,34 @@ stdenv.mkDerivation {
         --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
+  setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    configureFlags+=" -plugindir $out/lib/qt5/plugins"
-    configureFlags+=" -importdir $out/lib/qt5/imports"
-    configureFlags+=" -qmldir $out/lib/qt5/qml"
-    configureFlags+=" -docdir $out/share/doc/qt5"
-    export configureFlags
+    _multioutQtDevs() {
+        # We cannot simply set these paths in configureFlags because libQtCore retains
+        # references to the paths it was built with.
+        moveToOutput "bin" "$dev"
+        moveToOutput "include" "$dev"
+        moveToOutput "mkspecs" "$dev"
+
+        # The destination directory must exist or moveToOutput will do nothing
+        mkdir -p "$dev/share"
+        moveToOutput "share/doc" "$dev"
+
+        mkdir -p "$dev/lib"
+        lndir -silent "$out/lib" "$dev/lib"
+        if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi
+        if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi
+    }
+    preFixupHooks+=(_multioutQtDevs)
+
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
   '';
 
   prefixKey = "-prefix ";
@@ -194,15 +215,15 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  nativeBuildInputs = [ python perl pkgconfig ];
+  nativeBuildInputs = [ lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
-  postInstall =
+  postFixup =
     ''
       # Don't retain build-time dependencies like gdb and ruby.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
+      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri"
     '';
 
   inherit lndir;
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
index b86b6df28ac89..c44cd2234d76a 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
@@ -1,45 +1,26 @@
 if [[ -z "$QMAKE" ]]; then
 
-linkDependencyDir() {
+_qtLinkDependencyDir() {
     @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
+_qtLinkModule() {
+    if [ -d "$1/mkspecs" ]; then
         # $1 is a Qt module
-        linkDependencyDir "$1" mkspecs
+        _qtLinkDependencyDir "$1" mkspecs
 
         for dir in bin include lib share; do
-            if [[ -d "$1/$dir" ]]; then
-                linkDependencyDir "$1" "$dir"
+            if [ -d "$1/$dir" ]; then
+                _qtLinkDependencyDir "$1" "$dir"
             fi
         done
     fi
 }
 
-propagateRuntimeDeps() {
-    local propagated
-    for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-            break
-        fi
-    done
-}
-
-rmQtModules() {
+_qtRmModules() {
     cat "$out/nix-support/qt-inputs" | while read file; do
       if [[ -h "$out/$file" ]]; then
         rm "$out/$file"
@@ -55,14 +36,65 @@ rmQtModules() {
     rm "$out/nix-support/qt-inputs"
 }
 
-rmQMake() {
+addToSearchPathOnceWithCustomDelimiter() {
+    local delim="$1"
+    local search="$2"
+    local target="$3"
+    local dirs
+    local exported
+    IFS="$delim" read -a dirs <<< "${!search}"
+    for dir in ${dirs[@]}; do
+        if [ "z$dir" == "z$target" ]; then exported=1; fi
+    done
+    if [ -z $exported ]; then
+        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
+    fi
+}
+
+addToSearchPathOnce() {
+    addToSearchPathOnceWithCustomDelimiter ':' "$@"
+}
+
+propagateOnce() {
+    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+}
+
+_qtPropagateRuntimeDependencies() {
+    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+        if [ -d "$1/$dir" ]; then
+            propagateOnce propagatedBuildInputs "$1"
+            break
+        fi
+    done
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
+    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+}
+
+_qtRmQmake() {
     rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"
 }
 
-setQMakePath() {
+_qtSetQmakePath() {
     export PATH="$qtOut/bin${PATH:+:}$PATH"
 }
 
+_qtMultioutModuleDevs() {
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "${!outputDev}"
+    moveToOutput "include" "${!outputDev}"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "${!outputDev}/share"
+    moveToOutput "share/doc" "${!outputDev}"
+}
+
+_qtMultioutDevs() {
+    # This is necessary whether the package is a Qt module or not
+    moveToOutput "mkspecs" "${!outputDev}"
+}
+
 qtOut=""
 if [[ -z "$NIX_QT_SUBMODULE" ]]; then
     qtOut=`mktemp -d`
@@ -72,7 +104,7 @@ fi
 
 mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
 
-cp "@out@/bin/qmake" "$qtOut/bin"
+cp "@dev@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
@@ -84,17 +116,20 @@ EOF
 
 export QMAKE="$qtOut/bin/qmake"
 
-envHooks+=(addQtModule propagateRuntimeDeps)
-preConfigurePhases+=(setQMakePath)
+envHooks+=(_qtLinkModule _qtPropagateRuntimeDependencies)
+# Set PATH to find qmake first in a preConfigure hook
+# It must run after all the envHooks!
+preConfigureHooks+=(_qtSetQmakePath)
 
+preFixupHooks+=(_qtMultioutDevs)
 if [[ -n "$NIX_QT_SUBMODULE" ]]; then
-    preFixupPhases+=(rmQtModules)
-    postPhases+=(rmQMake)
+    postInstallHooks+=(_qtRmQmake _qtRmModules)
+    preFixupHooks+=(_qtMultioutModuleDevs)
 fi
 
 fi
 
 if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
     export NIX_QT_PIC=1
 fi

From fcf290cd1d184f34d4d2fba517b385611e191c63 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:56:46 -0600
Subject: [PATCH 426/857] qt55.qtbase: don't refer to .dev outputs at runtime

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 73fe320769cd4..65afcb4119e39 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
         --replace "@gtk@" "${gtk.out}" \
         --replace "@gnome_vfs@" "${gnome_vfs.out}" \
         --replace "@libgnomeui@" "${libgnomeui.out}" \
-        --replace "@gconf@" "${GConf}"
+        --replace "@gconf@" "${GConf.out}"
     ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \

From 5337a2a4b33027e157e6d5d575e614038554bdf0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:57:28 -0600
Subject: [PATCH 427/857] qt55.qtbase: don't propagate cups dependency

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 65afcb4119e39..212db01ea01da 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -185,14 +185,14 @@ stdenv.mkDerivation {
   # 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
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (cups != null) cups
   ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
-    ++ lib.optional developerBuild gdb;
+    ++ lib.optional developerBuild gdb
+    ++ lib.optional (cups != null) cups;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From d5d75546397c03959cf5231786f16bb81a64cf39 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:58:00 -0600
Subject: [PATCH 428/857] qt55.qtbase: don't propagate mysql dependency

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 212db01ea01da..b7a6203aeb940 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -185,14 +185,14 @@ stdenv.mkDerivation {
   # 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
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups;
+    ++ lib.optional (cups != null) cups
+    ++ lib.optional (mysql != null) mysql.lib;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 4b844747a27bc0522a19f91b10a0c0326eaeaaca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:58:25 -0600
Subject: [PATCH 429/857] qt55.qtbase: don't propagate postgresql dependency

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index b7a6203aeb940..91de7b7692928 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -185,14 +185,14 @@ stdenv.mkDerivation {
   # 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
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib;
+    ++ lib.optional (mysql != null) mysql.lib
+    ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From e64822b87dac14fdab96b31d110127d7270b5adf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:59:03 -0600
Subject: [PATCH 430/857] qt55.qtbase: don't propagate gtk dependencies

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 91de7b7692928..18f04d4199dbd 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -184,15 +184,15 @@ stdenv.mkDerivation {
   ]
   # 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
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
+  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql;
+    ++ lib.optional (postgresql != null) postgresql
+    ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 302450dbfe810cc00f55b447621a0f0ce8d90043 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:59:32 -0600
Subject: [PATCH 431/857] qt55.qtbase: don't propagate extra Mesa dependency

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 18f04d4199dbd..755c9d92fb5c3 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -14,7 +14,7 @@
 , mysql ? null, postgresql ? null
 
 # options
-, mesaSupported, mesa, mesa_glu
+, mesaSupported, mesa
 , buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
@@ -182,9 +182,7 @@ stdenv.mkDerivation {
     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
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
+  ++ lib.optional mesaSupported mesa;
 
   buildInputs =
     [ bison flex gperf ruby ]

From 3cfb552bbce40a275348d3ba70d0f08b21b0c71f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:59:52 -0600
Subject: [PATCH 432/857] qt55.qtbase: don't depend on makeWrapper

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 755c9d92fb5c3..f039973a9b94d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -194,8 +194,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ python perl pkgconfig ];
 
-  propagatedNativeBuildInputs = [ makeWrapper ];
-
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 

From db69888a02a85f98aafad2654c1c21072a4d3a4e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 16:00:20 -0600
Subject: [PATCH 433/857] qt55.qtbase: disable documentation

The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index f039973a9b94d..ef6e0620bca96 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -15,7 +15,6 @@
 
 # options
 , mesaSupported, mesa
-, buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
@@ -201,9 +200,6 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-    ''
-    + lib.optionalString buildDocs ''
-      make docs && make install_docs
     '';
 
   inherit lndir;

From 74121e07a74857667b58c6db5af99ef613679fb2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 16:02:20 -0600
Subject: [PATCH 434/857] qt55: use multiple outputs

---
 .../libraries/qt-5/5.5/default.nix            |  3 ++
 .../libraries/qt-5/5.5/qtbase/default.nix     | 34 ++++++++++++++++---
 .../libraries/qt-5/5.5/qtbase/setup-hook.sh   | 27 ++++++++++++---
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 9b1324d11373f..d0e09c6b10f74 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -43,6 +43,9 @@ let
       dontFixLibtool = args.dontFixLibtool or true;
       configureScript = args.configureScript or "qmake";
 
+      outputs = args.outputs or [ "dev" "out" ];
+      setOutputFlags = false;
+
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index ef6e0620bca96..8206483165321 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
 
   sourceRoot = "qt-everywhere-opensource-src-${version}";
 
+  outputs = [ "dev" "out" ];
+
   postUnpack = ''
     mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
   '';
@@ -93,12 +95,34 @@ stdenv.mkDerivation {
         --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
+  setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
-    export configureFlags+=" -docdir $out/share/doc/qt5"
+    _multioutQtDevs() {
+        # We cannot simply set these paths in configureFlags because libQtCore retains
+        # references to the paths it was built with.
+        moveToOutput "bin" "$dev"
+        moveToOutput "include" "$dev"
+        moveToOutput "mkspecs" "$dev"
+
+        # The destination directory must exist or moveToOutput will do nothing
+        mkdir -p "$dev/share"
+        moveToOutput "share/doc" "$dev"
+
+        mkdir -p "$dev/lib"
+        lndir -silent "$out/lib" "$dev/lib"
+        if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi
+        if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi
+    }
+    preFixupHooks+=(_multioutQtDevs)
+
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
   '';
 
   prefixKey = "-prefix ";
@@ -191,15 +215,15 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ python perl pkgconfig ];
+  nativeBuildInputs = [ lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
-  postInstall =
+  postFixup =
     ''
       # Don't retain build-time dependencies like gdb and ruby.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
+      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
     '';
 
   inherit lndir;
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
index b86b6df28ac89..59e04a3561e00 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
@@ -63,6 +63,22 @@ setQMakePath() {
     export PATH="$qtOut/bin${PATH:+:}$PATH"
 }
 
+_multioutQtModuleDevs() {
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "${!outputDev}"
+    moveToOutput "include" "${!outputDev}"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "${!outputDev}/share"
+    moveToOutput "share/doc" "${!outputDev}"
+}
+
+_multioutQtDevs() {
+    # This is necessary whether the package is a Qt module or not
+    moveToOutput "mkspecs" "${!outputDev}"
+}
+
 qtOut=""
 if [[ -z "$NIX_QT_SUBMODULE" ]]; then
     qtOut=`mktemp -d`
@@ -72,7 +88,7 @@ fi
 
 mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
 
-cp "@out@/bin/qmake" "$qtOut/bin"
+cp "@dev@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
@@ -85,11 +101,14 @@ EOF
 export QMAKE="$qtOut/bin/qmake"
 
 envHooks+=(addQtModule propagateRuntimeDeps)
-preConfigurePhases+=(setQMakePath)
+# Set PATH to find qmake first in a preConfigure hook
+# It must run after all the envHooks!
+preConfigureHooks+=(setQMakePath)
 
+preFixupHooks+=(_multioutQtDevs)
 if [[ -n "$NIX_QT_SUBMODULE" ]]; then
-    preFixupPhases+=(rmQtModules)
-    postPhases+=(rmQMake)
+    postInstallHooks+=(rmQMake rmQtModules)
+    preFixupHooks+=(_multioutQtModuleDevs)
 fi
 
 fi

From 6dda0824ba8eb8c1a4ac3d6190224491030c4064 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:06:40 -0600
Subject: [PATCH 435/857] qt55.qtbase: use -system-harfbuzz

---
 pkgs/development/libraries/qt-5/5.5/default.nix   |  1 +
 .../libraries/qt-5/5.5/qtbase/default.nix         | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index d0e09c6b10f74..4ace24956594a 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -64,6 +64,7 @@ let
 
       qtbase = callPackage ./qtbase {
         mesa = pkgs.mesa_noglu;
+        harfbuzz = pkgs.harfbuzz-icu;
         cups = if stdenv.isLinux then pkgs.cups else null;
         # GNOME dependencies are not used unless gtkStyle == true
         inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 8206483165321..c9d5d1a170e88 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -3,7 +3,8 @@
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
 , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
-, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre
+, fontconfig, freetype, harfbuzz
+, openssl, dbus, glib, udev, libxml2, libxslt, pcre
 , zlib, libjpeg, libpng, libtiff, sqlite, icu
 
 , coreutils, bison, flex, gdb, gperf, lndir, ruby
@@ -177,6 +178,7 @@ stdenv.mkDerivation {
     -no-mips_dspr2
 
     -system-zlib
+    -system-harfbuzz
     -system-libpng
     -system-libjpeg
     -system-xcb
@@ -200,9 +202,16 @@ stdenv.mkDerivation {
   PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
+    dbus glib libxml2 libxslt openssl pcre sqlite udev zlib
+
+    # Image formats
+    libjpeg libpng libtiff
+
+    # Text rendering
+    fontconfig freetype harfbuzz icu
+
+    # X11 libs
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
-    zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]
   ++ lib.optional mesaSupported mesa;

From 9adcd6f78c36163731b480b1be368defccc3e47a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:08:00 -0600
Subject: [PATCH 436/857] qt55: update homepage

---
 pkgs/development/libraries/qt-5/5.5/default.nix        | 2 +-
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 4ace24956594a..5f631357b5bbc 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -49,7 +49,7 @@ let
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
-        homepage = http://qt-project.org;
+        homepage = http://www.qt.io;
         description = "A cross-platform application framework for C++";
         license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
         maintainers = with maintainers; [ bbenoist qknight ttuegel ];
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index c9d5d1a170e88..092f72264c33b 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -241,7 +241,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = http://qt-project.org;
+    homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];

From a6c9a6f5bff3835ceb1d201e7904c83c9736f15d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:08:43 -0600
Subject: [PATCH 437/857] qt55.qtbase: set licenses correctly

---
 pkgs/development/libraries/qt-5/5.5/default.nix      | 12 ++++--------
 .../libraries/qt-5/5.5/qtbase/default.nix            |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 5f631357b5bbc..ae98c2c4b1f79 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -48,13 +48,7 @@ let
 
       enableParallelBuilding = args.enableParallelBuilding or true;
 
-      meta = {
-        homepage = http://www.qt.io;
-        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 {});
+      meta = self.qtbase.meta // (args.meta or {});
     });
 
   addPackages = self: with self;
@@ -117,4 +111,6 @@ let
 
     };
 
-in makeScope pkgs.newScope addPackages
+   self = makeScope pkgs.newScope addPackages;
+
+in self
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 092f72264c33b..5b0ced2302809 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -243,7 +243,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
+    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];
     platforms = platforms.linux;
   };

From 4465f438dee7bb766f97a9eb0f328fff87a2365b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:15:20 -0600
Subject: [PATCH 438/857] qt55: improve update documentation

---
 .../libraries/qt-5/5.5/default.nix            | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index ae98c2c4b1f79..9863683840cbc 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -1,15 +1,20 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./fetchsrcs.sh to point to the updated URL.
-#  2. Run ./fetchsrcs.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.
+/*
+
+# Minor Updates
+
+1. Edit ./fetchsrcs.sh to point to the updated URL.
+2. Run ./fetchsrcs.sh.
+3. Build and enjoy.
+
+# Major Updates
+
+1. Make a copy of this directory. (We like to keep the old version around
+   for a short time after major updates.)
+2. Delete the tmp/ subdirectory of the copy.
+3. Follow the minor update instructions above.
+4. Package any new Qt modules, if necessary.
+
+*/
 
 { pkgs
 

From 1087020a468f441bcc99b0e608cb642e58e5903b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 12:18:56 -0600
Subject: [PATCH 439/857] cmake: invoke configure hooks correctly

Otherwise, the multiple-outputs hooks will not fire correctly.
---
 pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 670376efdcab8..c4684e0376ce7 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -13,7 +13,7 @@ fixCmakeFiles() {
 }
 
 cmakeConfigurePhase() {
-    eval "$preConfigure"
+    runHook preConfigure
 
     if [ -z "$dontFixCmake" ]; then
         fixCmakeFiles .
@@ -53,7 +53,7 @@ cmakeConfigurePhase() {
 
     cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}"
 
-    eval "$postConfigure"
+    runHook postConfigure
 }
 
 if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then

From a714284d8b7d2dac3ed2c76670f290fe332da00c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 12:20:39 -0600
Subject: [PATCH 440/857] cmake: don't set incompatible flags for multiple
 outputs

---
 pkgs/development/tools/build-managers/cmake/setup-hook.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index c4684e0376ce7..b14e9984bc3c4 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -57,6 +57,7 @@ cmakeConfigurePhase() {
 }
 
 if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then
+    setOutputFlags=
     configurePhase=cmakeConfigurePhase
 fi
 

From a27a4c29ad87fc0a8745fc89927d0d98a9055a08 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 12:38:16 -0600
Subject: [PATCH 441/857] extra-cmake-modules: use multiple outputs

---
 .../0001-extra-cmake-modules-paths.patch      | 74 -------------------
 .../extra-cmake-modules/default.nix           | 12 +--
 .../extra-cmake-modules/nix-lib-path.patch    | 37 ++++++++++
 .../extra-cmake-modules/series                |  1 +
 .../extra-cmake-modules/setup-hook.sh         | 44 +++++++++++
 5 files changed, 89 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5b6..0000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
index 4e1b1aff3bd14..1c2ea70442d32 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
@@ -1,9 +1,11 @@
-{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
+{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
 
 kdeFramework {
   name = "extra-cmake-modules";
-  patches = [ ./0001-extra-cmake-modules-paths.patch ];
 
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
   setupHook = ./setup-hook.sh;
 
   # It is OK to propagate these inputs as long as
@@ -11,8 +13,8 @@ kdeFramework {
   # of some other derivation.
   propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
 
-  meta = {
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.ttuegel ];
+  meta = with lib; {
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
new file mode 100644
index 0000000000000..a74340a6dc969
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
@@ -0,0 +1,37 @@
+Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
+===================================================================
+--- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
++++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
+@@ -200,32 +200,6 @@
+ # GNUInstallDirs code deals with re-configuring, but that is dealt with
+ # by the _define_* macros in this module).
+ 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
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series
new file mode 100644
index 0000000000000..b4569e50a5f73
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series
@@ -0,0 +1 @@
+nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
index a6fa6189240b0..ee26f75cf5f05 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
@@ -24,4 +24,48 @@ addMimePkg() {
     fi
 }
 
+_ecmConfig() {
+    # Because we need to use absolute paths here, we must set *all* the paths.
+    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
+    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
+    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
+    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
+    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
+    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
+    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
+    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
+    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
+    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
+    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
+    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
+    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
+    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
+    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
+    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
+    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
+    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
+    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
+    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
+    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/interfaces"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/system-services"
+    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
+    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
+    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
+}
+
 envHooks+=(addMimePkg)
+preConfigureHooks+=(_ecmConfig)

From ac5a585ed8ef6cbc6fd32127165b52022ba4c1b8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:43:16 -0600
Subject: [PATCH 442/857] qt55: add fixQtModuleCMakeConfig setup hook

---
 pkgs/development/libraries/qt-5/5.5/default.nix              | 2 ++
 .../libraries/qt-5/5.5/fix-qt-module-cmake-config.sh         | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 9863683840cbc..88f064edc7d32 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -42,6 +42,7 @@ let
       inherit src;
 
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
       dontAddPrefix = args.dontAddPrefix or true;
@@ -113,6 +114,7 @@ let
       ];
 
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
+      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
 
     };
 
diff --git a/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh
new file mode 100644
index 0000000000000..7ca3e33b613c2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh
@@ -0,0 +1,5 @@
+fixQtModuleCMakeConfig() {
+    local module="$1"
+    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
+        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
+}

From 8bfae5c46d9f7c6109dae24d7328051011bf371a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:43:49 -0600
Subject: [PATCH 443/857] qt55.qtbase: fix Qt module CMake config files

---
 .../libraries/qt-5/5.5/qtbase/default.nix       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 5b0ced2302809..0dd17ed699bb4 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper
+{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig
 , srcs
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@@ -224,7 +224,7 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ lndir python perl pkgconfig ];
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -233,6 +233,19 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
+
+      fixQtModuleCMakeConfig "Concurrent"
+      fixQtModuleCMakeConfig "Core"
+      fixQtModuleCMakeConfig "DBus"
+      fixQtModuleCMakeConfig "Gui"
+      fixQtModuleCMakeConfig "Network"
+      fixQtModuleCMakeConfig "OpenGL"
+      fixQtModuleCMakeConfig "OpenGLExtensions"
+      fixQtModuleCMakeConfig "PrintSupport"
+      fixQtModuleCMakeConfig "Sql"
+      fixQtModuleCMakeConfig "Test"
+      fixQtModuleCMakeConfig "Widgets"
+      fixQtModuleCMakeConfig "Xml"
     '';
 
   inherit lndir;

From 6dfabcb47b0d84c9650d4c2960877fbf3b5489c7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:44:33 -0600
Subject: [PATCH 444/857] qt55.qtscript: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtscript/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
index 127766e2ebd61..b81a43aeadb04 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtscript";
   qtInputs = [ qtbase qttools ];
   patches = [ ./0001-glib-2.32.patch ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Script"
+  '';
 }

From 6c37bebabdf53b6d1195bfce5fc0acc60849c22d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:44:48 -0600
Subject: [PATCH 445/857] qt55.qtdeclarative: fix Qt module CMake config files

---
 .../libraries/qt-5/5.5/qtdeclarative/default.nix            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
index 9181c37b22583..e2219642a1224 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
@@ -5,4 +5,10 @@ qtSubmodule {
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Qml"
+    fixQtModuleCMakeConfig "Quick"
+    fixQtModuleCMakeConfig "QuickTest"
+    fixQtModuleCMakeConfig "QuickWidgets"
+  '';
 }

From 24d0cfbb3a54b78e3f11bcba69ad61d1e0c3b336 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:45:36 -0600
Subject: [PATCH 446/857] kde5.frameworks: use multiple outputs

---
 pkgs/development/libraries/kde-frameworks-5.18/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index f41aebcb59d31..2ecde7e834fb6 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -23,6 +23,8 @@ let
         name = "${name}-${version}";
         inherit src;
 
+        outputs = [ "dev" "out" ];
+
         cmakeFlags =
           (args.cmakeFlags or [])
           ++ [ "-DBUILD_TESTING=OFF" ]

From 27824e3332f7e77e876adc9b31b4fd80d9e0d2a1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:25:18 -0600
Subject: [PATCH 447/857] qt55.qtxmlpatterns: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
index 9a8ddbba2bd24..3b22132e4c38e 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtxmlpatterns";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "XmlPatterns"
+  '';
 }

From 055b1b86c5341cf8c6bb03ec61577332c59e00c1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:25:38 -0600
Subject: [PATCH 448/857] qt55.qtx11extras: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtx11extras.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
index a765161e2d7ea..db92f1353627d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtx11extras";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "X11Extras"
+  '';
 }

From da454bc547ae4f7fd3c26ee717f7b62606ec6c34 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:26:15 -0600
Subject: [PATCH 449/857] qt55.qtwebsockets: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
index fbdfbbcf0dbed..c0d0f9e7d714e 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebSockets"
+  '';
 }

From db7cabe0987f0a792b904b608801e95d2df8c813 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:26:31 -0600
Subject: [PATCH 450/857] qt55.qtwebkit: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
index 2e92391f4c085..b441a2448d769 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
@@ -31,4 +31,8 @@ qtSubmodule {
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
     ++ [ dlopen-webkit-udev ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebKit"
+    fixQtModuleCMakeConfig "WebKitWidgets"
+  '';
 }

From ed20a6a97cd9f674ca9f20668d9d2580f1a94913 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:08 -0600
Subject: [PATCH 451/857] qt55.qttools: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qttools.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix
index 65edc45081283..a6b29c07cac98 100644
--- a/pkgs/development/libraries/qt-5/5.5/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix
@@ -3,4 +3,11 @@
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Designer"
+    fixQtModuleCMakeConfig "Help"
+    fixQtModuleCMakeConfig "LinguistTools"
+    fixQtModuleCMakeConfig "UiPlugin"
+    fixQtModuleCMakeConfig "UiTools"
+  '';
 }

From 02f276123319d977764e39e3a167c45cc89eac31 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:23 -0600
Subject: [PATCH 452/857] qt55.qtsvg: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtsvg.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
index b9ccac7cf9331..a460d6da4c2ad 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Svg"
+  '';
 }

From 50de9a3f09b23205199ba5a8bc2dcfea76839ddb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:37 -0600
Subject: [PATCH 453/857] qt55.qtserialport: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
index 32549c95344a1..3f409f9c0e084 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
@@ -9,4 +9,7 @@ qtSubmodule {
       libudev = libudev.out;
     })
   ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "SerialPort"
+  '';
 }

From abcb26c2bb2ea1b710eafeddcece76725391db89 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:58 -0600
Subject: [PATCH 454/857] qt55.qtsensors: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtsensors.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
index 61e64dc47e4dc..5776f45a70689 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Sensors"
+  '';
 }

From 89dc8118b4eb3f208ca076ba3e82c4891b696620 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:28:13 -0600
Subject: [PATCH 455/857] qt55.qtquick1: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
index d1c7bb389a49c..d81abbcd6140d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtquick1";
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Declarative"
+  '';
 }

From ea0794696fab69120bbfa4200a9dd3b34dd8910b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:28:29 -0600
Subject: [PATCH 456/857] qt55.qtmultimedia: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
index b6b4d8ea0cf4e..8db8fa5f4b969 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
@@ -9,4 +9,8 @@ qtSubmodule {
     pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
   ];
   configureFlags = "GST_VERSION=1.0";
+  postFixup = ''
+    fixQtModuleCMakeConfig "Multimedia"
+    fixQtModuleCMakeConfig "MultimediaWidgets"
+  '';
 }

From 35c7cdac5fe2e195d8e0ee1918450fef7e843131 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:29:11 -0600
Subject: [PATCH 457/857] qt55.qtlocation: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtlocation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
index 1e134057c4b47..0e2ad8bafb30d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Location"
+    fixQtModuleCMakeConfig "Positioning"
+  '';
 }

From aea5ee64db08fdefca02d0e57a33ffad4a76bede Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:29:23 -0600
Subject: [PATCH 458/857] qt55.qtenginio: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtenginio.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
index b860a73ef8900..503a0f7ce4f55 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtenginio";
   qtInputs = [ qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Enginio"
+  '';
 }

From 776de6d955997fbd571891ccdd79a66862550d6a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:29:39 -0600
Subject: [PATCH 459/857] qt55.qtconnectivity: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
index 95cd6fea79b40..35538c7261f1d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Bluetooth"
+    fixQtModuleCMakeConfig "Nfc"
+  '';
 }

From c5083f8cbd701a09f669dbc021834e980bcd5dbd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:43:43 -0600
Subject: [PATCH 460/857] kde5.kfilemetadata: fix CMake install paths

---
 .../libraries/kde-frameworks-5.18/default.nix       |  2 +-
 .../kfilemetadata/cmake-install-paths.patch         | 13 +++++++++++++
 .../default.nix}                                    |  5 +++--
 .../kde-frameworks-5.18/kfilemetadata/series        |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
 rename pkgs/development/libraries/kde-frameworks-5.18/{kfilemetadata.nix => kfilemetadata/default.nix} (57%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index 2ecde7e834fb6..5d2cceff78d3e 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -67,7 +67,7 @@ let
     kdnssd = callPackage ./kdnssd.nix {};
     kdoctools = callPackage ./kdoctools {};
     kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata.nix {};
+    kfilemetadata = callPackage ./kfilemetadata {};
     kglobalaccel = callPackage ./kglobalaccel.nix {};
     kguiaddons = callPackage ./kguiaddons.nix {};
     khtml = callPackage ./khtml.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
new file mode 100644
index 0000000000000..732f7b69c828d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
@@ -0,0 +1,13 @@
+Index: kfilemetadata-5.18.0/src/CMakeLists.txt
+===================================================================
+--- kfilemetadata-5.18.0.orig/src/CMakeLists.txt
++++ kfilemetadata-5.18.0/src/CMakeLists.txt
+@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K
+ 
+ install(EXPORT KF5FileMetaDataTargets
+         NAMESPACE KF5::
+-        DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
++        DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
+         FILE KF5FileMetaDataTargets.cmake)
+ 
+ install(FILES
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
similarity index 57%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
rename to pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
index be99c58d55041..9bb4831cf8da2 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
@@ -1,9 +1,10 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
+, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
 }:
 
 kdeFramework {
   name = "kfilemetadata";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
   propagatedBuildInputs = [ qtbase ki18n ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series
new file mode 100644
index 0000000000000..d2689425c3876
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series
@@ -0,0 +1 @@
+cmake-install-paths.patch

From 7fae06718e5ef7f80cf82aca107c1455b2dab3d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 06:24:35 -0600
Subject: [PATCH 461/857] qt55.makeQtWrapper: don't set XDG_DATA_DIRS

---
 .../development/libraries/qt-5/5.5/make-qt-wrapper.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
index d61665455bf45..63525ba365bc3 100644
--- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
@@ -3,7 +3,6 @@ addQtDependency() {
     addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
     addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
     addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
-    addToSearchPath XDG_DATA_DIRS "$1/share"
 }
 
 wrapQtProgram() {
@@ -33,10 +32,10 @@ makeQtWrapper() {
 }
 
 # cannot use addToSearchPath because these directories may not exist yet
-export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins"
-export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports"
-export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml"
-export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg"
-export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share"
+export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
+export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
+export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
+export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
+export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share"
 
 envHooks+=(addQtDependency)

From b63c007412f5d81aaa62b51fb600839d42061cab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 06:25:05 -0600
Subject: [PATCH 462/857] kde5.kdelibs4support: don't use multiple outputs

---
 pkgs/development/libraries/kde-frameworks-5.18/default.nix      | 2 +-
 .../libraries/kde-frameworks-5.18/kdelibs4support.nix           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index 5d2cceff78d3e..080854380dc53 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -23,7 +23,7 @@ let
         name = "${name}-${version}";
         inherit src;
 
-        outputs = [ "dev" "out" ];
+        outputs = args.outputs or [ "dev" "out" ];
 
         cmakeFlags =
           (args.cmakeFlags or [])
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
index e61c4bb86e7c7..214b756d5cbdd 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
@@ -11,6 +11,7 @@
 
 kdeFramework {
   name = "kdelibs4support";
+  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcompletion kconfig kded kservice kwidgetsaddons

From ae75c888085d45c571c7fe0e021611f4cc3b7f03 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 06:31:06 -0600
Subject: [PATCH 463/857] qt55.qtbase: upstream patch for backing store issue

The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.

This patch is included in Qt 5.6, so we should remove it when we
upgrade.
---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 0dd17ed699bb4..68c209e60090b 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -26,6 +26,12 @@
 let
   inherit (srcs.qt5) version;
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
+
+  dontInvalidateBacking = fetchurl {
+    url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
+    name = "qtbug-48321-dont-invalidate-backing-store.patch";
+    sha256 = "07vnndmvri73psz0nrs2hg0zw2i4b1k1igy2al6kwjbp7d5xpglr";
+  };
 in
 
 stdenv.mkDerivation {
@@ -51,6 +57,10 @@ stdenv.mkDerivation {
 
   postPatch =
     ''
+      cd qtbase
+      patch -p1 <${dontInvalidateBacking}
+      cd ..
+
       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

From 7f43f089304042923901f45763b51b429d2f11b9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 09:37:16 -0600
Subject: [PATCH 464/857] extra-cmake-modules: add addToSearchPathOnce

---
 .../extra-cmake-modules/setup-hook.sh         | 54 +++++++++++--------
 1 file changed, 32 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
index ee26f75cf5f05..0dfc34ef4080d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
@@ -1,26 +1,36 @@
-addMimePkg() {
-    local propagated
+_propagateMimeTypes() {
+    if [ -d "$1/share/mime" ]; then
+        propagateOnce propagatedUserEnvPkgs "$1"
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    fi
+}
+
+addToSearchPathOnceWithCustomDelimiter() {
+    local delim="$1"
+    local search="$2"
+    local target="$3"
+    local dirs
+    local exported
+    IFS="$delim" read -a dirs <<< "${!search}"
+    for dir in ${dirs[@]}; do
+        if [ "z$dir" == "z$target" ]; then exported=1; fi
+    done
+    if [ -z $exported ]; then
+        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
+    fi
+}
+
+addToSearchPathOnce() {
+    addToSearchPathOnceWithCustomDelimiter ':' "$@"
+}
 
-    if [[ -d "$1/share/mime" ]]; then
-        propagated=
-        for pkg in $propagatedBuildInputs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedBuildInputs="$propagatedBuildInputs $1"
-        fi
+propagateOnce() {
+    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+}
 
-        propagated=
-        for pkg in $propagatedUserEnvPkgs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-        fi
+_exportLocales() {
+    if [[ -d "$1/share/locale" ]]; then
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
     fi
 }
 
@@ -67,5 +77,5 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
 }
 
-envHooks+=(addMimePkg)
+envHooks+=(_propagateMimeTypes _exportLocales)
 preConfigureHooks+=(_ecmConfig)

From 02c3ae154d8fcb4c43b69adabce7acb47338f88e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 09:37:35 -0600
Subject: [PATCH 465/857] kde5.kservice: propagate extra-cmake-modules input

---
 .../libraries/kde-frameworks-5.18/kservice/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
index 03b7c7c2f51d4..b502a18e0e5e4 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
@@ -5,7 +5,8 @@
 kdeFramework {
   name = "kservice";
   setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedNativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ kdoctools ];
   buildInputs = [ kcrash kdbusaddons ];
   propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
   propagatedUserEnvPkgs = [ kcoreaddons ];

From cfd70eac9dc38779ca04df9dbc184db574439fa6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 09:37:55 -0600
Subject: [PATCH 466/857] kde5.kservice: propagate service and service type
 inputs

---
 .../kservice/setup-hook.sh                    | 52 +++++--------------
 1 file changed, 13 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
index c28e862ff8aea..e1210515fcf1a 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
@@ -1,43 +1,17 @@
-addServicePkg() {
-    local propagated
-    for dir in "share/kservices5" "share/kservicetypes5"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-
-            propagated=
-            for pkg in $propagatedUserEnvPkgs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-            fi
+_propagateServices() {
+    if [ -d "$1/share/kservices5" ]; then
+        propagateOnce propagatedUserEnvPkgs "$1"
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    fi
+}
 
-            break
-        fi
-    done
+_propagateServiceTypes() {
+    if [ -d "$1/share/kservicetypes5" ]; then
+        propagateOnce propagatedUserEnvPkgs "$1"
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    fi
 }
 
-envHooks+=(addServicePkg)
+envHooks+=(_propagateServices _propagateServiceTypes)
 
-local propagated
-for pkg in $propagatedBuildInputs; do
-    if [[ "z$pkg" == "z@out@" ]]; then
-        propagated=1
-        break
-    fi
-done
-if [[ -z $propagated ]]; then
-    propagatedBuildInputs="$propagatedBuildInputs @out@"
-fi
+propagateOnce propagatedBuildInputs "@out@"

From 7049bde4d5ffc9475eab99c490e6c35d71eb1534 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 20:02:14 -0600
Subject: [PATCH 467/857] kde5.kdelibs4support: use multiple outputs

---
 .../libraries/kde-frameworks-5.18/default.nix       |  2 +-
 .../default.nix}                                    |  7 +++++--
 .../kdelibs4support/nix-kde-include-dir.patch       | 13 +++++++++++++
 .../kde-frameworks-5.18/kdelibs4support/series      |  1 +
 .../kdelibs4support/setup-hook.sh                   |  1 +
 5 files changed, 21 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/kde-frameworks-5.18/{kdelibs4support.nix => kdelibs4support/default.nix} (83%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index 080854380dc53..bb96048d6ff56 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -60,7 +60,7 @@ let
     kdbusaddons = callPackage ./kdbusaddons.nix {};
     kdeclarative = callPackage ./kdeclarative.nix {};
     kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support.nix {};
+    kdelibs4support = callPackage ./kdelibs4support {};
     kdesignerplugin = callPackage ./kdesignerplugin.nix {};
     kdewebkit = callPackage ./kdewebkit.nix {};
     kdesu = callPackage ./kdesu.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
similarity index 83%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
rename to pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
index 214b756d5cbdd..843db83a99b23 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
@@ -1,4 +1,5 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, docbook_xml_dtd_45, kauth
 , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
 , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
@@ -11,7 +12,9 @@
 
 kdeFramework {
   name = "kdelibs4support";
-  outputs = [ "out" ];
+  outputs = [ "dev" "out" ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcompletion kconfig kded kservice kwidgetsaddons
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
new file mode 100644
index 0000000000000..eabb702544830
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
@@ -0,0 +1,13 @@
+Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
+===================================================================
+--- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp
++++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
+@@ -292,7 +292,7 @@ static QString relativeInstallPath(const
+             return QFile::decodeName(ICON_INSTALL_DIR "/");
+         }
+         if (strcmp("include", type) == 0) {
+-            return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
++            return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR"));
+         }
+         break;
+     case 'l':
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
new file mode 100644
index 0000000000000..9b08ab208774a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
@@ -0,0 +1 @@
+nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh
new file mode 100644
index 0000000000000..21ac2e83b5dae
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh
@@ -0,0 +1 @@
+export NIX_KDE_INCLUDE_DIR="@dev@/include/"  # trailing slash is required!

From 4f7297f1e32f4d42544d6b5f9b332e1bd1f176ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:23:03 -0600
Subject: [PATCH 468/857] kde5.apps: use multiple outputs

---
 pkgs/applications/kde-apps-15.12/kde-app.nix         | 2 ++
 pkgs/applications/kde-apps-15.12/kde-locale-4.nix    | 7 +++++++
 pkgs/applications/kde-apps-15.12/kde-locale-5.nix    | 7 +++++++
 pkgs/applications/kde-apps-15.12/kdelibs/default.nix | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/applications/kde-apps-15.12/kde-app.nix
index 242f3d9c793d3..2f1fdc1d643c5 100644
--- a/pkgs/applications/kde-apps-15.12/kde-app.nix
+++ b/pkgs/applications/kde-apps-15.12/kde-app.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
+  outputs = args.outputs or [ "dev" "out" ];
+
   cmakeFlags =
     (args.cmakeFlags or [])
     ++ [ "-DBUILD_TESTING=OFF" ]
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix b/pkgs/applications/kde-apps-15.12/kde-locale-4.nix
index 4b612ee3e3c28..e83794c60d818 100644
--- a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix
+++ b/pkgs/applications/kde-apps-15.12/kde-locale-4.nix
@@ -6,6 +6,8 @@ kdeApp (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt4";
 
+  outputs = [ "out" ];
+
   nativeBuildInputs =
     [ automoc4 cmake gettext perl ]
     ++ (args.nativeBuildInputs or []);
@@ -17,4 +19,9 @@ kdeApp (args // {
     sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
     ${args.preConfigure or ""}
   '';
+
+  preFixup = ''
+    propagatedBuildInputs=
+    propagatedNativeBuildInputs=
+  '';
 })
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix b/pkgs/applications/kde-apps-15.12/kde-locale-5.nix
index 522fc542aeb2d..772ebe37e44f1 100644
--- a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix
+++ b/pkgs/applications/kde-apps-15.12/kde-locale-5.nix
@@ -6,6 +6,8 @@ kdeApp (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt5";
 
+  outputs = [ "out" ];
+
   nativeBuildInputs =
     [ cmake extra-cmake-modules gettext kdoctools ]
     ++ (args.nativeBuildInputs or []);
@@ -14,4 +16,9 @@ kdeApp (args // {
     sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
     ${args.preConfigure or ""}
   '';
+
+  preFixup = ''
+    propagatedBuildInputs=
+    propagatedNativeBuildInputs=
+  '';
 })
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/applications/kde-apps-15.12/kdelibs/default.nix
index 91c1f3af448aa..389362deecc61 100644
--- a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix
+++ b/pkgs/applications/kde-apps-15.12/kdelibs/default.nix
@@ -9,6 +9,8 @@
 kdeApp {
   name = "kdelibs";
 
+  outputs = [ "out" ];
+
   buildInputs = [
     attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
     polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre

From ec9073dd2ebe04188a3aa25c386ba7688ff9646f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 11:03:49 -0600
Subject: [PATCH 469/857] kde5.plasma: remove misguided setupHook

---
 pkgs/desktops/plasma-5.5/default.nix   | 2 --
 pkgs/desktops/plasma-5.5/setup-hook.sh | 1 -
 2 files changed, 3 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5.5/setup-hook.sh

diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix
index c9fcbdd8e6a06..bbac6ab35247c 100644
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/plasma-5.5/default.nix
@@ -26,8 +26,6 @@ let
         name = "${name}-${version}";
         inherit src;
 
-        setupHook = args.setupHook or ./setup-hook.sh;
-
         cmakeFlags =
           (args.cmakeFlags or [])
           ++ [ "-DBUILD_TESTING=OFF" ]
diff --git a/pkgs/desktops/plasma-5.5/setup-hook.sh b/pkgs/desktops/plasma-5.5/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36f4..0000000000000
--- a/pkgs/desktops/plasma-5.5/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share

From bda1938d3a278416d18aa3dc65bc40dce91467a4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 11:13:00 -0600
Subject: [PATCH 470/857] kde5.plasma: use multiple outputs

---
 pkgs/desktops/plasma-5.5/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix
index bbac6ab35247c..ea1533af75711 100644
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/plasma-5.5/default.nix
@@ -26,6 +26,8 @@ let
         name = "${name}-${version}";
         inherit src;
 
+        outputs = args.outputs or [ "dev" "out" ];
+
         cmakeFlags =
           (args.cmakeFlags or [])
           ++ [ "-DBUILD_TESTING=OFF" ]

From f6e87370fbe56848d30a0631ee019a9b3a97b7ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 11:25:35 -0600
Subject: [PATCH 471/857] kde5.kauth: fix helper install paths

---
 .../kauth/cmake-install-paths.patch             | 17 +++++++++++++++++
 .../kde-frameworks-5.18/kauth/default.nix       |  4 ++--
 .../kauth/kauth-policy-install.patch            | 13 -------------
 .../libraries/kde-frameworks-5.18/kauth/series  |  1 +
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
new file mode 100644
index 0000000000000..c66f5ecd008f8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
@@ -0,0 +1,17 @@
+Index: kauth-5.18.0/KF5AuthConfig.cmake.in
+===================================================================
+--- kauth-5.18.0.orig/KF5AuthConfig.cmake.in
++++ kauth-5.18.0/KF5AuthConfig.cmake.in
+@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I
+ 
+ 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_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+-set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions")
++set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}")
++set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
+ 
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
index 2b000ff3c0417..1352d8c5821f5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, copyPathsToStore
 , extra-cmake-modules
 , kcoreaddons
 , polkit-qt
@@ -9,7 +9,7 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ polkit-qt ];
   propagatedBuildInputs = [ kcoreaddons ];
-  patches = [ ./kauth-policy-install.patch ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f28f..0000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/series b/pkgs/development/libraries/kde-frameworks-5.18/kauth/series
new file mode 100644
index 0000000000000..d2689425c3876
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/series
@@ -0,0 +1 @@
+cmake-install-paths.patch

From 9065ab0c8ac68887f4007ded5ac30de8555bfc44 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 20:05:40 -0600
Subject: [PATCH 472/857] kde5.extra-cmake-modules: rewrite setupHook

The rewrite achieves three goals. First, all the installation paths are
set correctly for multiple outputs. Second, the correct search paths are
set for all types of shared data. Third, packages are installed through
propagatedUserEnvPkgs as required.
---
 .../extra-cmake-modules/setup-hook.sh         | 70 +++++++--------
 .../kde-frameworks-5.18/kdoctools/default.nix |  1 -
 .../kdoctools/setup-hook.sh                   |  5 --
 .../kde-frameworks-5.18/kservice/default.nix  |  1 -
 .../kservice/setup-hook.sh                    | 17 ----
 .../libraries/qt-5/5.5/make-qt-wrapper.sh     | 19 ++--
 .../libraries/qt-5/5.5/qtbase/setup-hook.sh   | 89 +++++++++++--------
 7 files changed, 94 insertions(+), 108 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
index 0dfc34ef4080d..56ed09f4ea59e 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
@@ -1,37 +1,37 @@
-_propagateMimeTypes() {
-    if [ -d "$1/share/mime" ]; then
-        propagateOnce propagatedUserEnvPkgs "$1"
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
+_ecmSetXdgDirs() {
+    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
+    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
 }
 
-addToSearchPathOnceWithCustomDelimiter() {
-    local delim="$1"
-    local search="$2"
-    local target="$3"
-    local dirs
-    local exported
-    IFS="$delim" read -a dirs <<< "${!search}"
-    for dir in ${dirs[@]}; do
-        if [ "z$dir" == "z$target" ]; then exported=1; fi
+_ecmPropagateSharedData() {
+    local sharedPaths=( \
+        "config.cfg" \
+        "doc" \
+        "kconf_update" \
+        "kservices5" \
+        "kservicetypes5" \
+        "kxmlgui5" \
+        "knotifications5" \
+        "icons" \
+        "sounds" \
+        "templates" \
+        "wallpapers" \
+        "applications" \
+        "desktop-directories" \
+        "mime" \
+        "info" \
+        "dbus-1" \
+        "interfaces" \
+        "services" \
+        "system-services" )
+    for dir in ${sharedPaths[@]}; do
+        if [ -d "$1/share/$dir" ]; then
+            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
+        fi
     done
-    if [ -z $exported ]; then
-        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
-    fi
-}
-
-addToSearchPathOnce() {
-    addToSearchPathOnceWithCustomDelimiter ':' "$@"
-}
-
-propagateOnce() {
-    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
-}
-
-_exportLocales() {
-    if [[ -d "$1/share/locale" ]]; then
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
 }
 
 _ecmConfig() {
@@ -69,13 +69,13 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
     cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
     cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/interfaces"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/services"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/system-services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
     cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
     cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
 }
 
-envHooks+=(_propagateMimeTypes _exportLocales)
+envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
 preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
index 138c3fc33b94b..f67c19f42395a 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
@@ -4,7 +4,6 @@
 
 kdeFramework {
   name = "kdoctools";
-  setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ karchive ];
   propagatedBuildInputs = [ ki18n ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
deleted file mode 100644
index 5cfffbd622d12..0000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addXdgData() {
-    addToSearchPath XDG_DATA_DIRS "$1/share"
-}
-
-envHooks+=(addXdgData)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
index b502a18e0e5e4..24c5e681ca8d2 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
@@ -4,7 +4,6 @@
 
 kdeFramework {
   name = "kservice";
-  setupHook = ./setup-hook.sh;
   propagatedNativeBuildInputs = [ extra-cmake-modules ];
   nativeBuildInputs = [ kdoctools ];
   buildInputs = [ kcrash kdbusaddons ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
deleted file mode 100644
index e1210515fcf1a..0000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-_propagateServices() {
-    if [ -d "$1/share/kservices5" ]; then
-        propagateOnce propagatedUserEnvPkgs "$1"
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
-}
-
-_propagateServiceTypes() {
-    if [ -d "$1/share/kservicetypes5" ]; then
-        propagateOnce propagatedUserEnvPkgs "$1"
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
-}
-
-envHooks+=(_propagateServices _propagateServiceTypes)
-
-propagateOnce propagatedBuildInputs "@out@"
diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
index 63525ba365bc3..f29bbb73639ba 100644
--- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
@@ -1,10 +1,3 @@
-addQtDependency() {
-    addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-    addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
-    addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
-    addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
-}
-
 wrapQtProgram() {
     local prog="$1"
     shift
@@ -12,8 +5,8 @@ wrapQtProgram() {
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
         --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
-        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
+        --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \
         "$@"
 }
 
@@ -26,8 +19,8 @@ makeQtWrapper() {
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
         --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
-        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
+        --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \
         "$@"
 }
 
@@ -37,5 +30,5 @@ export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/q
 export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
 export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
 export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share"
-
-envHooks+=(addQtDependency)
+export NIX_WRAP_XDG_CONFIG_DIRS="$NIX_WRAP_XDG_CONFIG_DIRS${NIX_WRAP_XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
+export NIX_WRAP_XDG_DATA_DIRS="$NIX_WRAP_XDG_DATA_DIRS${NIX_WRAP_XDG_DATA_DIRS:+:}${!outputLib}/share"
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
index 59e04a3561e00..9cf1ef9ccb614 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
@@ -1,45 +1,26 @@
 if [[ -z "$QMAKE" ]]; then
 
-linkDependencyDir() {
+_qtLinkDependencyDir() {
     @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
+_qtLinkModule() {
+    if [ -d "$1/mkspecs" ]; then
         # $1 is a Qt module
-        linkDependencyDir "$1" mkspecs
+        _qtLinkDependencyDir "$1" mkspecs
 
         for dir in bin include lib share; do
-            if [[ -d "$1/$dir" ]]; then
-                linkDependencyDir "$1" "$dir"
+            if [ -d "$1/$dir" ]; then
+                _qtLinkDependencyDir "$1" "$dir"
             fi
         done
     fi
 }
 
-propagateRuntimeDeps() {
-    local propagated
-    for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-            break
-        fi
-    done
-}
-
-rmQtModules() {
+_qtRmModules() {
     cat "$out/nix-support/qt-inputs" | while read file; do
       if [[ -h "$out/$file" ]]; then
         rm "$out/$file"
@@ -55,15 +36,51 @@ rmQtModules() {
     rm "$out/nix-support/qt-inputs"
 }
 
-rmQMake() {
+addToSearchPathOnceWithCustomDelimiter() {
+    local delim="$1"
+    local search="$2"
+    local target="$3"
+    local dirs
+    local exported
+    IFS="$delim" read -a dirs <<< "${!search}"
+    for dir in ${dirs[@]}; do
+        if [ "z$dir" == "z$target" ]; then exported=1; fi
+    done
+    if [ -z $exported ]; then
+        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
+    fi
+}
+
+addToSearchPathOnce() {
+    addToSearchPathOnceWithCustomDelimiter ':' "$@"
+}
+
+propagateOnce() {
+    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+}
+
+_qtPropagateRuntimeDependencies() {
+    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+        if [ -d "$1/$dir" ]; then
+            propagateOnce propagatedBuildInputs "$1"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
+        fi
+    done
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
+    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+}
+
+_qtRmQmake() {
     rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"
 }
 
-setQMakePath() {
+_qtSetQmakePath() {
     export PATH="$qtOut/bin${PATH:+:}$PATH"
 }
 
-_multioutQtModuleDevs() {
+_qtMultioutModuleDevs() {
     # We cannot simply set these paths in configureFlags because libQtCore retains
     # references to the paths it was built with.
     moveToOutput "bin" "${!outputDev}"
@@ -74,7 +91,7 @@ _multioutQtModuleDevs() {
     moveToOutput "share/doc" "${!outputDev}"
 }
 
-_multioutQtDevs() {
+_qtMultioutDevs() {
     # This is necessary whether the package is a Qt module or not
     moveToOutput "mkspecs" "${!outputDev}"
 }
@@ -100,20 +117,20 @@ EOF
 
 export QMAKE="$qtOut/bin/qmake"
 
-envHooks+=(addQtModule propagateRuntimeDeps)
+envHooks+=(_qtLinkModule _qtPropagateRuntimeDependencies)
 # Set PATH to find qmake first in a preConfigure hook
 # It must run after all the envHooks!
-preConfigureHooks+=(setQMakePath)
+preConfigureHooks+=(_qtSetQmakePath)
 
-preFixupHooks+=(_multioutQtDevs)
+preFixupHooks+=(_qtMultioutDevs)
 if [[ -n "$NIX_QT_SUBMODULE" ]]; then
-    postInstallHooks+=(rmQMake rmQtModules)
-    preFixupHooks+=(_multioutQtModuleDevs)
+    postInstallHooks+=(_qtRmQmake _qtRmModules)
+    preFixupHooks+=(_qtMultioutModuleDevs)
 fi
 
 fi
 
 if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
     export NIX_QT_PIC=1
 fi

From 7840e5e9a1014b1aa06033f2dd0120f953db12be Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:01:35 -0600
Subject: [PATCH 473/857] kde5.kde-gtk-config: fix extra include paths

---
 pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
index 6b41599994d5f..ab8867520b380 100644
--- a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
@@ -22,7 +22,7 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [ ki18n kio ];
   cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
   ];
 }

From 150238dc9959c2836c06c69ed650496b7c2c36df Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:08:58 -0600
Subject: [PATCH 474/857] qt54: updated homepage

---
 pkgs/development/libraries/qt-5/5.4/default.nix        | 2 +-
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index d0e09c6b10f74..3262da124cd85 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -49,7 +49,7 @@ let
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
-        homepage = http://qt-project.org;
+        homepage = http://www.qt.io;
         description = "A cross-platform application framework for C++";
         license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
         maintainers = with maintainers; [ bbenoist qknight ttuegel ];
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index e08640ae86952..15f77c8fc87ff 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -232,7 +232,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = http://qt-project.org;
+    homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];

From d282d0bfe7cbcc81bd45f40e3785e9d135e040ee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:10:42 -0600
Subject: [PATCH 475/857] qt54.qtbase: set licenses correctly

---
 pkgs/development/libraries/qt-5/5.4/default.nix      | 12 ++++--------
 .../libraries/qt-5/5.4/qtbase/default.nix            |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 3262da124cd85..ab132ae21c841 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -48,13 +48,7 @@ let
 
       enableParallelBuilding = args.enableParallelBuilding or true;
 
-      meta = {
-        homepage = http://www.qt.io;
-        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 {});
+      meta = self.qtbase.meta // (args.meta or {});
     });
 
   addPackages = self: with self;
@@ -116,4 +110,6 @@ let
 
     };
 
-in makeScope pkgs.newScope addPackages
+    self = makeScope pkgs.newScope addPackages;
+
+in self
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 15f77c8fc87ff..9525678ca1ad9 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -234,7 +234,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
+    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];
     platforms = platforms.linux;
   };

From f4e6b173bb770889541b59e77381e28cd5da99f0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:13:17 -0600
Subject: [PATCH 476/857] qt54: add fixQtModuleCMakeConfig setup hook

---
 pkgs/development/libraries/qt-5/5.4/default.nix              | 2 ++
 .../libraries/qt-5/5.4/fix-qt-module-cmake-config.sh         | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index ab132ae21c841..df2fb8ad18622 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -37,6 +37,7 @@ let
       inherit src;
 
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
       dontAddPrefix = args.dontAddPrefix or true;
@@ -107,6 +108,7 @@ let
       ];
 
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
+      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
 
     };
 
diff --git a/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh
new file mode 100644
index 0000000000000..7ca3e33b613c2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh
@@ -0,0 +1,5 @@
+fixQtModuleCMakeConfig() {
+    local module="$1"
+    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
+        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
+}

From 65ef8578c298390d37135fcef6b23e6094c67043 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:19:26 -0600
Subject: [PATCH 477/857] qt54.qtbase: fix Qt module CMake config files

---
 .../libraries/qt-5/5.4/qtbase/default.nix       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 9525678ca1ad9..0585601db765a 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper
+{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig
 , srcs
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@@ -215,7 +215,7 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  nativeBuildInputs = [ lndir python perl pkgconfig ];
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -224,6 +224,19 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri"
+
+      fixQtModuleCMakeConfig "Concurrent"
+      fixQtModuleCMakeConfig "Core"
+      fixQtModuleCMakeConfig "DBus"
+      fixQtModuleCMakeConfig "Gui"
+      fixQtModuleCMakeConfig "Network"
+      fixQtModuleCMakeConfig "OpenGL"
+      fixQtModuleCMakeConfig "OpenGLExtensions"
+      fixQtModuleCMakeConfig "PrintSupport"
+      fixQtModuleCMakeConfig "Sql"
+      fixQtModuleCMakeConfig "Test"
+      fixQtModuleCMakeConfig "Widgets"
+      fixQtModuleCMakeConfig "Xml"
     '';
 
   inherit lndir;

From fbcdf3ee629a113d61a4dd536de0c6adb612b904 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:20:51 -0600
Subject: [PATCH 478/857] qt54.qtscript: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtscript/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
index 127766e2ebd61..b81a43aeadb04 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtscript";
   qtInputs = [ qtbase qttools ];
   patches = [ ./0001-glib-2.32.patch ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Script"
+  '';
 }

From b7db2185a058a5b23090992a34d32e45e957d7e9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:39:49 -0600
Subject: [PATCH 479/857] qt54.qtdeclarative: fix Qt module CMake config files

---
 .../libraries/qt-5/5.4/qtdeclarative/default.nix            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
index 9181c37b22583..e2219642a1224 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
@@ -5,4 +5,10 @@ qtSubmodule {
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Qml"
+    fixQtModuleCMakeConfig "Quick"
+    fixQtModuleCMakeConfig "QuickTest"
+    fixQtModuleCMakeConfig "QuickWidgets"
+  '';
 }

From a67c2ded6b228685c72b5581e4351299c79c332a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:40:41 -0600
Subject: [PATCH 480/857] qt54.qtxmlpatterns: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
index 9a8ddbba2bd24..3b22132e4c38e 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtxmlpatterns";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "XmlPatterns"
+  '';
 }

From 669dcb34859357a5947a63f12f339b7cf40999a6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:41:43 -0600
Subject: [PATCH 481/857] qt54.qtx11extras: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtx11extras.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
index a765161e2d7ea..db92f1353627d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtx11extras";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "X11Extras"
+  '';
 }

From 4d25e971936d57b5737ad5705901196e19c3c88b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:42:35 -0600
Subject: [PATCH 482/857] qt54.qtwebsockets: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
index fbdfbbcf0dbed..c0d0f9e7d714e 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebSockets"
+  '';
 }

From 1a481e58ec23d6e2474d40a3a530910a7daa5ba5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:43:25 -0600
Subject: [PATCH 483/857] qt54.qtwebkit: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
index 2620dcdf2d8a3..7ed3017b95a3d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
@@ -31,4 +31,8 @@ qtSubmodule {
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
     ++ [ dlopen-webkit-udev ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebKit"
+    fixQtModuleCMakeConfig "WebKitWidgets"
+  '';
 }

From 35f33b438caca6b1f0687b8a7ad68384edce0a49 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:43:47 -0600
Subject: [PATCH 484/857] qt54.qttools: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qttools.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix
index 65edc45081283..a6b29c07cac98 100644
--- a/pkgs/development/libraries/qt-5/5.4/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qttools.nix
@@ -3,4 +3,11 @@
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Designer"
+    fixQtModuleCMakeConfig "Help"
+    fixQtModuleCMakeConfig "LinguistTools"
+    fixQtModuleCMakeConfig "UiPlugin"
+    fixQtModuleCMakeConfig "UiTools"
+  '';
 }

From ece0396b5581a054ac770907aa0e70419e6820a2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:44:20 -0600
Subject: [PATCH 485/857] qt54.qtsvg: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtsvg.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
index b9ccac7cf9331..a460d6da4c2ad 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Svg"
+  '';
 }

From 3bb5501a88f553f417c9bd6b23c68efba9c23152 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:44:48 -0600
Subject: [PATCH 486/857] qt54.qtserialport: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
index 072825dfe9ba3..2c9575f122e78 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
@@ -10,4 +10,7 @@ qtSubmodule {
       libudev = libudev.out;
     })
   ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "SerialPort"
+  '';
 }

From 2f0ec07921bc2e03e7c2a3202ebf818a47f1709a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:45:08 -0600
Subject: [PATCH 487/857] qt54.qtsensors: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtsensors.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
index 61e64dc47e4dc..5776f45a70689 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Sensors"
+  '';
 }

From d769d6c3bd719b335883e32ff0d0fe9fadc684ab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:45:41 -0600
Subject: [PATCH 488/857] qt54.qtquick1: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
index d1c7bb389a49c..d81abbcd6140d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtquick1";
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Declarative"
+  '';
 }

From a7cce8b329486b22eab45de7d31fe6f8fa9ef5a7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:46:26 -0600
Subject: [PATCH 489/857] qt54.qtmultimedia: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
index b6b4d8ea0cf4e..8db8fa5f4b969 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
@@ -9,4 +9,8 @@ qtSubmodule {
     pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
   ];
   configureFlags = "GST_VERSION=1.0";
+  postFixup = ''
+    fixQtModuleCMakeConfig "Multimedia"
+    fixQtModuleCMakeConfig "MultimediaWidgets"
+  '';
 }

From b3c8878a6598b5c738925412f59d79becff9be67 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:46:45 -0600
Subject: [PATCH 490/857] qt54.qtlocation: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtlocation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
index 1e134057c4b47..0e2ad8bafb30d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Location"
+    fixQtModuleCMakeConfig "Positioning"
+  '';
 }

From 6e623f87845b1233bb759eb803ad33bcd1276077 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:47:27 -0600
Subject: [PATCH 491/857] qt54.qtenginio: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtenginio.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
index b860a73ef8900..503a0f7ce4f55 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtenginio";
   qtInputs = [ qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Enginio"
+  '';
 }

From 0c79c7c3b2b0f81574dc50fb3c3e55a6f3ec5df6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:47:45 -0600
Subject: [PATCH 492/857] qt54.qtconnectivity: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
index 95cd6fea79b40..35538c7261f1d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Bluetooth"
+    fixQtModuleCMakeConfig "Nfc"
+  '';
 }

From 2f4087b13d71e648c774308ee64a2fa933d308a5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 09:04:46 -0600
Subject: [PATCH 493/857] google-talk-plugin: udev -> libudev

---
 .../browsers/mozilla-plugins/google-talk-plugin/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 6fd953636a83c..f35e88ae89e61 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
 , libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
-, dbus_glib, alsaLib, libpulseaudio, udev, pango
+, dbus_glib, alsaLib, libpulseaudio, libudev, pango
 }:
 
 with stdenv.lib;
@@ -36,7 +36,7 @@ let
       alsaLib
       libpulseaudio
       dbus_glib
-      udev
+      libudev
       curl
       pango
       cairo

From fe1bae4e58c64a9f0be4beef1ec1cf7f1420b26a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 09:04:57 -0600
Subject: [PATCH 494/857] spotify: udev -> libudev

---
 pkgs/applications/audio/spotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 6e4bf1b73111c..70dc832225be7 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl_1_0_1, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
-, libgcrypt, udev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
+, libgcrypt, libudev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
 
 assert stdenv.system == "x86_64-linux";
 
@@ -27,7 +27,7 @@ let
     nss
     pango
     stdenv.cc.cc
-    udev
+    libudev
     xorg.libX11
     xorg.libXcomposite
     xorg.libXcursor

From 2efbf665a381130c2dafee4736224c1b92c32854 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 09:52:07 -0600
Subject: [PATCH 495/857] qt55.qttools: move runtime executables to $out

---
 pkgs/development/libraries/qt-5/5.5/qttools.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix
index a6b29c07cac98..1472691c52547 100644
--- a/pkgs/development/libraries/qt-5/5.5/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix
@@ -4,6 +4,9 @@ qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
   postFixup = ''
+    moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qtpaths" "$out"
+
     fixQtModuleCMakeConfig "Designer"
     fixQtModuleCMakeConfig "Help"
     fixQtModuleCMakeConfig "LinguistTools"

From 588c8499f75d1c1f1c5bd42ca509eee83a6cb15a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 16:58:40 -0600
Subject: [PATCH 496/857] qt55: don't set output flags by default

---
 pkgs/development/libraries/qt-5/5.5/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 88f064edc7d32..955d57350c294 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -50,7 +50,7 @@ let
       configureScript = args.configureScript or "qmake";
 
       outputs = args.outputs or [ "dev" "out" ];
-      setOutputFlags = false;
+      setOutputFlags = args.setOutputFlags or false;
 
       enableParallelBuilding = args.enableParallelBuilding or true;
 

From 7ea3225ea47e214e8ba412803f60b1806b673739 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:00 -0600
Subject: [PATCH 497/857] kde5.breeze: use runtime outputs

---
 pkgs/desktops/plasma-5.5/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix
index ea1533af75711..384fa6f6d272f 100644
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/plasma-5.5/default.nix
@@ -48,8 +48,11 @@ let
     breeze-qt4 = callPackage ./breeze-qt4.nix {};
     breeze-qt5 = callPackage ./breeze-qt5.nix {};
     breeze =
-      let version = (builtins.parseDrvName breeze-qt5.name).version;
-      in symlinkJoin "breeze-${version}" [ breeze-gtk breeze-qt4 breeze-qt5 ];
+      let
+        version = (builtins.parseDrvName breeze-qt5.name).version;
+      in
+        symlinkJoin "breeze-${version}"
+        (map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]);
     kde-cli-tools = callPackage ./kde-cli-tools.nix {};
     kde-gtk-config = callPackage ./kde-gtk-config {};
     kdecoration = callPackage ./kdecoration.nix {};

From a5b7cf093937c114e515d8d74be28888d55193fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:14 -0600
Subject: [PATCH 498/857] kde5.kscreen: remove redundant propagatedUserEnvPkgs

---
 pkgs/desktops/plasma-5.5/kscreen.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/plasma-5.5/kscreen.nix
index 2cfd0df2e1d35..a521a79936281 100644
--- a/pkgs/desktops/plasma-5.5/kscreen.nix
+++ b/pkgs/desktops/plasma-5.5/kscreen.nix
@@ -23,11 +23,6 @@ plasmaPackage {
     qtdeclarative
     qtgraphicaleffects
   ];
-  propagatedUserEnvPkgs = [
-    libkscreen  # D-Bus service
-    qtdeclarative  # QML import
-    qtgraphicaleffects  # QML import
-  ];
   postInstall = ''
     wrapQtProgram "$out/bin/kscreen-console"
   '';

From 7b11d5066a7bd019466332e321e958ed03c53455 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:29 -0600
Subject: [PATCH 499/857] kde5.plasma-desktop: remove redundant
 propagatedUserEnvPkgs

---
 pkgs/desktops/plasma-5.5/plasma-desktop/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
index a73060ad1af17..5f27efc7f24ca 100644
--- a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
@@ -60,9 +60,6 @@ plasmaPackage rec {
     qtquickcontrols
     qtx11extras
   ];
-  # All propagatedBuildInputs should be present in the profile because
-  # wrappers cannot be used here.
-  propagatedUserEnvPkgs = propagatedBuildInputs;
   patches = [
     ./0001-qt-5.5-QML-import-paths.patch
     (substituteAll {

From 30d6a7199554578b89deeed610f84097c1f35ea4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:48 -0600
Subject: [PATCH 500/857] kde5.plasma-workspace: remove redundant
 propagatedUserEnvPkgs

---
 pkgs/desktops/plasma-5.5/plasma-mediacenter.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
index afd8a18bbbd6a..7088f45d64e29 100644
--- a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
@@ -17,7 +17,4 @@ plasmaPackage rec {
     baloo kactivities kdeclarative kfilemetadata ki18n kio
     plasma-framework
   ];
-  # All propagatedBuildInputs should be present in the profile because
-  # wrappers cannot be used here.
-  propagatedUserEnvPkgs = propagatedBuildInputs;
 }

From a7ae370fa3d0c0851d5ee2ef3cb3a24a31e3ecb4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:02:17 -0600
Subject: [PATCH 501/857] kde5.plasma-workspace: propagate inputs automatically

---
 .../plasma-5.5/plasma-workspace/default.nix   | 39 +++++++---
 .../plasma-workspace/startkde.patch           | 72 +++++++++----------
 2 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
index 2d9364d446ebb..01c5c63ce0aa8 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
@@ -11,7 +11,7 @@
 , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols
 }:
 
-plasmaPackage rec {
+plasmaPackage {
   name = "plasma-workspace";
 
   nativeBuildInputs = [
@@ -20,10 +20,11 @@ plasmaPackage rec {
     makeQtWrapper
   ];
   buildInputs = [
-    kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
-    knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient
-    libdbusmenu libSM libXcursor networkmanager-qt pam phonon
-    qtscript wayland
+    dbus_tools kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit
+    kinit kjsembed knewstuff knotifyconfig kpackage kservice
+    ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM
+    libXcursor mkfontdir networkmanager-qt pam phonon qtscript qttools
+    socat wayland xmessage xprop xset xsetroot
   ];
   propagatedBuildInputs = [
     baloo kactivities kdeclarative kdelibs4support kglobalaccel
@@ -32,13 +33,31 @@ plasmaPackage rec {
   ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  inherit bash coreutils gnused gnugrep socat;
-  inherit kconfig kinit kservice qttools;
-  inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot;
+
   postPatch = ''
-    substituteAllInPlace startkde/startkde.cmake
+    substituteInPlace startkde/startkde.cmake \
+        --subst-var-by bash $(type -P bash) \
+        --subst-var-by sed $(type -P sed) \
+        --subst-var-by grep $(type -P grep) \
+        --subst-var-by socat $(type -P socat) \
+        --subst-var-by kcheckrunning $(type -P kcheckrunning) \
+        --subst-var-by xmessage $(type -P xmessage) \
+        --subst-var-by tr $(type -P tr) \
+        --subst-var-by qtpaths $(type -P qtpaths) \
+        --subst-var-by qdbus $(type -P qdbus) \
+        --subst-var-by dbus-launch $(type -P dbus-launch) \
+        --subst-var-by mkfontdir $(type -P mkfontdir) \
+        --subst-var-by xset $(type -P xset) \
+        --subst-var-by xsetroot $(type -P xsetroot) \
+        --subst-var-by xprop $(type -P xprop) \
+        --subst-var-by start_kdeinit_wrapper "${kinit.out}/lib/libexec/kf5/start_kdeinit_wrapper" \
+        --subst-var-by kwrapper5 $(type -P kwrapper5) \
+        --subst-var-by kdeinit5_shutdown $(type -P kdeinit5_shutdown) \
+        --subst-var-by kbuildsycoca5 $(type -P kbuildsycoca5) \
+        --subst-var-by kreadconfig5 $(type -P kreadconfig5) \
+        --subst-var out
     substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-      --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
   '';
 
   postInstall = ''
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
index 802c92da64d07..17c0ccf0ca93f 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
+++ b/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
@@ -4,7 +4,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +++ plasma-workspace-5.5.1/startkde/startkde.cmake
 @@ -1,8 +1,31 @@
 -#!/bin/sh
-+#!@bash@/bin/bash
++#!@bash@
  #
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
@@ -29,7 +29,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +# in Trolltech.conf.  A better solution would be to stop
 +# Qt from doing this wackiness in the first place.
 +if [ -e $HOME/.config/Trolltech.conf ]; then
-+    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
++    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
 +fi
 +
  if test "x$1" = x--failsafe; then
@@ -54,13 +54,13 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -
  # Check if a KDE session already is running and whether it's possible to connect to X
 -kcheckrunning
-+@out@/bin/kcheckrunning
++@kcheckrunning@
  kcheckrunning_result=$?
  if test $kcheckrunning_result -eq 0 ; then
 -	echo "KDE seems to be already running on this display."
 -	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
 +  echo "KDE seems to be already running on this display."
-+  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
++  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
  	exit 1
  elif test $kcheckrunning_result -eq 2 ; then
  	echo "\$DISPLAY is not set or cannot connect to the X server."
@@ -80,7 +80,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -fi
 -
 -mkdir -p $configDir
-+configDir=$(@qttools@/bin/qtpaths --writable-path GenericConfigLocation)
++configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
 +mkdir -p "$configDir"
  
  #This is basically setting defaults so we can use them with kstartupconfig5
@@ -126,7 +126,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  returncode=$?
  if test $returncode -ne 0; then
 -    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
-+    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
++    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
      exit 1
  fi
  [ -r $configDir/startupconfig ] && . $configDir/startupconfig
@@ -134,7 +134,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
      export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
  fi
  
-+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
 +export XCURSOR_PATH
 +
  # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
@@ -160,7 +160,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +# If the user has overwritten fonts, the cursor font may be different now
 +# so don't move this up.
 +#
-+@xsetroot@/bin/xsetroot -cursor_name left_ptr
++@xsetroot@ -cursor_name left_ptr
  
  dl=$DESKTOP_LOCKED
  unset DESKTOP_LOCKED # Don't want it in the environment
@@ -168,14 +168,14 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +# Make sure that D-Bus is running
 +# D-Bus autolaunch is broken
 +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-+    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
 +fi
-+if @qttools@/bin/qdbus >/dev/null 2>/dev/null; then
++if @qdbus@ >/dev/null 2>/dev/null; then
 +    : # ok
 +else
 +    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
 +    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-+    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
++    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
 +    exit 1
 +fi
 +
@@ -195,7 +195,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
 -# TODO: Use GenericConfigLocation once we depend on Qt 5.4
 -scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
-+scriptpath=$(@qttools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
++scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
@@ -204,7 +204,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  if test -n "$KDEDIRS"; then
 -  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-+  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
++  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
    sys_odir=$kdedirs_first/share/fonts/override
    sys_fdir=$kdedirs_first/share/fonts
  else
@@ -216,10 +216,10 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
 -test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
 -test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
-+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
-+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
-+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
++test -d "$sys_odir" && @xset@ +fp "$sys_odir"
++test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
++test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
++test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
  
  # Ask X11 to rebuild its font list.
 -xset fp rehash
@@ -233,7 +233,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -# so don't move this up.
 -#
 -xsetroot -cursor_name left_ptr
-+@xset@/bin/xset fp rehash
++@xset@ fp rehash
  
  # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
  if test -n "$GS_LIB" ; then
@@ -269,12 +269,12 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
 -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
  
  KDE_SESSION_VERSION=5
  export KDE_SESSION_VERSION
 -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
  
  KDE_SESSION_UID=`id -ru`
  export KDE_SESSION_UID
@@ -283,12 +283,12 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  # At this point all the environment is ready, let's send it to kwalletd if running
  if test -n "$PAM_KWALLET_LOGIN" ; then
 -    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-+    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
  fi
  # ...and also to kwalletd5
  if test -n "$PAM_KWALLET5_LOGIN" ; then
 -    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
-+    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
  fi
  
  # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
@@ -297,27 +297,27 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
    echo 'startkde: Could not sync environment to dbus.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 -  xmessage -geometry 500x100 "Could not sync environment to dbus."
-+  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
++  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
    exit 1
  fi
  
  # We set LD_BIND_NOW to increase the efficiency of kdeinit.
  # kdeinit unsets this variable before loading applications.
 -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
-+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
  if test $? -ne 0; then
    # Startup error
    echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 -  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
-+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
    exit 1
  fi
  
 +# (NixOS) We run kbuildsycoca5 before starting the user session because things
 +# may be missing or moved if they have run nixos-rebuild and it may not be
 +# possible for them to start Konsole to run it manually!
-+@kservice@/bin/kbuildsycoca5
++@kbuildsycoca5@
 +
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -327,33 +327,33 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  KSMSERVEROPTIONS=""
  test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
 -kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
-+@kinit@/bin/kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
  if test $? -eq 255; then
    # Startup error
    echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 -  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
-+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
  fi
  
 -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
  
  if test x"$wait_drkonqi"x = x"true"x ; then
      # wait for remaining drkonqi instances with timeout (in seconds)
 -    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-+    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
      wait_drkonqi_counter=0
 -    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-+    while @qttools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
          sleep 5
          wait_drkonqi_counter=$((wait_drkonqi_counter+5))
          if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
              # ask remaining drkonqis to die in a graceful way
 -            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
 -                $qdbus "$address" "/MainApplication" "quit"
-+            @qttools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
-+                @qttools@/bin/qdbus "$address" "/MainApplication" "quit"
++            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
++                @qdbus@ "$address" "/MainApplication" "quit"
              done
              break
          fi
@@ -362,14 +362,14 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  # Clean up
 -kdeinit5_shutdown
-+@kinit@/bin/kdeinit5_shutdown
++@kdeinit5_shutdown@
  
  unset KDE_FULL_SESSION
 -xprop -root -remove KDE_FULL_SESSION
-+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
++@xprop@ -root -remove KDE_FULL_SESSION
  unset KDE_SESSION_VERSION
 -xprop -root -remove KDE_SESSION_VERSION
-+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
++@xprop@ -root -remove KDE_SESSION_VERSION
  unset KDE_SESSION_UID
  
  echo 'startkde: Done.'  1>&2

From 98aa0818124176bdbef278553bad18baaa1ca033 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:02:31 -0600
Subject: [PATCH 502/857] kde5.breeze-icons: remove redundant
 propagatedUserEnvPkgs

---
 pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
index 879262c56a417..44cc99daf261b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
@@ -6,5 +6,5 @@
 kdeFramework {
   name = "breeze-icons";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedUserEnvPkgs = [ qtsvg ];
+  buildInputs = [ qtsvg ];
 }

From 6c327da00791e5cf45c45984e16aabde6a24d5e4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:02:46 -0600
Subject: [PATCH 503/857] kde5.kservice: remove redundant propagatedUserEnvPkgs

---
 .../libraries/kde-frameworks-5.18/kservice/default.nix           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
index 24c5e681ca8d2..3a27d85b9166e 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
@@ -8,7 +8,6 @@ kdeFramework {
   nativeBuildInputs = [ kdoctools ];
   buildInputs = [ kcrash kdbusaddons ];
   propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  propagatedUserEnvPkgs = [ kcoreaddons ];
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
     ./0002-no-canonicalize-path.patch

From 29e2b511db3fd6df110ee01d1a12bd5d3540fd88 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:03:08 -0600
Subject: [PATCH 504/857] sddm: link theme runtime outputs

---
 pkgs/applications/display-managers/sddm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index e4f68d786f403..83e2e0018c16e 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ lndir makeQtWrapper ];
   buildInputs = [ unwrapped ] ++ themes;
-  inherit themes;
+  themes = map (pkg: pkg.out or pkg) themes;
   inherit unwrapped;
 
   installPhase = ''

From db419ce555c0ea9b4c4ef812239a392bf9f3130c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:03:25 -0600
Subject: [PATCH 505/857] sddm: remove bash-ism

---
 pkgs/applications/display-managers/sddm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 83e2e0018c16e..8e1812ec013ba 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
     mkdir -p "$out/share/sddm"
     for pkg in $unwrapped $themes; do
         local sddmDir="$pkg/share/sddm"
-        if [[ -d "$sddmDir" ]]; then
+        if [ -d "$sddmDir" ]; then
             lndir -silent "$sddmDir" "$out/share/sddm"
         fi
     done

From 4768f41e36dca53ff1c79ea73f6d74e3ccab0234 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:03:42 -0600
Subject: [PATCH 506/857] nixos/kde5: use runtime outputs

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index e8c768e41fadd..4b238938d9275 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -55,12 +55,12 @@ in
     services.xserver.desktopManager.session = singleton {
       name = "kde5";
       bgSupport = true;
-      start = ''exec ${kde5.plasma-workspace}/bin/startkde;'';
+      start = ''exec startkde;'';
     };
 
     security.setuidOwners = singleton {
       program = "kcheckpass";
-      source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass";
+      source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
       owner = "root";
       group = "root";
       setuid = true;
@@ -168,12 +168,12 @@ in
 
     # Enable GTK applications to load SVG icons
     environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {
-      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
+      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
     };
 
     fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
 
-    programs.ssh.askPassword = "${kde5.ksshaskpass}/bin/ksshaskpass";
+    programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
 
     # Enable helpful DBus services.
     services.udisks2.enable = true;

From f43eb5ece02ef40ca17675cd3dc4dfe8a11fe5de Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 21:11:30 -0600
Subject: [PATCH 507/857] qt54.qttools: move runtime executables to $out

---
 pkgs/development/libraries/qt-5/5.4/qttools.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix
index a6b29c07cac98..1472691c52547 100644
--- a/pkgs/development/libraries/qt-5/5.4/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qttools.nix
@@ -4,6 +4,9 @@ qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
   postFixup = ''
+    moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qtpaths" "$out"
+
     fixQtModuleCMakeConfig "Designer"
     fixQtModuleCMakeConfig "Help"
     fixQtModuleCMakeConfig "LinguistTools"

From 9782c593edcfd4f7f41689f4ecb2390dbf1bc003 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:45:55 +0200
Subject: [PATCH 508/857] treewide: Mass replace 'acl}/bin' to refer the 'bin'
 output

---
 pkgs/applications/misc/udevil/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index 75c02d3ba6ddf..8ce683ec9088e 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
       --with-mount-prog=${utillinux}/bin/mount \
       --with-umount-prog=${utillinux}/bin/umount \
       --with-losetup-prog=${utillinux}/bin/losetup \
-      --with-setfacl-prog=${acl}/bin/setfacl \
+      --with-setfacl-prog=${acl.bin}/bin/setfacl \
       --sysconfdir=$prefix/etc
   '';
   preConfigure = ''

From 5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:45:57 +0200
Subject: [PATCH 509/857] treewide: Mass replace 'bzip2}/bin' to refer the
 'bin' output

---
 .../version-management/git-and-tools/cgit/default.nix         | 2 +-
 pkgs/os-specific/linux/sysstat/default.nix                    | 2 +-
 pkgs/servers/http/nix-binary-cache/default.nix                | 4 ++--
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix              | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix                    | 2 +-
 pkgs/tools/backup/store-backup/default.nix                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 6cde64b309007..ec92470468eb4 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
-        -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \
+        -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
         -e 's|"xz"|"${xz}/bin/xz"|' \
         -i ui-snapshot.c
   '';
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index 6544210b20674..16431c465c168 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export PATH_CP=$(type -tp cp)
     export PATH_CHKCONFIG=/no-such-program
-    export BZIP=${bzip2}/bin/bzip2
+    export BZIP=${bzip2.bin}/bin/bzip2
     export SYSTEMCTL=systemctl
   '';
 
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index b007c09b0560b..857d4bb4d490b 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
       --replace @xz@ "${xz}/bin" \
-      --replace @bzip2@ "${bzip2}/bin" \
+      --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
       --replace @openssl@ "${openssl}/bin" \
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
       --replace @xz@ "${xz}/bin" \
-      --replace @bzip2@ "${bzip2}/bin" \
+      --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
       --replace @openssl@ "${openssl}/bin" \
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 6b562eef53c23..dd35e03478ab6 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -166,7 +166,7 @@ rec {
         cp -d ${gawk}/bin/awk $out/bin
         cp ${gnutar}/bin/tar $out/bin
         cp ${gzip}/bin/gzip $out/bin
-        cp ${bzip2}/bin/bzip2 $out/bin
+        cp ${bzip2.bin}/bin/bzip2 $out/bin
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index d33d8f9fb663f..5732437970d52 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -79,7 +79,7 @@ rec {
         cp -d ${gawk}/bin/awk $out/bin
         cp ${gnutar}/bin/tar $out/bin
         cp ${gzip}/bin/gzip $out/bin
-        cp ${bzip2}/bin/bzip2 $out/bin
+        cp ${bzip2.bin}/bin/bzip2 $out/bin
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 93a7f9e1e39f7..9329cd23e83f8 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     for p in $out/bin/*
       do wrapProgram "$p" \
       --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \
-      --prefix PATH ":" "${which}/bin:${bzip2}/bin"
+      --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin"
     done
 
     patchShebangs $out

From a4dff4bf1bb9e66ad553e5b43b244b77060d98ae Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:45:59 +0200
Subject: [PATCH 510/857] treewide: Mass replace 'dbus_daemon}/bin' to refer
 the 'out' output

---
 pkgs/applications/misc/dunst/default.nix    | 2 +-
 pkgs/development/libraries/glib/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index c398c3c43d00d..651c74b2d2176 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram "$out/bin/dunst" \
-      --prefix PATH : '${dbus_daemon}/bin'
+      --prefix PATH : '${dbus_daemon.out}/bin'
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 7feccdef9aaa3..894dee3990c56 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
        export XDG_RUNTIME_HOME="$TMP"
        export HOME="$TMP"
        export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
-       export G_TEST_DBUS_DAEMON="${dbus_daemon}/bin/dbus-daemon"
+       export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
 
        substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true"
        # Needs machine-id, comment the test

From 9700be43813a5ce707fd7e126c64fd8d1cca0205 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:00 +0200
Subject: [PATCH 511/857] treewide: Mass replace 'djvulibre}/bin' to refer the
 'bin' output

---
 pkgs/tools/typesetting/djvu2pdf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix
index 512efe497fa0f..a426356a09f53 100644
--- a/pkgs/tools/typesetting/djvu2pdf/default.nix
+++ b/pkgs/tools/typesetting/djvu2pdf/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp -p djvu2pdf $out/bin
-    wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre}/bin:${which}/bin
+    wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin
 
     mkdir -p $out/man/man1
     cp -p djvu2pdf.1.gz $out/man/man1

From 76cfa449dc81cbc6d178ff4564cbc3211f0945aa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:02 +0200
Subject: [PATCH 512/857] treewide: Mass replace 'flac}/bin' to refer the 'bin'
 output

---
 pkgs/applications/audio/caudec/default.nix | 2 +-
 pkgs/tools/audio/beets/default.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 978dd27facdb7..d84ff702ce872 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     for executable in $(cd $out/bin && ls); do
 	wrapProgram $out/bin/$executable \
-	  --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin"
+	  --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin"
     done
   '';
 
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 35a69262acdef..3cdd4b4f0a2ed 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -121,7 +121,7 @@ in buildPythonPackage rec {
     }' beets/ui/commands.py
   '' + optionalString enableBadfiles ''
     sed -i -e '/self\.run_command(\[/ {
-      s,"flac","${flac}/bin/flac",
+      s,"flac","${flac.bin}/bin/flac",
       s,"mp3val","${mp3val}/bin/mp3val",
     }' beetsplug/badfiles.py
   '' + optionalString enableReplaygain ''

From 0eb84e882bde4c539dc7c0e3f192cc5742f6a570 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:10 +0200
Subject: [PATCH 513/857] treewide: Mass replace 'libjpeg}/bin' to refer the
 'bin' output

---
 pkgs/tools/graphics/jhead/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index dfbd7c4e5e066..2fb1c9325c03f 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
     substituteInPlace jhead.c \
       --replace "\"   Compiled: \"__DATE__" "" \
-      --replace "jpegtran -trim" "${libjpeg}/bin/jpegtran -trim"
+      --replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim"
   '';
 
   installPhase = ''

From 3cc7fa0be91ba9ac4dd9b96c551de79220b27704 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:15 +0200
Subject: [PATCH 514/857] treewide: Mass replace 'lzma}/bin' to refer the 'bin'
 output

---
 pkgs/build-support/vm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 2311b0d2fec89..fffdc85d2bce5 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -574,7 +574,7 @@ rec {
       buildCommand = ''
         ${createRootFS}
 
-        PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma}/bin
+        PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin
 
         # Unpack the .debs.  We do this to prevent pre-install scripts
         # (which have lots of circular dependencies) from barfing.

From 13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:16 +0200
Subject: [PATCH 515/857] treewide: Mass replace 'openssl}/bin' to refer the
 'bin' output

---
 nixos/modules/services/web-servers/apache-httpd/owncloud.nix  | 2 +-
 nixos/modules/system/boot/luksroot.nix                        | 2 +-
 pkgs/applications/networking/mailreaders/mailpile/default.nix | 2 +-
 pkgs/applications/virtualization/openstack/keystone.nix       | 2 +-
 pkgs/development/libraries/opendkim/default.nix               | 2 +-
 pkgs/development/tools/sslmate/default.nix                    | 2 +-
 pkgs/servers/http/nix-binary-cache/default.nix                | 4 ++--
 pkgs/servers/shellinabox/default.nix                          | 2 +-
 pkgs/tools/networking/easyrsa/default.nix                     | 2 +-
 pkgs/tools/virtualization/ec2-ami-tools/default.nix           | 2 +-
 pkgs/top-level/python-packages.nix                            | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index 9994de0f9b40b..5633f30e4a85b 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -333,7 +333,7 @@ let
 
       'version' => '${config.package.version}',
 
-      'openssl' => '${pkgs.openssl}/bin/openssl'
+      'openssl' => '${pkgs.openssl.bin}/bin/openssl'
 
       );
 
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 6ea11e60b263b..77a82547031a1 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -436,7 +436,7 @@ in
       ${optionalString luks.yubikeySupport ''
         copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp
         copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
-        copy_bin_and_libs ${pkgs.openssl}/bin/openssl
+        copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl
 
         cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
         strip -s pbkdf2-sha512
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index c43944dc59795..b3ca52999efb4 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/mailpile \
-      --prefix PATH ":" "${gnupg1orig}/bin:${openssl}/bin"
+      --prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
index 3060dcb04cb35..ff60dc3640517 100644
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@@ -33,7 +33,7 @@ pythonPackages.buildPythonPackage rec {
     ldap ldappool webtest requests2 oslotest pep8 pymongo which
   ];
 
-  makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"];
+  makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];
 
   postInstall = ''
     # install .ini files
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index e89cd880df13b..7f4b5ba2e3282 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/sbin/opendkim-genkey \
-      --prefix PATH : ${openssl}/bin
+      --prefix PATH : ${openssl.bin}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix
index 72af189845145..8def4b6a66577 100644
--- a/pkgs/development/tools/sslmate/default.nix
+++ b/pkgs/development/tools/sslmate/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
         JSONPP
         TermReadKey
       ]}" \
-      --prefix PATH : "${openssl}/bin"
+      --prefix PATH : "${openssl.bin}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 857d4bb4d490b..be7cadac44dab 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
-      --replace @openssl@ "${openssl}/bin" \
+      --replace @openssl@ "${openssl.bin}/bin" \
       --replace @lighttpd@ "${lighttpd}/sbin" \
       --replace @iproute@ "${iproute}/sbin" \
       --replace "xXxXx" "xXxXx"
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
-      --replace @openssl@ "${openssl}/bin" \
+      --replace @openssl@ "${openssl.bin}/bin" \
       --replace @lighttpd@ "${lighttpd}/sbin" \
       --replace @iproute@ "${iproute}/sbin" \
       --replace "xXxXx" "xXxXx"
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 6df4905af2cd3..c9f4e2d253f9b 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
     substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
-    substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
+    substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin"
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index 2b41f8ca1d3cf..59d97a4a18b62 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa
     substituteInPlace $out/bin/easyrsa \
       --subst-var out \
-      --subst-var-by openssl ${openssl}/bin/openssl
+      --subst-var-by openssl ${openssl.bin}/bin/openssl
 
     # Helper utility
     cat > $out/bin/easyrsa-init <<EOF
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index dee14db46bcf7..6ccce4684ad5a 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       for i in $out/bin/*; do
           wrapProgram $i \
             --set EC2_HOME $out \
-            --prefix PATH : ${ruby}/bin:${openssl}/bin
+            --prefix PATH : ${ruby}/bin:${openssl.bin}/bin
       done
 
       sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 581e2834d8fdf..7e97a4bd35989 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -279,7 +279,7 @@ in modules // {
     doCheck = false;
 
     patchPhase = ''
-      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
+      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl"
     '';
 
     installPhase = ''

From 7b0c4d452a3517b0f715d2847a42f7420bbf434e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:18 +0200
Subject: [PATCH 516/857] treewide: Mass replace 'poppler_utils}/bin' to refer
 the 'out' output

---
 pkgs/applications/misc/calibre/default.nix  | 2 +-
 pkgs/applications/search/recoll/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index f464c3ccd0279..916173fa73bc0 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
-                     --prefix PATH : ${poppler_utils}/bin
+                     --prefix PATH : ${poppler_utils.out}/bin
     done
   '';
 
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 631555234cee2..a9599614c3e36 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
       substituteInPlace  $f --replace iconv         ${libiconv.bin}/bin/iconv
       substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
-      substituteInPlace  $f --replace pdftotext     ${poppler_utils}/bin/pdftotext
+      substituteInPlace  $f --replace pdftotext     ${poppler_utils.out}/bin/pdftotext
       substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 
       substituteInPlace  $f --replace sed           ${gnused}/bin/sed
       substituteInPlace  $f --replace tar           ${gnutar}/bin/tar

From 33e7a2549afd53851c3ca1bd89395c90442a2530 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:23 +0200
Subject: [PATCH 517/857] treewide: Mass replace 'xfsprogs}/bin' to refer the
 'bin' output

---
 nixos/modules/programs/xfs_quota.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
index 90b6304fa9990..648fd9a8a94f4 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -89,8 +89,8 @@ in
       nameValuePair "xfs_quota-${name}" {
         description = "Setup xfs_quota for project ${name}";
         script = ''
-          ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
-          ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
+          ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
+          ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
         '';
 
         wantedBy = [ "multi-user.target" ];

From 5dfcafb20552f89a569e605e1007b3000b8ac3b3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:27 +0200
Subject: [PATCH 518/857] treewide: Mass replace 'xwayland}/bin' to refer the
 'out' output

---
 pkgs/applications/window-managers/weston/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 0720368222dcd..f154d3c28c7e6 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"
     ++ stdenv.lib.optionals (xwayland != null) [
         "--enable-xwayland"
-        "--with-xserver-path=${xwayland}/bin/Xwayland"
+        "--with-xserver-path=${xwayland.out}/bin/Xwayland"
       ];
 
   meta = with stdenv.lib; {

From e97e6902440b17cc1c9b05d41fd38f7c0b291139 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:28 +0200
Subject: [PATCH 519/857] treewide: Mass replace 'xz}/bin' to refer the 'bin'
 output

---
 .../version-management/git-and-tools/cgit/default.nix         | 2 +-
 pkgs/applications/virtualization/docker/default.nix           | 2 +-
 pkgs/servers/http/nix-binary-cache/default.nix                | 4 ++--
 pkgs/tools/compression/pxz/default.nix                        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index ec92470468eb4..3c8712cc2f91f 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
         -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-        -e 's|"xz"|"${xz}/bin/xz"|' \
+        -e 's|"xz"|"${xz.bin}/bin/xz"|' \
         -i ui-snapshot.c
   '';
 
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2af39cd33deb9..54c9ed7b1ab2b 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
     install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
     makeWrapper $out/libexec/docker/docker $out/bin/docker \
-      --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}"
+      --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index be7cadac44dab..674557d74fc21 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       --replace @coreutils@ "${coreutils}/bin" \
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
-      --replace @xz@ "${xz}/bin" \
+      --replace @xz@ "${xz.bin}/bin" \
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       --replace @coreutils@ "${coreutils}/bin" \
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
-      --replace @xz@ "${xz}/bin" \
+      --replace @xz@ "${xz.bin}/bin" \
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix
index 07c3e205a982e..f6424b5e88037 100644
--- a/pkgs/tools/compression/pxz/default.nix
+++ b/pkgs/tools/compression/pxz/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     gcc -o pxz pxz.c -llzma \
         -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \
         -DPXZ_BUILD_DATE=\"nixpkgs\" \
-        -DXZ_BINARY=\"${xz}/bin/xz\" \
+        -DXZ_BINARY=\"${xz.bin}/bin/xz\" \
         -DPXZ_VERSION=\"${version}\"
   '';
 

From f89a136fd508c88a4f5aa7332e380603a802eb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Feb 2016 14:42:33 +0100
Subject: [PATCH 520/857] cc-wrapper: fixup branch interactions

c0599fdd61c and changes on closure-size didn't go well together.
---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   | 4 ++--
 pkgs/build-support/cc-wrapper/default.nix     | 2 +-
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 4 ++--
 pkgs/build-support/cc-wrapper/ld-wrapper.sh   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 6e12a0d8bc8fa..99cee577cd337 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,7 +1,7 @@
 #! @shell@ -e
 path_backup="$PATH"
-if [ -n "@coreutils@" ]; then
-  PATH="@coreutils@/bin:@gnugrep@/bin"
+if [ -n "@coreutils_bin@" ]; then
+  PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
 fi
 
 if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 0458eedc62bc0..6cdd047724455 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   preferLocalBuild = true;
 
   inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
-  gnugrep = if nativeTools then "" else gnugrep;
+  gnugrep_bin = if nativeTools then "" else gnugrep;
 
   passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; };
 
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index ae46b40ac6318..06858da512a70 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,7 +1,7 @@
 #! @shell@ -e
 path_backup="$PATH"
-if [ -n "@coreutils@" ]; then
-  PATH="@coreutils@/bin"
+if [ -n "@coreutils_bin@" ]; then
+  PATH="@coreutils_bin@/bin"
 fi
 
 if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 6ef06eb703483..955b3767a62f9 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,7 +1,7 @@
 #! @shell@ -e
 path_backup="$PATH"
-if [ -n "@coreutils@" ]; then
-  PATH="@coreutils@/bin"
+if [ -n "@coreutils_bin@" ]; then
+  PATH="@coreutils_bin@/bin"
 fi
 
 if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then

From bd2ca1e539c71e83445bb04ccc0e15cb4c80861f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Feb 2016 04:56:56 +0100
Subject: [PATCH 521/857] libvdpau: fixup branch interactions

This solution is cleaner anyway.
---
 pkgs/development/libraries/libvdpau/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index c2ec587a52e3a..da0773335a4d5 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -16,13 +16,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau" ];
 
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  postInstall = ''
-    cp -r $out/${mesa_noglu.driverLink}/* $out
-    cp -r $out/$out/* $out
-    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
-  '';
+  installFlags = [ "moduledir=$(out)/lib/vdpau" ];
 
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;

From 2c51a075ab12c2ec06ced04bd9bcc0d809a804ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Feb 2016 04:58:34 +0100
Subject: [PATCH 522/857] makeFontsConf: fix with multiple outputs

---
 pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 1321948c3c818..b996cd228c77d 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -16,7 +16,7 @@ runCommand "fc-cache"
     <?xml version='1.0'?>
     <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
     <fontconfig>
-      <include>${fontconfig}/etc/fonts/fonts.conf</include>
+      <include>${fontconfig.out}/etc/fonts/fonts.conf</include>
       <cachedir>$out</cachedir>
     EOF
     cat "$fontDirsPath" >> fonts.conf

From 824c8dfa9573d1913fd3f21b586f0188de042c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Feb 2016 12:31:17 +0100
Subject: [PATCH 523/857] add ensureNewerSourcesHook and apply to all python

Fixes #12663: problems in python stuff due to old timestamps in sources.
- Files in sources older than a certain year are set to that year.
- Applied with 1980 for all python packages due to the way it often uses zip.

(cherry picked from staging commit e4ab8aee62fe65252b40861900decc7e880517a7)
---
 pkgs/development/python-modules/generic/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                     | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index dab20b2f7447b..15f369a44f2d2 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -3,7 +3,8 @@
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip }:
+{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip
+, ensureNewerSourcesHook }:
 
 { name
 
@@ -60,6 +61,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
   name = namePrefix + name;
 
   buildInputs = [ wrapPython bootstrapped-pip ] ++ buildInputs ++ pythonPath
+    ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
   # propagate python/setuptools to active setup-hook in nix-shell
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0eda14f2f4cb9..393eb4b37c883 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -259,6 +259,14 @@ let
     { substitutions = { inherit autoconf automake gettext libtool; }; }
     ../build-support/setup-hooks/autoreconf.sh;
 
+  ensureNewerSourcesHook = { year }: makeSetupHook {}
+    (writeScript "ensure-newer-sources-hook.sh" ''
+      postUnpackHooks+=(_ensureNewerSources)
+      _ensureNewerSources() {
+        find "$sourceRoot" '!' -newermt '${year}-01-01' -exec touch -d '${year}-01-02' '{}' '+'
+      }
+    '');
+
   buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
 
   buildFHSEnv = callPackage ../build-support/build-fhs-chrootenv/env.nix {

From 108570129324b72a486cdd1af38e6aaf5a0499de Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 11:34:35 +0200
Subject: [PATCH 524/857] gnutar: Depend on 'acl' only on Linux

I'm not sure why but the 'acl' dependency only exists in the
multiple-outputs branch...
---
 pkgs/tools/archivers/gnutar/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 6b5717ab29705..36d3ebd9816fb 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "info" ];
 
-  buildInputs = [ acl ]
+  buildInputs = [ ]
+    ++ stdenv.lib.optional stdenv.isLinux acl
     ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 
   # May have some issues with root compilation because the bootstrap tool

From c8577b9f30ec99bc430694a1a377cf91bbcdba98 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 5 Feb 2016 14:26:01 -0600
Subject: [PATCH 525/857] haskell-double-conversion: add libstdc++ to inputs

---
 pkgs/development/haskell-modules/configuration-common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f746802c7b0d..c233934a21515 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -226,8 +226,8 @@ self: super: {
     else super.x509-system;
 
   double-conversion = if !pkgs.stdenv.isDarwin
-    then super.double-conversion
-    else addBuildDepend (overrideCabal super.double-conversion (drv:
+    then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib
+    else addExtraLibrary (overrideCabal super.double-conversion (drv:
       {
         postPatch = ''
           substituteInPlace double-conversion.cabal --replace stdc++ c++

From 5a13e9500c79ee38fd2bf99ae23d7d0276a858f6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 7 Feb 2016 18:38:00 -0600
Subject: [PATCH 526/857] nixos/nix-serve: use bzip2.bin output

---
 nixos/modules/services/networking/nix-serve.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 880a1d361dfeb..8f6881441cf79 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -50,7 +50,7 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      path = [ config.nix.package pkgs.bzip2 ];
+      path = [ config.nix.package pkgs.bzip2.bin ];
       environment.NIX_REMOTE = "daemon";
       environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
 

From 6f2ab634f9f76365d7af195a3c8b14d81a070ff7 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 13 Feb 2016 09:52:02 -0500
Subject: [PATCH 527/857] bzip2: fix shared library generation on darwin

This fixes #6504
(cherry picked from commit 31ab7d38f23e556fd4e25508bed02455474b6c97)
---
 pkgs/tools/compression/bzip2/default.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index ea2ee660a2cef..59da8d1079166 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -3,9 +3,13 @@
 let
   version = "1.0.6";
 
-  sharedLibrary = !stdenv.isDarwin && !(stdenv ? isStatic)
+  sharedLibrary = !(stdenv ? isStatic)
                && stdenv.system != "i686-cygwin" && !linkStatic;
 
+  darwinMakefile = fetchurl {
+    url    = "https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib";
+    sha256 = "1lq6g98kfpwv2f7wn4sk8hzcf87dwf92gviq0b4691f5bvc9mawz";
+  };
 in stdenv.mkDerivation {
   name = "bzip2-${version}";
 
@@ -40,17 +44,24 @@ in stdenv.mkDerivation {
   outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out";
 
   preBuild = stdenv.lib.optionalString sharedLibrary ''
-    make -f Makefile-libbz2_so
+    make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"}
   '';
 
-  preInstall = stdenv.lib.optionalString sharedLibrary ''
+  preInstall = stdenv.lib.optionalString sharedLibrary (if !stdenv.isDarwin then ''
     mkdir -p $out/lib
     mv libbz2.so* $out/lib
     ( cd $out/lib &&
       ln -s libbz2.so.1.0.? libbz2.so &&
       ln -s libbz2.so.1.0.? libbz2.so.1
     )
-  '';
+  '' else ''
+    mkdir -p $out/lib
+    mv libbz2.*.dylib $out/lib
+    ( cd $out/lib &&
+      ln -s libbz2.1.0.?.dylib libbz2.dylib &&
+      ln -s libbz2.1.0.?.dylib libbz2.1.dylib
+    )
+  '');
 
   installFlags = [ "PREFIX=$(bin)" ];
 
@@ -66,6 +77,11 @@ in stdenv.mkDerivation {
   patchPhase = ''
     substituteInPlace Makefile --replace CC=gcc CC=cc
     substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp ${darwinMakefile} Makefile-libbz2_dylib
+    substituteInPlace Makefile-libbz2_dylib \
+      --replace "CC=gcc" "CC=cc" \
+      --replace "PREFIX=/usr" "PREFIX=$out"
   '';
 
   preConfigure = ''

From 0a23d430bf68c1028bd8827a46b0786ba17b10eb Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 13 Feb 2016 15:46:42 -0500
Subject: [PATCH 528/857] stdenv-darwin: fix to work with multiple outputs

---
 pkgs/stdenv/darwin/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 0af7071e21869..8100318091735 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -176,7 +176,7 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ xz libcxx libcxxabi icu ]) ++
+      (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++
       (with pkgs.darwin; [ dyld Libsystem CF locale ]);
 
     overrides = persistent1;
@@ -211,7 +211,7 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ icu bash libcxx libcxxabi ]) ++
+      (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++
       (with pkgs.darwin; [ dyld Libsystem locale ]);
 
     overrides = persistent2;
@@ -294,9 +294,11 @@ in rec {
     };
 
     allowedRequisites = (with pkgs; [
-      xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi
-      coreutils ed diffutils gnutar gzip ncurses gnused bash gawk
-      gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext
+      xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
+      bzip2.bin llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
+      gzip ncurses.out ncurses.dev ncurses.lib ncurses.man gnused bash gawk
+      gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
+      binutils-raw.dev binutils gettext
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools libiconv locale
     ]);

From 0cd08e7e0299c3e87ddd5241f116efd5eeec2f55 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 11:33:31 +0200
Subject: [PATCH 529/857] HACK: darwin adv_cmds: Add a dummy 'out' output

---
 .../darwin/apple-source-releases/adv_cmds/default.nix          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index d72afac88feea..b8b436efe24f9 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -73,12 +73,15 @@ in appleDerivation {
 
     install -d 0755 $ps/bin
     install ps $ps/bin/ps
+    touch "$out"
   '';
 
   outputs = [
+    "out"
     "ps"
     "locale"
   ];
+  setOutputFlags = false;
 
   # ps uses this syscall to get process info
   propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port";

From 78e62da7f1f022e6ee3cc16a1ef716d82151f2f2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 00:51:08 +0200
Subject: [PATCH 530/857] python2: Fix on Darwin

Presumably $out/lib/python*/plat-linux2/ is a Linux-only thing.
---
 pkgs/development/interpreters/python/2.7/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 1bcb0777e85c0..31839d24754e6 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -141,9 +141,9 @@ let
 
         paxmark E $out/bin/python${majorVersion}
 
-        ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
+        ${optionalString includeModules "$out/bin/python ./setup.py build_ext"}
 
-        rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev
+        ${optionalString stdenv.isLinux ''rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev''}
       '';
 
     passthru = rec {

From 34922a3951a0ada7af4fe808250abaf5feb4e28e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 00:51:08 +0200
Subject: [PATCH 531/857] python2: Fix on non-Linux

The location of this 'regen' script (whatever is does) depends on the
platform. AFAICT it always exists due to this:

$(srcdir)/Lib/$(PLATDIR):
        mkdir $(srcdir)/Lib/$(PLATDIR)
        cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
---
 pkgs/development/interpreters/python/2.7/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 31839d24754e6..f1ae897ea4ac1 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -143,7 +143,7 @@ let
 
         ${optionalString includeModules "$out/bin/python ./setup.py build_ext"}
 
-        ${optionalString stdenv.isLinux ''rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev''}
+        rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
       '';
 
     passthru = rec {

From 20c31e65ab922f4b079c056dae3a0e28a01920de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 15 Feb 2016 17:05:31 +0100
Subject: [PATCH 532/857] libva: use a cleaner installation method

(cherry-picked from commit 8ea5563011ee202eda146e2cc8f8754f239303cf)
Tweaked not to cause a mass rebuild ATM.
---
 pkgs/development/libraries/libva/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index e04c3b9828d84..3b4c623568640 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -21,16 +21,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = lib.optionals (!minimal) [
     "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
-     "--enable-glx" 
-   ];
+    "--enable-glx"
+  ];
 
-   installFlags = lib.optional (!minimal) "DESTDIR=$(out)";
-
-  postInstall = lib.optionalString (!minimal) ''
-    cp -r $out/${mesa_noglu.driverLink}/* $out
-    cp -r $out/$out/* $out
-    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
-  '';
+  installFlags = lib.optional (!minimal) "dummy_drv_video_ladir=$(out)/lib/dri";
+  postInstall = "";
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;

From f3110c0a0123638d9fad798d986a008c2bafb5bd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Feb 2016 16:02:52 -0600
Subject: [PATCH 533/857] kde5.frameworks: 5.18 -> 5.19

This will cause some merge conflicts, but the changes in closure-size
will be overwritten by the upgrade in master otherwise.
---
 .../libraries/kde-frameworks-5.18/srcs.nix    | 565 ------------------
 .../attica.nix                                |   0
 .../baloo.nix                                 |   0
 .../bluez-qt.nix                              |   0
 .../breeze-icons.nix                          |   0
 .../default.nix                               |   0
 .../extra-cmake-modules/default.nix           |   0
 .../extra-cmake-modules/nix-lib-path.patch    |   0
 .../extra-cmake-modules/series                |   0
 .../extra-cmake-modules/setup-hook.sh         |   0
 .../fetchsrcs.sh                              |   2 +-
 .../frameworkintegration.nix                  |   0
 .../kactivities.nix                           |   0
 .../kapidox.nix                               |   0
 .../karchive.nix                              |   0
 .../kauth/cmake-install-paths.patch           |   0
 .../kauth/default.nix                         |   0
 .../kauth/series                              |   0
 .../kbookmarks.nix                            |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kcmutils/default.nix                      |   0
 .../kcodecs.nix                               |   0
 .../kcompletion.nix                           |   0
 .../kconfig.nix                               |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kconfigwidgets/default.nix                |   0
 .../kcoreaddons.nix                           |   0
 .../kcrash.nix                                |   0
 .../kdbusaddons.nix                           |   0
 .../kdeclarative.nix                          |   0
 .../kded.nix                                  |   0
 .../kdelibs4support/default.nix               |   0
 .../kdelibs4support/nix-kde-include-dir.patch |   0
 .../kdelibs4support/series                    |   0
 .../kdelibs4support/setup-hook.sh             |   0
 .../kdesignerplugin.nix                       |   0
 .../kdesu.nix                                 |   0
 .../kdewebkit.nix                             |   0
 .../kdnssd.nix                                |   0
 .../kdoctools/default.nix                     |   0
 .../kdoctools-no-find-docbook-xml.patch       |   0
 .../kemoticons.nix                            |   0
 .../kfilemetadata/cmake-install-paths.patch   |   0
 .../kfilemetadata/default.nix                 |   0
 .../kfilemetadata/series                      |   0
 .../kglobalaccel.nix                          |   0
 .../kguiaddons.nix                            |   0
 .../khtml.nix                                 |   0
 .../ki18n.nix                                 |   0
 .../kiconthemes/default-theme-breeze.patch    |   0
 .../kiconthemes/default.nix                   |   0
 .../kiconthemes/series                        |   0
 .../kidletime.nix                             |   0
 .../kimageformats.nix                         |   0
 .../kinit/0001-kinit-libpath.patch            |   0
 .../kinit/default.nix                         |   0
 .../kio/default.nix                           |   0
 .../kio/samba-search-path.patch               |   0
 .../kio/series                                |   0
 .../kitemmodels.nix                           |   0
 .../kitemviews.nix                            |   0
 .../kjobwidgets.nix                           |   0
 .../kjs.nix                                   |   0
 .../kjsembed.nix                              |   0
 .../kmediaplayer.nix                          |   0
 .../knewstuff.nix                             |   0
 .../knotifications.nix                        |   0
 .../knotifyconfig.nix                         |   0
 .../kpackage/allow-external-paths.patch       |   0
 .../kpackage/default.nix                      |   0
 .../qdiriterator-follow-symlinks.patch        |   0
 .../kpackage/series                           |   0
 .../kparts.nix                                |   0
 .../kpeople.nix                               |   0
 .../kplotting.nix                             |   0
 .../kpty.nix                                  |   0
 .../kross.nix                                 |   0
 .../krunner.nix                               |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kservice/0002-no-canonicalize-path.patch  |   0
 .../kservice/default.nix                      |   0
 .../ktexteditor/default.nix                   |   0
 .../ktexteditor/no-qcoreapplication.patch     |   0
 .../ktexteditor/series                        |   0
 .../ktextwidgets.nix                          |   0
 .../kunitconversion.nix                       |   0
 .../kwallet.nix                               |  12 +-
 .../kwidgetsaddons.nix                        |   0
 .../kwindowsystem.nix                         |   0
 .../kxmlgui.nix                               |   0
 .../kxmlrpcclient.nix                         |   0
 .../modemmanager-qt.nix                       |   0
 .../networkmanager-qt.nix                     |   0
 .../oxygen-icons5.nix                         |   0
 .../plasma-framework/default.nix              |   0
 .../solid.nix                                 |   0
 .../sonnet.nix                                |   0
 .../libraries/kde-frameworks-5.19/srcs.nix    | 565 ++++++++++++++++++
 .../threadweaver.nix                          |   0
 pkgs/top-level/all-packages.nix               |   2 +-
 100 files changed, 573 insertions(+), 573 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/attica.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/baloo.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/bluez-qt.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/breeze-icons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/nix-lib-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/setup-hook.sh (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/fetchsrcs.sh (96%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/frameworkintegration.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kactivities.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kapidox.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/karchive.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kauth/cmake-install-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kauth/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kauth/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kbookmarks.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcmutils/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcodecs.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcompletion.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kconfig.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kconfigwidgets/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcoreaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcrash.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdbusaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdeclarative.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kded.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/nix-kde-include-dir.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/setup-hook.sh (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdesignerplugin.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdesu.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdewebkit.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdnssd.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdoctools/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kemoticons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kfilemetadata/cmake-install-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kfilemetadata/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kfilemetadata/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kglobalaccel.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kguiaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/khtml.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ki18n.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kiconthemes/default-theme-breeze.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kiconthemes/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kiconthemes/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kidletime.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kimageformats.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kinit/0001-kinit-libpath.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kinit/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kio/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kio/samba-search-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kio/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kitemmodels.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kitemviews.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kjobwidgets.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kjs.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kjsembed.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kmediaplayer.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/knewstuff.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/knotifications.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/knotifyconfig.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/allow-external-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kparts.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpeople.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kplotting.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpty.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kross.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/krunner.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kservice/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kservice/0002-no-canonicalize-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kservice/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktexteditor/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktexteditor/no-qcoreapplication.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktexteditor/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktextwidgets.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kunitconversion.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kwallet.nix (51%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kwidgetsaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kwindowsystem.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kxmlgui.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kxmlrpcclient.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/modemmanager-qt.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/networkmanager-qt.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/oxygen-icons5.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/plasma-framework/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/solid.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/sonnet.nix (100%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/threadweaver.nix (100%)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
deleted file mode 100644
index 12c5c30a24719..0000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
+++ /dev/null
@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/attica-5.18.0.tar.xz";
-      sha256 = "1n6pkaak9xf7nyi0b1wr8fm5qkv7mgpsws9igd7g2xqvvqzyp5xw";
-      name = "attica-5.18.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/baloo-5.18.0.tar.xz";
-      sha256 = "0sdnd6v01rcgq7v2jny0655jrghfamwyj0win7xfhx1622dfi8l8";
-      name = "baloo-5.18.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz";
-      sha256 = "17vx77w4fwdi7y394s2pqph2vmfs8n0107rmz4q7aa62q9iwdrbr";
-      name = "bluez-qt-5.18.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz";
-      sha256 = "0a4iqr5zrb56aln5hdsk5zrl23w8w8y5nmrxb093h205r36hfw4z";
-      name = "breeze-icons-5.18.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz";
-      sha256 = "1kp0pysa154cbp1ysgyqk03w8s335v3wmfrx4pshyfpg1s24k83y";
-      name = "extra-cmake-modules-5.18.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz";
-      sha256 = "06hw885mk0i2173lfdqz3hyp1fx2bndpj00hk32s3i2ggnn2y1rv";
-      name = "frameworkintegration-5.18.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kactivities-5.18.0.tar.xz";
-      sha256 = "0nqa63ds7vj87zg2gz1mx42c30l3ypfk4ghhgxwziab315bpcpmr";
-      name = "kactivities-5.18.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kapidox-5.18.0.tar.xz";
-      sha256 = "1hackjnpxijqqpn9cvnwcn9yc0jni21qgjccj74025ihdgigp70s";
-      name = "kapidox-5.18.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/karchive-5.18.0.tar.xz";
-      sha256 = "0ph59w8y49b3znaj9c1qk0zwkg0pmjjcyr4jlv5w56mh0zkq37h5";
-      name = "karchive-5.18.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kauth-5.18.0.tar.xz";
-      sha256 = "14kvy7cbw31sc48f0aldpi52wxhwd69prwadvjhqwy912s8kr04n";
-      name = "kauth-5.18.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz";
-      sha256 = "0qi2f612s756qh5ldibscfhcq8q802vgr2497fm9xl95kfqmcg1n";
-      name = "kbookmarks-5.18.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz";
-      sha256 = "1m53308icq1x1877afcxlhygl56dsl50fiwmfjf0g5pfmnql3qfp";
-      name = "kcmutils-5.18.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz";
-      sha256 = "1injdpz7kdf2j6is2w3v3xgd9ahgls0j632q03q7qa48xp4wx64h";
-      name = "kcodecs-5.18.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz";
-      sha256 = "0gkj4gplm7qwx4nqhhph5h3jp4h8b22ssmw0vvv6bpsnq7idk76b";
-      name = "kcompletion-5.18.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kconfig-5.18.0.tar.xz";
-      sha256 = "1s7fvhflsvv8zwb9cr50m3hxh0d4z5grh0nkri5ngzqb123wi91n";
-      name = "kconfig-5.18.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz";
-      sha256 = "08i12040prs2nxybxbbf3w0n91c9p0c64j8fz18axi4yszrmv8im";
-      name = "kconfigwidgets-5.18.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz";
-      sha256 = "05y8pan8hdn6qj2si9v9igjrx00l7bqzhdm2qq9vbjrv5xj8axzf";
-      name = "kcoreaddons-5.18.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcrash-5.18.0.tar.xz";
-      sha256 = "0rk27zr0mb4jlicm1s175x139avzi0q4jk3mlczfg4rkrxzgbx5w";
-      name = "kcrash-5.18.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz";
-      sha256 = "0l9ww3zaz1x6bk9axmm6zlj1dcn0gr0z61v9lw5y31rypxclhza8";
-      name = "kdbusaddons-5.18.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz";
-      sha256 = "0mpvwn26msg3sc9z1r1vnw32rkl842jxpvpx2vg8kwcd9snwx9a6";
-      name = "kdeclarative-5.18.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kded-5.18.0.tar.xz";
-      sha256 = "0y5sn7yxalylcwcz2j4h349lll2vkf44bw3n6w2cbqqf5wnr2za5";
-      name = "kded-5.18.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz";
-      sha256 = "0flhhjnnm2wh6869q8gxk45wlpq0679xlklzqlxvqx7a4kxdl8d8";
-      name = "kdelibs4support-5.18.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz";
-      sha256 = "163lfx8vxxdhxbn090k5r4m9vy940kfwvsyjsi8v0pp9ww49g13n";
-      name = "kdesignerplugin-5.18.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdesu-5.18.0.tar.xz";
-      sha256 = "0dqjmvi440p4n62w9y3qw4n7fcivyg3d54fv9nrf1sx87vdw7r83";
-      name = "kdesu-5.18.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz";
-      sha256 = "1ahr62xfk085kb9p2axx04gf7bpnr0vv2d4kpc4s0xrj3xi0alnl";
-      name = "kdewebkit-5.18.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz";
-      sha256 = "12vplqfsc3zks1grmb5i4hdww0g51lv54nb1drpj42mzyi1q1v1l";
-      name = "kdnssd-5.18.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz";
-      sha256 = "10h74lb4597fs1h88x60ykpkz47pgfa4k04h4i5l0qb5vb1jlw7d";
-      name = "kdoctools-5.18.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz";
-      sha256 = "0lba6rzmij20ndkq0vw9zkxbjq6g98may3ypyj0kc82d3sw9hkhs";
-      name = "kemoticons-5.18.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz";
-      sha256 = "19b8nh5x8c0w516afh8ln72vi5dk91wl8bcsqd84h3s6gw55rsm4";
-      name = "kfilemetadata-5.18.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz";
-      sha256 = "1v22rh8c103zl63cgg4gx430qw29f9yn9k5219pcw5n57jx0n5c1";
-      name = "kglobalaccel-5.18.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz";
-      sha256 = "153mjbiwg4p65c2msj8j3pycn5gys39ahg9ik7jqg7w4cjcl2jxz";
-      name = "kguiaddons-5.18.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz";
-      sha256 = "0kgin1bhbx95kypsg1k318qjxz3258x3a6kkdbky3cvfmq8r5ka5";
-      name = "khtml-5.18.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ki18n-5.18.0.tar.xz";
-      sha256 = "14vlq49a0bp1vpjb2zxkgqsd5yjmb0azri2iq9sgxxx1v6gyy9h9";
-      name = "ki18n-5.18.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz";
-      sha256 = "10pj2q28y57ng26xg2211v9vy91hqqmcyxh90q1qj89clykimwid";
-      name = "kiconthemes-5.18.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kidletime-5.18.0.tar.xz";
-      sha256 = "0726nq508rpzjxvfp354jd8n14m49grv6nfv09q2zyw02cf6n9bi";
-      name = "kidletime-5.18.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz";
-      sha256 = "1y6zc04sx4sqyfavr8nf05a1p4kyb8ic335iy5s869r6zrvljpnc";
-      name = "kimageformats-5.18.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kinit-5.18.0.tar.xz";
-      sha256 = "142xm7yglssw771340bs0lk1xgsr53218zh87v6n9hchrd34zg08";
-      name = "kinit-5.18.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kio-5.18.0.tar.xz";
-      sha256 = "020gvxs5xp9v4pra814200nv79c9b9j59skbrxq9cazhnywnnlns";
-      name = "kio-5.18.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz";
-      sha256 = "0r5r7ia1lwqll6bz92k4qgj737hsg6pfhxmycr6g88b9fiab1qw4";
-      name = "kitemmodels-5.18.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz";
-      sha256 = "10pbh0fpzrh0ijbadjx81690p9iw34rs2waks99fc0jy3hamny3b";
-      name = "kitemviews-5.18.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz";
-      sha256 = "0gxvh9wxnfkrxm9zc7yx579vlxs3xmihfyqs92fpkjhy2shfd2sg";
-      name = "kjobwidgets-5.18.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz";
-      sha256 = "0z89l2yhs3vld1qbd6v506lksmxvwrzgdq77aghy3mbkfgz3jd62";
-      name = "kjs-5.18.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz";
-      sha256 = "0mpq7aywspm6l13afrr2dis8ygyld5il21g90ij0fc1jwp95zk3d";
-      name = "kjsembed-5.18.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz";
-      sha256 = "07m3agz73yzmfn8ykg0f6a2c39rkzchzqc1iam2zfydqxyvh4bxb";
-      name = "kmediaplayer-5.18.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz";
-      sha256 = "0mda1n0py6nm9wp89z5hkhhk9ah5sjrkzl1dshd4lq77f7p7i1g4";
-      name = "knewstuff-5.18.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knotifications-5.18.0.tar.xz";
-      sha256 = "1npir2v4irhm6xmzf60aj5388slq6fw7jbcwjjscldrwk2ca06hz";
-      name = "knotifications-5.18.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz";
-      sha256 = "0q2735m2m1wrnp7g4ycnbjy7qgpjxc5fvx9zrwnd0jl5rmdw4sbb";
-      name = "knotifyconfig-5.18.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpackage-5.18.0.tar.xz";
-      sha256 = "14q2ssf3g7ljakzpq7q9q2zbm8jqk01ybjx4s16qpw9gakcrbli9";
-      name = "kpackage-5.18.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kparts-5.18.0.tar.xz";
-      sha256 = "1q4xd4dy40mh4a8vgpvdamy1242isjy9ma94cf95qqc6qgjnqxhy";
-      name = "kparts-5.18.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpeople-5.18.0.tar.xz";
-      sha256 = "0d0mp2qz3f1bki6rfw8x6zc0rmv4n43mi06k3vh30qpiaj7crl5k";
-      name = "kpeople-5.18.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kplotting-5.18.0.tar.xz";
-      sha256 = "1jiqx9gdv69frfh8vanphp6lzc3vxn2q1lhibi7v03qkc2qaw5cc";
-      name = "kplotting-5.18.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpty-5.18.0.tar.xz";
-      sha256 = "1baz1xs22r4qli74sqwpcjmxnfrd0iqyyzg1fmljr8fvs4pdy1x1";
-      name = "kpty-5.18.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz";
-      sha256 = "1ky13yqxhkghxqd21jrnrpjfnrkgspv0p3dfij994rkaqq8rm1r6";
-      name = "kross-5.18.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz";
-      sha256 = "14c51kiwr49dbdxg8y6ivmmfr9h6p8jjd32k35pi4gpi2vlh29pf";
-      name = "krunner-5.18.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kservice-5.18.0.tar.xz";
-      sha256 = "0pbs1n2i7vjgjh7j87ps8gkzmj5igw1aib1aq089m4hfrl8pbrq8";
-      name = "kservice-5.18.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz";
-      sha256 = "0fx82s5y1wya3v36qq3agmfrnff9a7v94fhifvfiwmhk2ddwwg3v";
-      name = "ktexteditor-5.18.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz";
-      sha256 = "1wflqfmgqa3lh3apf22sami6caclvyv7li6qiskwfkzkb0a6x373";
-      name = "ktextwidgets-5.18.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz";
-      sha256 = "0gpmndyly977dzfyfhrd0q434c0qr1sinh75dwf9clmqw576jl6i";
-      name = "kunitconversion-5.18.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwallet-5.18.0.tar.xz";
-      sha256 = "0w69y0xdvvrvcydv160z7s03y1n5vxjj3sfk530zc6bjszplvxis";
-      name = "kwallet-5.18.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz";
-      sha256 = "06fqz7cwczp5sahg54zi46rf9jf2si88w5yizp61z8yv57kvpvk1";
-      name = "kwidgetsaddons-5.18.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz";
-      sha256 = "01hzd4r8y4hdpynnh32qf418hxzbd67fkdq6a4vabl384aipnmk7";
-      name = "kwindowsystem-5.18.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz";
-      sha256 = "0yimy0r73sv8z4wq0mkdx24icjrzmy5bciblwlnzagd61f8j8qri";
-      name = "kxmlgui-5.18.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz";
-      sha256 = "0h88pc3h5z3q58b7qxdn69klwr0p9ffbirzncyvxjrhr7dq36nv9";
-      name = "kxmlrpcclient-5.18.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz";
-      sha256 = "09k07wxkn511sa4hwmrs6jfx4lnnw3zcac5dzz43hhsmw74yj9az";
-      name = "modemmanager-qt-5.18.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz";
-      sha256 = "11j818ws5jz23hyilfpf3npk893hs388v1xpwhh0lkjwm60wkzln";
-      name = "networkmanager-qt-5.18.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz";
-      sha256 = "11zmxc9n7x6iwdckwxwjji0497yjcsjli7pzr8d049lbc7xsjvi8";
-      name = "oxygen-icons5-5.18.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz";
-      sha256 = "1lxhlzx3jcqzx90kjl8w8p53nrgrkjiz1xf92ah3mygjyvi5rlh8";
-      name = "plasma-framework-5.18.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/solid-5.18.0.tar.xz";
-      sha256 = "0ilki4s3f3gjsdj6z41a8k4h2b52w8xrh2api0sqj0ifk2yhx6wh";
-      name = "solid-5.18.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/sonnet-5.18.0.tar.xz";
-      sha256 = "1780jvsfkasabdbk9xjhjcihcc6mxxipi2rsq2001flxnnx4kykg";
-      name = "sonnet-5.18.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz";
-      sha256 = "00c9vvyhyysg0cdlmvpls0h3pdbbhhwfxlm9l9i9r3j8x6rigm54";
-      name = "threadweaver-5.18.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/attica.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
similarity index 96%
rename from pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
rename to pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
index 84b882a0a075a..7937e6f8bed92 100755
--- a/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.18/"
+RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/series b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kauth/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kauth/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kded.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kio/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kross.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series
rename to pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
similarity index 51%
rename from pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
index 7c4177e009d20..5ade5f63a8d04 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
@@ -1,14 +1,14 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
-}:
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
+, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
+, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
+, makeQtWrapper }:
 
 kdeFramework {
   name = "kwallet";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
-    kconfig kcoreaddons kdbusaddons kiconthemes knotifications
-    kservice kwidgetsaddons libgcrypt
+    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    knotifications kservice kwidgetsaddons libgcrypt
   ];
   propagatedBuildInputs = [ ki18n kwindowsystem ];
   postInstall = ''
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/solid.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
new file mode 100644
index 0000000000000..b86c0b71224d6
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
@@ -0,0 +1,565 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  attica = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz";
+      sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv";
+      name = "attica-5.19.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz";
+      sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg";
+      name = "baloo-5.19.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz";
+      sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv";
+      name = "bluez-qt-5.19.0.tar.xz";
+    };
+  };
+  breeze-icons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz";
+      sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0";
+      name = "breeze-icons-5.19.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz";
+      sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63";
+      name = "extra-cmake-modules-5.19.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz";
+      sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3";
+      name = "frameworkintegration-5.19.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz";
+      sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3";
+      name = "kactivities-5.19.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz";
+      sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz";
+      name = "kapidox-5.19.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz";
+      sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv";
+      name = "karchive-5.19.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz";
+      sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss";
+      name = "kauth-5.19.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz";
+      sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd";
+      name = "kbookmarks-5.19.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz";
+      sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8";
+      name = "kcmutils-5.19.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz";
+      sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66";
+      name = "kcodecs-5.19.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz";
+      sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd";
+      name = "kcompletion-5.19.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz";
+      sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm";
+      name = "kconfig-5.19.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz";
+      sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv";
+      name = "kconfigwidgets-5.19.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz";
+      sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw";
+      name = "kcoreaddons-5.19.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz";
+      sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl";
+      name = "kcrash-5.19.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz";
+      sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28";
+      name = "kdbusaddons-5.19.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz";
+      sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g";
+      name = "kdeclarative-5.19.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz";
+      sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz";
+      name = "kded-5.19.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz";
+      sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn";
+      name = "kdelibs4support-5.19.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz";
+      sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5";
+      name = "kdesignerplugin-5.19.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz";
+      sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz";
+      name = "kdesu-5.19.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz";
+      sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj";
+      name = "kdewebkit-5.19.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz";
+      sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314";
+      name = "kdnssd-5.19.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz";
+      sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn";
+      name = "kdoctools-5.19.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz";
+      sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5";
+      name = "kemoticons-5.19.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz";
+      sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr";
+      name = "kfilemetadata-5.19.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz";
+      sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d";
+      name = "kglobalaccel-5.19.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz";
+      sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy";
+      name = "kguiaddons-5.19.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz";
+      sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145";
+      name = "khtml-5.19.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz";
+      sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05";
+      name = "ki18n-5.19.0.tar.xz";
+    };
+  };
+  kiconthemes = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz";
+      sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n";
+      name = "kiconthemes-5.19.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz";
+      sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6";
+      name = "kidletime-5.19.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz";
+      sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5";
+      name = "kimageformats-5.19.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz";
+      sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm";
+      name = "kinit-5.19.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz";
+      sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv";
+      name = "kio-5.19.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz";
+      sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7";
+      name = "kitemmodels-5.19.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz";
+      sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn";
+      name = "kitemviews-5.19.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz";
+      sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji";
+      name = "kjobwidgets-5.19.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz";
+      sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf";
+      name = "kjs-5.19.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz";
+      sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48";
+      name = "kjsembed-5.19.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz";
+      sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay";
+      name = "kmediaplayer-5.19.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz";
+      sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4";
+      name = "knewstuff-5.19.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz";
+      sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av";
+      name = "knotifications-5.19.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz";
+      sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj";
+      name = "knotifyconfig-5.19.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz";
+      sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv";
+      name = "kpackage-5.19.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz";
+      sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l";
+      name = "kparts-5.19.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz";
+      sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98";
+      name = "kpeople-5.19.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz";
+      sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq";
+      name = "kplotting-5.19.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz";
+      sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03";
+      name = "kpty-5.19.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz";
+      sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p";
+      name = "kross-5.19.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz";
+      sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx";
+      name = "krunner-5.19.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz";
+      sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm";
+      name = "kservice-5.19.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz";
+      sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp";
+      name = "ktexteditor-5.19.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz";
+      sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp";
+      name = "ktextwidgets-5.19.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz";
+      sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb";
+      name = "kunitconversion-5.19.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz";
+      sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm";
+      name = "kwallet-5.19.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz";
+      sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm";
+      name = "kwidgetsaddons-5.19.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz";
+      sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch";
+      name = "kwindowsystem-5.19.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz";
+      sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah";
+      name = "kxmlgui-5.19.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz";
+      sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g";
+      name = "kxmlrpcclient-5.19.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz";
+      sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w";
+      name = "modemmanager-qt-5.19.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz";
+      sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13";
+      name = "networkmanager-qt-5.19.0.tar.xz";
+    };
+  };
+  oxygen-icons5 = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz";
+      sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0";
+      name = "oxygen-icons5-5.19.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz";
+      sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497";
+      name = "plasma-framework-5.19.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz";
+      sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz";
+      name = "solid-5.19.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz";
+      sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7";
+      name = "sonnet-5.19.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz";
+      sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw";
+      name = "threadweaver-5.19.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f093dc1063380..f7d7c8f03f0bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15015,7 +15015,7 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.18 { inherit pkgs; };
+      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
       plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
       named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };

From 4e2fe6e5794a78173f415dfb3d2afa3d499065db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 28 Feb 2016 07:03:49 -0600
Subject: [PATCH 534/857] m17n-db: fix path to charmaps

---
 pkgs/tools/inputmethods/m17n-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
index fbe7188ef9ac9..944d6de1084ae 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext}:
+{ stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
   name = "m17n-db-1.7.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gettext ];
 
   configureFlags = stdenv.lib.optional (stdenv ? glibc)
-    "--with-charmaps=${stdenv.glibc}/share/i18n/charmaps"
+    "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps"
   ;
 
   meta = {

From f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 8 Mar 2016 08:31:34 +0100
Subject: [PATCH 535/857] kde5: move files around to simplify merge

It is analogous to 98d8e1a160d3.
---
 .gitignore                                        |  4 +---
 .../kde-5/applications-15.12}/ark.nix             |  0
 .../kde-5/applications-15.12}/baloo-widgets.nix   |  0
 .../kde-5/applications-15.12}/default.nix         |  0
 .../kde-5/applications-15.12}/dolphin-plugins.nix |  0
 .../kde-5/applications-15.12}/dolphin.nix         |  0
 .../kde-5/applications-15.12}/fetchsrcs.sh        |  0
 .../kde-5/applications-15.12}/ffmpegthumbs.nix    |  0
 .../kde-5/applications-15.12}/gpgmepp.nix         |  0
 .../kde-5/applications-15.12}/gwenview.nix        |  0
 .../kde-5/applications-15.12}/kate.nix            |  0
 .../kde-5/applications-15.12}/kde-app.nix         |  0
 .../kde-5/applications-15.12}/kde-locale-4.nix    |  0
 .../kde-5/applications-15.12}/kde-locale-5.nix    |  0
 .../kdegraphics-thumbnailers.nix                  |  0
 .../kdelibs/0001-old-kde4-cmake-policies.patch    |  0
 .../kdelibs/0002-polkit-install-path.patch        |  0
 .../kdelibs/0003-remove_xdg_impurities.patch      |  0
 .../kde-5/applications-15.12}/kdelibs/default.nix |  0
 .../applications-15.12}/kdelibs/setup-hook.sh     |  0
 .../kdenetwork-filesharing.nix                    |  0
 .../kde-5/applications-15.12}/kgpg.nix            |  0
 .../kde-5/applications-15.12}/kio-extras.nix      |  0
 .../kde-5/applications-15.12}/konsole.nix         |  0
 .../kde-5/applications-15.12}/l10n.nix            |  0
 .../kde-5/applications-15.12}/libkdcraw.nix       |  0
 .../kde-5/applications-15.12}/libkexiv2.nix       |  0
 .../kde-5/applications-15.12}/libkipi.nix         |  0
 .../kde-5/applications-15.12}/okular.nix          |  0
 .../kde-5/applications-15.12}/print-manager.nix   |  0
 .../kde-5/applications-15.12}/spectacle.nix       |  0
 .../kde-5/applications-15.12}/srcs.nix            |  0
 .../kde-5/frameworks-5.19}/attica.nix             |  0
 .../kde-5/frameworks-5.19}/baloo.nix              |  0
 .../kde-5/frameworks-5.19}/bluez-qt.nix           |  0
 .../kde-5/frameworks-5.19}/breeze-icons.nix       |  0
 .../kde-5/frameworks-5.19}/default.nix            |  0
 .../extra-cmake-modules/default.nix               |  0
 .../extra-cmake-modules/nix-lib-path.patch        |  0
 .../frameworks-5.19}/extra-cmake-modules/series   |  0
 .../extra-cmake-modules/setup-hook.sh             |  0
 .../kde-5/frameworks-5.19}/fetchsrcs.sh           |  0
 .../frameworks-5.19}/frameworkintegration.nix     |  0
 .../kde-5/frameworks-5.19}/kactivities.nix        |  0
 .../kde-5/frameworks-5.19}/kapidox.nix            |  0
 .../kde-5/frameworks-5.19}/karchive.nix           |  0
 .../kauth/cmake-install-paths.patch               |  0
 .../kde-5/frameworks-5.19}/kauth/default.nix      |  0
 .../kde-5/frameworks-5.19}/kauth/series           |  0
 .../kde-5/frameworks-5.19}/kbookmarks.nix         |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../kde-5/frameworks-5.19}/kcmutils/default.nix   |  0
 .../kde-5/frameworks-5.19}/kcodecs.nix            |  0
 .../kde-5/frameworks-5.19}/kcompletion.nix        |  0
 .../kde-5/frameworks-5.19}/kconfig.nix            |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../frameworks-5.19}/kconfigwidgets/default.nix   |  0
 .../kde-5/frameworks-5.19}/kcoreaddons.nix        |  0
 .../kde-5/frameworks-5.19}/kcrash.nix             |  0
 .../kde-5/frameworks-5.19}/kdbusaddons.nix        |  0
 .../kde-5/frameworks-5.19}/kdeclarative.nix       |  0
 .../kde-5/frameworks-5.19}/kded.nix               |  0
 .../frameworks-5.19}/kdelibs4support/default.nix  |  0
 .../kdelibs4support/nix-kde-include-dir.patch     |  0
 .../kde-5/frameworks-5.19}/kdelibs4support/series |  0
 .../kdelibs4support/setup-hook.sh                 |  0
 .../kde-5/frameworks-5.19}/kdesignerplugin.nix    |  0
 .../kde-5/frameworks-5.19}/kdesu.nix              |  0
 .../kde-5/frameworks-5.19}/kdewebkit.nix          |  0
 .../kde-5/frameworks-5.19}/kdnssd.nix             |  0
 .../kde-5/frameworks-5.19}/kdoctools/default.nix  |  0
 .../kdoctools/kdoctools-no-find-docbook-xml.patch |  0
 .../kde-5/frameworks-5.19}/kemoticons.nix         |  0
 .../kfilemetadata/cmake-install-paths.patch       |  0
 .../frameworks-5.19}/kfilemetadata/default.nix    |  0
 .../kde-5/frameworks-5.19}/kfilemetadata/series   |  0
 .../kde-5/frameworks-5.19}/kglobalaccel.nix       |  0
 .../kde-5/frameworks-5.19}/kguiaddons.nix         |  0
 .../kde-5/frameworks-5.19}/khtml.nix              |  0
 .../kde-5/frameworks-5.19}/ki18n.nix              |  0
 .../kiconthemes/default-theme-breeze.patch        |  0
 .../frameworks-5.19}/kiconthemes/default.nix      |  0
 .../kde-5/frameworks-5.19}/kiconthemes/series     |  0
 .../kde-5/frameworks-5.19}/kidletime.nix          |  0
 .../kde-5/frameworks-5.19}/kimageformats.nix      |  0
 .../kinit/0001-kinit-libpath.patch                |  0
 .../kde-5/frameworks-5.19}/kinit/default.nix      |  0
 .../kde-5/frameworks-5.19}/kio/default.nix        |  0
 .../frameworks-5.19}/kio/samba-search-path.patch  |  0
 .../kde-5/frameworks-5.19}/kio/series             |  0
 .../kde-5/frameworks-5.19}/kitemmodels.nix        |  0
 .../kde-5/frameworks-5.19}/kitemviews.nix         |  0
 .../kde-5/frameworks-5.19}/kjobwidgets.nix        |  0
 .../kde-5/frameworks-5.19}/kjs.nix                |  0
 .../kde-5/frameworks-5.19}/kjsembed.nix           |  0
 .../kde-5/frameworks-5.19}/kmediaplayer.nix       |  0
 .../kde-5/frameworks-5.19}/knewstuff.nix          |  0
 .../kde-5/frameworks-5.19}/knotifications.nix     |  0
 .../kde-5/frameworks-5.19}/knotifyconfig.nix      |  0
 .../kpackage/allow-external-paths.patch           |  0
 .../kde-5/frameworks-5.19}/kpackage/default.nix   |  0
 .../kpackage/qdiriterator-follow-symlinks.patch   |  0
 .../kde-5/frameworks-5.19}/kpackage/series        |  0
 .../kde-5/frameworks-5.19}/kparts.nix             |  0
 .../kde-5/frameworks-5.19}/kpeople.nix            |  0
 .../kde-5/frameworks-5.19}/kplotting.nix          |  0
 .../kde-5/frameworks-5.19}/kpty.nix               |  0
 .../kde-5/frameworks-5.19}/kross.nix              |  0
 .../kde-5/frameworks-5.19}/krunner.nix            |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../kservice/0002-no-canonicalize-path.patch      |  0
 .../kde-5/frameworks-5.19}/kservice/default.nix   |  0
 .../frameworks-5.19}/ktexteditor/default.nix      |  0
 .../ktexteditor/no-qcoreapplication.patch         |  0
 .../kde-5/frameworks-5.19}/ktexteditor/series     |  0
 .../kde-5/frameworks-5.19}/ktextwidgets.nix       |  0
 .../kde-5/frameworks-5.19}/kunitconversion.nix    |  0
 .../kde-5/frameworks-5.19}/kwallet.nix            |  0
 .../kde-5/frameworks-5.19}/kwidgetsaddons.nix     |  0
 .../kde-5/frameworks-5.19}/kwindowsystem.nix      |  0
 .../kde-5/frameworks-5.19}/kxmlgui.nix            |  0
 .../kde-5/frameworks-5.19}/kxmlrpcclient.nix      |  0
 .../kde-5/frameworks-5.19}/modemmanager-qt.nix    |  0
 .../kde-5/frameworks-5.19}/networkmanager-qt.nix  |  0
 .../kde-5/frameworks-5.19}/oxygen-icons5.nix      |  0
 .../frameworks-5.19}/plasma-framework/default.nix |  0
 .../kde-5/frameworks-5.19}/solid.nix              |  0
 .../kde-5/frameworks-5.19}/sonnet.nix             |  0
 .../kde-5/frameworks-5.19}/srcs.nix               |  0
 .../kde-5/frameworks-5.19}/threadweaver.nix       |  0
 .../desktops/{ => kde-5}/plasma-5.5/bluedevil.nix |  0
 .../{ => kde-5}/plasma-5.5/breeze-gtk.nix         |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt4.nix         |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt5.nix         |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/default.nix  |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/fetchsrcs.sh |  0
 .../{ => kde-5}/plasma-5.5/kde-cli-tools.nix      |  0
 .../kde-gtk-config/0001-follow-symlinks.patch     |  0
 .../plasma-5.5/kde-gtk-config/default.nix         |  0
 .../{ => kde-5}/plasma-5.5/kdecoration.nix        |  0
 .../{ => kde-5}/plasma-5.5/kdeplasma-addons.nix   |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kgamma5.nix  |  0
 .../{ => kde-5}/plasma-5.5/khelpcenter.nix        |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/khotkeys.nix |  0
 .../{ => kde-5}/plasma-5.5/kinfocenter.nix        |  0
 .../desktops/{ => kde-5}/plasma-5.5/kmenuedit.nix |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kscreen.nix  |  0
 .../{ => kde-5}/plasma-5.5/kscreenlocker.nix      |  0
 .../{ => kde-5}/plasma-5.5/ksshaskpass.nix        |  0
 .../desktops/{ => kde-5}/plasma-5.5/ksysguard.nix |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kwayland.nix |  0
 .../kwin/0001-qdiriterator-follow-symlinks.patch  |  0
 .../{ => kde-5}/plasma-5.5/kwin/default.nix       |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kwrited.nix  |  0
 .../{ => kde-5}/plasma-5.5/libkscreen/default.nix |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../plasma-5.5/libksysguard/default.nix           |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/milou.nix    |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/oxygen.nix   |  0
 .../0001-qt-5.5-QML-import-paths.patch            |  0
 .../plasma-5.5/plasma-desktop/0002-hwclock.patch  |  0
 .../plasma-5.5/plasma-desktop/0003-tzdir.patch    |  0
 .../plasma-5.5/plasma-desktop/default.nix         |  0
 .../{ => kde-5}/plasma-5.5/plasma-mediacenter.nix |  0
 ...0001-mobile-broadband-provider-info-path.patch |  0
 .../{ => kde-5}/plasma-5.5/plasma-nm/default.nix  |  0
 .../desktops/{ => kde-5}/plasma-5.5/plasma-pa.nix |  0
 .../plasma-5.5/plasma-workspace-wallpapers.nix    |  0
 .../plasma-5.5/plasma-workspace/default.nix       |  0
 .../plasma-workspace/qml-import-path.patch        |  0
 .../plasma-5.5/plasma-workspace/series            |  0
 .../plasma-5.5/plasma-workspace/startkde.patch    |  0
 .../{ => kde-5}/plasma-5.5/polkit-kde-agent.nix   |  0
 .../{ => kde-5}/plasma-5.5/powerdevil.nix         |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix     |  0
 .../{ => kde-5}/plasma-5.5/systemsettings.nix     |  0
 pkgs/top-level/all-packages.nix                   | 15 ++++++++++-----
 177 files changed, 11 insertions(+), 8 deletions(-)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ark.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/baloo-widgets.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin-plugins.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/fetchsrcs.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ffmpegthumbs.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gpgmepp.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gwenview.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kate.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-app.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-4.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-5.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdegraphics-thumbnailers.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0001-old-kde4-cmake-policies.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0002-polkit-install-path.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0003-remove_xdg_impurities.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/setup-hook.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdenetwork-filesharing.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kgpg.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kio-extras.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/konsole.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/l10n.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkdcraw.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkexiv2.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkipi.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/okular.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/print-manager.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/spectacle.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/attica.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/baloo.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/bluez-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/breeze-icons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/nix-lib-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/fetchsrcs.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/frameworkintegration.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kactivities.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kapidox.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/karchive.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/cmake-install-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kbookmarks.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcodecs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcompletion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcoreaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcrash.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdbusaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdeclarative.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kded.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/nix-kde-include-dir.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesignerplugin.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesu.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdewebkit.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdnssd.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kemoticons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata/cmake-install-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kglobalaccel.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kguiaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/khtml.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ki18n.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default-theme-breeze.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kidletime.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kimageformats.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/0001-kinit-libpath.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/samba-search-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemmodels.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemviews.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjobwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjsembed.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kmediaplayer.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knewstuff.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifications.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifyconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/allow-external-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kparts.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpeople.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kplotting.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpty.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kross.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/krunner.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0002-no-canonicalize-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/no-qcoreapplication.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktextwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kunitconversion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwallet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwidgetsaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwindowsystem.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlgui.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlrpcclient.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/modemmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/networkmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/oxygen-icons5.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/plasma-framework/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/solid.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/sonnet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/threadweaver.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/bluedevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-gtk.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt4.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/fetchsrcs.sh (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-cli-tools.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdecoration.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdeplasma-addons.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kgamma5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khelpcenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khotkeys.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kinfocenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kmenuedit.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreenlocker.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksshaskpass.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksysguard.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwayland.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwrited.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libkscreen/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/milou.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/oxygen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0002-hwclock.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0003-tzdir.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-mediacenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-pa.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace-wallpapers.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/qml-import-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/series (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/startkde.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/polkit-kde-agent.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/powerdevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/systemsettings.nix (100%)

diff --git a/.gitignore b/.gitignore
index 74de941b76855..dba957f766205 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,5 @@ result-*
 
 .DS_Store
 
-/pkgs/applications/kde-apps-*/tmp/
-/pkgs/development/libraries/kde-frameworks-*/tmp/
 /pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/plasma-*/tmp/
\ No newline at end of file
+/pkgs/desktops/kde-5/*/tmp/
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.12/ark.nix b/pkgs/desktops/kde-5/applications-15.12/ark.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ark.nix
rename to pkgs/desktops/kde-5/applications-15.12/ark.nix
diff --git a/pkgs/applications/kde-apps-15.12/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/baloo-widgets.nix
rename to pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/desktops/kde-5/applications-15.12/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin-plugins.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin.nix
diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/fetchsrcs.sh
rename to pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
diff --git a/pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix
rename to pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
diff --git a/pkgs/applications/kde-apps-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gpgmepp.nix
rename to pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
diff --git a/pkgs/applications/kde-apps-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gwenview.nix
rename to pkgs/desktops/kde-5/applications-15.12/gwenview.nix
diff --git a/pkgs/applications/kde-apps-15.12/kate.nix b/pkgs/desktops/kde-5/applications-15.12/kate.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kate.nix
rename to pkgs/desktops/kde-5/applications-15.12/kate.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-app.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-app.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-4.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-5.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
diff --git a/pkgs/applications/kde-apps-15.12/kgpg.nix b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kgpg.nix
rename to pkgs/desktops/kde-5/applications-15.12/kgpg.nix
diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kio-extras.nix
rename to pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
diff --git a/pkgs/applications/kde-apps-15.12/konsole.nix b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/konsole.nix
rename to pkgs/desktops/kde-5/applications-15.12/konsole.nix
diff --git a/pkgs/applications/kde-apps-15.12/l10n.nix b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/l10n.nix
rename to pkgs/desktops/kde-5/applications-15.12/l10n.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkdcraw.nix b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkdcraw.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkexiv2.nix b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkexiv2.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkipi.nix b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkipi.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkipi.nix
diff --git a/pkgs/applications/kde-apps-15.12/okular.nix b/pkgs/desktops/kde-5/applications-15.12/okular.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/okular.nix
rename to pkgs/desktops/kde-5/applications-15.12/okular.nix
diff --git a/pkgs/applications/kde-apps-15.12/print-manager.nix b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/print-manager.nix
rename to pkgs/desktops/kde-5/applications-15.12/print-manager.nix
diff --git a/pkgs/applications/kde-apps-15.12/spectacle.nix b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/spectacle.nix
rename to pkgs/desktops/kde-5/applications-15.12/spectacle.nix
diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/srcs.nix
rename to pkgs/desktops/kde-5/applications-15.12/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/attica.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series b/pkgs/desktops/kde-5/frameworks-5.19/kauth/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kded.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/desktops/kde-5/frameworks-5.19/kio/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kross.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/solid.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/bluedevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-gtk.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt4.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/default.nix
diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
similarity index 100%
rename from pkgs/desktops/plasma-5.5/fetchsrcs.sh
rename to pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
diff --git a/pkgs/desktops/plasma-5.5/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-cli-tools.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdecoration.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
diff --git a/pkgs/desktops/plasma-5.5/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdeplasma-addons.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/plasma-5.5/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kgamma5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
diff --git a/pkgs/desktops/plasma-5.5/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khelpcenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
diff --git a/pkgs/desktops/plasma-5.5/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khotkeys.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
diff --git a/pkgs/desktops/plasma-5.5/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kinfocenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
diff --git a/pkgs/desktops/plasma-5.5/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kmenuedit.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreenlocker.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
diff --git a/pkgs/desktops/plasma-5.5/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksshaskpass.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
diff --git a/pkgs/desktops/plasma-5.5/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksysguard.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
diff --git a/pkgs/desktops/plasma-5.5/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwayland.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
diff --git a/pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwrited.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
diff --git a/pkgs/desktops/plasma-5.5/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libkscreen/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
diff --git a/pkgs/desktops/plasma-5.5/milou.nix b/pkgs/desktops/kde-5/plasma-5.5/milou.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/milou.nix
rename to pkgs/desktops/kde-5/plasma-5.5/milou.nix
diff --git a/pkgs/desktops/plasma-5.5/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/oxygen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-pa.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/series
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
diff --git a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/polkit-kde-agent.nix
rename to pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/plasma-5.5/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/powerdevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/srcs.nix
rename to pkgs/desktops/kde-5/plasma-5.5/srcs.nix
diff --git a/pkgs/desktops/plasma-5.5/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/systemsettings.nix
rename to pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7d7c8f03f0bc..7e3cd07e46fce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15015,12 +15015,17 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 

From b291f1682f5511ddf1cb3d8fa0126ab5de424ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 7 Mar 2016 22:03:07 +0100
Subject: [PATCH 536/857] perl merge fixup

---
 .../development/interpreters/perl/default.nix | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index d9158ad55ab56..0e1df94db5ea0 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -17,7 +17,8 @@ assert enableThreading -> (stdenv ? glibc);
 let
 
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
-
+  libcInc = libc.dev or libc;
+  libcLib = libc.out or libc;
   common = { version, sha256 }: stdenv.mkDerivation rec {
     name = "perl-${version}";
 
@@ -26,7 +27,9 @@ let
       inherit sha256;
     };
 
-    outputs = [ "out" "man" ];
+    # TODO: Add a "dev" output containing the header files.
+    outputs = [ "out" "man" "docdev" ];
+    setOutputFlags = false;
 
     patches =
       [ # Do not look in /usr etc. for dependencies.
@@ -35,17 +38,11 @@ let
       ++ optional stdenv.isSunOS ./ld-shared.patch
       ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ];
 
-    # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
-    # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
-    # while at the same time erasing the PATH environment variable so it unconditionally
-    # fails. The code in question is guarded by a check for Mac OS, but the patch below
-    # doesn't have any runtime effect on other platforms.
-    postPatch = optional stdenv.isDarwin ''
+    postPatch = ''
       pwd="$(type -P pwd)"
       substituteInPlace dist/PathTools/Cwd.pm \
         --replace "/bin/pwd" "$pwd"
     '';
-
     sandboxProfile = sandbox.allow "ipc-sysv-sem";
 
     # Build a thread-safe Perl with a dynamic libperls.o.  We need the
@@ -59,8 +56,8 @@ let
         "-Uinstallusrbinperl"
         "-Dinstallstyle=lib/perl5"
         "-Duseshrplib"
-        "-Dlocincpth=${libc}/include"
-        "-Dloclibpth=${libc}/lib"
+        "-Dlocincpth=${libcInc}/include"
+        "-Dloclibpth=${libcLib}/lib"
       ]
       ++ optional stdenv.isSunOS "-Dcc=gcc"
       ++ optional enableThreading "-Dusethreads";
@@ -74,10 +71,8 @@ let
     preConfigure =
       ''
         configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-
-        ${optionalString stdenv.isArm ''
-          configureFlagsArray=(-Dldflags="-lm -lrt")
-        ''}
+    '' + optionalString stdenv.isArm ''
+      configureFlagsArray=(-Dldflags="-lm -lrt")
       '' + optionalString stdenv.isDarwin ''
         substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
       '' + optionalString (!enableThreading) ''
@@ -91,18 +86,26 @@ let
         substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
       '';
 
-    # Inspired by nuke-references, which I can't depend on because it uses perl. Perhaps it should just use sed :)
-    postInstall = ''
-      self=$(echo $out | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p")
-
-      sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config.pm
-      sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config_heavy.pl
-    '';
-
     setupHook = ./setup-hook.sh;
 
     passthru.libPrefix = "lib/perl5/site_perl";
 
+  # TODO: it seems like absolute paths to some coreutils is required.
+  postInstall =
+    ''
+      # Remove dependency between "out" and "man" outputs.
+      rm "$out"/lib/perl5/*/*/.packlist
+
+      # Remove dependencies on glibc and gcc
+      sed "/ *libpth =>/c    libpth => ' '," \
+        -i "$out"/lib/perl5/*/*/Config.pm
+      # TODO: removing those paths would be cleaner than overwriting with nonsense.
+      substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
+        --replace "${libcInc}" /no-such-path \
+        --replace "${stdenv.cc.cc or "/no-such-path"}" /no-such-path \
+        --replace "$man" /no-such-path
+    ''; # */
+
     meta = {
       homepage = https://www.perl.org/;
       description = "The standard implementation of the Perl 5 programmming language";

From 61ebdc192d5ca5c434cb7420f84aa6bf4f554fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 21 Feb 2016 17:47:44 +0100
Subject: [PATCH 537/857] bash-interactive: better split doc stuff

... while avoiding mass rebuild ATM.
---
 pkgs/shells/bash/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index e49e7ef5da49b..2fa229692eb3c 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -21,7 +21,12 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = if (!interactive) # conditional to avoid mass rebuild ATM
+    then [ "out" "doc" ]
+    else [ "out" "doc" "info" ];
+
+  # the man pages are small and useful enough
+  outputMan = if interactive then "out" else null;
 
   NIX_CFLAGS_COMPILE = ''
     -DSYS_BASHRC="/etc/bashrc"

From 2cbe6bb3f00d86307d08cbcdfbf3b4a7f8c64d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 22 Feb 2016 09:57:31 +0100
Subject: [PATCH 538/857] nix: split man output from doc

---
 pkgs/tools/package-management/nix/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 8369873368934..77b27dbf3dc6f 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -9,7 +9,7 @@ let
   common = { name, src }: stdenv.mkDerivation rec {
     inherit name src;
 
-    outputs = [ "out" "doc" ];
+    outputs = [ "out" "man" "doc" ];
 
     nativeBuildInputs = [ perl pkgconfig ];
 

From 394ffcb3e5a89690588319eb995d3e066a1f2f89 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 8 Mar 2016 11:26:14 -0600
Subject: [PATCH 539/857] staruml: fix evaluation on closure-size

---
 pkgs/tools/misc/staruml/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 4c60e790238e6..0d2982c022f9d 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -1,5 +1,12 @@
-{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, udev }:
+{ stdenv, fetchurl, makeWrapper
+, dpkg, patchelf
+, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, libudev }:
 
+let
+  inherit (stdenv) lib;
+  LD_LIBRARY_PATH = lib.makeLibraryPath
+    [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];
+in
 stdenv.mkDerivation rec {
   version = "2.6.0";
   name = "staruml-${version}";
@@ -16,13 +23,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ dpkg ];
 
   nativeBuildInputs = [ makeWrapper ];
-  
+
   unpackPhase = ''
     mkdir pkg
     dpkg-deb -x $src pkg
     sourceRoot=pkg
   '';
-  
+
   installPhase = ''
     mkdir $out
     mv opt/staruml $out/bin
@@ -30,14 +37,14 @@ stdenv.mkDerivation rec {
     ${patchelf}/bin/patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       $out/bin/StarUML
-    
+
     mkdir -p $out/lib
-    
+
     ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
-    ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
+    ln -s ${libudev.out}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     wrapProgram $out/bin/StarUML \
-      --prefix LD_LIBRARY_PATH : $out/lib:${glib}/lib:${gtk2}/lib:${gdk_pixbuf}/lib/:${alsaLib}/lib/:${nss}/lib/:${nspr}/lib/:${GConf}/lib/:${cups}/lib/:${libgcrypt}/lib/:${dbus}/lib/
+      --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
   '';
 
   meta = with stdenv.lib; {

From 3ef7671cea0ed5a4819e1cd83c03f4ee1f85eb96 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 1 Feb 2016 11:16:50 -0600
Subject: [PATCH 540/857] ncurses: combine $lib and $out outputs

The $lib output refers to the terminfo database in $out, which is about
10x larger than the ncurses shared library. Splitting these outputs
saves a small amount of space for any derivations that use the terminfo
database but not the ncurses library, but we do not have evidence that
any such exist.
---
 .../editors/emacs-24/macport-24.5.nix            |  4 ++--
 pkgs/applications/editors/heme/default.nix       |  2 +-
 .../science/logic/saw-tools/default.nix          |  2 +-
 pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix     |  2 +-
 pkgs/desktops/gnome-3/3.18/core/vte/default.nix  |  2 +-
 .../compilers/gcc-arm-embedded/default.nix       |  2 +-
 pkgs/development/compilers/ghc/6.10.2-binary.nix |  2 +-
 pkgs/development/compilers/ghc/6.12.3.nix        |  2 +-
 pkgs/development/compilers/ghc/7.0.4-binary.nix  |  2 +-
 pkgs/development/compilers/ghc/7.0.4.nix         |  2 +-
 pkgs/development/compilers/ghc/7.10.2.nix        |  2 +-
 pkgs/development/compilers/ghc/7.10.3.nix        |  2 +-
 pkgs/development/compilers/ghc/7.2.2.nix         |  2 +-
 pkgs/development/compilers/ghc/7.4.2-binary.nix  |  2 +-
 pkgs/development/compilers/ghc/7.4.2.nix         |  2 +-
 pkgs/development/compilers/ghc/7.6.3.nix         |  2 +-
 pkgs/development/compilers/ghc/7.8.3.nix         |  2 +-
 pkgs/development/compilers/ghc/7.8.4.nix         |  2 +-
 pkgs/development/compilers/ghc/8.0.1.nix         |  2 +-
 pkgs/development/compilers/ghc/head.nix          |  2 +-
 pkgs/development/compilers/ghc/nokinds.nix       |  2 +-
 pkgs/development/compilers/mentor/default.nix    |  2 +-
 .../interpreters/ruby/gemconfig/default.nix      |  2 +-
 pkgs/development/libraries/aalib/default.nix     |  2 +-
 .../legacy/gst-plugins-good/default.nix          |  2 +-
 pkgs/development/libraries/libedit/default.nix   |  2 +-
 pkgs/development/libraries/ncurses/default.nix   | 16 ++++++++--------
 .../mobile/androidenv/androidndk_r8e.nix         |  2 +-
 pkgs/servers/sql/mariadb/default.nix             |  2 +-
 pkgs/stdenv/darwin/default.nix                   |  2 +-
 pkgs/stdenv/darwin/make-bootstrap-tools.nix      |  2 +-
 pkgs/tools/system/gptfdisk/default.nix           |  2 +-
 pkgs/top-level/perl-packages.nix                 |  2 +-
 33 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index ae0a66b30feef..23133ec262c39 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "LDFLAGS=-L${ncurses.lib}/lib"
+    "LDFLAGS=-L${ncurses.out}/lib"
     "--with-xml2=yes"
     "--with-gnutls=yes"
     "--with-mac"
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   ];
 
   CFLAGS = "-O3";
-  LDFLAGS = "-O3 -L${ncurses.lib}/lib";
+  LDFLAGS = "-O3 -L${ncurses.out}/lib";
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index 9ced023988ccf..c74e47a5243de 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile \
       --replace "/usr/local" "$out" \
       --replace "CFLAGS = " "CFLAGS = -I${ncurses.dev}/include " \
-      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.lib}/lib " \
+      --replace "LDFLAGS = " "LDFLAGS = -L${ncurses.out}/lib " \
       --replace "-lcurses" "-lncurses"
   '';
   buildInputs = [ ncurses ];
diff --git a/pkgs/applications/science/logic/saw-tools/default.nix b/pkgs/applications/science/logic/saw-tools/default.nix
index 97a06bf093d35..1153c0b3cf5c0 100644
--- a/pkgs/applications/science/logic/saw-tools/default.nix
+++ b/pkgs/applications/science/logic/saw-tools/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     mv doc $out/share
 
     # Hack around lack of libtinfo in NixOS
-    ln -s ${ncurses.lib}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
+    ln -s ${ncurses.out}/lib/libncursesw.so.5       $out/lib/libtinfo.so.5
     ln -s ${stdenv.cc.libc}/lib/libpthread.so.0 $out/lib/libpthread.so.0
 
     # Add a clang symlink for easy building with a suitable compiler.
diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix
index 663d6b9e35242..cbb52c9aaa129 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vte/2.90.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
index 5cd5ae18831fd..38850f0fe761b 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
@@ -20,7 +20,7 @@ let baseAttrs = rec {
   enableParallelBuilding = true;
 
   postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.lib}/lib -lncurses"
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 3f9a2a1f2fbb9..33f51270f43ed 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
     for f in $(find $out); do
       if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
         patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
-                 --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.lib}/lib \
+                 --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.out}/lib \
                  "$f" || true
       fi
     done
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 5a3ddc97587ec..3d80b165a7b0d 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     (if stdenv.isLinux then ''
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${libedit}/lib:${ncurses.lib}/lib:${gmp.out}/lib" {} \;
+          --set-rpath "${libedit}/lib:${ncurses.out}/lib:${gmp.out}/lib" {} \;
       for prog in ld ar gcc strip ranlib; do
         find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \;
       done
diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix
index e8e9b55a88571..54d67fd1025cc 100644
--- a/pkgs/development/compilers/ghc/6.12.3.nix
+++ b/pkgs/development/compilers/ghc/6.12.3.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
   '';
 
   preConfigure = ''
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index 874cf627864e6..c03cfbaaaddac 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -62,7 +62,7 @@ stdenv.mkDerivation rec {
     stdenv.lib.optionalString stdenv.isLinux ''
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "${ncurses.lib}/lib:${gmp.out}/lib" {} \;
+          --set-rpath "${ncurses.out}/lib:${gmp.out}/lib" {} \;
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       for prog in ld ar gcc strip ranlib; do
diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix
index 79b5f654ae9db..9152210b420d5 100644
--- a/pkgs/development/compilers/ghc/7.0.4.nix
+++ b/pkgs/development/compilers/ghc/7.0.4.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 935834474542c..d7f1e064030b4 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -9,7 +9,7 @@ let
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index f3be40e145dd2..8d540fb3ad8aa 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.lib}/lib"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix
index 20d80753afad0..a08745732f887 100644
--- a/pkgs/development/compilers/ghc/7.2.2.nix
+++ b/pkgs/development/compilers/ghc/7.2.2.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index 70cd7d21c4775..cf21a61b1b39c 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
     # find editline/gmp.
     stdenv.lib.optionalString stdenv.isLinux ''
       mkdir -p "$out/lib"
-      ln -sv "${ncurses.lib}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
+      ln -sv "${ncurses.out}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
           --set-rpath "$out/lib:${gmp.out}/lib" {} \;
diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix
index 46855e86d3363..bf48e50b6b73e 100644
--- a/pkgs/development/compilers/ghc/7.4.2.nix
+++ b/pkgs/development/compilers/ghc/7.4.2.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix
index 8e630641abfc3..af9fd3f8d93c0 100644
--- a/pkgs/development/compilers/ghc/7.6.3.nix
+++ b/pkgs/development/compilers/ghc/7.6.3.nix
@@ -25,7 +25,7 @@ in stdenv.mkDerivation rec {
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-libraries="${libiconv}/lib"
diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.3.nix
index 5d74af99dcaa1..706899a8f7ba0 100644
--- a/pkgs/development/compilers/ghc/7.8.3.nix
+++ b/pkgs/development/compilers/ghc/7.8.3.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     DYNAMIC_BY_DEFAULT = NO
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
diff --git a/pkgs/development/compilers/ghc/7.8.4.nix b/pkgs/development/compilers/ghc/7.8.4.nix
index 9020df2f053a0..cdcc2cf0e75eb 100644
--- a/pkgs/development/compilers/ghc/7.8.4.nix
+++ b/pkgs/development/compilers/ghc/7.8.4.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation (rec {
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     DYNAMIC_BY_DEFAULT = NO
     ${stdenv.lib.optionalString stdenv.isDarwin ''
       libraries/base_CONFIGURE_OPTS += --configure-option=--with-iconv-includes="${libiconv}/include"
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 3a451204eeadb..10aa163918664 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
-    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.lib}/lib"
+    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index ffb6512000ceb..0fc80a24eca08 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
-    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.lib}/lib"
+    "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 27e7346714e61..ca0a78eb0b677 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -7,7 +7,7 @@ let
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp.out}/lib"
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp.dev}/include"
     libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-includes="${ncurses.dev}/include"
-    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.lib}/lib"
+    libraries/terminfo_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="${ncurses.out}/lib"
     DYNAMIC_BY_DEFAULT = NO
     SRC_HC_OPTS        = -H64m -O -fasm
     GhcLibHcOpts       = -O -dcore-lint
diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix
index 573bf82103197..74905c6ffae41 100644
--- a/pkgs/development/compilers/mentor/default.nix
+++ b/pkgs/development/compilers/mentor/default.nix
@@ -34,7 +34,7 @@ let
 
             # GDB needs ncurses
             case "$file" in
-              *gdb) patchelf --set-rpath "${ncurses.lib}/lib" "$file";;
+              *gdb) patchelf --set-rpath "${ncurses.out}/lib" "$file";;
             esac
         done
 
diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix
index 058c02c3c8fc2..1f807315276d8 100644
--- a/pkgs/development/interpreters/ruby/gemconfig/default.nix
+++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix
@@ -73,7 +73,7 @@ in
     buildInputs = [ ncurses ];
     buildFlags = [
       "--with-cflags=-I${ncurses.dev}/include"
-      "--with-ldflags=-L${ncurses.lib}/lib"
+      "--with-ldflags=-L${ncurses.out}/lib"
     ];
   };
 
diff --git a/pkgs/development/libraries/aalib/default.nix b/pkgs/development/libraries/aalib/default.nix
index fb8edd27bf8b6..7ddb78d052e09 100644
--- a/pkgs/development/libraries/aalib/default.nix
+++ b/pkgs/development/libraries/aalib/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   postInstall = ''
     mkdir -p $dev/bin
     mv $bin/bin/aalib-config $dev/bin/aalib-config
-    substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.lib}/lib"
+    substituteInPlace $out/lib/libaa.la --replace "${ncurses.dev}/lib" "${ncurses.out}/lib"
   '';
 
   meta = {
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 44e52b99d71b8..191c1f6b0f2ce 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/lib/gstreamer-0.10/libgstaasink.la \
-      --replace "${ncurses.dev}/lib" "${ncurses.lib}/lib"
+      --replace "${ncurses.dev}/lib" "${ncurses.out}/lib"
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix
index abd04849beb1d..7868c2cfd140f 100644
--- a/pkgs/development/libraries/libedit/default.nix
+++ b/pkgs/development/libraries/libedit/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     find $out/lib -type f | grep '\.\(la\|pc\)''$' | xargs sed -i \
-      -e 's,-lncurses[a-z]*,-L${ncurses.lib}/lib -lncursesw,g'
+      -e 's,-lncurses[a-z]*,-L${ncurses.out}/lib -lncursesw,g'
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 41d609db47857..ed582fd3ed137 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   # gcc-5.patch should be removed after 5.9
   patches = [ ./clang.patch ./gcc-5.patch ];
 
-  outputs = [ "dev" "lib" "out" "man" ];
+  outputs = [ "dev" "out" "man" ];
   setOutputFlags = false; # some aren't supported
 
   configureFlags = [
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     export PKG_CONFIG_LIBDIR="$dev/lib/pkgconfig"
     mkdir -p "$PKG_CONFIG_LIBDIR"
     configureFlagsArray+=(
-      "--libdir=$lib/lib"
+      "--libdir=$out/lib"
       "--includedir=$dev/include"
       "--bindir=$dev/bin"
       "--mandir=$man/share/man"
@@ -85,14 +85,14 @@ stdenv.mkDerivation rec {
 
       for library in $libs; do
         for dylibtype in so dll dylib; do
-          if [ -e "$lib/lib/lib''${library}$suffix.$dylibtype" ]; then
-            ln -svf lib''${library}$suffix.$dylibtype $lib/lib/lib$library$newsuffix.$dylibtype
-            ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $lib/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
+          if [ -e "$out/lib/lib''${library}$suffix.$dylibtype" ]; then
+            ln -svf lib''${library}$suffix.$dylibtype $out/lib/lib$library$newsuffix.$dylibtype
+            ln -svf lib''${library}$suffix.$dylibtype.${abiVersion} $out/lib/lib$library$newsuffix.$dylibtype.${abiVersion}
           fi
         done
         for statictype in a dll.a la; do
-          if [ -e "$lib/lib/lib''${library}$suffix.$statictype" ]; then
-            ln -svf lib''${library}$suffix.$statictype $lib/lib/lib$library$newsuffix.$statictype
+          if [ -e "$out/lib/lib''${library}$suffix.$statictype" ]; then
+            ln -svf lib''${library}$suffix.$statictype $out/lib/lib$library$newsuffix.$statictype
           fi
         done
         ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    rm "$lib"/lib/*.a
+    rm "$out"/lib/*.a
   '';
 
   meta = {
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index a38d2d6b33cfc..428cef49a2d14 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${zlib.out}/lib:${ncurses.lib}/lib {} \;
+                          --set-rpath ${zlib.out}/lib:${ncurses.out}/lib {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
     do
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 340e29e94b3ef..78a4635532140 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
     "-DWITHOUT_TOKUDB=1"
-    "-DCURSES_LIBRARY=${ncurses.lib}/lib/libncurses.dylib"
+    "-DCURSES_LIBRARY=${ncurses.out}/lib/libncurses.dylib"
   ];
 
   # fails to find lex_token.h sometimes
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 8100318091735..16e35d19db0d2 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -296,7 +296,7 @@ in rec {
     allowedRequisites = (with pkgs; [
       xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
       bzip2.bin llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
-      gzip ncurses.out ncurses.dev ncurses.lib ncurses.man gnused bash gawk
+      gzip ncurses.out ncurses.dev ncurses.man gnused bash gawk
       gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
       binutils-raw.dev binutils gettext
     ]) ++ (with pkgs.darwin; [
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index dc52015c52dc4..32b779689deba 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -65,7 +65,7 @@ rec {
       cp -d ${libiconv.lib}/lib/lib*.dylib $out/lib
       cp -d ${gettext}/lib/libintl*.dylib $out/lib
       chmod +x $out/lib/libintl*.dylib
-      cp -d ${ncurses.lib}/lib/libncurses*.dylib $out/lib
+      cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib
 
       # Copy what we need of clang
       cp -d ${llvmPackages.clang-unwrapped}/bin/clang $out/bin
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 940383a6bc656..0b034819651dc 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile.mac --replace \
       " -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
     substituteInPlace Makefile.mac --replace \
-      "/opt/local/lib/libncurses.a" "${ncurses.lib}/lib/libncurses.dylib"
+      "/opt/local/lib/libncurses.a" "${ncurses.out}/lib/libncurses.dylib"
   '';
 
   buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac";
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index ce6a61602b612..2adff2534b59f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11220,7 +11220,7 @@ let self = _self // overrides; _self = with self; {
     preConfigure =
       ''
         substituteInPlace Makefile.PL --replace '$Config{libpth}' \
-          "'${pkgs.ncurses.lib}/lib'"
+          "'${pkgs.ncurses.out}/lib'"
       '';
 
     # Tests don't work because they require /dev/tty.

From da972b6cc40b4be7492df1661a522e12bf747807 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 1 Feb 2016 11:18:39 -0600
Subject: [PATCH 541/857] ncurses: move runtime utilities to $out

All the programs provided by ncurses were being installed to the $dev
output, but several of them are intended for runtime use, e.g. to
operate on the running terminal. These user-facing programs are moved to
the $bin output.

Several packages referred to "${ncurses}/bin" or "${ncurses.dev}/bin" at
runtime; these paths are also updated to refer to "${ncurses.bin}/bin".
---
 pkgs/applications/misc/girara/default.nix       | 2 +-
 pkgs/applications/misc/zathura/core/default.nix | 2 +-
 pkgs/development/libraries/ncurses/default.nix  | 8 ++++++++
 pkgs/development/tools/misc/drush/default.nix   | 2 +-
 pkgs/shells/fish/default.nix                    | 2 +-
 pkgs/tools/misc/entr/default.nix                | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index 6598c13253bb7..cfa38a118614d 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig gtk gettext ];
 
   makeFlags = [ "PREFIX=$(out)" ]
-    ++ optional withBuildColors "TPUT=${ncurses.dev}/bin/tput"
+    ++ optional withBuildColors "TPUT=${ncurses.out}/bin/tput"
     ++ optional (!withBuildColors) "TPUT_AVAILABLE=0"
     ;
 
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index f09c971351f31..62e7ee60cb3e4 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
     "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
-    "TPUT=${ncurses.dev}/bin/tput"
+    "TPUT=${ncurses.out}/bin/tput"
   ];
 
   postInstall = ''
diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index ed582fd3ed137..edd2636059609 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -98,6 +98,14 @@ stdenv.mkDerivation rec {
         ln -svf ''${library}$suffix.pc $dev/lib/pkgconfig/$library$newsuffix.pc
       done
     done
+
+    # move some utilities to $bin
+    # these programs are used at runtime and don't really belong in $dev
+    moveToOutput "bin/clear" "$out"
+    moveToOutput "bin/reset" "$out"
+    moveToOutput "bin/tabs" "$out"
+    moveToOutput "bin/tput" "$out"
+    moveToOutput "bin/tset" "$out"
   '';
 
   preFixup = ''
diff --git a/pkgs/development/tools/misc/drush/default.nix b/pkgs/development/tools/misc/drush/default.nix
index 0751f51281ded..72bbe50422cae 100644
--- a/pkgs/development/tools/misc/drush/default.nix
+++ b/pkgs/development/tools/misc/drush/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"
     cp -r . "$out/src"
     mkdir "$out/bin"
-    wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.dev}/bin"
+    wrapProgram "$out/src/drush" --prefix PATH : "${which}/bin:${php}/bin:${bash}/bin:${coreutils}/bin:${ncurses.out}/bin"
     ln -s "$out/src/drush" "$out/bin/drush"
   '';
 }
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 521212940672b..5dcf61a55562d 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
         -i "$out/share/fish/functions/alias.fish" \
            "$out/share/fish/functions/prompt_pwd.fish"
     substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \
-      --replace "clear;" "${ncurses}/bin/clear;"
+      --replace "clear;" "${ncurses.out}/bin/clear;"
   '' + stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
       --replace "| ul" "| ${utillinux}/bin/ul" 
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index a99e28c6f817d..69ddbd6dbfe78 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Makefile.bsd --replace /bin/echo echo
     substituteInPlace entr.c --replace /bin/cat ${coreutils}/bin/cat
-    substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.dev}/bin/clear
+    substituteInPlace entr.c --replace /usr/bin/clear ${ncurses.out}/bin/clear
     substituteInPlace entr.1 --replace /bin/cat cat
     substituteInPlace entr.1 --replace /usr/bin/clear clear
   '';

From 1d5a9c0fab7b135d91a74ed1cab2013cd1a7f2a3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 8 Mar 2016 13:36:19 -0600
Subject: [PATCH 542/857] kde5: fix merge conflicts from master

The last merge from master into closure-size obliterated all my
closure-size fixes for KDE 5! Luckily, I had them backed-up in another
branch.
---
 .../0001-extra-cmake-modules-paths.patch      | 74 --------------
 .../extra-cmake-modules/default.nix           | 12 ++-
 .../extra-cmake-modules/setup-hook.sh         | 98 ++++++++++++++-----
 .../kde-5/frameworks-5.19/kwallet.nix         |  4 +-
 4 files changed, 85 insertions(+), 103 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch

diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5b6..0000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
index 4e1b1aff3bd14..1c2ea70442d32 100644
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
@@ -1,9 +1,11 @@
-{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
+{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
 
 kdeFramework {
   name = "extra-cmake-modules";
-  patches = [ ./0001-extra-cmake-modules-paths.patch ];
 
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
   setupHook = ./setup-hook.sh;
 
   # It is OK to propagate these inputs as long as
@@ -11,8 +13,8 @@ kdeFramework {
   # of some other derivation.
   propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
 
-  meta = {
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.ttuegel ];
+  meta = with lib; {
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
index a6fa6189240b0..56ed09f4ea59e 100644
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
@@ -1,27 +1,81 @@
-addMimePkg() {
-    local propagated
+_ecmSetXdgDirs() {
+    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
+    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
+}
 
-    if [[ -d "$1/share/mime" ]]; then
-        propagated=
-        for pkg in $propagatedBuildInputs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedBuildInputs="$propagatedBuildInputs $1"
+_ecmPropagateSharedData() {
+    local sharedPaths=( \
+        "config.cfg" \
+        "doc" \
+        "kconf_update" \
+        "kservices5" \
+        "kservicetypes5" \
+        "kxmlgui5" \
+        "knotifications5" \
+        "icons" \
+        "sounds" \
+        "templates" \
+        "wallpapers" \
+        "applications" \
+        "desktop-directories" \
+        "mime" \
+        "info" \
+        "dbus-1" \
+        "interfaces" \
+        "services" \
+        "system-services" )
+    for dir in ${sharedPaths[@]}; do
+        if [ -d "$1/share/$dir" ]; then
+            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
         fi
+    done
+}
 
-        propagated=
-        for pkg in $propagatedUserEnvPkgs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-        fi
-    fi
+_ecmConfig() {
+    # Because we need to use absolute paths here, we must set *all* the paths.
+    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
+    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
+    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
+    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
+    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
+    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
+    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
+    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
+    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
+    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
+    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
+    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
+    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
+    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
+    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
+    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
+    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
+    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
+    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
+    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
+    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
+    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
+    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
+    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
 }
 
-envHooks+=(addMimePkg)
+envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
+preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
index ec6d196c06491..5ade5f63a8d04 100644
--- a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
@@ -1,6 +1,6 @@
 { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
-, kcoreaddons, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kservice, kwidgetsaddons, kwindowsystem, libgcrypt
+, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
+, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
 , makeQtWrapper }:
 
 kdeFramework {

From cb1b4e803d526953eb5bf270858154c73e442739 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 9 Mar 2016 06:11:58 -0600
Subject: [PATCH 543/857] kde5.kcalc: add gmp dependency

---
 pkgs/desktops/kde-5/applications-15.12/kcalc.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
index a1f0316825dae..e4c8e9d69253d 100644
--- a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
@@ -1,14 +1,14 @@
 { kdeApp
 , lib
+, makeQtWrapper
 , extra-cmake-modules
+, gmp
 , kdoctools
-, makeQtWrapper
 , kconfig
 , kconfigwidgets
 , kguiaddons
 , kinit
 , knotifications
-
 }:
 
 kdeApp {
@@ -20,6 +20,7 @@ kdeApp {
   ];
 
   buildInputs = [
+    gmp
     kconfig
     kconfigwidgets
     kguiaddons

From c801cd1a047efa51055fd04698e316ddd503fd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 11 Mar 2016 11:50:40 +0100
Subject: [PATCH 544/857] php: fixup build when configured with httpd via nixos

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
 pkgs/development/interpreters/php/default.nix               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index ed66ea9fc8767..760d7e147d7cd 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -12,7 +12,7 @@ let
 
   httpdConf = mainCfg.configFile;
 
-  php = pkgs.php.override { apacheHttpd = httpd; };
+  php = pkgs.php.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 9448c4c159a1f..8c60fcb9ba229 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -30,7 +30,7 @@ let
         # SAPI modules:
 
         apxs2 = {
-          configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
+          configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs"];
           buildInputs = [apacheHttpd];
         };
 

From 4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 11 Mar 2016 15:10:30 +0100
Subject: [PATCH 545/857] chromium: fixup plugins with multiple outputs

Chromium+flash seem to work fine now.
---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index c3b294876c879..ebdb3d8441873 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -45,6 +45,7 @@ let
 
     phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
     outputs = [ "flash" "widevine" ];
+    out = "flash"; # outputs TODO: is this a hack?
 
     unpackCmd = let
       chan = if source.channel == "dev"    then "chrome-unstable"
@@ -64,7 +65,7 @@ let
     '';
 
     patchPhase = let
-      rpaths = [ stdenv.cc.cc ];
+      rpaths = [ stdenv.cc.cc.lib ];
       mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
     in ''
       for sofile in PepperFlash/libpepflashplayer.so \

From c0c2be83a36fb25b3f47518a93b4bbcbbcc27c54 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 08:44:28 -0600
Subject: [PATCH 546/857] kde5.plasma-workspace: move kbuildsycoca5 earlier in
 startkde

---
 .../plasma-workspace/startkde.patch           | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
index 17c0ccf0ca93f..eea0ae4c199d2 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
@@ -1,8 +1,8 @@
-Index: plasma-workspace-5.5.1/startkde/startkde.cmake
+Index: plasma-workspace-5.5.5/startkde/startkde.cmake
 ===================================================================
---- plasma-workspace-5.5.1.orig/startkde/startkde.cmake
-+++ plasma-workspace-5.5.1/startkde/startkde.cmake
-@@ -1,8 +1,31 @@
+--- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
++++ plasma-workspace-5.5.5/startkde/startkde.cmake
+@@ -1,8 +1,36 @@
 -#!/bin/sh
 +#!@bash@
  #
@@ -31,11 +31,16 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +if [ -e $HOME/.config/Trolltech.conf ]; then
 +    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
 +fi
++
++# (NixOS) We run kbuildsycoca5 before starting the user session because things
++# may be missing or moved if they have run nixos-rebuild and it may not be
++# possible for them to start Konsole to run it manually!
++@kbuildsycoca5@
 +
  if test "x$1" = x--failsafe; then
      KDE_FAILSAFE=1 # General failsafe flag
      KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -17,29 +40,16 @@ trap 'echo GOT SIGHUP' HUP
+@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
  # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
  unset DYLD_FORCE_FLAT_NAMESPACE
  
@@ -69,7 +74,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  fi
  
  # Boot sequence:
-@@ -57,13 +67,8 @@ fi
+@@ -57,13 +72,8 @@ fi
  # * Then ksmserver is started which takes control of the rest of the startup sequence
  
  # We need to create config folder so we can write startupconfigkeys
@@ -85,7 +90,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  #This is basically setting defaults so we can use them with kstartupconfig5
  cat >$configDir/startupconfigkeys <<EOF
-@@ -102,42 +107,10 @@ XftSubPixel=none
+@@ -102,42 +112,10 @@ XftSubPixel=none
  EOF
  }
  
@@ -130,7 +135,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
      exit 1
  fi
  [ -r $configDir/startupconfig ] && . $configDir/startupconfig
-@@ -146,9 +119,11 @@ if test "$kdeglobals_kscreen_scalefactor
+@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
      export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
  fi
  
@@ -143,7 +148,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
      kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
      if test $? -eq 10; then
-@@ -164,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursorthem
+@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
      fi
  fi
  
@@ -189,7 +194,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
        ;;
      None)
        ;;
-@@ -201,8 +194,7 @@ fi
+@@ -201,8 +199,7 @@ fi
  # For anything else (that doesn't set env vars, or that needs a window manager),
  # better use the Autostart folder.
  
@@ -199,7 +204,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
-@@ -232,7 +224,7 @@ usr_odir=$HOME/.fonts/kde-override
+@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
  usr_fdir=$HOME/.fonts
  
  if test -n "$KDEDIRS"; then
@@ -208,7 +213,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
    sys_odir=$kdedirs_first/share/fonts/override
    sys_fdir=$kdedirs_first/share/fonts
  else
-@@ -245,23 +237,13 @@ fi
+@@ -245,23 +242,13 @@ fi
  # add the user's dirs to the font path, as they might simply have been made
  # read-only by the administrator, for whatever reason.
  
@@ -237,7 +242,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
  if test -n "$GS_LIB" ; then
-@@ -274,26 +256,6 @@ fi
+@@ -274,26 +261,6 @@ fi
  
  echo 'startkde: Starting up...'  1>&2
  
@@ -264,7 +269,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  # Mark that full KDE session is running (e.g. Konqueror preloading works only
  # with full KDE running). The KDE_FULL_SESSION property can be detected by
  # any X client connected to the same X session, even if not launched
-@@ -318,11 +280,11 @@ fi
+@@ -318,11 +285,11 @@ fi
  #
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
@@ -278,7 +283,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  KDE_SESSION_UID=`id -ru`
  export KDE_SESSION_UID
-@@ -332,11 +294,11 @@ export XDG_CURRENT_DESKTOP
+@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
  
  # At this point all the environment is ready, let's send it to kwalletd if running
  if test -n "$PAM_KWALLET_LOGIN" ; then
@@ -292,7 +297,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  fi
  
  # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-@@ -349,21 +311,26 @@ if test $? -ne 0; then
+@@ -349,18 +316,18 @@ if test $? -ne 0; then
    # Startup error
    echo 'startkde: Could not sync environment to dbus.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
@@ -314,14 +319,6 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
    exit 1
  fi
  
-+# (NixOS) We run kbuildsycoca5 before starting the user session because things
-+# may be missing or moved if they have run nixos-rebuild and it may not be
-+# possible for them to start Konsole to run it manually!
-+@kbuildsycoca5@
-+
- # finally, give the session control to the session manager
- # see kdebase/ksmserver for the description of the rest of the startup sequence
- # if the KDEWM environment variable has been set, then it will be used as KDE's
 @@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
  # lock now and do the rest of the KDE startup underneath the locker.
  KSMSERVEROPTIONS=""

From cd5e923f550950fa85ec409cc992460032ddd684 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 08:57:39 -0600
Subject: [PATCH 547/857] luajit: fix evaluation on Darwin

---
 pkgs/development/interpreters/luajit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 0d4a5ef2d6a63..ab57d285288ab 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
   ''
     substituteInPlace Makefile \
-      --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig
+      --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig
   '';
 
   configurePhase = false;

From 9e5b2d5e3d517ec915ff2472f95967e504f392b7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:10:10 -0600
Subject: [PATCH 548/857] qt48: fix evaluation error on Darwin

---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 07a7993a67fe9..788fb87414023 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       ./libressl.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
-        cups = cups.out;
+        cups = if cups != null then cups.out else null;
         icu = icu.out;
         libXfixes = libXfixes.out;
         glibc = stdenv.cc.libc.out;

From 1fae9a36aa0c1dc5ac4521fe9cce2218a13e5845 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:12:39 -0600
Subject: [PATCH 549/857] ppp: fix evaluation error on Darwin

---
 pkgs/tools/networking/ppp/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 7d3ced17b40c2..0f5de17c71b60 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     [ ( substituteAll {
         src = ./nix-purity.patch;
         inherit libpcap;
-        glibc = stdenv.cc.libc.dev;
+        glibc = stdenv.cc.libc.dev or stdenv.cc.libc;
       })
       # Without nonpriv.patch, pppd --version doesn't work when not run as
       # root.

From 5ec07e4bf3bcd68db4f5e02a6012ed429ce1e045 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:53:04 -0600
Subject: [PATCH 550/857] module-init-tools: disable on Darwin to fix
 evaluation error

---
 pkgs/os-specific/linux/module-init-tools/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
index 2d6875d506a76..ded6e77e43b41 100644
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
 
+assert (stdenv.lib.elem stdenv.system stdenv.lib.platforms.linux);
+
 stdenv.mkDerivation {
   name = "module-init-tools-3.16";
 
@@ -31,5 +33,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/;
     description = "Tools for loading and managing Linux kernel modules";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 1f56abef8eb31b84658133c647a60b795e926913 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:53:20 -0600
Subject: [PATCH 551/857] recoll: fix evaluation error on Darwin

---
 pkgs/applications/search/recoll/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 55fd3eba62203..253b97aff1e70 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace egrep         ${gnugrep}/bin/egrep
       substituteInPlace  $f --replace groff         ${groff}/bin/groff
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
-      substituteInPlace  $f --replace iconv         ${libiconv.bin}/bin/iconv
+      substituteInPlace  $f --replace iconv         ${libiconv.bin or libiconv}/bin/iconv
       substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
       substituteInPlace  $f --replace pdftotext     ${poppler_utils.out}/bin/pdftotext
       substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 

From 2667e4f5d7b19df4b66c471bcc89aede579d8458 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 10:30:28 -0600
Subject: [PATCH 552/857] make-bootstrap-tools: fix evaluation error on Darwin

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index dc52015c52dc4..e2ad9c2b8d7eb 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -62,7 +62,7 @@ rec {
       cp -d ${openssl.out}/lib/*.dylib $out/lib
 
       cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
-      cp -d ${libiconv.lib}/lib/lib*.dylib $out/lib
+      cp -d ${libiconv.lib or libiconv}/lib/lib*.dylib $out/lib
       cp -d ${gettext}/lib/libintl*.dylib $out/lib
       chmod +x $out/lib/libintl*.dylib
       cp -d ${ncurses.lib}/lib/libncurses*.dylib $out/lib

From 42b1e8ee580712b1f4d3f194b79b2099667e648e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 10:30:45 -0600
Subject: [PATCH 553/857] ghc-6.10.2-binary: fix evaluation error on Darwin

---
 pkgs/development/compilers/ghc/6.10.2-binary.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 5a3ddc97587ec..b3208209b05bc 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
      '' else "");
 
   configurePhase = ''
-    ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include
+    ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include
   '';
 
   # Stripping combined with patchelf breaks the executables (they die

From 9fa2ad9635d0f91f6c85eb034002bcc035bc2e07 Mon Sep 17 00:00:00 2001
From: Mayeu - Cast <Mayeu@users.noreply.github.com>
Date: Fri, 18 Mar 2016 17:16:37 +0100
Subject: [PATCH 554/857] librest 0.7.92 -> 0.7.93

---
 pkgs/desktops/gnome-3/3.18/core/rest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix
index eada9ab199340..344bc00780f95 100644
--- a/pkgs/desktops/gnome-3/3.18/core/rest/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/rest/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "rest-0.7.92";
+  name = "rest-0.7.93";
 
   src = fetchurl {
     url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-    sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec";
+    sha256 = "05mj10hhiik23ai8w4wkk5vhsp7hcv24bih5q3fl82ilam268467";
   };
 
   buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];

From 4b3b703d5b74f002bea06b990845def27296a975 Mon Sep 17 00:00:00 2001
From: Marc Scholten <marc@pedigital.de>
Date: Tue, 22 Mar 2016 21:47:11 +0100
Subject: [PATCH 555/857] factorio: 0.12.20 -> 0.12.28

---
 pkgs/games/factorio/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index c9517b22a33b9..3118c3fffb1bb 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -1,13 +1,13 @@
 { stdenv, callPackage, fetchurl, makeWrapper
 # Begin libraries
-, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi
+, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu
 # Begin download parameters
 , username ? ""
 , password ? ""
 }:
 
 let
-  version = "0.12.20";
+  version = "0.12.28";
 
   fetch = callPackage ./fetch.nix { username = username; password = password; };
   arch = if stdenv.system == "x86_64-linux" then "x64"
@@ -17,12 +17,12 @@ let
   variants = {
     x64 = {
       url = "https://www.factorio.com/get-download/${version}/alpha/linux64";
-      sha256 = "1xpzrx3q678519qgjl92fxn3qv55hd188x9jp6dcfk2ljhi1gmqk";
+      sha256 = "01si5n9hb2h0c5q8k3hr3nphsakp9kki84qyp70dgddwqsn8wfjl";
     };
 
     x32 = {
       url = "https://www.factorio.com/get-download/${version}/alpha/linux32";
-      sha256 = "1dl1dsp4nni5nda437ckyw1ss6w168g19v51h7cdvb3cgsdb7sab";
+      sha256 = "13h013ixyhv4rpvh0jv5jry3mrwv65v57nqn16bjh3hr8ip70lkq";
     };
   };
 in
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     libXinerama
     libXrandr
     libXi
+    mesa_noglu
   ];
 
   buildInputs = [ makeWrapper ];

From 879778091a5f8280a72a577b536137fa7a7a852a Mon Sep 17 00:00:00 2001
From: Mitchell Pleune <mitchpleune@gmail.com>
Date: Sat, 26 Mar 2016 12:02:00 -0400
Subject: [PATCH 556/857] iodine service: add clients implimentation

- services.iodined moved to services.iodine
- configuration file backwards compatable
- old iodine server configuration moved to services.iodine.server
- attribute set services.iodine.clients added to specify any number
  of iodine clients
  - example:
    iodine.clients.home = { server = "iodinesubdomain.yourserver.com"; ... };
  - client services names iodine-name where name would be home
---
 nixos/modules/module-list.nix                 |   2 +-
 nixos/modules/rename.nix                      |   7 +
 nixos/modules/services/networking/iodine.nix  | 136 ++++++++++++++++++
 nixos/modules/services/networking/iodined.nix |  86 -----------
 4 files changed, 144 insertions(+), 87 deletions(-)
 create mode 100644 nixos/modules/services/networking/iodine.nix
 delete mode 100644 nixos/modules/services/networking/iodined.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index d317333f9631d..c410cb4b87db4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -326,7 +326,7 @@
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
   ./services/networking/i2p.nix
-  ./services/networking/iodined.nix
+  ./services/networking/iodine.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
   ./services/networking/lambdabot.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index c6a781b6f00f2..84eccfd512921 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -101,6 +101,13 @@ with lib;
     # Enlightenment
     (mkRenamedOptionModule [ "services" "xserver" "desktopManager" "e19" "enable" ] [ "services" "xserver" "desktopManager" "enlightenment" "enable" ])
 
+    # Iodine
+    (mkRenamedOptionModule [ "services" "iodined" "enable" ] [ "services" "iodine" "server" "enable" ])
+    (mkRenamedOptionModule [ "services" "iodined" "domain" ] [ "services" "iodine" "server" "domain" ])
+    (mkRenamedOptionModule [ "services" "iodined" "ip" ] [ "services" "iodine" "server" "ip" ])
+    (mkRenamedOptionModule [ "services" "iodined" "extraConfig" ] [ "services" "iodine" "server" "extraConfig" ])
+    (mkRemovedOptionModule [ "services" "iodined" "client" ])
+
     # Options that are obsolete and have no replacement.
     (mkRemovedOptionModule [ "boot" "initrd" "luks" "enable" ])
     (mkRemovedOptionModule [ "programs" "bash" "enable" ])
diff --git a/nixos/modules/services/networking/iodine.nix b/nixos/modules/services/networking/iodine.nix
new file mode 100644
index 0000000000000..1b0d2d9a517c8
--- /dev/null
+++ b/nixos/modules/services/networking/iodine.nix
@@ -0,0 +1,136 @@
+# NixOS module for iodine, ip over dns daemon
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.iodine;
+
+  iodinedUser = "iodined";
+
+in
+{
+
+  ### configuration
+
+  options = {
+
+    services.iodine = {
+      clients = mkOption {
+        default = {};
+        description = ''
+          Each attribute of this option defines a systemd service that
+          runs iodine. Many or none may be defined.
+          The name of each service is
+          <literal>iodine-<replaceable>name</replaceable></literal>
+          where <replaceable>name</replaceable> is the name of the
+          corresponding attribute name.
+        '';
+        example = literalExample ''
+        {
+          foo = {
+            server = "tunnel.mdomain.com";
+            relay = "8.8.8.8";
+            extraConfig = "-P mysecurepassword";
+          }
+        }
+        '';
+        type = types.attrsOf (types.submodule (
+        {
+          options = {
+            server = mkOption {
+              type = types.str;
+              default = "";
+              description = "Domain or Subdomain of server running iodined";
+              example = "tunnel.mydomain.com";
+            };
+
+            relay = mkOption {
+              type = types.str;
+              default = "";
+              description = "DNS server to use as a intermediate relay to the iodined server";
+              example = "8.8.8.8";
+            };
+
+            extraConfig = mkOption {
+              type = types.str;
+              default = "";
+              description = "Additional command line parameters";
+              example = "-P mysecurepassword -l 192.168.1.10 -p 23";
+            };
+          };
+        }));
+      };
+
+      server = {
+        enable = mkOption {
+          type = types.bool;
+          default = false;
+          description = "enable iodined server";
+        };
+
+        ip = mkOption {
+          type = types.str;
+          default = "";
+          description = "The assigned ip address or ip range";
+          example = "172.16.10.1/24";
+        };
+
+        domain = mkOption {
+          type = types.str;
+          default = "";
+          description = "Domain or subdomain of which nameservers point to us";
+          example = "tunnel.mydomain.com";
+        };
+
+        extraConfig = mkOption {
+          type = types.str;
+          default = "";
+          description = "Additional command line parameters";
+          example = "-P mysecurepassword -l 192.168.1.10 -p 23";
+        };
+      };
+
+    };
+  };
+
+  ### implementation
+
+  config = mkIf (cfg.server.enable || cfg.clients != {}) {
+    environment.systemPackages = [ pkgs.iodine ];
+    boot.kernelModules = [ "tun" ];
+
+    systemd.services =
+    let
+      createIodineClientService = name: cfg:
+      {
+        description = "iodine client - ${name}";
+        wantedBy = [ "ip-up.target" ];
+        serviceConfig = {
+          RestartSec = "30s";
+          Restart = "always";
+          ExecStart = "${pkgs.iodine}/bin/iodine -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.relay} ${cfg.server}";
+        };
+      };
+    in
+    listToAttrs (
+      mapAttrsToList
+        (name: value: nameValuePair "iodine-${name}" (createIodineClientService name value))
+        cfg.clients
+    ) // {
+      iodined = mkIf (cfg.server.enable) {
+        description = "iodine, ip over dns server daemon";
+        wantedBy = [ "ip-up.target" ];
+        serviceConfig.ExecStart = "${pkgs.iodine}/bin/iodined -f -u ${iodinedUser} ${cfg.server.extraConfig} ${cfg.server.ip} ${cfg.server.domain}";
+      };
+    };
+
+    users.extraUsers = singleton {
+      name = iodinedUser;
+      uid = config.ids.uids.iodined;
+      description = "Iodine daemon user";
+    };
+    users.extraGroups.iodined.gid = config.ids.gids.iodined;
+  };
+}
diff --git a/nixos/modules/services/networking/iodined.nix b/nixos/modules/services/networking/iodined.nix
deleted file mode 100644
index 20d371c4e2d1f..0000000000000
--- a/nixos/modules/services/networking/iodined.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-# NixOS module for iodine, ip over dns daemon
-
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-  cfg = config.services.iodined;
-
-  iodinedUser = "iodined";
-
-in
-
-{
-
-  ### configuration
-
-  options = {
-
-    services.iodined = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable iodine, ip over dns daemon";
-      };
-
-      client = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Start iodine in client mode";
-      };
-
-      ip = mkOption {
-        type = types.str;
-        default = "";
-        description = "Assigned ip address or ip range";
-        example = "172.16.10.1/24";
-      };
-
-      domain = mkOption {
-        type = types.str;
-        default = "";
-        description = "Domain or subdomain of which nameservers point to us";
-        example = "tunnel.mydomain.com";
-      };
-
-      extraConfig = mkOption {
-        type = types.str;
-        default = "";
-        description = "Additional command line parameters";
-        example = "-P mysecurepassword -l 192.168.1.10 -p 23";
-      };
-
-    };
-
-  };
-
-  ### implementation
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.iodine ];
-    boot.kernelModules = [ "tun" ];
-
-    systemd.services.iodined = {
-      description = "iodine, ip over dns daemon";
-      wantedBy = [ "ip-up.target" ];
-      serviceConfig.ExecStart = "${pkgs.iodine}/sbin/iodined -f -u ${iodinedUser} ${cfg.extraConfig} ${cfg.ip} ${cfg.domain}";
-    };
-
-
-    users.extraUsers = singleton {
-      name = iodinedUser;
-      uid = config.ids.uids.iodined;
-      description = "Iodine daemon user";
-    };
-    users.extraGroups.iodined.gid = config.ids.gids.iodined;
-
-    assertions = [{ assertion = if !cfg.client then cfg.ip != "" else true;
-                    message = "cannot start iodined without ip set";}
-                  { assertion = cfg.domain != "";
-                    message = "cannot start iodined without domain name set";}];
-
-  };
-
-}

From 8857774f91b99b49aa5348c550e40bb71f472de1 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 22 Mar 2016 00:04:49 +0800
Subject: [PATCH 557/857] network-manager: use ping/ping6 from the nix store

NM upstream has a hardcoded path to /usr/bin/ping.

This patch changes:

 - ping/ping6 are now from the nix store
 - we no longer try to make substitutions on a missing file
 - we use file from the nix store
---
 pkgs/tools/networking/network-manager/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index c23b818e048f3..6c5a91fd4ded1 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -2,7 +2,7 @@
 , udev, libgudev, libnl, libuuid, polkit, gnutls, ppp, dhcp, dhcpcd, iptables
 , libgcrypt, dnsmasq, avahi, bind, perl, bluez5, substituteAll, readline
 , gobjectIntrospection, modemmanager, openresolv, libndp, newt, libsoup
-, ethtool, gnused }:
+, ethtool, gnused, coreutils, file, inetutils }:
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
@@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
+    substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
+    substituteInPlace configure --replace /usr/bin/file ${file}/bin/file
+    substituteInPlace src/devices/nm-device.c --replace /usr/bin/ping ${inetutils}/bin/ping
     substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
     substituteInPlace data/85-nm-unmanaged.rules \
       --replace /bin/sh ${stdenv.shell} \

From d852a23662f31df25c0712bf4af66cf7216a3a38 Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Tue, 29 Mar 2016 16:40:11 +0200
Subject: [PATCH 558/857] bindfs: Let `mount` find `bindfs` mount helper

When mount is used with mount-type "fuse.bindfs", it cannot find the
mount helper.

If mount can't find `mount.fuse.bindfs`, it executes the `mount.fuse`
mount helper and passes `fuse.bindfs` as argument. Then `mount.fuse`
tries to execute `bindfs` on its own, but it is not found in the PATH.

By creating a `mount.fuse.bindfs` link to the `bindfs` executable, this
problem is avoided because `mount` will just execute the
`mount.fuse.bindfs` mount helper without `mount.fuse` in the middle.
---
 pkgs/tools/filesystems/bindfs/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/filesystems/bindfs/default.nix b/pkgs/tools/filesystems/bindfs/default.nix
index 7d79eefb122c1..80027c7a04740 100644
--- a/pkgs/tools/filesystems/bindfs/default.nix
+++ b/pkgs/tools/filesystems/bindfs/default.nix
@@ -12,6 +12,9 @@ stdenv.mkDerivation rec {
   dontStrip = true;
 
   buildInputs = [ fuse pkgconfig ];
+  postFixup = ''
+    ln -s $out/bin/bindfs $out/bin/mount.fuse.bindfs
+  '';
 
   meta = {
     description = "A FUSE filesystem for mounting a directory to another location";

From 09fe0e3c810c2cf5162c72fb57810b850139a8b7 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Tue, 29 Mar 2016 16:38:38 -0700
Subject: [PATCH 559/857] qgifer: init at 0.2.1

---
 pkgs/applications/video/qgifer/default.nix | 25 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  5 +++++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/video/qgifer/default.nix

diff --git a/pkgs/applications/video/qgifer/default.nix b/pkgs/applications/video/qgifer/default.nix
new file mode 100644
index 0000000000000..f528ce99a8a26
--- /dev/null
+++ b/pkgs/applications/video/qgifer/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchsvn, cmake, opencv, qt, giflib }:
+
+stdenv.mkDerivation rec {
+  name = "qgifer-${version}";
+  version = "0.2.1";
+
+  src = fetchsvn {
+    url = "https://svn.code.sf.net/p/qgifer/code/tags/${name}";
+    sha256 = "0fv40n58xjwfr06ix9ga79hs527rrzfaq1sll3n2xxchpgf3wf4f";
+  };
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace "SET(CMAKE_INSTALL_PREFIX" "#"
+  '';
+
+  buildInputs = [ cmake opencv qt giflib ];
+
+  meta = with stdenv.lib; {
+    description = "Video-based animated GIF creator";
+    homepage = https://sourceforge.net/projects/qgifer/;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.andrewrk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d15f689b0f61..59c541391f87b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2937,6 +2937,11 @@ in
     qt = qt4;
   };
 
+  qgifer = callPackage ../applications/video/qgifer {
+    giflib = giflib_4_1;
+    qt = qt4;
+  };
+
   qhull = callPackage ../development/libraries/qhull { };
 
   qjoypad = callPackage ../tools/misc/qjoypad { };

From f8f16b1a3642978110ba1abf04e3fbddae04d581 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles@cstrahan.com>
Date: Thu, 31 Mar 2016 04:17:19 -0400
Subject: [PATCH 560/857] mesos: 0.27.1 -> 0.28.0

---
 pkgs/applications/networking/cluster/mesos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index b1b4518551102..7efd34dee563d 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -10,7 +10,7 @@ let
   soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
 in stdenv.mkDerivation rec {
-  version = "0.27.1";
+  version = "0.28.0";
   name = "mesos-${version}";
 
   enableParallelBuilding = true;
@@ -18,7 +18,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://apache/mesos/${version}/${name}.tar.gz";
-    sha256 = "147iq7vwi09kqblx1h8r6lkrg9g50i257qk1cph1zr5j3rncz7l8";
+    sha256 = "05dnj6r5pspizna0fk7yayn38a4w9hlcswgg8l9qmb35m6nq6hby";
   };
 
   patches = [

From cce37d216460f6a51a66030e162df52c36d53305 Mon Sep 17 00:00:00 2001
From: ne0phyte <felix.dietz17@gmail.com>
Date: Thu, 31 Mar 2016 04:26:54 +0200
Subject: [PATCH 561/857] kicad: 2013 stable -> 4.0.2

---
 .../science/electronics/kicad/default.nix     | 65 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix
index 0762002b8a841..56fbf20f52d18 100644
--- a/pkgs/applications/science/electronics/kicad/default.nix
+++ b/pkgs/applications/science/electronics/kicad/default.nix
@@ -1,21 +1,39 @@
-{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext }:
+{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, openssl, boost, pkgconfig, doxygen }:
 
 stdenv.mkDerivation rec {
-  name = "kicad-20131025";
+  name = "kicad-${series}";
+  series = "4.0";
+  version = "4.0.2";
 
-  src = fetchbzr {
-    url = "https://code.launchpad.net/kicad/stable";
-    rev = 4024;
-    sha256 = "1sv1l2zpbn6439ccz50p05hvqg6j551aqra551wck9h3929ghly5";
-  };
+  srcs = [
+    (fetchurl {
+      url = "https://code.launchpad.net/kicad/${series}/${version}/+download/kicad-${version}.tar.xz";
+      sha256 = "1fcf91fmxj6ha3mm6gzdb0px50j58m80p8wrncm8ca9shj36kbif";
+    })
 
-  srcLibrary = fetchbzr {
-    url = "http://bazaar.launchpad.net/~kicad-product-committers/kicad/library";
-    rev = 293;
-    sha256 = "1wn9a4nhqyjzzfkq6xm7ag8n5n10xy7gkq6i7yry7wxini7pzv1i";
-  };
+    (fetchurl {
+      url = "http://downloads.kicad-pcb.org/libraries/kicad-library-${version}.tar.gz";
+      sha256 = "1xk9sxxb3d42chdysqmvizrjcbm0467q7nsq5cahq3j1hci49m6l";
+    })
+
+    (fetchurl {
+      url = "http://downloads.kicad-pcb.org/libraries/kicad-footprints-${version}.tar.gz";
+      sha256 = "0vrzykgxx423iwgz6186bi8724kmbi5wfl92gfwb3r6mqammgwpg";
+    })
+  ];
+  
+  sourceRoot = "kicad-${version}";
+
+  cmakeFlags = ''
+    -DCMAKE_BUILD_TYPE=Release
+    -DKICAD_SKIP_BOOST=ON
+    -DKICAD_BUILD_VERSION=${version}
+    -DKICAD_REPO_NAME=stable
+  '';
 
-  cmakeFlags = "-DKICAD_STABLE_VERSION=ON";
+  enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
+
+  buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo openssl boost pkgconfig doxygen ];
 
   # They say they only support installs to /usr or /usr/local,
   # so we have to handle this.
@@ -23,17 +41,26 @@ stdenv.mkDerivation rec {
     sed -i -e 's,/usr/local/kicad,'$out,g common/gestfich.cpp
   '';
 
-  #enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory
-
-  buildInputs = [ cmake mesa wxGTK zlib libX11 gettext ];
+  postUnpack = ''
+    pushd $(pwd)
+  '';  
 
   postInstall = ''
-    mkdir library
-    cd library
-    cmake -DCMAKE_INSTALL_PREFIX=$out $srcLibrary
+    popd
+
+    pushd kicad-library-*
+    cmake -DCMAKE_INSTALL_PREFIX=$out
+    make $MAKE_FLAGS
     make install
+    popd
+   
+    pushd kicad-footprints-*
+    mkdir -p $out/share/kicad/modules
+    cp -R *.pretty $out/share/kicad/modules/
+    popd
   '';
 
+
   meta = {
     description = "Free Software EDA Suite";
     homepage = "http://www.kicad-pcb.org/";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b09a913f8e7a9..1bd17f8335844 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15730,7 +15730,7 @@ in
   gtkwave = callPackage ../applications/science/electronics/gtkwave { };
 
   kicad = callPackage ../applications/science/electronics/kicad {
-    wxGTK = wxGTK29;
+    wxGTK = wxGTK30;
   };
 
   ngspice = callPackage ../applications/science/electronics/ngspice { };

From 1d09c97ac40dc3c1b780055409d57281c49f234a Mon Sep 17 00:00:00 2001
From: guaraqe <guaraqe@openmailbox.org>
Date: Mon, 21 Mar 2016 00:49:59 +0100
Subject: [PATCH 562/857] grive2: init at 0.5.0

grive2: update 0.5.0

grive2: various cosmetic changes
---
 pkgs/tools/filesystems/grive2/default.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/filesystems/grive2/default.nix

diff --git a/pkgs/tools/filesystems/grive2/default.nix b/pkgs/tools/filesystems/grive2/default.nix
new file mode 100644
index 0000000000000..a3ee1b67bab27
--- /dev/null
+++ b/pkgs/tools/filesystems/grive2/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, pkgconfig, fetchurl, yajl, cmake, libgcrypt, curl, expat, boost, binutils }:
+
+stdenv.mkDerivation rec {
+  version = "0.5.0";
+  name = "grive2-${version}";
+
+  src = fetchFromGitHub {
+    owner = "vitalif";
+    repo = "grive2";
+    rev =  "v${version}";
+    sha256 = "0gyic9228j25l5x8qj9xxxp2cgbw6y4skxqx0xrq6qilhv4lj23c";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ libgcrypt yajl curl expat stdenv boost binutils ];
+
+  meta = with stdenv.lib; {
+    description = "A console Google Drive client";
+    homepage = https://github.com/vitalif/grive2;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9729e2945d313..c3a6890352447 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1867,6 +1867,8 @@ let
     json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable
   };
 
+  grive2 = callPackage ../tools/filesystems/grive2 { };
+
   groff = callPackage ../tools/text/groff {
     ghostscript = null;
   };

From fc1e886f1b97d5eebd267a6bf7af2205a889b381 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 31 Mar 2016 16:05:23 +0200
Subject: [PATCH 563/857] php: 7.0.2 -> 7.0.5 (security)

https://secure.php.net/ChangeLog-7.php#7.0.5
---
 pkgs/development/interpreters/php/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index f15aed484519a..fc8041b597b45 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -298,8 +298,8 @@ in {
   };
 
   php70 = generic {
-    version = "7.0.2";
-    sha256 = "0di2vallv5kry85l67za25nq4f2hjr8fad5j0c06nb69v7xpa6wv";
+    version = "7.0.5";
+    sha256 = "1s8xnnxwq5big2rnbp3w7zw7wh5d5ra9p2q9bxwylds5wrzsy29c";
   };
 
 }

From 0d091ffd4abb6c7f5fea060e41e8b7d91c4a7b8d Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 31 Mar 2016 16:14:54 +0200
Subject: [PATCH 564/857] simplify ISSUE_TEMPLATE

---
 .github/ISSUE_TEMPLATE.md | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 327959fe7a3cc..5d99147051f16 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,17 +1,13 @@
-## Basic info
+## Issue description
 
-To make sure that we are on the same page:
 
-* Kernel: (run `uname -a`)
-* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
-* Nix version: (run `nix-env --version`)
-* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)
 
-## Describe your issue here
+### Steps to reproduce
 
-### Expected result
 
-### Actual result
 
-### Steps to reproduce
+## Technical details
 
+* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
+* Nix version: (run `nix-env --version`)
+* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)

From 011f69992a37982974aabc80186b9d10a2d719af Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 31 Mar 2016 16:22:56 +0200
Subject: [PATCH 565/857] satallax: 1.4 -> 2.7

---
 .../science/logic/satallax/default.nix        | 107 +++++++++---------
 1 file changed, 51 insertions(+), 56 deletions(-)

diff --git a/pkgs/applications/science/logic/satallax/default.nix b/pkgs/applications/science/logic/satallax/default.nix
index 89a214c3f474a..7935be11926da 100644
--- a/pkgs/applications/science/logic/satallax/default.nix
+++ b/pkgs/applications/science/logic/satallax/default.nix
@@ -1,71 +1,66 @@
-x@{builderDefsPackage
-  , sbcl, zlib
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
+{stdenv, fetchurl, ocaml, zlib, which, eprover, makeWrapper, coq}:
+stdenv.mkDerivation rec {
+  name = "satallax-${version}";
+  version = "2.7";
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="satallax";
-    version="1.4";
-    name="${baseName}-${version}";
-    url="http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
-    hash="0l8dq4nyfw2bdsyqmgb4v6fjw3739p8nqv4bh2gh2924ibzrq5fc";
+  buildInputs = [ocaml zlib which eprover makeWrapper coq];
+  src = fetchurl {
+    url = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads/${name}.tar.gz";
+    sha256 = "1kvxn8mc35igk4vigi5cp7w3wpxk2z3bgwllfm4n3h2jfs0vkpib";
   };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
 
-  phaseNames = ["doDeployMinisat" "doDeploy"];
+  preConfigure = ''
+    mkdir fake-tools
+    echo "echo 'Nix-build-host.localdomain'" > fake-tools/hostname
+    chmod a+x fake-tools/hostname
+    export PATH="$PATH:$PWD/fake-tools"
 
-  doDeployMinisat = a.fullDepEntry (''
     (
-      cd minisat/simp
+      cd picosat-*
+      ./configure
+      make
+    )
+    export PATH="$PATH:$PWD/libexec/satallax"
+
+    mkdir -p "$out/libexec/satallax"
+    cp picosat-*/picosat picosat-*/picomus "$out/libexec/satallax"
+
+    ( 
+      cd minisat
+      export MROOT=$PWD
+      cd core
+      make
+      cd ../simp
       make
     )
+  '';
 
-    mkdir -p "$out/bin"
-    cp minisat/simp/minisat "$out/bin"
+  postBuild = "echo testing; ! (bash ./test | grep ERROR)";
 
-    echo "(setq *minisat-binary* \"$out/bin/minisat\")" > config.lisp
+  installPhase = ''
+    mkdir -p "$out/share/doc/satallax" "$out/bin" "$out/lib" "$out/lib/satallax"
+    cp bin/satallax.opt "$out/bin/satallax"
+    wrapProgram "$out/bin/satallax" \
+      --suffix PATH : "${coq}/bin:${eprover}/bin:$out/libexec/satallax" \
+      --add-flags "-M" --add-flags "$out/lib/satallax/modes"
 
-  '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
-  doDeploy = a.fullDepEntry (''
-    mkdir -p "$out/share/satallax/build-dir"
-    cp -r * "$out/share/satallax/build-dir"
-    cd  "$out/share/satallax/build-dir"
+    cp LICENSE README "$out/share/doc/satallax"
 
-    sbcl --load make.lisp
-    ! ( ./test | grep ERROR )
+    cp bin/*.so "$out/lib"
 
-    mkdir -p "$out/bin"
-    cp bin/satallax "$out/bin"
-  '') ["defEnsureDir" "minInit" "addInputs" "doUnpack"];
+    cp -r modes "$out/lib/satallax/"
+    cp -r problems "$out/lib/satallax/"
+    cp -r coq* "$out/lib/satallax/"
+  '';
 
   meta = {
-    description = "A higher-order logic prover";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      unix;
-    license = a.lib.licenses.free;
-    homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/";
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/";
-    };
+    inherit version;
+    description = ''Automated theorem prover for higher-order logic'';
+    license = stdenv.lib.licenses.mit ;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    downloadPage = "http://www.ps.uni-saarland.de/~cebrown/satallax/downloads.php";
+    homepage = "http://www.ps.uni-saarland.de/~cebrown/satallax/index.php";
+    updateWalker = true;
   };
-}) x
+}

From 9c6a69230dff8131130670b46c4590fb30cf6416 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Thu, 31 Mar 2016 16:57:30 +0200
Subject: [PATCH 566/857] zsh: fix configureFlags #14256

commit 97332d3 introduced non expanding $out/etc/zprofile in zshs compiled in PATH.
this commit reverts the change so that $out is expanded at configure time.
---
 pkgs/shells/zsh/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/shells/zsh/default.nix b/pkgs/shells/zsh/default.nix
index d65b7dc80a8b6..fda3e77c61f4c 100644
--- a/pkgs/shells/zsh/default.nix
+++ b/pkgs/shells/zsh/default.nix
@@ -21,13 +21,9 @@ stdenv.mkDerivation {
 
   buildInputs = [ ncurses pcre ];
 
-  configureFlags = [
-    "--enable-maildir-support"
-    "--enable-multibyte"
-    "--enable-zprofile=$out/etc/zprofile"
-    "--with-tcsetpgrp"
-    "--enable-pcre"
-  ];
+  preConfigure = ''
+    configureFlags="--enable-maildir-support --enable-multibyte --enable-zprofile=$out/etc/zprofile --with-tcsetpgrp --enable-pcre"
+  '';
 
   # the zsh/zpty module is not available on hydra
   # so skip groups Y Z

From d6f9e3568307583a2679b212f745691c38d12280 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 31 Mar 2016 17:16:46 +0200
Subject: [PATCH 567/857] gnupg20: 2.0.29 -> 2.0.30

See https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html
---
 pkgs/tools/security/gnupg/20.nix              | 4 ++--
 pkgs/tools/security/gnupg/gpgkey2ssh-20.patch | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/gnupg/20.nix b/pkgs/tools/security/gnupg/20.nix
index 117fc41c1abea..65d43ec9dbeec 100644
--- a/pkgs/tools/security/gnupg/20.nix
+++ b/pkgs/tools/security/gnupg/20.nix
@@ -12,11 +12,11 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.0.29";
+  name = "gnupg-2.0.30";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1jaakn0mi6pi2b3g3imxj3qzxw2zg0ifxs30baq2b157dcw6pvb8";
+    sha256 = "0wax4cy14hh0h7kg9hj0hjn9424b71z8lrrc5kbsasrn9xd7hag3";
   };
 
   buildInputs
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
index b536a4fe50e3a..4bfdc13ef5982 100644
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
+++ b/pkgs/tools/security/gnupg/gpgkey2ssh-20.patch
@@ -2,7 +2,7 @@ diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
 index 903fb5b..d5611dc 100644
 --- a/tools/gpgkey2ssh.c
 +++ b/tools/gpgkey2ssh.c
-@@ -266,7 +266,7 @@ main (int argc, char **argv)
+@@ -268,7 +268,7 @@ main (int argc, char **argv)
    keyid = argv[1];
  
    ret = asprintf (&command,

From 1186bffb7f3ed6f6c24159608cafadba0e04f925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 31 Mar 2016 17:56:24 +0200
Subject: [PATCH 568/857] partimage: fix build with openssl-1.0.2

...by using patch from Arch (taken from Debian).
---
 pkgs/tools/backup/partimage/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/backup/partimage/default.nix b/pkgs/tools/backup/partimage/default.nix
index 009dc90576b38..18e8bb400253d 100644
--- a/pkgs/tools/backup/partimage/default.nix
+++ b/pkgs/tools/backup/partimage/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, bzip2, zlib, newt, openssl, pkgconfig, slang
+{stdenv, fetchurl, fetchpatch, bzip2, zlib, newt, openssl, pkgconfig, slang
 , automake, autoconf, libtool, gettext
 }:
 stdenv.mkDerivation {
@@ -17,6 +17,12 @@ stdenv.mkDerivation {
 
   patches = [
     ./gentoos-zlib.patch
+    (fetchpatch {
+      name = "no-SSLv2.patch";
+      url = "https://projects.archlinux.org/svntogit/community.git/plain/trunk"
+        + "/use-SSLv3-by-default.patch?h=packages/partimage&id=7e95d1c6614e";
+      sha256 = "1zfixa6g1nb1hqfzn2wvyvxsr38gm7908zfml2iaqnwy6iz6jd8v";
+    })
   ];
 
   meta = {

From 9134f9358a934c9ad24d8e8d03d975af2626b114 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 31 Mar 2016 19:50:53 +0300
Subject: [PATCH 569/857] stdenvAdapters.useOldCXXAbi: add new adapter

---
 pkgs/stdenv/adapters.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 836dedf1cb189..8398c45400e48 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -241,4 +241,11 @@ rec {
       then pkgs.allStdenvs.stdenvDarwinNaked
       else pkgs.stdenv;
   };
+
+  /* Modify a stdenv so a build uses pre-C++11 ABI by default. */
+  useOldCXXAbi = stdenv: stdenv //
+    { mkDerivation = args: stdenv.mkDerivation (args // {
+        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -D_GLIBCXX_USE_CXX11_ABI=0";
+      });
+    };
 }

From 9b7edbeb2f4e3494b3c466b5ed97652348b22b2f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 31 Mar 2016 19:51:15 +0300
Subject: [PATCH 570/857] primus: propagate stdenv to primusLibs

---
 pkgs/tools/X11/primus/default.nix | 9 +++++++--
 pkgs/top-level/all-packages.nix   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix
index f0a971dde18f6..88589a0587836 100644
--- a/pkgs/tools/X11/primus/default.nix
+++ b/pkgs/tools/X11/primus/default.nix
@@ -4,6 +4,7 @@
 # same LD_LIBRARY_PATH.
 # Other distributions do the same.
 { stdenv
+, stdenv_i686
 , primusLib
 , writeScriptBin
 , primusLib_i686 ? null
@@ -11,8 +12,12 @@
 }:
 
 let
-  primus = if useNvidia then primusLib else primusLib.override { nvidia_x11 = null; };
-  primus_i686 = if useNvidia then primusLib_i686 else primusLib_i686.override { nvidia_x11 = null; };
+  # We override stdenv in case we need different ABI for libGL
+  primusLib_ = primusLib.override { inherit stdenv; };
+  primusLib_i686_ = primusLib_i686.override { stdenv = stdenv_i686; };
+
+  primus = if useNvidia then primusLib_ else primusLib_.override { nvidia_x11 = null; };
+  primus_i686 = if useNvidia then primusLib_i686_ else primusLib_i686_.override { nvidia_x11 = null; };
   ldPath = stdenv.lib.makeLibraryPath ([primus] ++ stdenv.lib.optional (primusLib_i686 != null) primus_i686);
 
 in writeScriptBin "primusrun" ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc8896d4c4575..b85650072b8cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14082,6 +14082,7 @@ in
   };
 
   primus = callPackage ../tools/X11/primus {
+    stdenv_i686 = pkgsi686Linux.stdenv;
     primusLib_i686 = if system == "x86_64-linux"
       then pkgsi686Linux.primusLib
       else null;

From 0276a8b2d2fbb3b69b320530cbe4a5379751bec5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 31 Mar 2016 19:51:52 +0300
Subject: [PATCH 571/857] steam: use old C++ ABI for primus

---
 pkgs/games/steam/chrootenv.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index e6652d2f02399..35b3611812b53 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -24,7 +24,10 @@ buildFHSUserEnv {
       perl
     ]
     ++ lib.optional withJava jdk
-    ++ lib.optional withPrimus primus
+    ++ lib.optional withPrimus (primus.override {
+      stdenv = useOldCXXAbi stdenv;
+      stdenv_i686 = useOldCXXAbi pkgsi686Linux.stdenv;
+    })
     ;
 
   multiPkgs = pkgs: with pkgs; [

From 0689ff157484409ee11d0b7481b1e14623f4bdda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 31 Mar 2016 18:59:36 +0200
Subject: [PATCH 572/857] gnucash-2.6: hack around test failures

They were most likely triggered by #909.
Tested only against 16.03 due to webkitgtk problems on master.
---
 pkgs/applications/office/gnucash/2.6.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index 3c2348bfa8b7c..844ef92770891 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -2,6 +2,7 @@
 , intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
 , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
 , gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
+, pango, gdk_pixbuf
 }:
 
 /*
@@ -78,7 +79,7 @@ stdenv.mkDerivation rec {
   '';
 
   # The following settings fix failures in the test suite. It's not required otherwise.
-  NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib}/lib";
+  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk pango gdk_pixbuf ];
   preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
   doCheck = true;
 

From d58302d5bb9fbb7078464aa48c75c6e44613e4dc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 17:05:06 +0200
Subject: [PATCH 573/857] pythonPackages.numpy: 1.10 -> 1.11 and use current
 openblas

That is, openblas 0.2.17.
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d99977c54b5db..2b4eca5cf4495 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13214,10 +13214,10 @@ in modules // {
 
   buildNumpyPackage = callPackage ../development/python-modules/numpy.nix {
     gfortran = pkgs.gfortran;
-    blas = pkgs.openblasCompat_2_14;
+    blas = pkgs.openblasCompat;
   };
 
-  numpy = self.numpy_1_10;
+  numpy = self.numpy_1_11;
 
   numpy_1_10 = self.buildNumpyPackage rec {
     version = "1.10.4";

From a4098c1133ebafd61752367a31904be8fb449c2a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 17:06:17 +0200
Subject: [PATCH 574/857] pythonPackages.pandas_17: remove it

---
 pkgs/top-level/python-packages.nix | 73 ------------------------------
 1 file changed, 73 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2b4eca5cf4495..ce1a97dfc9bcc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14913,79 +14913,6 @@ in modules // {
 
   pandas = self.pandas_18;
 
-  pandas_17 = let
-    inherit (pkgs.stdenv.lib) optional optionalString;
-    inherit (pkgs.stdenv) isDarwin;
-  in buildPythonPackage rec {
-    name = "pandas-${version}";
-    version = "0.17.1";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/p/pandas/${name}.tar.gz";
-      sha256 = "cfd7214a7223703fe6999fbe34837749540efee1c985e6aee9933f30e3f72837";
-    };
-
-    buildInputs = with self; [ nose ] ++ optional isDarwin pkgs.libcxx;
-    propagatedBuildInputs = with self; [
-      dateutil
-      scipy_0_17
-      numexpr
-      pytz
-      xlrd
-      bottleneck
-      sqlalchemy
-      lxml
-      html5lib
-      modules.sqlite3
-      beautifulsoup4
-    ] ++ optional isDarwin pkgs.darwin.locale; # provides the locale command
-
-    # For OSX, we need to add a dependency on libcxx, which provides
-    # `complex.h` and other libraries that pandas depends on to build.
-    patchPhase = optionalString isDarwin ''
-      cpp_sdk="${pkgs.libcxx}/include/c++/v1";
-      echo "Adding $cpp_sdk to the setup.py common_include variable"
-      substituteInPlace setup.py \
-        --replace "['pandas/src/klib', 'pandas/src']" \
-                  "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
-
-      # disable clipboard tests since pbcopy/pbpaste are not open source
-      substituteInPlace pandas/io/tests/test_clipboard.py \
-        --replace pandas.util.clipboard no_such_module \
-        --replace OSError ImportError
-    '';
-
-    # The flag `-A 'not network'` will disable tests that use internet.
-    # The `-e` flag disables a few problematic tests.
-    # https://github.com/pydata/pandas/issues/11169
-    # https://github.com/pydata/pandas/issues/11287
-    # The test_sql checks fail specifically on python 3.5; see here:
-    # https://github.com/pydata/pandas/issues/11112
-    checkPhase = let
-      testsToSkip = ["test_data" "test_excel" "test_html" "test_json"
-                     "test_frequencies" "test_frame"
-                     "test_read_clipboard_infer_excel"
-                     "test_interp_alt_scipy" "test_nanops" "test_stats"] ++
-                    optional isPy35 "test_sql";
-    in ''
-      runHook preCheck
-      # The flag `-A 'not network'` will disable tests that use internet.
-      # The `-e` flag disables a few problematic tests.
-      ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \
-        -e '${concatStringsSep "|" testsToSkip}' --verbosity=3
-
-      runHook postCheck
-    '';
-
-    meta = {
-      homepage = "http://pandas.pydata.org/";
-      description = "Python Data Analysis Library";
-      license = licenses.bsd3;
-      maintainers = with maintainers; [ raskin fridh ];
-      platforms = platforms.unix;
-    };
-  };
-
   pandas_18 = let
     inherit (pkgs.stdenv.lib) optional optionalString;
     inherit (pkgs.stdenv) isDarwin;

From 4bd01c5cbd5bbc91050cc9ded817fbd94a5b82f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 17:07:47 +0200
Subject: [PATCH 575/857] openblas_2_14: remove

because we don't need it for numpy anymore.
---
 .../science/math/openblas/0.2.14.nix          | 65 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 67 deletions(-)
 delete mode 100644 pkgs/development/libraries/science/math/openblas/0.2.14.nix

diff --git a/pkgs/development/libraries/science/math/openblas/0.2.14.nix b/pkgs/development/libraries/science/math/openblas/0.2.14.nix
deleted file mode 100644
index 2fac8a4db08b8..0000000000000
--- a/pkgs/development/libraries/science/math/openblas/0.2.14.nix
+++ /dev/null
@@ -1,65 +0,0 @@
-{ stdenv, fetchurl, gfortran, perl, which, 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 blas64_ = blas64; in
-
-let local = config.openblas.preferLocalBuild or false;
-    binary =
-      { i686-linux = "32";
-        x86_64-linux = "64";
-        x86_64-darwin = "64";
-      }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
-    genericFlags =
-      [ "DYNAMIC_ARCH=1"
-        "NUM_THREADS=64"
-      ];
-    localFlags = config.openblas.flags or
-      optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
-    blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system;
-
-    version = "0.2.14";
-in
-stdenv.mkDerivation {
-  name = "openblas-${version}";
-  src = fetchurl {
-    url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
-    sha256 = "2411c4f56f477b42dff54db2b7ffc0b7cf53bb9778d54982595c64cc69c40fc1";
-    name = "openblas-${version}.tar.gz";
-  };
-
-  inherit blas64;
-
-  nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which];
-
-  makeFlags =
-    (if local then localFlags else genericFlags)
-    ++
-    optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"]
-    ++
-    [
-      "FC=gfortran"
-      # 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)"''
-      "BINARY=${binary}"
-      "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
-      "INTERFACE64=${if blas64 then "1" else "0"}"
-    ];
-
-  doCheck = true;
-  checkTarget = "tests";
-
-  meta = with stdenv.lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.bsd3;
-    homepage = "https://github.com/xianyi/OpenBLAS";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b85650072b8cb..9148bef349e6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15483,12 +15483,10 @@ in
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
   openblas = callPackage ../development/libraries/science/math/openblas { };
-  openblas_2_14 = callPackage ../development/libraries/science/math/openblas/0.2.14.nix { };
 
   # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
   # standard BLAS and LAPACK.
   openblasCompat = openblas.override { blas64 = false; };
-  openblasCompat_2_14 = openblas_2_14.override { blas64 = false; };
 
   openlibm = callPackage ../development/libraries/science/math/openlibm {};
 

From c39a73b2a21986248514b4e07ff1afd63b32dc54 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 17:50:49 +0200
Subject: [PATCH 576/857] pythonPackages.pyusb: 1.0.0b2 -> 1.0.0rc1

---
 pkgs/top-level/python-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ce1a97dfc9bcc..d8e59870254b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23901,11 +23901,11 @@ in modules // {
 
 
   pyusb = buildPythonPackage rec {
-    name = "pyusb-1.0.0b2";
+    name = "pyusb-1.0.0rc1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pyusb/${name}.tar.gz";
-      sha256 = "14ec66077bdcd6f1aa9e892a0a35a54bb3c1ec56aa740ead64349c18f0186d19";
+      sha256 = "07cjq11qhngzjd746k7688s6y2x7lpj669fxqfsiy985rg0jsn7j";
     };
 
     # Fix the USB backend library lookup
@@ -23915,6 +23915,9 @@ in modules // {
       sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py
     '';
 
+    # No tests included
+    doCheck = false;
+
     meta = {
       description = "Python USB access module (wraps libusb 1.0)";  # can use other backends
       homepage = http://pyusb.sourceforge.net/;

From 423d3e424483305a3eb8ae661de69f8b9f1c4648 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 17:52:19 +0200
Subject: [PATCH 577/857] pythonPackages.BlinkStick: broken

---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d8e59870254b6..a84e05bbf99d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23936,6 +23936,10 @@ in modules // {
       sha256 = "3edf4b83a3fa1a7bd953b452b76542d54285ff6f1145b6e19f9b5438120fa408";
     };
 
+    # Requires pyusb 1.0.0b1.
+    # Likely current pyusb will work but we need to patch the hard requirement then.
+    broken = true;
+
     propagatedBuildInputs = with self; [ pyusb ];
 
     meta = {

From 7c92e0a40ffcdf30f13b27c6a6a6b8ed17d569e8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 17:56:14 +0200
Subject: [PATCH 578/857] pythonPackages.pid: fix build

---
 pkgs/top-level/python-packages.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a84e05bbf99d9..92d59ffbdc23c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20042,6 +20042,11 @@ in modules // {
       sha256 = "0cylj8p25nwkdfgy4pzai21wyzmrxdqlwwbzqag9gb5qcjfdwk05";
     };
 
+    buildInputs = with self; [ nose ];
+
+    # No tests included
+    doCheck = false;
+
     meta = {
       description = "Pidfile featuring stale detection and file-locking";
       homepage = https://github.com/trbs/pid/;

From aaad88eccc11395a56e69b5b4e923519e1a74a52 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 17:58:33 +0200
Subject: [PATCH 579/857] pythonPackages.dns: disable py3k

---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 92d59ffbdc23c..f0fffd55d053b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4909,6 +4909,10 @@ in modules // {
       sha256 = "0kvjlkp96qzh3j31szpjlzqbp02brixh4j4clnpw80b0hspq5yq3";
     };
 
+    # Not supported.
+    # See instead https://pypi.python.org/pypi/dnspython3/1.12.0
+    disabled = isPy3k;
+
     meta = {
       description = "A DNS toolkit for Python 3.x";
       homepage = http://www.dnspython.org;

From da27cb67d67d94d6fd5289e92c4321e2b87ddb32 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 18:02:15 +0200
Subject: [PATCH 580/857] pythonPackages.batinfo: 0.2 -> 0.3

---
 pkgs/top-level/python-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0fffd55d053b..92a838b681ce4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1572,14 +1572,17 @@ in modules // {
   };
 
   batinfo = buildPythonPackage rec {
-    version = "0.2";
+    version = "0.3";
     name = "batinfo-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/batinfo/${name}.tar.gz";
-      sha256 = "1kmrdr1c2ivpqgp2csln7vbanga3sh3nvaqmgbsg96z6fbg7f7w8";
+      sha256 = "0gyzkxzvj5l6qrw706bnm3cckqzzzbrjr7jkxc087d7775a73499";
     };
 
+    # No tests included
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/nicolargo/batinfo;
       description = "A simple Python lib to retrieve battery information";

From 300744cc70931b38685f23c12a1e9e92c9fa130d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 18:04:07 +0200
Subject: [PATCH 581/857] pythonPackages.colorlog: 2.6.0 -> 2.6.1

---
 pkgs/top-level/python-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 92a838b681ce4..063f8f110fcb3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1882,13 +1882,16 @@ in modules // {
 
   colorlog = buildPythonPackage rec {
     name = "colorlog-${version}";
-    version = "2.6.0";
+    version = "2.6.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/colorlog/${name}.tar.gz";
-      sha256 = "1s8z9zr4r18igr4rri71nba01arnpppifrkaxhi2xb51500sw0qg";
+      sha256 = "0djv6ky1yk28s1l093w8plg19kp88q4nyrm1vfxyq0s9j4pix29l";
     };
 
+    # No tests included
+    doCheck = false;
+
     meta = {
       description = "Log formatting with colors";
       homepage = https://github.com/borntyping/python-colorlog;

From bdff6bb3f1de6a51310362513ae61c63fcc107d4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 18:07:29 +0200
Subject: [PATCH 582/857] pythonPackages.dot2tex: disabled for py3k

---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 063f8f110fcb3..1ec3b04a804df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25613,6 +25613,9 @@ in modules // {
       sha256 = "7d3e54add7dccdaeb6cc9e61ceaf7b587914cf8ebd6821cfea008acdc1e50d4a";
     };
 
+    # Tests fail with 3.x. Furthermore, package is no longer maintained.
+    disabled = isPy3k;
+
     propagatedBuildInputs = with self; [
       pyparsing
     ];

From 9f34475f933fb9bd35b45d9ab08d202c819c61c0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 18:15:37 +0200
Subject: [PATCH 583/857] pythonPackages.signal: 0.9.2 -> 1.0.1

---
 pkgs/top-level/python-packages.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ec3b04a804df..f44fad4522b20 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19746,14 +19746,19 @@ in modules // {
   };
 
   sigal = buildPythonPackage rec {
-    name = "sigal-0.9.2";
+    name = "sigal-1.0.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz";
-      sha256 = "0mk3bzaxn9snx9lc0pj9zvgdgdyhkza6b8z5x91772mlv84sfw6c";
+      sha256 = "198g2r8bii6a0p44mlk1wg07jjv95xpfvnqhhxxziqpizc776b34";
     };
 
-    propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click pytest blinker ];
+    buildInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [ jinja2 markdown pillow pilkit clint click blinker ];
+
+    # No tests included
+    doCheck = false;
+
 
     meta = {
       description = "Yet another simple static gallery generator";

From c350b6acc69aa5d9b8d25ce3faec905141b3589f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 18:38:08 +0200
Subject: [PATCH 584/857] pythonPackages.nibabel: 2.0.1 -> 2.0.2

---
 pkgs/top-level/python-packages.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f44fad4522b20..f91705ee274c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12801,12 +12801,12 @@ in modules // {
   });
 
   nibabel = buildPythonPackage rec {
-    version = "2.0.1";
+    version = "2.0.2";
     name = "nibabel-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/n/nibabel/${name}.tar.gz";
-      sha256 = "e559bcb40ae395c7f75c51079f815a13a94cd8a035a47315fc9fba0d2ae2ecaf";
+      sha256 = "0k8mv5zmwb6vc8kwrydl3pp0pnw937rf5mz10figkxczrw6dkk7h";
     };
 
     propagatedBuildInputs = with self; [
@@ -12815,17 +12815,10 @@ in modules // {
       modules.sqlite3
     ];
 
-    preCheck = ''
-      # Test does not work on Py3k because it calls 'python'.
-      # https://github.com/nipy/nibabel/issues/341
-      rm nisext/tests/test_testers.py
-      # Test fails with numpy 1.10.1: ERROR: nibabel.tests.test_proxy_api.TestPARRECAPI.test_proxy_slicing
-      # See https://github.com/nipy/nibabel/pull/358
-      # and https://github.com/numpy/numpy/issues/6491
-      rm nibabel/tests/test_proxy_api.py
-      # https://github.com/nipy/nibabel/issues/366
-      rm nisext/tests/test_doctest_markup.py
-    '';
+    # Failing tests
+    # nibabel.tests.test_minc1.test_old_namespace
+    # nisext.tests.test_testers.test_back_tick
+    doCheck = false;
 
     meta = {
       homepage = http://nipy.org/nibabel/;

From 7332740e206ddd24c8ac978d6692adfd81426e31 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 18:41:37 +0200
Subject: [PATCH 585/857] pythonPackages.llfuse: fix build

---
 pkgs/top-level/python-packages.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f91705ee274c0..3274c8f6cf5d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11302,7 +11302,16 @@ in modules // {
       sha256 = "1li7q04ljrvwharw4fblcbfhvk6s0l3lnv8yqb4c22lcgbkiqlps";
     };
 
-    buildInputs = [ pkgs.pkgconfig pkgs.fuse pkgs.attr ];
+    buildInputs = with self; [ pytest pkgs.pkgconfig pkgs.fuse pkgs.attr pkgs.which ];
+
+    propagatedBuildInputs = with self; [ contextlib2 ];
+
+    checkPhase = ''
+      py.test
+    '';
+
+    # FileNotFoundError: [Errno 2] No such file or directory: '/usr/bin'
+    doCheck = false;
 
     meta = {
       description = "Python bindings for the low-level FUSE API";

From a9b80ad72ffadf4158e8d7147b3c2d5d87efb40d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 18:52:51 +0200
Subject: [PATCH 586/857] pythonPackages.pyPdf: disabled py3k

---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3274c8f6cf5d0..ed7bc8ca82558 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17736,6 +17736,9 @@ in modules // {
 
     buildInputs = with self; [ ];
 
+    # Not supported. Package is no longer maintained.
+    disabled = isPy3k;
+
     meta = {
       description = "Pure-Python PDF toolkit";
       homepage = "http://pybrary.net/pyPdf/";

From 8886e0ffa0c6cd17632feb8e33b103de2dff3574 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 31 Mar 2016 20:50:28 +0200
Subject: [PATCH 587/857] pythonPackages.pandas: fix tests

---
 pkgs/top-level/python-packages.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ed7bc8ca82558..44f62fd6150f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14973,18 +14973,17 @@ in modules // {
 
     # The flag `-A 'not network'` will disable tests that use internet.
     # The `-e` flag disables a few problematic tests.
-    # https://github.com/pydata/pandas/issues/11169
-    # https://github.com/pydata/pandas/issues/11287
-    # The test_sql checks fail specifically on python 3.5; see here:
-    # https://github.com/pydata/pandas/issues/11112
+
+    # Disable two tests that are broken since numpy 1.11. Fixed upstream.
+
     checkPhase = let
-      testsToSkip = [];
+      testsToSkip = [ "test_range_slice_day" "test_range_slice_seconds" ];
     in ''
       runHook preCheck
       # The flag `-A 'not network'` will disable tests that use internet.
       # The `-e` flag disables a few problematic tests.
-      ${python.executable} setup.py nosetests -A 'not slow and not network' \
-         --verbosity=3
+      ${python.executable} setup.py nosetests -A 'not slow and not network' --stop \
+        -e '${concatStringsSep "|" testsToSkip}' --verbosity=3
 
       runHook postCheck
     '';

From 29f5b917eabc73b395aa2d0f8b75c16b698f453c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 31 Mar 2016 22:06:12 +0200
Subject: [PATCH 588/857] i2pd: 2.5.1 -> 2.6.0

---
 pkgs/tools/networking/i2pd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 454d3b418187d..3fd4e37c90808 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -4,13 +4,13 @@ stdenv.mkDerivation rec {
 
   name = pname + "-" + version;
   pname = "i2pd";
-  version = "2.5.1";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "17qf2pbxf05iw2gzyc5bc2zg3a4ns6zf1pm8q9j7nqhchh1rv4cm";
+    sha256 = "0siqg2gf1w85c3j7w6bzjyyjzlxr8z57jk0675gn8yz0xvpkrdys";
   };
 
   buildInputs = [ boost zlib openssl ];

From e3e563330798723a8991f0d7011e5c1b74a36e5d Mon Sep 17 00:00:00 2001
From: Corbin <cds@corbinsimpson.com>
Date: Tue, 22 Mar 2016 23:40:35 -0700
Subject: [PATCH 589/857] services: Add Tahoe-LAFS service.

Including systemd configuration and much of the standard storage node and
introducer configuration.
---
 nixos/modules/module-list.nix                 |   1 +
 .../services/network-filesystems/tahoe.nix    | 286 ++++++++++++++++++
 2 files changed, 287 insertions(+)
 create mode 100644 nixos/modules/services/network-filesystems/tahoe.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9462d72996fc8..2df612c4f0e1b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -283,6 +283,7 @@
   ./services/network-filesystems/openafs-client/default.nix
   ./services/network-filesystems/rsyncd.nix
   ./services/network-filesystems/samba.nix
+  ./services/network-filesystems/tahoe.nix
   ./services/network-filesystems/diod.nix
   ./services/network-filesystems/u9fs.nix
   ./services/network-filesystems/yandex-disk.nix
diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix
new file mode 100644
index 0000000000000..ab441339a560f
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/tahoe.nix
@@ -0,0 +1,286 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+let
+  cfg = config.services.tahoe;
+in
+  {
+    options.services.tahoe = {
+      introducers = mkOption {
+        default = {};
+        type = types.loaOf types.optionSet;
+        description = ''
+          The Tahoe introducers.
+        '';
+        options = {
+          nickname = mkOption {
+            type = types.str;
+            description = ''
+              The nickname of this Tahoe introducer.
+            '';
+          };
+          tub.port = mkOption {
+            default = 3458;
+            type = types.int;
+            description = ''
+              The port on which the introducer will listen.
+            '';
+          };
+          package = mkOption {
+            default = pkgs.tahoelafs;
+            defaultText = "pkgs.tahoelafs";
+            type = types.package;
+            example = literalExample "pkgs.tahoelafs";
+            description = ''
+              The package to use for the Tahoe LAFS daemon.
+            '';
+          };
+        };
+      };
+      nodes = mkOption {
+        default = {};
+        type = types.loaOf types.optionSet;
+        description = ''
+          The Tahoe nodes.
+        '';
+        options = {
+          nickname = mkOption {
+            type = types.str;
+            description = ''
+              The nickname of this Tahoe node.
+            '';
+          };
+          tub.port = mkOption {
+            default = 3457;
+            type = types.int;
+            description = ''
+              The port on which the tub will listen.
+
+              This is the correct setting to tweak if you want Tahoe's storage
+              system to listen on a different port.
+            '';
+          };
+          web.port = mkOption {
+            default = 3456;
+            type = types.int;
+            description = ''
+              The port on which the Web server will listen.
+
+              This is the correct setting to tweak if you want Tahoe's WUI to
+              listen on a different port.
+            '';
+          };
+          client.introducer = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            description = ''
+              The furl for a Tahoe introducer node.
+
+              Like all furls, keep this safe and don't share it.
+            '';
+          };
+          client.helper = mkOption {
+            default = null;
+            type = types.nullOr types.str;
+            description = ''
+              The furl for a Tahoe helper node.
+
+              Like all furls, keep this safe and don't share it.
+            '';
+          };
+          client.shares.needed = mkOption {
+            default = 3;
+            type = types.int;
+            description = ''
+              The number of shares required to reconstitute a file.
+            '';
+          };
+          client.shares.happy = mkOption {
+            default = 7;
+            type = types.int;
+            description = ''
+              The number of distinct storage nodes required to store
+              a file.
+            '';
+          };
+          client.shares.total = mkOption {
+            default = 10;
+            type = types.int;
+            description = ''
+              The number of shares required to store a file.
+            '';
+          };
+          storage.enable = mkEnableOption "storage service";
+          storage.reservedSpace = mkOption {
+            default = "1G";
+            type = types.str;
+            description = ''
+              The amount of filesystem space to not use for storage.
+            '';
+          };
+          helper.enable = mkEnableOption "helper service";
+          package = mkOption {
+            default = pkgs.tahoelafs;
+            defaultText = "pkgs.tahoelafs";
+            type = types.package;
+            example = literalExample "pkgs.tahoelafs";
+            description = ''
+              The package to use for the Tahoe LAFS daemon.
+            '';
+          };
+        };
+      };
+    };
+    config = mkMerge [
+      (mkIf (cfg.introducers != {}) {
+        environment = {
+          etc = flip mapAttrs' cfg.introducers (node: settings:
+            nameValuePair "tahoe-lafs/introducer-${node}.cfg" {
+              mode = "0444";
+              text = ''
+                # This configuration is generated by Nix. Edit at your own
+                # peril; here be dragons.
+
+                [node]
+                nickname = ${settings.nickname}
+                tub.port = ${toString settings.tub.port}
+              '';
+            });
+          # Actually require Tahoe, so that we will have it installed.
+          systemPackages = flip mapAttrsToList cfg.introducers (node: settings:
+            settings.package
+          );
+        };
+        # Open up the firewall.
+        # networking.firewall.allowedTCPPorts = flip mapAttrsToList cfg.introducers
+        #   (node: settings: settings.tub.port);
+        systemd.services = flip mapAttrs' cfg.introducers (node: settings:
+          let
+            pidfile = "/run/tahoe.introducer-${node}.pid";
+            # This is a directory, but it has no trailing slash. Tahoe commands
+            # get antsy when there's a trailing slash.
+            nodedir = "/var/db/tahoe-lafs/introducer-${node}";
+          in nameValuePair "tahoe.introducer-${node}" {
+            description = "Tahoe LAFS node ${node}";
+            wantedBy = [ "multi-user.target" ];
+            path = [ settings.package ];
+            restartTriggers = [
+              config.environment.etc."tahoe-lafs/introducer-${node}.cfg".source ];
+            serviceConfig = {
+              Type = "simple";
+              PIDFile = pidfile;
+            };
+            preStart = ''
+              if [ \! -d ${nodedir} ]; then
+                mkdir -p /var/db/tahoe-lafs
+                tahoe create-introducer ${nodedir}
+              fi
+
+              # Tahoe has created a predefined tahoe.cfg which we must now
+              # scribble over.
+              # XXX I thought that a symlink would work here, but it doesn't, so
+              # we must do this on every prestart. Fixes welcome.
+              # rm ${nodedir}/tahoe.cfg
+              # ln -s /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
+              cp /etc/tahoe-lafs/introducer-${node}.cfg ${nodedir}/tahoe.cfg
+            '';
+            # Believe it or not, Tahoe is very brittle about the order of
+            # arguments to $(tahoe start). The node directory must come first,
+            # and arguments which alter Twisted's behavior come afterwards.
+            script = ''
+              tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+            '';
+          });
+        users.extraUsers = flip mapAttrs' cfg.introducers (node: _:
+          nameValuePair "tahoe.introducer-${node}" {
+            description = "Tahoe node user for introducer ${node}";
+            isSystemUser = true;
+          });
+      })
+      (mkIf (cfg.nodes != {}) {
+        environment = {
+          etc = flip mapAttrs' cfg.nodes (node: settings:
+            nameValuePair "tahoe-lafs/${node}.cfg" {
+              mode = "0444";
+              text = ''
+                # This configuration is generated by Nix. Edit at your own
+                # peril; here be dragons.
+
+                [node]
+                nickname = ${settings.nickname}
+                tub.port = ${toString settings.tub.port}
+                # This is a Twisted endpoint. Twisted Web doesn't work on
+                # non-TCP. ~ C.
+                web.port = tcp:${toString settings.web.port}
+
+                [client]
+                ${optionalString (settings.client.introducer != null)
+                  "introducer.furl = ${settings.client.introducer}"}
+                ${optionalString (settings.client.helper != null)
+                  "helper.furl = ${settings.client.helper}"}
+
+                shares.needed = ${toString settings.client.shares.needed}
+                shares.happy = ${toString settings.client.shares.happy}
+                shares.total = ${toString settings.client.shares.total}
+
+                [storage]
+                enabled = ${if settings.storage.enable then "true" else "false"}
+                reserved_space = ${settings.storage.reservedSpace}
+
+                [helper]
+                enabled = ${if settings.helper.enable then "true" else "false"}
+              '';
+            });
+          # Actually require Tahoe, so that we will have it installed.
+          systemPackages = flip mapAttrsToList cfg.nodes (node: settings:
+            settings.package
+          );
+        };
+        # Open up the firewall.
+        # networking.firewall.allowedTCPPorts = flip mapAttrsToList cfg.nodes
+        #   (node: settings: settings.tub.port);
+        systemd.services = flip mapAttrs' cfg.nodes (node: settings:
+          let
+            pidfile = "/run/tahoe.${node}.pid";
+            # This is a directory, but it has no trailing slash. Tahoe commands
+            # get antsy when there's a trailing slash.
+            nodedir = "/var/db/tahoe-lafs/${node}";
+          in nameValuePair "tahoe.${node}" {
+            description = "Tahoe LAFS node ${node}";
+            wantedBy = [ "multi-user.target" ];
+            path = [ settings.package ];
+            restartTriggers = [
+              config.environment.etc."tahoe-lafs/${node}.cfg".source ];
+            serviceConfig = {
+              Type = "simple";
+              PIDFile = pidfile;
+            };
+            preStart = ''
+              if [ \! -d ${nodedir} ]; then
+                mkdir -p /var/db/tahoe-lafs
+                tahoe create-node ${nodedir}
+              fi
+
+              # Tahoe has created a predefined tahoe.cfg which we must now
+              # scribble over.
+              # XXX I thought that a symlink would work here, but it doesn't, so
+              # we must do this on every prestart. Fixes welcome.
+              # rm ${nodedir}/tahoe.cfg
+              # ln -s /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
+              cp /etc/tahoe-lafs/${node}.cfg ${nodedir}/tahoe.cfg
+            '';
+            # Believe it or not, Tahoe is very brittle about the order of
+            # arguments to $(tahoe start). The node directory must come first,
+            # and arguments which alter Twisted's behavior come afterwards.
+            script = ''
+              tahoe start ${nodedir} -n -l- --pidfile=${pidfile}
+            '';
+          });
+        users.extraUsers = flip mapAttrs' cfg.nodes (node: _:
+          nameValuePair "tahoe.${node}" {
+            description = "Tahoe node user for node ${node}";
+            isSystemUser = true;
+          });
+      })
+    ];
+  }

From aff6c3b77d4804d386180578a8b6442b16759d94 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 30 Mar 2016 19:30:09 -0400
Subject: [PATCH 590/857] pydot_ng: init at 1.0.0

---
 pkgs/top-level/python-packages.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 763e1aa15ff21..437122057785c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16721,6 +16721,30 @@ in modules // {
     };
   };
 
+  pydot_ng = buildPythonPackage rec {
+    name = "pydot_ng-1.0.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pydot-ng/${name}.tar.gz";
+      sha256 = "0h8k8wlzvnb40v4js7afgfyhp3wasmb1kg4gr6z7ck63iv8fq864";
+    };
+
+    buildInputs = [ self.pytest self.unittest2 ];
+    propagatedBuildInputs = [ pkgs.graphviz self.pyparsing ];
+
+    checkPhase = ''
+      mkdir test/my_tests
+      py.test test
+    '';
+
+    meta = {
+      homepage = "https://pypi.python.org/pypi/pydot-ng";
+      description = "Python 3-compatible update of pydot, a Python interface to Graphviz's Dot";
+      license = licenses.mit;
+      maintainers = [ maintainers.bcdarwin ];
+    };
+  };
+
   pyelasticsearch = buildPythonPackage (rec {
     name = "pyelasticsearch-1.4";
 

From 33f345eed0f4956971bf2f7945155839d1b6222b Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Thu, 31 Mar 2016 23:36:50 +0100
Subject: [PATCH 591/857] {lib}mediainfo{-gui}: 0.7.83 -> 0.7.84

Built and tested locally.

From the changelog:
```
Version 0.7.84, 2016-03-31
x #I122, MPEG-4/MOV: Crash if mdhd timescale is 0
x MPEG-4/MOV: Infinite loop if malformed stsc / stsz (detected by
  fuzzing)
x MPEG-TS: some DVB Subtitles were not detected
x HLS: better handling of media playlists having EXT-X-BYTERANGE
```
---
 pkgs/applications/misc/mediainfo-gui/default.nix    | 4 ++--
 pkgs/applications/misc/mediainfo/default.nix        | 4 ++--
 pkgs/development/libraries/libmediainfo/default.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix
index 83130164fd995..a136497de8909 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -2,11 +2,11 @@
 , desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.83";
+  version = "0.7.84";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7";
+    sha256 = "0w3hm34amfy5bq3n1jihbwqvwqn0f8kvvq3lfc8nfwf8v7mjn7q9";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index cf1a4ce82800a..6f4c014fb23a0 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.83";
+  version = "0.7.84";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0d8mph9lbg2lw0ccg1la0kqhbisra8q9rzn195lncch5cia5zyg7";
+    sha256 = "0w3hm34amfy5bq3n1jihbwqvwqn0f8kvvq3lfc8nfwf8v7mjn7q9";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index b3d76b1c931fb..8b8bf61a99b71 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.83";
+  version = "0.7.84";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0kl5x07j3jp5mnmhpjvdq0a2nnlgvqnhwar0xalvg3b3msdf8417";
+    sha256 = "0k657ynfxcw6lvakc8plz0pzfixlqbsiih2idimk9k1dd4xzhq3d";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 55a86b799ece27e044afb031057260b86f09d7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 31 Mar 2016 23:46:54 +0100
Subject: [PATCH 592/857] nixos-generate-config.pl: correct path for
 broadcom-43xx
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit b01eedaeecd4bd292fd9a22225c9490a285e3b77)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 nixos/modules/installer/tools/nixos-generate-config.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index ec880e0847263..d3005cdfd6f79 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -165,7 +165,7 @@ sub pciCheck {
         ) )
     {
         # we need e.g. brcmfmac43602-pcie.bin
-        push @imports, "<nixos/modules/hardware/network/broadcom-43xx.nix>";
+        push @imports, "<nixpkgs/nixos/modules/hardware/network/broadcom-43xx.nix>";
     }
 
     # Can't rely on $module here, since the module may not be loaded

From b357ee9a6f37c95ddb4299ab61ed9dadf3dac8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 31 Mar 2016 23:00:24 +0100
Subject: [PATCH 593/857] changelog: add all new NixOS modules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit d231868990f8b2d471648d76f07e747f396b9421)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 nixos/doc/manual/release-notes/rl-1603.xml | 51 +++++++++++++++++++++-
 1 file changed, 49 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 8119470385f61..eb67d1e565e7c 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -58,10 +58,57 @@ has the following highlights:</para>
 
   <itemizedlist>
     <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
+    <listitem><para><literal>hardware/video/webcam/facetimehd.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/inputMethod/fcitx.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/inputMethod/ibus.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/inputMethod/nabi.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/inputMethod/uim.nix</literal></para></listitem>
+    <listitem><para><literal>programs/fish.nix</literal></para></listitem>
+    <listitem><para><literal>security/acme.nix</literal></para></listitem>
+    <listitem><para><literal>security/audit.nix</literal></para></listitem>
+    <listitem><para><literal>security/oath.nix</literal></para></listitem>
+    <listitem><para><literal>services/hardware/irqbalance.nix</literal></para></listitem>
+    <listitem><para><literal>services/mail/dspam.nix</literal></para></listitem>
+    <listitem><para><literal>services/mail/opendkim.nix</literal></para></listitem>
+    <listitem><para><literal>services/mail/postsrsd.nix</literal></para></listitem>
+    <listitem><para><literal>services/mail/rspamd.nix</literal></para></listitem>
+    <listitem><para><literal>services/mail/rmilter.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/autofs.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/bepasty.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/calibre-server.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/cfdyndns.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/gammu-smsd.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/mathics.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/matrix-synapse.nix</literal></para></listitem>
+    <listitem><para><literal>services/misc/octoprint.nix</literal></para></listitem>
+    <listitem><para><literal>services/monitoring/hdaps.nix</literal></para></listitem>
+    <listitem><para><literal>services/monitoring/heapster.nix</literal></para></listitem>
+    <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
+    <listitem><para><literal>services/network-filesystems/netatalk.nix</literal></para></listitem>
+    <listitem><para><literal>services/network-filesystems/xtreemfs.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/autossh.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/dnschain.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/gale.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/miniupnpd.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/namecoind.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/ostinato.nix</literal></para></listitem>
     <listitem><para><literal>services/networking/pdnsd.nix</literal></para></listitem>
-    <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/shairport-sync.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/supplicant.nix</literal></para></listitem>
+    <listitem><para><literal>services/search/kibana.nix</literal></para></listitem>
     <listitem><para><literal>services/security/haka.nix</literal></para></listitem>
-    <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem>
+    <listitem><para><literal>services/security/physlock.nix</literal></para></listitem>
+    <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem>
+    <listitem><para><literal>services/x11/hardware/libinput.nix</literal></para></listitem>
+    <listitem><para><literal>services/x11/window-managers/windowlab.nix</literal></para></listitem>
+    <listitem><para><literal>system/boot/initrd-network.nix</literal></para></listitem>
+    <listitem><para><literal>system/boot/initrd-ssh.nix</literal></para></listitem>
+    <listitem><para><literal>system/boot/loader/loader.nix</literal></para></listitem>
+    <listitem><para><literal>system/boot/networkd.nix</literal></para></listitem>
+    <listitem><para><literal>system/boot/resolved.nix</literal></para></listitem>
+    <listitem><para><literal>virtualisation/lxd.nix</literal></para></listitem>
+    <listitem><para><literal>virtualisation/rkt.nix</literal></para></listitem>
   </itemizedlist>
 </para>
 

From 9dfc6829fe18a4ef6316aa33cab57378039985da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 31 Mar 2016 23:08:49 +0100
Subject: [PATCH 594/857] changelog: note release date
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 279557e6d2a1afce8419030ec538c1eb3f42abe4)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 nixos/doc/manual/release-notes/rl-1603.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index eb67d1e565e7c..4cf3a3716dbf4 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -4,7 +4,7 @@
          version="5.0"
          xml:id="sec-release-16.03">
 
-<title>Release 16.03 (“Emu”, 2016/03/??)</title>
+<title>Release 16.03 (“Emu”, 2016/03/31)</title>
 
 <para>In addition to numerous new and upgraded packages, this release
 has the following highlights:</para>

From cc25628212514421efb901c80c8f25fbbf70006b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 31 Mar 2016 23:39:01 +0100
Subject: [PATCH 595/857] changelog: note binutils upgrade
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 216c840ca8c7a3a0e71244be3b739dafa32a0709)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 nixos/doc/manual/release-notes/rl-1603.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 4cf3a3716dbf4..018dcd42206f5 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -33,6 +33,10 @@ has the following highlights:</para>
     <para>Glibc 2.23 (was 2.21).</para>
   </listitem>
 
+  <listitem>
+    <para>Binutils 2.26 (was 2.23.1). See #909</para>
+  </listitem>
+
   <listitem>
     <para>Improved support for ensuring <link
     xlink:href="https://reproducible-builds.org/">bitwise reproducible

From d8abfc87c62477fb8e9afaa22bec1c763f80c62e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 31 Mar 2016 23:46:54 +0100
Subject: [PATCH 596/857] changelog: correct path to gitit nixos module

---
 nixos/doc/manual/release-notes/rl-1603.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index 018dcd42206f5..faee3a407daec 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -165,7 +165,7 @@ following incompatible changes:</para>
 
 <programlisting><![CDATA[
 {
-  imports = [ <nixos/modules/services/misc/gitit.nix> ];
+  imports = [ <nixpkgs/nixos/modules/services/misc/gitit.nix> ];
 }
 ]]></programlisting>
 

From a98a918b1053e3808a3d550527443b9b8d38b926 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Fri, 1 Apr 2016 01:26:52 +0200
Subject: [PATCH 597/857] syncthing: run daemon with dedicated user as default

---
 nixos/modules/misc/ids.nix                    |  2 ++
 .../modules/services/networking/syncthing.nix | 33 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index f71d1e3fe2006..2b5008b9ca8f7 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -257,6 +257,7 @@
       radicale = 234;
       hydra-queue-runner = 235;
       hydra-www = 236;
+      syncthing = 237;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -485,6 +486,7 @@
       pdnsd = 229;
       octoprint = 230;
       radicale = 234;
+      syncthing = 237;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 67b90516b996e..da9a270f30b69 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -5,6 +5,7 @@ with lib;
 let
 
   cfg = config.services.syncthing;
+  defaultUser = "syncthing";
 
 in
 
@@ -17,6 +18,7 @@ in
     services.syncthing = {
 
       enable = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to enable the Syncthing, self-hosted open-source alternative
@@ -26,7 +28,8 @@ in
       };
 
       user = mkOption {
-        default = "syncthing";
+        type = types.string;
+        default = defaultUser;
         description = ''
           Syncthing will be run under this user (user must exist,
           this can be your user name).
@@ -34,8 +37,8 @@ in
       };
 
       all_proxy = mkOption {
-        type = types.string;
-        default = "";
+        type = types.nullOr types.string;
+        default = null;
         example = "socks5://address.com:1234";
         description = ''
           Overwrites all_proxy environment variable for the syncthing process to
@@ -45,6 +48,7 @@ in
       };
 
       dataDir = mkOption {
+        type = types.path;
         default = "/var/lib/syncthing";
         description = ''
           Path where the settings and keys will exist.
@@ -71,20 +75,33 @@ in
 
   config = mkIf cfg.enable {
 
+    users = mkIf (cfg.user == defaultUser) {
+      extraUsers."${defaultUser}" =
+        { group = defaultUser;
+          home  = cfg.dataDir;
+          createHome = true;
+          uid = config.ids.uids.syncthing;
+          description = "Syncthing daemon user";
+        };
+
+      extraGroups."${defaultUser}".gid =
+        config.ids.gids.syncthing;
+    };
+
     systemd.services.syncthing =
       {
         description = "Syncthing service";
-        after = [ "network.target" ];
+        after    = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
         environment = {
           STNORESTART = "yes";  # do not self-restart
           STNOUPGRADE = "yes";
-        } //
-        (config.networking.proxy.envVars) //
-        (if cfg.all_proxy != "" then { all_proxy = cfg.all_proxy; } else {});
+          inherit (cfg) all_proxy;
+        } // config.networking.proxy.envVars;
 
         serviceConfig = {
-          User = "${cfg.user}";
+          User  = cfg.user;
+          Group = optionalString (cfg.user == defaultUser) defaultUser;
           PermissionsStartOnly = true;
           Restart = "on-failure";
           ExecStart = "${pkgs.syncthing}/bin/syncthing -no-browser -home=${cfg.dataDir}";

From 4cd54c5ce9ad608a3d7a2fbcd726565b5f8b6781 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Fri, 1 Apr 2016 01:51:00 +0100
Subject: [PATCH 598/857] jython: 2.7-rc3 -> 2.7.0

---
 pkgs/development/interpreters/jython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/jython/default.nix b/pkgs/development/interpreters/jython/default.nix
index f9d6271e5d868..80661c3feb9eb 100644
--- a/pkgs/development/interpreters/jython/default.nix
+++ b/pkgs/development/interpreters/jython/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "jython-${version}";
 
-  version = "2.7-rc3";
+  version = "2.7.0";
 
   src = fetchurl {
     url = "http://search.maven.org/remotecontent?filepath=org/python/jython-standalone/${version}/jython-standalone-${version}.jar";
-    sha256 = "89fcaf53f1bda6124f836065c1e318e2e853d5a9a1fbf0e96a387c6d38828c78";
+    sha256 = "0sk4myh9v7ma7nmzb8khg41na77xfi2zck7876bs7kq18n8nc1nx";
   };
 
   buildInputs = [ makeWrapper ];

From a37491386c795563a02917ce6c66766fd16381f0 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 31 Mar 2016 22:35:38 -0400
Subject: [PATCH 599/857] log4cxx: darwin compatibility

This patch replicates the patch logic from the brew recipe
<https://github.com/Homebrew/homebrew/blob/56b57d583e874e6dfe7a417d329a147e4d4b064f/Library/Formula/log4cxx.rb>
which is necessary to build on darwin.
---
 pkgs/development/libraries/log4cxx/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/log4cxx/default.nix b/pkgs/development/libraries/log4cxx/default.nix
index b2e13a1e9ab87..cae6e5c0a55e8 100644
--- a/pkgs/development/libraries/log4cxx/default.nix
+++ b/pkgs/development/libraries/log4cxx/default.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
     }' src/examples/cpp/console.cpp \
        src/main/cpp/inputstreamreader.cpp \
        src/main/cpp/socketoutputstream.cpp
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+  sed -i 's/namespace std { class locale; }/#include <locale>/' src/main/include/log4cxx/helpers/simpledateformat.h
+  sed -i 's/\(#include <cctype>\)/\1\n#include <cstdlib>/' src/main/cpp/stringhelper.cpp
   '';
 
   buildInputs = [autoconf automake libtool libxml2 cppunit boost apr aprutil db expat];

From f58de47cd000f1df43bbd24addd35fd8064a4ab7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 1 Apr 2016 08:19:59 +0200
Subject: [PATCH 600/857] spotify: 1.0.26.125.g64dc8bc6-14 ->
 1.0.26.125.g64dc8bc6-15

---
 pkgs/applications/audio/spotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 243d1e49c7b72..e1eee1cdd8ecb 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,7 +5,7 @@
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "1.0.26.125.g64dc8bc6-14";
+  version = "1.0.26.125.g64dc8bc6-15";
 
   deps = [
     alsaLib
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "09wanpml2a6k8asfc0pd56n7fia37amgsplsan1qdh6dwdzr3rv5";
+      sha256 = "01y4jr1r928251mj9kz1i7x93ya0ky4xaibm0q08q3zjsafianz1";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From bd4fdfd722c1177e8ce76291100120d6a8b339ad Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Thu, 31 Mar 2016 02:17:52 -0700
Subject: [PATCH 601/857] vimPlugins: add vim-jsonnet and zenburn

---
 pkgs/misc/vim-plugins/default.nix      | 22 ++++++++++++++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  3 +++
 2 files changed, 25 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index fa09d1ca92b9a..b219e625033d9 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -464,6 +464,17 @@ rec {
 
   };
 
+  vim-jsonnet = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-jsonnet-2016-01-21";
+    src = fetchgit {
+      url = "git://github.com/google/vim-jsonnet";
+      rev = "5d59d0ba6af2bca4484909e02d72c96fbdd5b220";
+      sha256 = "eb7508aedce86bdcb7f104f62490b92bea6e23fb14fafacd251c6aab80aece78";
+    };
+    dependencies = [];
+
+  };
+
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "idris-vim-2016-01-29";
     src = fetchgit {
@@ -552,6 +563,17 @@ rec {
 
   };
 
+  zenburn = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "zenburn-2015-09-18";
+    src = fetchgit {
+      url = "git://github.com/jnurmine/zenburn";
+      rev = "f7847fb1531b91e2b4bb4aed5db3146f07765179";
+      sha256 = "05d7c348dfaf70b8068abb3eaba3bc961b060e4d7a4c99fb6c4538fba5085ad1";
+    };
+    dependencies = [];
+
+  };
+
   vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-colorstepper-2016-01-28";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 88e9bbb959441..69a6682e691cd 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -32,6 +32,7 @@
 "github:esneider/YUNOcommit.vim"
 "github:fatih/vim-go"
 "github:flazz/vim-colorschemes"
+"github:google/vim-jsonnet"
 "github:idris-hackers/idris-vim"
 "github:itchyny/calendar.vim"
 "github:itchyny/thumbnail.vim"
@@ -41,6 +42,7 @@
 "github:jeetsukumaran/vim-buffergator"
 "github:jgdavey/tslime.vim"
 "github:jistr/vim-nerdtree-tabs"
+"github:jnurmine/zenburn"
 "github:jonbri/vim-colorstepper"
 "github:joonty/vim-xdebug"
 "github:junegunn/limelight.vim"
@@ -96,6 +98,7 @@
 "surround"
 "table-mode"
 "taglist"
+"tlib"
 "undotree"
 "vim-addon-async"
 "vim-addon-commenting"

From efe33d6e8739ea79efcada98e15da49aeed598b6 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 1 Apr 2016 08:51:37 +0200
Subject: [PATCH 602/857] openldap: 2.4.42 -> 2.4.44

---
 pkgs/development/libraries/openldap/default.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 7d836cd5a0df9..c4f8ef0ee6616 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -1,25 +1,13 @@
 { stdenv, fetchurl, openssl, cyrus_sasl, db, groff }:
 
 stdenv.mkDerivation rec {
-  name = "openldap-2.4.42";
+  name = "openldap-2.4.44";
 
   src = fetchurl {
     url = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz";
-    sha256 = "0qwfpb5ipp2l76v11arghq5mr0sjc6xhjfg8a0kgsaw5qpib1dzf";
+    sha256 = "0044p20hx07fwgw2mbwj1fkx04615hhs1qyx4mawj2bhqvrnppnp";
   };
 
-  # Should be removed with >=2.4.43
-  patches = [
-    ./CVE-2015-6908.patch
-    (
-      fetchurl {
-        sha256 = "5bcb3f9fb7186b380efa0a1c2d31ad755e190134b5c4dac07c65bbf7c0b6b3b3";
-        url = "https://github.com/LMDB/lmdb/commit/3360cbad668f678fb23c064ca4efcc5c9ae95d10.patch";
-        name = "openldap-clang-compilation.patch";
-      }
-    )
-  ];
-
   outputs = [ "out" "man" ];
 
   buildInputs = [ openssl cyrus_sasl db groff ];

From 4f463fe6c1f7c1ceede9056729be1aee7cd238aa Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 18 Feb 2016 16:12:06 +0100
Subject: [PATCH 603/857] pythonPackages.pygments: 2.1 -> 2.1.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4bf21a9ed44ea..e39a23b58d169 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16916,12 +16916,12 @@ in modules // {
   };
 
   pygments = buildPythonPackage rec {
-    version = "2.1";
+    version = "2.1.1";
     name = "Pygments-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
-      sha256 = "0yx4p3w9lw1kw24zr87xnaqxm007mdxgwa5wjpwnrcfpmxgyz80k";
+      sha256 = "06y0b7xh9h3r0wbxl41ccnnnw8dxfz48zj8x09y4rranbfldkxrd";
     };
 
     propagatedBuildInputs = with self; [ docutils ];

From 36aa19b105f607c1013bb49af2ad6e28c6aa2d5c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 1 Apr 2016 09:32:40 +0200
Subject: [PATCH 604/857] btrfs-progs: 4.5 -> 4.5.1

Bugfix release. Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
---
 pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix
index 59935af0a5d4e..d0fda2da4142f 100644
--- a/pkgs/tools/filesystems/btrfs-progs/default.nix
+++ b/pkgs/tools/filesystems/btrfs-progs/default.nix
@@ -2,14 +2,14 @@
 , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt
 }:
 
-let version = "4.5"; in
+let version = "4.5.1"; in
 
 stdenv.mkDerivation rec {
   name = "btrfs-progs-${version}";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    sha256 = "04d8w1wqaij6kxhxcirwvy1bkvc7aikkyw981ciwlznblzc16y7f";
+    sha256 = "1znf2zhb56zbmdjk3lq107678xwsqwc5gczspypmc5i31qnppy7f";
   };
 
   buildInputs = [

From 635c99ce878d5009eaf21da80319d5426a534cee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 30 Mar 2016 09:47:09 +0200
Subject: [PATCH 605/857] vm: allow overriding QEMU_OPTS / memSize for images.

It's nice to be able to create disk images with -smp 4
in qemu.
---
 pkgs/build-support/vm/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index c11c21170e01b..56a13d6787a7d 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -414,12 +414,12 @@ rec {
   fillDiskWithRPMs =
     { size ? 4096, rpms, name, fullName, preInstall ? "", postInstall ? ""
     , runScripts ? true, createRootFS ? defaultCreateRootFS
+    , QEMU_OPTS ? "", memSize ? 512
     , unifiedSystemDir ? false
     }:
 
     runInLinuxVM (stdenv.mkDerivation {
-      inherit name preInstall postInstall rpms;
-      memSize = 512;
+      inherit name preInstall postInstall rpms QEMU_OPTS memSize;
       preVM = createEmptyImage {inherit size fullName;};
 
       buildCommand = ''
@@ -685,10 +685,11 @@ rec {
     , packages, extraPackages ? []
     , preInstall ? "", postInstall ? "", archs ? ["noarch" "i386"]
     , runScripts ? true, createRootFS ? defaultCreateRootFS
+    , QEMU_OPTS ? "", memSize ? 512
     , unifiedSystemDir ? false }:
 
     fillDiskWithRPMs {
-      inherit name fullName size preInstall postInstall runScripts createRootFS unifiedSystemDir;
+      inherit name fullName size preInstall postInstall runScripts createRootFS unifiedSystemDir QEMU_OPTS memSize;
       rpms = import (rpmClosureGenerator {
         inherit name packagesLists urlPrefixes archs;
         packages = packages ++ extraPackages;

From f07b934c8a9f9bde57efc14eaa348f777220cec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 1 Apr 2016 11:16:02 +0200
Subject: [PATCH 606/857] Updating trigger-rally to 0.6.3

---
 pkgs/games/trigger/default.nix  | 40 ++++++++++++++++-----------------
 pkgs/games/trigger/search.patch | 14 ++++++++++++
 2 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/games/trigger/search.patch

diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix
index ad65b54ddcda9..382edb6908b43 100644
--- a/pkgs/games/trigger/default.nix
+++ b/pkgs/games/trigger/default.nix
@@ -1,38 +1,36 @@
-{ fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, jam }:
+{ fetchurl, stdenv, SDL, freealut, SDL_image, openal, physfs, zlib, mesa, glew }:
 
 stdenv.mkDerivation rec {
-  name = "trigger-rally-0.6.1";
+  name = "trigger-rally-0.6.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/trigger-rally/${name}-src.tar.bz2";
-    sha256 = "1fvb6dl5bwclmx0y8ygyrfn8jczc5kxawxlyv6mp592smb5x5hjs";
+    url = "mirror://sourceforge/trigger-rally/${name}.tar.gz";
+    sha256 = "103mv4vpq335mrmgzlhahrfncq7ds3b5ip5a52967rv2j6hhzpvy";
   };
 
-  srcData = fetchurl {
-    url = "mirror://sourceforge/trigger-rally/${name}-data.tar.bz2";
-    sha256 = "04f9d74gz5xvfx6pnmbfxqhp0kd1p16j5lrgcq12wxvla6py4qaw";
-  };
-
-  buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa jam ];
+  buildInputs = [ SDL freealut SDL_image openal physfs zlib mesa glew ];
 
   preConfigure = ''
-    configureFlags="$configureFlags --datadir=$out/share/${name}-data"
-  '';
+    sed s,/usr/local,$out, -i bin/*defs
 
-  # It has some problems installing the README file, so... out.
-  patchPhase = ''
-    sed -i /README/d Jamfile
+    cd src
+    export makeFlags="$makeFlags prefix=$out"
   '';
 
-  buildPhase = "jam";
+  enableParallelBuilding = true;
 
-  installPhase = ''
-    jam install
-    mkdir -p $out/share
-    pushd $out/share
-    tar xf $srcData
+  postInstall = ''
+    mkdir -p $out/bin
+    cat <<EOF > $out/bin/trigger-rally
+    #!/bin/sh
+    exec $out/games/trigger-rally "$@"
+    EOF
+    chmod +x $out/bin/trigger-rally
   '';
 
+  # search.patch :   fix c++ error.
+  patches = [ ./search.patch ];
+
   meta = {
     description = "Rally";
     homepage = http://trigger-rally.sourceforge.net/;
diff --git a/pkgs/games/trigger/search.patch b/pkgs/games/trigger/search.patch
new file mode 100644
index 0000000000000..60a69b159b5bd
--- /dev/null
+++ b/pkgs/games/trigger/search.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Trigger/main.cpp b/src/Trigger/main.cpp
+index 39539e1..680c12c 100644
+--- a/src/Trigger/main.cpp
++++ b/src/Trigger/main.cpp
+@@ -890,7 +890,8 @@ bool MainApp::loadAll()
+                 std::smatch mr; // Match Results
+                 std::regex pat(R"(^(\w+)(\..+)$)"); // Pattern
+ 
+-                if (!std::regex_search(std::string(*fname), mr, pat))
++                std::string search(*fname);
++                if (!std::regex_search(search, mr, pat))
+                     continue;
+ 
+                 std::string basefname = mr[1];

From 0de2d2fbcdcea47292662d2509f5d06c81288e48 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 29 Mar 2016 05:27:51 -0700
Subject: [PATCH 607/857] mfi: init at 2.1.11

This package has some outdated dependencies, so old versions of mongodb
and v8 had to be re-added as well.
---
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/networking/mfi.nix     | 90 +++++++++++++++++++
 pkgs/development/libraries/v8/3.14.nix        | 28 ++++++
 .../v8/fix-GetLocalizedMessage-usage.patch    | 27 ++++++
 pkgs/servers/mfi/default.nix                  | 28 ++++++
 pkgs/servers/nosql/mongodb/2.4.8.nix          | 45 ++++++++++
 pkgs/top-level/all-packages.nix               |  8 ++
 8 files changed, 229 insertions(+)
 create mode 100644 nixos/modules/services/networking/mfi.nix
 create mode 100644 pkgs/development/libraries/v8/3.14.nix
 create mode 100644 pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch
 create mode 100644 pkgs/servers/mfi/default.nix
 create mode 100644 pkgs/servers/nosql/mongodb/2.4.8.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 2b5008b9ca8f7..1e14fe655fc08 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -258,6 +258,7 @@
       hydra-queue-runner = 235;
       hydra-www = 236;
       syncthing = 237;
+      mfi = 238;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -487,6 +488,7 @@
       octoprint = 230;
       radicale = 234;
       syncthing = 237;
+      #mfi = 238; # unused
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9462d72996fc8..f5352eb6ed0f8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -333,6 +333,7 @@
   ./services/networking/lambdabot.nix
   ./services/networking/libreswan.nix
   ./services/networking/mailpile.nix
+  ./services/networking/mfi.nix
   ./services/networking/mjpg-streamer.nix
   ./services/networking/minidlna.nix
   ./services/networking/miniupnpd.nix
diff --git a/nixos/modules/services/networking/mfi.nix b/nixos/modules/services/networking/mfi.nix
new file mode 100644
index 0000000000000..5afb83ed022fb
--- /dev/null
+++ b/nixos/modules/services/networking/mfi.nix
@@ -0,0 +1,90 @@
+{ config, lib, pkgs, utils, ... }:
+with lib;
+let
+  name = "Ubiquiti mFi Controller";
+  cfg = config.services.mfi;
+  stateDir = "/var/lib/mfi";
+  # XXX 2 runtime exceptions using jre8: JSPException on GET / ; can't initialize ./data/keystore on first run.
+  cmd = "@${pkgs.jre7}/bin/java java -jar ${stateDir}/lib/ace.jar";
+  mountPoints = [
+    { what = "${pkgs.mfi}/dl"; where = "${stateDir}/dl"; }
+    { what = "${pkgs.mfi}/lib"; where = "${stateDir}/lib"; }
+    { what = "${pkgs.mongodb248}/bin"; where = "${stateDir}/bin"; }
+  ];
+  systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints;
+  ports = [ 6080 6880 6443 6843 ];
+in
+{
+  options = {
+    services.mfi = {
+      enable = mkEnableOption name;
+      openPorts = mkOption {
+        type = types.bool;
+        default = true;
+        description = "Whether to open TCP ports ${concatMapStrings (a: "${toString a} ") ports}for the services.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    networking.firewall.allowedTCPPorts = mkIf config.services.mfi.openPorts ports;
+
+    users.users.mfi = {
+      uid = config.ids.uids.mfi;
+      description = "mFi controller daemon user";
+      home = "${stateDir}";
+    };
+
+    # We must create the binary directories as bind mounts instead of symlinks
+    # This is because the controller resolves all symlinks to absolute paths
+    # to be used as the working directory.
+    systemd.mounts = map ({ what, where }: {
+        bindsTo = [ "mfi.service" ];
+        partOf = [ "mfi.service" ];
+        unitConfig.RequiresMountsFor = stateDir;
+        options = "bind";
+        what = what;
+        where = where;
+      }) mountPoints;
+
+    systemd.services.mfi = {
+      description = "mFi controller daemon";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ] ++ systemdMountPoints;
+      partOf = systemdMountPoints;
+      bindsTo = systemdMountPoints;
+      unitConfig.RequiresMountsFor = stateDir;
+
+      preStart = ''
+        # Clear ./webapps each run.
+        rm -rf                               "${stateDir}/webapps"
+        mkdir -p                             "${stateDir}/webapps"
+        ln -s "${pkgs.mfi}/webapps/ROOT.war" "${stateDir}/webapps"
+
+        # Copy initial config only once.
+        test -e "${stateDir}/conf" || cp -ar "${pkgs.mfi}/conf" "${stateDir}/conf"
+        test -e "${stateDir}/data" || cp -ar "${pkgs.mfi}/data" "${stateDir}/data"
+
+        # Fix Permissions.
+        # (Bind-mounts cause errors; ignore exit codes)
+        chown -fR mfi:      "${stateDir}" || true
+        chmod -fR u=rwX,go= "${stateDir}" || true
+      '';
+
+      postStop = ''
+        rm -rf "${stateDir}/webapps"
+      '';
+
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${cmd} start";
+        ExecStop = "${cmd} stop";
+        User = "mfi";
+        PermissionsStartOnly = true;
+        UMask = "0077";
+        WorkingDirectory = "${stateDir}";
+      };
+    };
+  };
+}
diff --git a/pkgs/development/libraries/v8/3.14.nix b/pkgs/development/libraries/v8/3.14.nix
new file mode 100644
index 0000000000000..fee0f868ea922
--- /dev/null
+++ b/pkgs/development/libraries/v8/3.14.nix
@@ -0,0 +1,28 @@
+{ stdenv, callPackage, fetchFromGitHub, python, ... } @ args:
+with stdenv.lib;
+let
+  version = "3.14.5.10";
+  sha256 = "08vhl84166x13b3cbx8y0g99yqx772zd33gawsa1nxqkyrykql6k";
+in
+(callPackage ./generic.nix (args // {
+  inherit version sha256;
+})).overrideDerivation (oldAttrs:{
+  patchPhase = [
+    oldAttrs.patchPhase
+    "sed -i 's,#!/usr/bin/python,#!${python}/bin/python,' build/gyp_v8"
+  ];
+
+  # http://code.google.com/p/v8/issues/detail?id=2149
+  NIX_CFLAGS_COMPILE = concatStringsSep " " [
+    oldAttrs.NIX_CFLAGS_COMPILE
+    "-Wno-unused-local-typedefs"
+    "-Wno-aggressive-loop-optimizations"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "v8";
+    repo = "v8";
+    rev = "${version}";
+    inherit sha256;
+  };
+})
diff --git a/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch
new file mode 100644
index 0000000000000..3bc0fff4d509b
--- /dev/null
+++ b/pkgs/development/libraries/v8/fix-GetLocalizedMessage-usage.patch
@@ -0,0 +1,27 @@
+From dbe142c4eda0f15fad9fa85743dd11b81292fa8f Mon Sep 17 00:00:00 2001
+From: Timothy J Fontaine <tjfontaine@gmail.com>
+Date: Thu, 23 May 2013 13:57:59 -0700
+Subject: [PATCH] v8: fix GetLocalizedMessage usage
+
+As is the backport of the abort on uncaught exception wouldn't compile
+because we it was passing in `this` when it was unnecessary.
+---
+ deps/v8/src/isolate.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/isolate.cc b/src/isolate.cc
+index 04a438b..5a5293e 100644
+--- a/src/isolate.cc
++++ b/src/isolate.cc
+@@ -1161,7 +1161,7 @@ void Isolate::DoThrow(Object* exception, MessageLocation* location) {
+           (report_exception || can_be_caught_externally)) {
+         fatal_exception_depth++;
+         fprintf(stderr, "%s\n\nFROM\n",
+-          *MessageHandler::GetLocalizedMessage(this, message_obj));
++          *MessageHandler::GetLocalizedMessage(message_obj));
+         PrintCurrentStackTrace(stderr);
+         OS::Abort();
+       }
+-- 
+1.8.1.6
+
diff --git a/pkgs/servers/mfi/default.nix b/pkgs/servers/mfi/default.nix
new file mode 100644
index 0000000000000..e431ca993a900
--- /dev/null
+++ b/pkgs/servers/mfi/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  name = "mfi-controller-${version}";
+  version = "2.1.11";
+
+  src = fetchurl {
+    url = "https://dl.ubnt.com/mfi/${version}/mFi.unix.zip";
+    sha256 = "0b9q6025zf9zjzq8dcmcyai8rslx67g52j41gacxsk9i5dspmw90";
+  };
+
+  buildInputs = [ unzip ];
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out
+    cp -ar conf data dl lib webapps $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://www.ubnt.com/;
+    description = "Controller for Ubiquiti mFi devices";
+    license = licenses.unfree;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ elitak ];
+  };
+}
diff --git a/pkgs/servers/nosql/mongodb/2.4.8.nix b/pkgs/servers/nosql/mongodb/2.4.8.nix
new file mode 100644
index 0000000000000..448d260bdb9d6
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/2.4.8.nix
@@ -0,0 +1,45 @@
+# This derivation was resurrected from 4c8ec5e12e187347fd97b1a1a9a43eb19e009ed0
+# by elitak for use with the Ubiquiti mFi Controller package, which breaks at
+# runtime on mongodb3+ and jre8+. We will need to pull in sufficiently old
+# versions of boost and v8 to build this, as well.
+{ stdenv, fetchurl, scons, boost155, v8_3_14, gperftools, pcre, snappy }:
+with stdenv.lib;
+let
+  version = "2.4.8";
+in
+stdenv.mkDerivation rec {
+  name = "mongodb-${version}";
+
+  src = fetchurl {
+    url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
+    sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x";
+  };
+
+  nativeBuildInputs = [ scons boost155 v8_3_14 gperftools pcre snappy ];
+
+  postPatch = ''
+    substituteInPlace SConstruct \
+        --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" \
+        --replace 'CCFLAGS=["-Werror", "-pipe"]' 'CCFLAGS=["-pipe"]'
+  '';
+
+  NIX_CFLAGS_COMPILE = "-Wno-unused-local-typedefs";
+
+  buildPhase = ''
+    export SCONSFLAGS="-j$NIX_BUILD_CORES"
+    scons all --use-system-all
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib
+    scons install --use-system-all --full --prefix=$out
+  '';
+
+  meta = {
+    description = "A scalable, high-performance, open source NoSQL database";
+    homepage = http://www.mongodb.org;
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ bluescreen303 elitak ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cca23969c83d4..1a32ba98d319f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8907,6 +8907,10 @@ in
     gnutls = gnutls;
   });
 
+  v8_3_14 = callPackage ../development/libraries/v8/3.14.nix {
+    inherit (pythonPackages) gyp;
+  };
+
   v8_3_16_14 = callPackage ../development/libraries/v8/3.16.14.nix {
     inherit (pythonPackages) gyp;
     # The build succeeds using gcc5 but it fails to build pkgs.consul-ui
@@ -9624,6 +9628,8 @@ in
 
   meteor = callPackage ../servers/meteor/default.nix { };
 
+  mfi = callPackage ../servers/mfi { };
+
   # Backwards compatibility.
   mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;
   mod_evasive = pkgs.apacheHttpdPackages.mod_evasive;
@@ -9741,6 +9747,8 @@ in
     sasl = cyrus_sasl;
   };
 
+  mongodb248 = callPackage ../servers/nosql/mongodb/2.4.8.nix { };
+
   riak = callPackage ../servers/nosql/riak/2.1.1.nix { };
 
   influxdb = (callPackage ../servers/nosql/influxdb { }).bin // { outputs = [ "bin" ]; };

From 8d756babee0bfbd175e4e5cef18852f3a864f4f1 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 1 Apr 2016 12:35:51 +0200
Subject: [PATCH 608/857] nodejs: 5.9.0 -> 5.10.0

---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index c1d45443885e3..a96e50008292f 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -6,7 +6,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.9.0";
+  version = "5.10.0";
 
   deps = {
     inherit openssl zlib libuv;
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0ghgfqs64794g6ggrvsdcqwz2lnhck0yiy2fyyg3in8z91k5l5z5";
+    sha256 = "0avn25j04q172ri8mksrryyg4g95k7x2pqzsbmp1nr6ybfpvkblg";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From 5c21ca886e3d22b79c99f8cd9c16245c1a1f5fc9 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 1 Apr 2016 12:51:17 +0200
Subject: [PATCH 609/857] galen: 2.2.3 -> 2.2.4

---
 pkgs/development/tools/galen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
index 7ff283176e1d1..3ee29f2267a50 100644
--- a/pkgs/development/tools/galen/default.nix
+++ b/pkgs/development/tools/galen/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "galen";
-  version = "2.2.3";
+  version = "2.2.4";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/galenframework/galen/releases/download/galen-${version}/galen-bin-${version}.zip";
-    sha256 = "13kvxbw68g82rv8bp9g4fkrrsd7nag1a4bspilqi2wnxc51c8mqq";
+    sha256 = "0qx6pza6aw880ph76wbypcgy983pln8k4ad2indagb5qhiz4zw1d";
   };
 
   buildInputs = [ unzip ];

From 13a1c7b8c1ae5c4558aa5dc3a173fb15d55d4656 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2016 13:36:59 +0200
Subject: [PATCH 610/857] useOldCXXAbi: Change into a setup hook

Stdenv adapters considered weird.
---
 pkgs/build-support/setup-hooks/use-old-cxx-abi.sh | 1 +
 pkgs/games/steam/chrootenv.nix                    | 4 ++--
 pkgs/stdenv/adapters.nix                          | 6 ------
 pkgs/top-level/all-packages.nix                   | 2 ++
 4 files changed, 5 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/build-support/setup-hooks/use-old-cxx-abi.sh

diff --git a/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh b/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh
new file mode 100644
index 0000000000000..53335d7a9a7ae
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/use-old-cxx-abi.sh
@@ -0,0 +1 @@
+export NIX_CFLAGS_COMPILE+=" -D_GLIBCXX_USE_CXX11_ABI=0"
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 35b3611812b53..8bb73fc5cef37 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -25,8 +25,8 @@ buildFHSUserEnv {
     ]
     ++ lib.optional withJava jdk
     ++ lib.optional withPrimus (primus.override {
-      stdenv = useOldCXXAbi stdenv;
-      stdenv_i686 = useOldCXXAbi pkgsi686Linux.stdenv;
+      stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
+      stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
     })
     ;
 
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 8398c45400e48..87d3938f13d39 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -242,10 +242,4 @@ rec {
       else pkgs.stdenv;
   };
 
-  /* Modify a stdenv so a build uses pre-C++11 ABI by default. */
-  useOldCXXAbi = stdenv: stdenv //
-    { mkDerivation = args: stdenv.mkDerivation (args // {
-        NIX_CFLAGS_COMPILE = toString (args.NIX_CFLAGS_COMPILE or "") + " -D_GLIBCXX_USE_CXX11_ABI=0";
-      });
-    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cca23969c83d4..22303669f9c3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -325,6 +325,8 @@ in
 
   separateDebugInfo = makeSetupHook { } ../build-support/setup-hooks/separate-debug-info.sh;
 
+  useOldCXXAbi = makeSetupHook { } ../build-support/setup-hooks/use-old-cxx-abi.sh;
+
 
   ### TOOLS
 

From 2f0195003ec528c203590012316571e46fa60940 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2016 13:51:24 +0200
Subject: [PATCH 611/857] firefox-esr: Fix name

The Firefox wrapped called itself "firefox" rather than "firefox-esr".

Also eliminate a use of splitString which is evil and should never be
used.
---
 pkgs/applications/networking/browsers/firefox/default.nix | 1 +
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 41f8cc155a8e7..552c8d4d822e2 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -122,6 +122,7 @@ common = { pname, version, sha256 }: stdenv.mkDerivation rec {
   passthru = {
     inherit gtk nspr version;
     isFirefox3Like = true;
+    browserName = pname;
   };
 };
 
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 91486b608b2c6..5fb887bda220e 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -9,8 +9,8 @@
 }:
 
 ## configurability of the wrapper itself
-browser :
-{ browserName ? (lib.head (lib.splitString "-" browser.name))  # name of the executable
+browser:
+{ browserName ? browser.browserName or (builtins.parseDrvName browser.name).name
 , name ? (browserName + "-" + (builtins.parseDrvName browser.name).version)
 , desktopName ? # browserName with first letter capitalized
   (lib.toUpper (lib.substring 0 1 browserName) + lib.substring 1 (-1) browserName)

From fd2273e41918f2b6bb72356b20c8cb6186251e37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2016 13:52:54 +0200
Subject: [PATCH 612/857] Stronger warning against usage of splitString

---
 lib/strings.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index a2a4be11e1b84..01a6f181d0389 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -258,7 +258,7 @@ rec {
   /* Cut a string with a separator and produces a list of strings which
      were separated by this separator.
 
-     NOTE: this function is not performant and should be avoided
+     NOTE: this function is not performant and should never be used.
 
      Example:
        splitString "." "foo.bar.baz"

From 160c7df7512551bf2668f6d5d83d4a8ba5d28176 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Fri, 1 Apr 2016 08:08:31 -0400
Subject: [PATCH 613/857] atom: 1.6.0 -> 1.6.1

---
 pkgs/applications/editors/atom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index de857b7a8c6ec..c6083a89f6c04 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "1izp2fwxk4rrksdbhcaj8fn0aazi7brid72n1vp7f49adrkqqc1b";
+    sha256 = "0g31kw4daysjp4iz1rxlh64hnqxbn561k41n908pxgc7kjwbl2hj";
     name = "${name}.deb";
   };
 

From d9798553c69620f772c0fcd5c6ad6f7d34fad65c Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Fri, 1 Apr 2016 08:09:34 -0400
Subject: [PATCH 614/857] oh-my-zsh: 2016-03-24 -> 2016-03-31

---
 pkgs/shells/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index a7e57b145d618..4b2a4d4e763ea 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "oh-my-zsh-git-${version}";
-  version = "2016-03-24";
+  version = "2016-03-31";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "9280f2c874b1126ee9399c353d1e0184fd39b4e4";
-    sha256 = "1rldqfs5vkqxp3r7nn5q1837a363gml0d5pji0zkl7ia49f7bdnk";
+    rev = "286c3e5e28b651c3f629e6aaba589a1cf56da4d8";
+    sha256 = "1jgbpfk6plj1gkwrv7xl1nsxjnrhyh7k3rjkindxx5s9lbq52f7z";
   };
 
   phases = "installPhase";

From 3fb170842736c9c3c10cd53675f98aa3912bf6ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2016 15:52:59 +0200
Subject: [PATCH 615/857] ssh: Fix support for ssh-dss host keys

---
 nixos/modules/programs/ssh.nix                |  1 +
 pkgs/tools/networking/openssh/default.nix     |  4 +-
 .../fix-host-key-algorithms-plus.patch        | 52 +++++++++++++++++++
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 1ad45f4680304..cc835081c9f95 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -189,6 +189,7 @@ in
 
         # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
         PubkeyAcceptedKeyTypes +ssh-dss
+        HostKeyAlgorithms +ssh-dss
 
         ${cfg.extraConfig}
       '';
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 957d5e715e782..19b96fdc8dd51 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -41,7 +41,9 @@ stdenv.mkDerivation rec {
     '';
 
   patches =
-    [ ./locale_archive.patch ]
+    [ ./locale_archive.patch
+      ./fix-host-key-algorithms-plus.patch
+    ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
diff --git a/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch
new file mode 100644
index 0000000000000..02846e9bdad2f
--- /dev/null
+++ b/pkgs/tools/networking/openssh/fix-host-key-algorithms-plus.patch
@@ -0,0 +1,52 @@
+Specifying "HostKeyAlgorithms +ssh-dds" does not work properly because
+setting any value for HostKeyAlgorithms causes the known host keys to
+be ignored for the purpose of determining the priority of algorithms.
+This was fixed upstream for HostKeyAlgorithms in sshd_config, but not
+in ssh_config. The fix is to apply order_hostkeyalgs() if the user
+specifies a HostKeyAlgorithms starting with "+".
+
+diff -ru -x '*~' openssh-7.2p2-orig/sshconnect2.c openssh-7.2p2/sshconnect2.c
+--- openssh-7.2p2-orig/sshconnect2.c	2016-03-09 19:04:48.000000000 +0100
++++ openssh-7.2p2/sshconnect2.c	2016-04-01 15:39:45.140945902 +0200
+@@ -100,7 +100,7 @@
+ }
+ 
+ static char *
+-order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port)
++order_hostkeyalgs(char *host, struct sockaddr *hostaddr, u_short port, char *algs)
+ {
+ 	char *oavail, *avail, *first, *last, *alg, *hostname, *ret;
+ 	size_t maxlen;
+@@ -116,7 +116,7 @@
+ 	for (i = 0; i < options.num_system_hostfiles; i++)
+ 		load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]);
+ 
+-	oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG);
++	oavail = avail = xstrdup(algs);
+ 	maxlen = strlen(avail) + 1;
+ 	first = xmalloc(maxlen);
+ 	last = xmalloc(maxlen);
+@@ -181,18 +181,21 @@
+ 	myproposal[PROPOSAL_MAC_ALGS_CTOS] =
+ 	    myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;
+ 	if (options.hostkeyalgorithms != NULL) {
++		int append = options.hostkeyalgorithms[0] == '+';
+ 		if (kex_assemble_names(KEX_DEFAULT_PK_ALG,
+ 		    &options.hostkeyalgorithms) != 0)
+ 			fatal("%s: kex_assemble_namelist", __func__);
+ 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
+-		    compat_pkalg_proposal(options.hostkeyalgorithms);
++		    compat_pkalg_proposal(append
++			? order_hostkeyalgs(host, hostaddr, port, options.hostkeyalgorithms)
++			: options.hostkeyalgorithms);
+ 	} else {
+ 		/* Enforce default */
+ 		options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG);
+ 		/* Prefer algorithms that we already have keys for */
+ 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
+ 		    compat_pkalg_proposal(
+-		    order_hostkeyalgs(host, hostaddr, port));
++		    order_hostkeyalgs(host, hostaddr, port, KEX_DEFAULT_PK_ALG));
+ 	}
+ 
+ 	if (options.rekey_limit || options.rekey_interval)

From 54eed78450d7b6eed53c036a309f97828b1c5f1a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 1 Apr 2016 09:46:48 +0200
Subject: [PATCH 616/857] timewarrior: init at 2016-03-29

---
 .../applications/misc/timewarrior/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/applications/misc/timewarrior/default.nix

diff --git a/pkgs/applications/misc/timewarrior/default.nix b/pkgs/applications/misc/timewarrior/default.nix
new file mode 100644
index 0000000000000..a7afa6562fa55
--- /dev/null
+++ b/pkgs/applications/misc/timewarrior/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchgit, cmake, libuuid, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "timewarrior-${version}";
+  version = "2016-03-29";
+
+  enableParallelBuilding = true;
+
+  src = fetchgit {
+    url = "https://git.tasktools.org/scm/tm/timew.git";
+    rev = "2175849a81ddd03707dca7b4c9d69d8fa11e35f7";
+    sha256 = "1c55a5jsm9n2zcyskklhqiclnlb2pz2h7klbzx481nsn62xd6bbg";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "A command-line time tracker";
+    homepage = http://tasktools.org/projects/timewarrior.html;
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e726acd2da67a..3e3795ea176fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13834,6 +13834,8 @@ in
 
   timbreid = callPackage ../applications/audio/pd-plugins/timbreid { };
 
+  timewarrior = callPackage ../applications/misc/timewarrior { };
+
   timidity = callPackage ../tools/misc/timidity { };
 
   tint2 = callPackage ../applications/misc/tint2 { };

From 00a794b9600716d692e3f3a61e3ffa53ca3b59c0 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Fri, 1 Apr 2016 17:02:41 +0200
Subject: [PATCH 617/857] gnome-boxes: add qemu to PATH

---
 pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
index 6f5af374dbc42..1edea6b888ba8 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gnome-boxes/default.nix
@@ -3,7 +3,7 @@
 , spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
 , libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
 , desktop_file_utils, mtools, cdrkit, libcdio, numactl, xen
-, libusb, libarchive, acl, libgudev
+, libusb, libarchive, acl, libgudev, qemu
 }:
 
 # TODO: ovirt (optional)
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
         wrapProgram "$prog" \
             --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
             --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
+            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin:${qemu}/bin"
     done
   '';
 

From e0c225857ffef4142f2478e7d3bda42b92446a8e Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Wed, 30 Mar 2016 11:15:20 -0500
Subject: [PATCH 618/857] update skarnet.org packages

skalibs:           2.4.7.0 -> 2.3.9.0
execline:          2.1.4.0 -> 2.1.4.5
s6:                2.2.1.0 -> 2.2.4.3
s6-rc:             0.0.1.0 -> 0.0.2.1
s6-portable-utils: 2.0.5.2 -> 2.0.5.3
s6-linux-utils:    2.0.2.0 -> 2.0.2.3
s6-dns:            2.0.0.4 -> 2.0.0.7
s6-networking:     2.1.0.1 -> 2.1.0.4
---
 pkgs/development/libraries/skalibs/default.nix    | 4 ++--
 pkgs/os-specific/linux/s6-linux-utils/default.nix | 4 ++--
 pkgs/tools/misc/execline/default.nix              | 4 ++--
 pkgs/tools/misc/s6-portable-utils/default.nix     | 4 ++--
 pkgs/tools/networking/s6-dns/default.nix          | 4 ++--
 pkgs/tools/networking/s6-networking/default.nix   | 4 ++--
 pkgs/tools/system/s6-rc/default.nix               | 4 ++--
 pkgs/tools/system/s6/default.nix                  | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index e8b3403df405f..1b5a990b19de8 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.3.7.0";
+  version = "2.3.9.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 = "11k84vckwvxphjswqxv677p6riyb2hgx1kh15f865hnk8n21fldx";
+    sha256 = "1c5ap14f2yr3izz8s1blgp5g4r898kzppay7xrga2j216i51zfpw";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix
index faf5106c67e3b..c6065dbfca2d1 100644
--- a/pkgs/os-specific/linux/s6-linux-utils/default.nix
+++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.0.2.0";
+  version = "2.0.2.3";
 
 in stdenv.mkDerivation rec {
 
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz";
-    sha256 = "0y6dq4wb5v1c6ps6a7jyq08r2pjksrvz6n3dnfa9c91gzm4m1dxb";
+    sha256 = "1hwc3dmqh4cyhx9b4gd48yvjrwmfkz968rncpqc511krpfwzyngr";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 7478b1e33eea0..5d8e36ba83c18 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.1.4.0";
+  version = "2.1.4.5";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/execline";
     rev = "refs/tags/v${version}";
-    sha256 = "1ih0mmkra3aa697nz7haaifq2hfy3wjj39npxzg9zr37m7yw67yz";
+    sha256 = "1k4db9iyskrqf6wbc4dkiqgpn0wb43qc9rf1br7kvy9rrzq3yrj0";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index 0ca0774989de3..b8107f20005ff 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.0.5.2";
+  version = "2.0.5.3";
 
 in stdenv.mkDerivation rec {
 
@@ -10,7 +10,7 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz";
-    sha256 = "0d5dvqz61abr4m2n10by8hccvw51jdvyckvpbbq0c57viri54jzm";
+    sha256 = "029fg9c37vwh9yagd69h8r192nrx4mfva8dwgpm1gxkdssrh3gi7";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 233425dc3a110..653eee56f0939 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.0.0.4";
+  version = "2.0.0.7";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-dns";
     rev = "refs/tags/v${version}";
-    sha256 = "0h2s0r0g0qi74aw04c0jap09yjzzprwc6ihknx8bqgbzv08yv03w";
+    sha256 = "033pijilkvj3vw94aqrvavr4mqafm7kcc8ql8lc3ma6lqkx4xyak";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index 5f24592f030ea..f102405e5bb97 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.1.0.1";
+  version = "2.1.0.4";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-networking";
     rev = "refs/tags/v${version}";
-    sha256 = "0jdjxwqrp7lzdb85sp1gdkm7s478wyl7wqxb3jfxflgh2bgdgvy2";
+    sha256 = "1mvsiiv2zk1mbhway5q593xzjzd3lyzdqg85wrpvv791mv0kk8m9";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index a3b244d875b6f..c86cd7a2f520f 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "0.0.1.0";
+  version = "0.0.2.1";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6-rc";
     rev = "refs/tags/v${version}";
-    sha256 = "02ppsda8pg7mph3r7lrh7dhi6ip99bgghsl3lf902cg9i4n50q6q";
+    sha256 = "0x9ghi1f7zqphzlzyz67z7n7mnnyxf1hghi2wa2f8cdl70nfdi2f";
   };
 
   dontDisableStatic = true;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 5e29c20339cf5..04f723fabc078 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "2.2.1.0";
+  version = "2.2.4.3";
 
 in stdenv.mkDerivation rec {
 
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   src = fetchgit {
     url = "git://git.skarnet.org/s6";
     rev = "refs/tags/v${version}";
-    sha256 = "1g8gr3znxj8lyqpwrmgzh47yb64zldrvvvgpp1m4pb37k5k11bj9";
+    sha256 = "0j981xslcsra8filaawgwq6daqvxxjs0014lqb7dy3qf7c5pc4l8";
   };
 
   dontDisableStatic = true;

From f2af8874e8fa2265d1847d8fec9cc271de7f2efa Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 1 Apr 2016 17:30:34 +0200
Subject: [PATCH 619/857] Revert "initrd: Use modprobe from busybox"

This reverts commit 45c218f893d38f94cd62fc256117b9fb1a0d1749.

Busybox's modprobe causes numerous "Unknown symbol" errors in the
kernel log, even though the modules do appear to load correctly.
---
 nixos/modules/system/boot/stage-1.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 757d883373ac5..7b13a305f0355 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -67,6 +67,10 @@ let
         copy_bin_and_libs $BIN
       done
 
+      # Copy modprobe.
+      copy_bin_and_libs ${pkgs.kmod}/bin/kmod
+      ln -sf kmod $out/bin/modprobe
+
       # Copy resize2fs if needed.
       ${optionalString (any (fs: fs.autoResize) (attrValues config.fileSystems)) ''
         # We need mke2fs in the initrd.

From fc1f5d2cf1a4febaa7843284554fd7397c8988bc Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Fri, 1 Apr 2016 10:20:13 -0500
Subject: [PATCH 620/857] set target for darwin binary compat in skarnet.org
 packages

skalibs:
execline:
s6-dns:
s6-networking:
s6-portable-utils:
s6-rc:
s6:

The above software uses the target triplet from `cc -dumpmachine` as a
binary compatibility check. However, on darwin, the output includes the
darwin version number, which leads to build failures against a binary
skalibs package built a different version of darwin than the current
system.

Explicitly setting target ensures code can be compiled against a skalibs
binary built on a different version of darwin.

See http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
---
 pkgs/development/libraries/skalibs/default.nix  | 9 ++++++++-
 pkgs/tools/misc/execline/default.nix            | 4 +++-
 pkgs/tools/misc/s6-portable-utils/default.nix   | 3 ++-
 pkgs/tools/networking/s6-dns/default.nix        | 4 +++-
 pkgs/tools/networking/s6-networking/default.nix | 3 ++-
 pkgs/tools/system/s6-rc/default.nix             | 4 +++-
 pkgs/tools/system/s6/default.nix                | 4 +++-
 7 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix
index 1b5a990b19de8..349e5582013f4 100644
--- a/pkgs/development/libraries/skalibs/default.nix
+++ b/pkgs/development/libraries/skalibs/default.nix
@@ -23,7 +23,14 @@ in stdenv.mkDerivation rec {
     "--libdir=\${prefix}/lib"
     "--includedir=\${prefix}/include"
     "--sysdepdir=\${prefix}/lib/skalibs/sysdeps"
-  ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
+  ]
+  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
+  # On darwin, the target triplet from -dumpmachine includes version number, but
+  # skarnet.org software uses the triplet to test binary compatibility.
+  # Explicitly setting target ensures code can be compiled against a skalibs
+  # binary built on a different version of darwin.
+  # http://www.skarnet.org/cgi-bin/archive.cgi?1:mss:623:heiodchokfjdkonfhdph
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   meta = {
     homepage = http://skarnet.org/software/skalibs/;
diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix
index 5d8e36ba83c18..1726afca0d02f 100644
--- a/pkgs/tools/misc/execline/default.nix
+++ b/pkgs/tools/misc/execline/default.nix
@@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
     "--with-include=${skalibs}/include"
     "--with-lib=${skalibs}/lib"
     "--with-dynlib=${skalibs}/lib"
-  ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
+  ]
+  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   meta = {
     homepage = http://skarnet.org/software/execline/;
diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix
index b8107f20005ff..70b36222cca92 100644
--- a/pkgs/tools/misc/s6-portable-utils/default.nix
+++ b/pkgs/tools/misc/s6-portable-utils/default.nix
@@ -20,7 +20,8 @@ in stdenv.mkDerivation rec {
     "--with-include=${skalibs}/include"
     "--with-lib=${skalibs}/lib"
     "--with-dynlib=${skalibs}/lib"
-  ];
+  ]
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-portable-utils/;
diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix
index 653eee56f0939..8715cb0c45cc0 100644
--- a/pkgs/tools/networking/s6-dns/default.nix
+++ b/pkgs/tools/networking/s6-dns/default.nix
@@ -25,7 +25,9 @@ in stdenv.mkDerivation rec {
     "--with-include=${skalibs}/include"
     "--with-lib=${skalibs}/lib"
     "--with-dynlib=${skalibs}/lib"
-  ] ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ]);
+  ]
+  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-dns/;
diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix
index f102405e5bb97..603b2f61551b8 100644
--- a/pkgs/tools/networking/s6-networking/default.nix
+++ b/pkgs/tools/networking/s6-networking/default.nix
@@ -32,7 +32,8 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${execline}/lib"
     "--with-dynlib=${s6}/lib"
     "--with-dynlib=${s6Dns}/lib"
-  ];
+  ]
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   meta = {
     homepage = http://www.skarnet.org/software/s6-networking/;
diff --git a/pkgs/tools/system/s6-rc/default.nix b/pkgs/tools/system/s6-rc/default.nix
index c86cd7a2f520f..35763e8212e33 100644
--- a/pkgs/tools/system/s6-rc/default.nix
+++ b/pkgs/tools/system/s6-rc/default.nix
@@ -29,7 +29,9 @@ in stdenv.mkDerivation rec {
     "--with-dynlib=${skalibs}/lib"
     "--with-dynlib=${execline}/lib"
     "--with-dynlib=${s6}/lib"
-  ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
+  ]
+  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   meta = {
     homepage = http://skarnet.org/software/s6-rc/;
diff --git a/pkgs/tools/system/s6/default.nix b/pkgs/tools/system/s6/default.nix
index 04f723fabc078..e1e30de5799fa 100644
--- a/pkgs/tools/system/s6/default.nix
+++ b/pkgs/tools/system/s6/default.nix
@@ -26,7 +26,9 @@ in stdenv.mkDerivation rec {
     "--with-lib=${execline}/lib"
     "--with-dynlib=${skalibs}/lib"
     "--with-dynlib=${execline}/lib"
-  ] ++ [ (if stdenv.isDarwin then "--disable-shared" else "--enable-shared") ];
+  ]
+  ++ (if stdenv.isDarwin then [ "--disable-shared" ] else [ "--enable-shared" ])
+  ++ (stdenv.lib.optional stdenv.isDarwin "--target=${stdenv.system}");
 
   preBuild = ''
     substituteInPlace "src/daemontools-extras/s6-log.c" \

From e5c4d29f7940f319d70fab8466873e2f119aa19a Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 1 Apr 2016 19:00:16 +0200
Subject: [PATCH 621/857] ibus-engines.mozc: build protobuf dependency using
 clang.

Fixes #14261.
---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d70da4ebf4112..abdbce9b13c4c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1067,6 +1067,7 @@ in
 
     mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
       inherit (pythonPackages) gyp;
+      protobuf = protobuf.override { stdenv = clangStdenv; };
     };
 
     table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {

From bbfad5111a3e2cb273e975945ac4fb4cb30a9cd4 Mon Sep 17 00:00:00 2001
From: Aaron Son <aaron@snapchat.com>
Date: Wed, 30 Mar 2016 15:07:29 -0700
Subject: [PATCH 622/857] gradle: Fix gradle-2.12 on Linux to find libstdc++.so
 reference in native library.

---
 .../tools/build-managers/gradle/default.nix    | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index c2b24c69904fa..96477e55d26ae 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -4,6 +4,8 @@ rec {
   gradleGen = {name, src} : stdenv.mkDerivation rec {
     inherit name src;
 
+    buildPhase = ":";
+
     installPhase = ''
       mkdir -pv $out/lib/gradle/
       cp -rv lib/ $out/lib/gradle/
@@ -15,7 +17,21 @@ rec {
         --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
     '';
 
-    phases = "unpackPhase installPhase";
+    fixupPhase = if (!stdenv.isLinux) then ":" else
+      let arch = if stdenv.is64bit then "amd64" else "i386"; in ''
+        mkdir patching
+        pushd patching
+        jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-0.10.jar
+        patchelf --set-rpath "${stdenv.cc.cc}/lib:${stdenv.cc.cc}/lib64" net/rubygrapefruit/platform/linux-${arch}/libnative-platform.so
+        jar cf native-platform-linux-${arch}-0.10.jar .
+        mv native-platform-linux-${arch}-0.10.jar $out/lib/gradle/lib/
+        popd
+
+        # The scanner doesn't pick up the runtime dependency in the jar.
+        # Manually add a reference where it will be found.
+        mkdir $out/nix-support
+        echo ${stdenv.cc.cc} > $out/nix-support/manual-runtime-dependencies
+      '';
 
     buildInputs = [ unzip jdk makeWrapper ];
 

From 94396b8d915a9a559cbafa306f398d07847b1c55 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 1 Apr 2016 23:59:34 +0200
Subject: [PATCH 623/857] imlib2: 1.4.6 -> 1.4.8 (security)

Fixes:

 * CVE-2014-9762
 * CVE-2014-9763
 * CVE-2014-9764
---
 pkgs/development/libraries/imlib2/default.nix |  8 +--
 .../libraries/imlib2/giflib51.patch           | 64 -------------------
 2 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/development/libraries/imlib2/giflib51.patch

diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix
index 3ff608a4ac330..8d79fcc50a8ec 100644
--- a/pkgs/development/libraries/imlib2/default.nix
+++ b/pkgs/development/libraries/imlib2/default.nix
@@ -1,21 +1,17 @@
 { stdenv, fetchurl, xlibsWrapper, libjpeg, libtiff, giflib, libpng, bzip2, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "imlib2-1.4.6";
+  name = "imlib2-1.4.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/enlightenment/${name}.tar.bz2";
-    sha256 = "0x1j0ylpclkp8cfpwfpkjywqz124bqskyxbw8pvwzkv2gmrbwldg";
+    sha256 = "0xxhgkd1axlcmf3kp1d7naiygparpg8l3sg3d263rhl2z0gm7aw9";
   };
 
   buildInputs = [ xlibsWrapper libjpeg libtiff giflib libpng bzip2 ];
 
   nativeBuildInputs = [ pkgconfig ];
 
-  # From
-  # https://github.com/PhantomX/slackbuilds/blob/master/imlib2/patches/imlib2-giflib51.patch
-  patches = [ ./giflib51.patch ];
-
   preConfigure = ''
     substituteInPlace imlib2-config.in \
       --replace "@my_libs@" ""
diff --git a/pkgs/development/libraries/imlib2/giflib51.patch b/pkgs/development/libraries/imlib2/giflib51.patch
deleted file mode 100644
index 97eaeb0b96e6d..0000000000000
--- a/pkgs/development/libraries/imlib2/giflib51.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c
---- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c	2013-12-21 10:16:10.000000000 +0000
-+++ imlib2-1.4.6/src/modules/loaders/loader_gif.c	2014-05-27 09:52:35.857291512 +0000
-@@ -36,7 +36,7 @@
- #endif
-    if (fd < 0)
-       return 0;
--   gif = DGifOpenFileHandle(fd);
-+   gif = DGifOpenFileHandle(fd, NULL);
-    if (!gif)
-      {
-         close(fd);
-@@ -60,13 +60,13 @@
-              h = gif->Image.Height;
-              if (!IMAGE_DIMENSIONS_OK(w, h))
-                {
--                  DGifCloseFile(gif);
-+                  DGifCloseFile(gif, NULL);
-                   return 0;
-                }
-              rows = malloc(h * sizeof(GifRowType *));
-              if (!rows)
-                {
--                  DGifCloseFile(gif);
-+                  DGifCloseFile(gif, NULL);
-                   return 0;
-                }
-              for (i = 0; i < h; i++)
-@@ -78,7 +78,7 @@
-                   rows[i] = malloc(w * sizeof(GifPixelType));
-                   if (!rows[i])
-                     {
--                       DGifCloseFile(gif);
-+                       DGifCloseFile(gif, NULL);
-                        for (i = 0; i < h; i++)
-                          {
-                             if (rows[i])
-@@ -150,7 +150,7 @@
-         im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
-         if (!im->data)
-           {
--             DGifCloseFile(gif);
-+             DGifCloseFile(gif, NULL);
-              free(rows);
-              return 0;
-           }
-@@ -181,7 +181,7 @@
-                        last_per = (int)per;
-                        if (!(progress(im, (int)per, 0, last_y, w, i)))
-                          {
--                            DGifCloseFile(gif);
-+                            DGifCloseFile(gif, NULL);
-                             for (i = 0; i < h; i++)
-                               {
-                                  free(rows[i]);
-@@ -198,7 +198,7 @@
-      {
-         progress(im, 100, 0, last_y, w, h);
-      }
--   DGifCloseFile(gif);
-+   DGifCloseFile(gif, NULL);
-    for (i = 0; i < h; i++)
-      {
-         free(rows[i]);
\ No newline at end of file

From a32d5d37558d22b2d9ff878336786f315f4681f9 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Fri, 1 Apr 2016 16:10:06 -0400
Subject: [PATCH 624/857] lammps: init at 2016-02-16

---
 .../molecular-dynamics/lammps/default.nix     | 55 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  9 +++
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/applications/science/molecular-dynamics/lammps/default.nix

diff --git a/pkgs/applications/science/molecular-dynamics/lammps/default.nix b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
new file mode 100644
index 0000000000000..35ab534836878
--- /dev/null
+++ b/pkgs/applications/science/molecular-dynamics/lammps/default.nix
@@ -0,0 +1,55 @@
+{ stdenv, writeText, fetchurl,
+  libpng, fftw,
+  mpiSupport ? false, mpi ? null
+}:
+
+assert mpiSupport -> mpi != null;
+
+stdenv.mkDerivation rec {
+  # LAMMPS has weird versioning converted to ISO 8601 format
+  version = "2016-02-16";
+  name = "lammps-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/lammps/lammps-16Feb16.tar.gz";
+    sha256 = "1yzfbkxma3xa1288rnn66h4w0smbmjkwq1fx1y60pjiw0prmk105";
+  };
+
+  passthru = {
+    inherit mpi;
+  };
+
+  buildInputs = [ fftw libpng ]
+  ++ (stdenv.lib.optionals mpiSupport [ mpi ]);
+
+  # Must do manual build due to LAMMPS requiring a seperate build for
+  # the libraries and executable
+  builder = writeText "builder.sh" ''
+    source $stdenv/setup
+
+    tar xzf $src
+    cd lammps-*/src
+    make mode=exe ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+    make mode=shlib ${if mpiSupport then "mpi" else "serial"} SHELL=$SHELL LMP_INC="-DLAMMPS_GZIP -DLAMMPS_PNG" FFT_PATH=-DFFT_FFTW3 FFT_LIB=-lfftw3 JPG_LIB=-lpng
+
+    mkdir -p $out/bin
+    cp -v lmp_* $out/bin/lammps
+
+    mkdir -p $out/lib
+    cp -v liblammps* $out/lib/
+  '';
+
+  meta = {
+    description = "Classical Molecular Dynamics simulation code";
+    longDescription = ''
+      LAMMPS is a classical molecular dynamics simulation code designed to
+      run efficiently on parallel computers. It was developed at Sandia
+      National Laboratories, a US Department of Energy facility, with
+      funding from the DOE. It is an open-source code, distributed freely
+      under the terms of the GNU Public License (GPL).
+      '';
+    homepage = "http://lammps.sandia.gov";
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d70da4ebf4112..2f583ac5cdecd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15524,6 +15524,15 @@ in
 
   ### SCIENCE/MOLECULAR-DYNAMICS
 
+  lammps = callPackage ../applications/science/molecular-dynamics/lammps {
+    fftw = fftw;
+  };
+
+  lammps-mpi = appendToName "mpi" (lammps.override {
+    mpiSupport = true;
+    mpi = openmpi;
+  });
+
   gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
     singlePrec = true;
     mpiEnabled = false;

From 857cb10e1d7160012962a2323f255e0f81f5cc30 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Fri, 1 Apr 2016 18:56:23 -0400
Subject: [PATCH 625/857] ccacheStdenv: provide working example config in docs

---
 pkgs/top-level/all-packages.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d70da4ebf4112..08a99e1a706ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5744,16 +5744,22 @@ in
   # It can be used by setting in nixpkgs config like this, for example:
   #    replaceStdenv = { pkgs }: pkgs.ccacheStdenv;
   # But if you build in chroot, you should have that path in chroot
-  # If instantiated directly, it will use the HOME/.ccache as cache directory.
-  # You can use an override in packageOverrides to set extraConfig:
+  # If instantiated directly, it will use $HOME/.ccache as the cache directory,
+  # i.e. /homeless-shelter/.ccache using the Nix daemon.
+  # You should specify a different directory using an override in
+  # packageOverrides to set extraConfig.
+  #
+  # Example using Nix daemon (i.e. multiuser Nix install or on NixOS):
   #    packageOverrides = pkgs: {
   #     ccacheWrapper = pkgs.ccacheWrapper.override {
   #       extraConfig = ''
-  #         CCACHE_COMPRESS=1
-  #         CCACHE_DIR=/bin/.ccache
+  #         export CCACHE_COMPRESS=1
+  #         export CCACHE_DIR=/var/cache/ccache
+  #         export CCACHE_UMASK=007
   #       '';
   #     };
-  #
+  # You can use a different directory, but whichever directory you choose
+  # should be owned by user root, group nixbld with permissions 0770.
   ccacheWrapper = makeOverridable ({ extraConfig ? "" }:
      wrapCC (ccache.links extraConfig)) {};
   ccacheStdenv = lowPrio (overrideCC stdenv ccacheWrapper);

From 456ce674623e186ca026356635b3711c89e227d6 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Mon, 21 Mar 2016 19:19:32 -0500
Subject: [PATCH 626/857] Patch erlang-R17

Fix R17 build on OS X, modeling changes after R18,
i.e. inherit Carbon, Cocoa.
---
 pkgs/development/interpreters/erlang/R17.nix |  8 +++++---
 pkgs/top-level/all-packages.nix              | 19 +++++++++++++++----
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix
index e06b2741d35c9..8096ca555a44d 100644
--- a/pkgs/development/interpreters/erlang/R17.nix
+++ b/pkgs/development/interpreters/erlang/R17.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, perl, gnum4, ncurses, openssl
 , gnused, gawk, makeWrapper
+, Carbon, Cocoa
 , odbcSupport ? false, unixODBC ? null
 , wxSupport ? true, mesa ? null, wxGTK ? null, xorg ? null, wxmac ? null
 , javacSupport ? false, openjdk ? null
@@ -27,9 +28,10 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ perl gnum4 ncurses openssl makeWrapper
-    ] ++ optional wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
-      ++ optional odbcSupport [ unixODBC ]
-      ++ optional javacSupport [ openjdk ];
+    ] ++ optionals wxSupport (if stdenv.isDarwin then [ wxmac ] else [ mesa wxGTK xorg.libX11 ])
+      ++ optional odbcSupport unixODBC
+      ++ optional javacSupport openjdk
+      ++ stdenv.lib.optionals stdenv.isDarwin [ Carbon Cocoa ];
 
   patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f583ac5cdecd..d75963e066aa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5231,10 +5231,21 @@ in
 
   erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { };
   erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; };
-  erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { };
-  erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; };
-  erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; };
-  erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix { javacSupport = true; odbcSupport = true; };
+  erlangR17 = callPackage ../development/interpreters/erlang/R17.nix {
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+  };
+  erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix {
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    odbcSupport = true;
+  };
+  erlangR17_javac = callPackage ../development/interpreters/erlang/R17.nix {
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    javacSupport = true;
+  };
+  erlangR17_odbc_javac = callPackage ../development/interpreters/erlang/R17.nix {
+    inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
+    javacSupport = true; odbcSupport = true;
+  };
   erlangR18 = callPackage ../development/interpreters/erlang/R18.nix {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };

From 838217332baed839667a99fd79323eff3099c849 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Apr 2016 02:16:31 +0200
Subject: [PATCH 627/857] bandwidth: 1.1b -> 1.2.0

---
 pkgs/tools/misc/bandwidth/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index ff5e47336d3cb..853c619859d4e 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -10,11 +10,13 @@ let
     else null;
 in
 stdenv.mkDerivation rec {
-  name = "bandwidth-1.1b";
+  name = "bandwidth-${version}";
+  version = "1.2.0";
 
   src = fetchurl {
-    url = "http://zsmith.co/archives/${name}.tar.gz";
-    sha256 = "01c3ca0x3rh65j1s2g6cg5xr9fvm0lp2wpmv71vhz55xwqqqmiz8";
+    url = "https://mutineer.org/file.php?id=ee10698c6a675ece26f08ddb5e6001323d6305c1&p=bandwidth";
+    name = "${name}.tar.gz";
+    sha256 = "1jq6a4n77gcx68bkr8l79agsmgv8saw9nv183297gnah1g67nvw6";
   };
 
   buildInputs = [ nasm ];
@@ -30,9 +32,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://zsmith.co/bandwidth.html;
-    description = "and artificial benchmark for identifying weaknesses in the memory subsystem";
+    description = "Artificial benchmark for identifying weaknesses in the memory subsystem";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ nckx wkennington ];
   };
 }

From 1ae7281cc31cff834414c07d38df3fa12cc43a74 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 2 Apr 2016 13:29:33 +0900
Subject: [PATCH 628/857] albert: 0.8.0 -> 0.8.7.2

---
 pkgs/applications/misc/albert/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index b6c0feede6cd2..5e6931ce78e28 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, qtbase, qtx11extras, makeQtWrapper, muparser, cmake }:
+{ stdenv, fetchFromGitHub, qtbase, qtsvg, qtx11extras, makeQtWrapper, muparser, cmake }:
 
 stdenv.mkDerivation rec {
   name    = "albert-${version}";
-  version = "0.8.0";
+  version = "0.8.7.2";
 
   src = fetchFromGitHub {
     owner  = "manuelschneid3r";
     repo   = "albert";
     rev    = "v${version}";
-    sha256 = "0lzj1gbcc5sp2x1c0d3s21y55kcnnn4dmy8d205mrgnyavjrak7n";
+    sha256 = "04k6cawil6kqkmsilq5mpjy8lwgk0g08s0v23d5a83calpq3ljpc";
   };
 
-  buildInputs = [ cmake qtbase qtx11extras muparser makeQtWrapper ];
+  buildInputs = [ cmake qtbase qtsvg qtx11extras muparser makeQtWrapper ];
 
   fixupPhase = ''
     wrapQtProgram $out/bin/albert

From a5285ae47794fb4e3563b66469f5191f81e5c302 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 2 Apr 2016 15:58:48 +0900
Subject: [PATCH 629/857] fcitx-engines.mozc: build protobuf dependency using
 clang

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ccef4ab8b5a7..4d5abc3e08464 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1427,6 +1427,7 @@ in
 
     mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
       inherit (pythonPackages) gyp;
+      protobuf = protobuf.override { stdenv = clangStdenv; };
     };
 
     table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };

From 3d8f7ccc09776fc43c0955e46c341a58f75375a4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Apr 2016 09:59:21 +0200
Subject: [PATCH 630/857] pythonPackages.imagesize: init at 0.7.0

---
 pkgs/top-level/python-packages.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e39a23b58d169..86e719b9a8191 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6115,6 +6115,23 @@ in modules // {
     };
   };
 
+  imagesize = buildPythonPackage rec {
+    name = "imagesize-${version}";
+    version = "0.7.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/i/imagesize/${name}.tar.gz";
+      sha256 = "0msgz4ncp2nb5nbsxnf8kvxsl6nhwvc3b46ik097fvznl3y10gdv";
+    };
+
+    meta = {
+      description = "Getting image size from png/jpeg/jpeg2000/gif file";
+      homepage = https://github.com/shibukawa/imagesize_py;
+      license = with licenses; [ mit ];
+    };
+
+  };
+
   imread = buildPythonPackage rec {
     name = "python-imread-${version}";
     version = "0.5.1";

From 15a2c7e667371c474c6faec93fc60c2e2c658745 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Apr 2016 09:59:35 +0200
Subject: [PATCH 631/857] pythonPackages.flake8: 2.5.1 -> 2.5.4

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86e719b9a8191..43270204e2e71 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8935,11 +8935,11 @@ in modules // {
 
   flake8 = buildPythonPackage rec {
     name = "flake8-${version}";
-    version = "2.5.1";
+    version = "2.5.4";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
-      sha256 = "448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603";
+      sha256 = "0bs9cz4fr99r2rwig1b8jwaadl1nan7kgpdzqwj0bwbckwbmh7nc";
     };
 
     buildInputs = with self; [ nose mock ];

From aed9eb04d03013be34986ce159984e2393c7ddf1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Apr 2016 09:59:56 +0200
Subject: [PATCH 632/857] pythonPackages.mccabe: 0.3 -> 0.4.0

---
 pkgs/top-level/python-packages.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 43270204e2e71..ec52499e6266c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11665,11 +11665,11 @@ in modules // {
 
 
   mccabe = buildPythonPackage (rec {
-    name = "mccabe-0.3";
+    name = "mccabe-0.4.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/m/mccabe/${name}.tar.gz";
-      sha256 = "3d8ca9bf65c5014f469180544d1dd5bb5b9df709aad6304f9c2e4370ae0a7b7c";
+      sha256 = "0yr08a36h8lqlif10l4xcikbbig7q8f41gqywir7rrvnv3mi4aws";
     };
 
     # See https://github.com/flintwork/mccabe/issues/31
@@ -11681,6 +11681,8 @@ in modules // {
       }}" test_mccabe.py
     '';
 
+    buildInputs = with self; [ pytestrunner pytest ];
+
     meta = {
       description = "McCabe checker, plugin for flake8";
       homepage = "https://github.com/flintwork/mccabe";

From ff286cf2a271525113f317889b5dd42d9a34bc30 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Apr 2016 10:00:14 +0200
Subject: [PATCH 633/857] pythonPackages.pygments: 2.1.1 -> 2.1.3

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec52499e6266c..3bbf74f2044d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16935,12 +16935,12 @@ in modules // {
   };
 
   pygments = buildPythonPackage rec {
-    version = "2.1.1";
+    version = "2.1.3";
     name = "Pygments-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
-      sha256 = "06y0b7xh9h3r0wbxl41ccnnnw8dxfz48zj8x09y4rranbfldkxrd";
+      sha256 = "10axnp2wpjnq9g8wg53fx0c70dfxqrz498jyz8mrdx9a3flwir48";
     };
 
     propagatedBuildInputs = with self; [ docutils ];

From 99b8baf036b54cac52d3db79fdc13fa36804509f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Apr 2016 10:02:09 +0200
Subject: [PATCH 634/857] pythonPackages.pytz: 2015.7 -> 2016.3

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3bbf74f2044d3..32529f30dba0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18145,11 +18145,11 @@ in modules // {
 
   pytz = buildPythonPackage rec {
     name = "pytz-${version}";
-    version = "2015.7";
+    version = "2016.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.gz";
-      sha256 = "99266ef30a37e43932deec2b7ca73e83c8dbc3b9ff703ec73eca6b1dae6befea";
+      sha256 = "1a3hjclyylc4m1v1dn04b38wm2vl649ijdswpg0d8m8n0lcxlj9l";
     };
 
     meta = {

From 2e9a1e263ae45fdfcd9c902d9ce2060c6c29bab9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Apr 2016 10:10:16 +0200
Subject: [PATCH 635/857] pythonPackages.sphinx_rtd_theme: 0.1.8 -> 0.1.9

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32529f30dba0c..6765bd2900457 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20574,11 +20574,11 @@ in modules // {
   };
 
   sphinx_rtd_theme = buildPythonPackage (rec {
-    name = "sphinx_rtd_theme-0.1.8";
+    name = "sphinx_rtd_theme-0.1.9";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/sphinx_rtd_theme/${name}.tar.gz";
-      sha256 = "12mnb7qscr07mllmyyqfpx37778sr21m8663b4fivnk17bnk7xkl";
+      sha256 = "18d0r63w7jpdrk4q5qy26n08vdlmnj9sar93akwjphyambw4cf17";
     };
 
     postPatch = ''

From 65efc9ee2eaec581766ed5b4384307b17ab016cf Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 1 Apr 2016 11:48:18 -0500
Subject: [PATCH 636/857] pythonPackages.sphinx: 1.3.4 -> 1.3.6

---
 .../sphinx-fix-tests-with-pygments-2.1.patch  | 63 -------------------
 pkgs/top-level/python-packages.nix            | 15 +++--
 2 files changed, 7 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch

diff --git a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch
deleted file mode 100644
index 5aa4af873cd53..0000000000000
--- a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 5574aba60ed76f2bae947722122ac4d71ab8ed5a Mon Sep 17 00:00:00 2001
-From: Takeshi KOMIYA <i.tkomiya@gmail.com>
-Date: Mon, 18 Jan 2016 12:38:02 +0900
-Subject: [PATCH] Fix tests are broken with pygments-2.1
-
----
- tests/test_build_html.py |  2 +-
- tests/test_intl.py       | 10 ++++++----
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/tests/test_build_html.py b/tests/test_build_html.py
-index e330761..17ea089 100644
---- a/tests/test_build_html.py
-+++ b/tests/test_build_html.py
-@@ -82,7 +82,7 @@ def checker(nodes):
-         (".//a[@href='_downloads/img1.png']", ''),
-         (".//pre", u'"quotes"'),
-         (".//pre", u"'included'"),
--        (".//pre/span[@class='s']", u'üöä'),
-+        (".//pre/span[@class='s2']", u'üöä'),
-         (".//div[@class='inc-pyobj1 highlight-text']//pre",
-             r'^class Foo:\n    pass\n\s*$'),
-         (".//div[@class='inc-pyobj2 highlight-text']//pre",
-diff --git a/tests/test_intl.py b/tests/test_intl.py
-index 4c665d4..b24ec65 100644
---- a/tests/test_intl.py
-+++ b/tests/test_intl.py
-@@ -694,14 +694,15 @@ def test_additional_targets_should_not_be_translated(app, status, warning):
-     yield assert_count(expected_expr, result, 1)
- 
-     # C code block with lang should not be translated but be *C* highlighted
--    expected_expr = """<span class="cp">#include &lt;stdio.h&gt;</span>"""
-+    expected_expr = ("""<span class="cp">#include</span> """
-+                     """<span class="cpf">&lt;stdio.h&gt;</span>""")
-     yield assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted
-     expected_expr = (
-         """<span class="gp">&gt;&gt;&gt; </span>"""
-         """<span class="kn">import</span> <span class="nn">sys</span>  """
--        """<span class="c"># sys importing</span>""")
-+        """<span class="c1"># sys importing</span>""")
-     yield assert_count(expected_expr, result, 1)
- 
-     ## raw.txt
-@@ -754,14 +755,15 @@ def test_additional_targets_should_be_translated(app, status, warning):
-     yield assert_count(expected_expr, result, 1)
- 
-     # C code block with lang should be translated and be *C* highlighted
--    expected_expr = """<span class="cp">#include &lt;STDIO.H&gt;</span>"""
-+    expected_expr = ("""<span class="cp">#include</span> """
-+                     """<span class="cpf">&lt;STDIO.H&gt;</span>""")
-     yield assert_count(expected_expr, result, 1)
- 
-     # doctest block should not be translated but be highlighted
-     expected_expr = (
-         """<span class="gp">&gt;&gt;&gt; </span>"""
-         """<span class="kn">import</span> <span class="nn">sys</span>  """
--        """<span class="c"># SYS IMPORTING</span>""")
-+        """<span class="c1"># SYS IMPORTING</span>""")
-     yield assert_count(expected_expr, result, 1)
- 
-     ## raw.txt
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6765bd2900457..561c8e05794b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -785,7 +785,7 @@ in modules // {
       url = "http://devel.ag-projects.com/repositories/${pname}";
       rev = "release-${version}";
       sha256 = "19dszv44py8qrq0jcjdycxpa7z2p8hi3ijq9gnqdsazbbjzf9svn";
-    };  
+    };
     buildInputs = with self; [ zope_interface ];
 
   };
@@ -5386,7 +5386,7 @@ in modules // {
       url = "http://devel.ag-projects.com/repositories/${pname}";
       rev = "release-${version}";
       sha256 = "1zxhpq8i4jwsk7wmfncqfm211hqikj3hp38cfv509924bi76wak8";
-    };  
+    };
 
     propagatedBuildInputs = with self; [ greenlet ];
 
@@ -12244,8 +12244,8 @@ in modules // {
       url = "http://devel.ag-projects.com/repositories/${pname}";
       rev = "release-${version}";
       sha256 = "0jqvvssbwzq7bwqn3wrjfnpj8zb558mynn2visnlrcma6b57yhwd";
-    };  
-    
+    };
+
     propagatedBuildInputs = with self; [ eventlib application gnutls ];
   };
 
@@ -20534,14 +20534,13 @@ in modules // {
 
 
   sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.3.4";
+    name = "Sphinx-1.3.6";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
-      sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a";
+      sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb";
     };
 
-    patches = [ ../development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch ];
     LC_ALL = "en_US.UTF-8";
     checkPhase = ''
       PYTHON=${python.executable} make test
@@ -20784,7 +20783,7 @@ in modules // {
 
     src = pkgs.fetchFromGitHub {
       repo = "sqlalchemy-imageattach";
-      owner = "crosspop";      
+      owner = "crosspop";
       rev = "${version}";
       sha256 = "1pqf7vk4lsvnhw169cqfyk0iz5f8n45470mdslklpi38z2fax9p0";
     };

From 15e5b83174700daf23a711fdfec72719dffcfc63 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 2 Apr 2016 10:30:44 +0200
Subject: [PATCH 637/857] pythonPackages.sphinx: add note

---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 561c8e05794b3..24279c41088d4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20536,6 +20536,9 @@ in modules // {
   sphinx = buildPythonPackage (rec {
     name = "Sphinx-1.3.6";
 
+    # 1.4 is broken
+    # https://github.com/sphinx-doc/sphinx/issues/2394
+
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
       sha256 = "12pzlfkjjlwgvsj56k0y809jpx5mgcs9548k1l4kdbr028ifjfqb";

From b40890a0b5952a5ea36fae9cde999c7cce5c6763 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Fri, 1 Apr 2016 10:18:42 +0200
Subject: [PATCH 638/857] godep: 2015-10-15 -> 60

---
 pkgs/top-level/go-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 5735aac8ad1a9..2639cc4ac7acf 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3832,12 +3832,12 @@ let
     subPackages = [ "./" ];
   };
 
-  godep = buildFromGitHub {
-    rev    = "5598a9815350896a2cdf9f4f1d0a3003ab9677fb";
-    version = "2015-10-15";
+  godep = buildFromGitHub rec {
+    version = "60";
+    rev    = "v${version}";
     owner  = "tools";
     repo   = "godep";
-    sha256 = "0zc1ah5cvaqa3zw0ska89a40x445vwl1ixz8v42xi3zicx16ibwz";
+    sha256 = "1v05185ikfcb3sz9ygcwm9x8la77i27ml1bg9fs6vvahjzyr0rif";
   };
 
   color = buildFromGitHub {

From d17dbcb0817edc8f79c117a5794284ceeee023eb Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 2 Apr 2016 14:20:13 +0000
Subject: [PATCH 639/857] atom: 1.6.1 -> 1.6.2

---
 pkgs/applications/editors/atom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index c6083a89f6c04..33813ca3a660c 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0g31kw4daysjp4iz1rxlh64hnqxbn561k41n908pxgc7kjwbl2hj";
+    sha256 = "1kl2pc0smacn4lgk5wwlaiw03rm8b0763vaisgp843p35zzsbc9n";
     name = "${name}.deb";
   };
 

From 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Apr 2016 16:24:12 +0200
Subject: [PATCH 640/857] tzdata: fixup after merging master

also rename lib output to dev - it contains a header and a static lib.
---
 pkgs/data/misc/tzdata/default.nix              | 12 +++++++-----
 pkgs/os-specific/darwin/opencflite/default.nix |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/data/misc/tzdata/default.nix b/pkgs/data/misc/tzdata/default.nix
index 5b51da58e6221..8ffd213306022 100644
--- a/pkgs/data/misc/tzdata/default.nix
+++ b/pkgs/data/misc/tzdata/default.nix
@@ -16,14 +16,16 @@ stdenv.mkDerivation rec {
     ];
 
   sourceRoot = ".";
-  outputs = [ "out" "lib" ];
+
+  outputs = [ "out" "man" "dev" ];
+  propagatedBuildOutputs = [];
 
   makeFlags = [
     "TOPDIR=$(out)"
     "TZDIR=$(out)/share/zoneinfo"
     "ETCDIR=$(TMPDIR)/etc"
-    "LIBDIR=$(lib)/lib"
-    "MANDIR=$(TMPDIR)/man"
+    "LIBDIR=$(dev)/lib"
+    "MANDIR=$(man)/man"
     "AWK=awk"
     "CFLAGS=-DHAVE_LINK=0"
   ];
@@ -34,8 +36,8 @@ stdenv.mkDerivation rec {
       ln -s . $out/share/zoneinfo/posix
       mv $out/share/zoneinfo-leaps $out/share/zoneinfo/right
 
-      mkdir -p "$lib/include"
-      cp tzfile.h "$lib/include/tzfile.h"
+      mkdir -p "$dev/include"
+      cp tzfile.h "$dev/include/tzfile.h"
     '';
 
   meta = {
diff --git a/pkgs/os-specific/darwin/opencflite/default.nix b/pkgs/os-specific/darwin/opencflite/default.nix
index a2408bfc5c8a1..1cd7f2bf9d6e1 100644
--- a/pkgs/os-specific/darwin/opencflite/default.nix
+++ b/pkgs/os-specific/darwin/opencflite/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   configureFlags = [ "--with-uuid=${libuuid}" ];
-  buildInputs = [ icu tzdata.lib ];
+  buildInputs = [ icu tzdata.dev ];
   enableParallelBuilding = true;
 
   meta = {

From 83cb6ec399e067b0d111abc39381204d1796758f Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 2 Apr 2016 23:11:57 +0800
Subject: [PATCH 641/857] dbus nixos module: add units for systemd user session

This patch makes dbus launch with any user session instead of
leaving it up to the desktop environment launch script to run it.

It has been tested with KDE, which simply uses the running daemon
instead of launching its own.

This is upstream's recommended way to run dbus.
---
 nixos/modules/services/system/dbus.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 77427ce9606e4..ba34eb25169cc 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -139,6 +139,30 @@ in
 
     systemd.services.dbus.restartTriggers = [ configDir ];
 
+    systemd.user = {
+      services.dbus = {
+        description = "D-Bus User Message Bus";
+        requires = [ "dbus.socket" ];
+        # NixOS doesn't support "Also" so we pull it in manually
+        # As the .service is supposed to come up at the same time as
+        # the .socket, we use basic.target instead of default.target
+        wantedBy = [ "basic.target" ];
+        serviceConfig = {
+          ExecStart = "${pkgs.dbus_daemon}/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation";
+          ExecReload = "${pkgs.dbus_daemon}/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig";
+        };
+      };
+
+      sockets.dbus = {
+        description = "D-Bus User Message Bus Socket";
+        socketConfig = {
+          ListenStream = "%t/bus";
+          ExecStartPost = "-${config.systemd.package}/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus";
+        };
+        wantedBy = [ "sockets.target" ];
+      };
+    };
+
     environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];
 
   };

From ca3f82e2587c22d69150639b1eb6703dcc4515e2 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sat, 2 Apr 2016 23:05:21 +0800
Subject: [PATCH 642/857] pulseaudio nixos module: run as systemd user service
 instead

Most of the desktop environments will spawn pulseaudio, but we can instead simply run it as a systemd service instead.

This patch also makes the system wide service run in foreground as recommended by the systemd projects and allows it to use sd_notify to signal ready instead of reading a pid written to a file. It is now also restarted on failure.

The user version has been tested with KDE and works fine there.

The system-wide version runs, but I haven't actually used it and upstream does not recommend running in this mode.
---
 nixos/modules/config/pulseaudio.nix | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index 179e826ba059f..8b4ad796d0d51 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -150,6 +150,29 @@ in {
         target = "pulse/default.pa";
         source = cfg.configFile;
       };
+
+      systemd.user = {
+        services.pulseaudio = {
+          description = "PulseAudio Server";
+          # NixOS doesn't support "Also" so we bring it in manually
+          wantedBy = [ "default.target" ];
+          serviceConfig = {
+            Type = "notify";
+            ExecStart = "${cfg.package}/bin/pulseaudio --daemonize=no";
+            Restart = "on-failure";
+          };
+        };
+
+        sockets.pulseaudio = {
+          description = "PulseAudio Socket";
+          wantedBy = [ "sockets.target" ];
+          socketConfig = {
+            Priority = 6;
+            Backlog = 5;
+            ListenStream = "%t/pulse/native";
+          };
+        };
+      };
     })
 
     (mkIf systemWide {
@@ -171,8 +194,9 @@ in {
         before = [ "sound.target" ];
         environment.PULSE_RUNTIME_PATH = stateDir;
         serviceConfig = {
-          ExecStart = "${cfg.package}/bin/pulseaudio -D --log-level=${cfg.daemon.logLevel} --system --use-pid-file -n --file=${cfg.configFile}";
-          PIDFile = "${stateDir}/pid";
+          Type = "notify";
+          ExecStart = "${cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
+          Restart = "on-failure";
         };
       };
     })

From d6998b06744064deb7ed6ea38a062c51638d33bc Mon Sep 17 00:00:00 2001
From: Rastus Vernon <rastus.vernon@protonmail.ch>
Date: Tue, 22 Mar 2016 22:32:03 -0400
Subject: [PATCH 643/857] nixos manual: recommend use of dd for writing the
 image

Unetbootin works by altering the image and placing a boot loader on it.
For this reason, it cannot work with UEFI and the installation guides
for other distributions (incl. Debian and Fedora) recommend against
using it.

Since dd writes the image verbatim to the drive, and not just the files,
it is not necessary to change the label after using it for UEFI
installations.

vcunat: tiny changes to the PR. Close #14139.
---
 nixos/doc/manual/installation/installing-usb.xml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/installation/installing-usb.xml b/nixos/doc/manual/installation/installing-usb.xml
index 5def6e8753fea..a4b5dafbed16e 100644
--- a/nixos/doc/manual/installation/installing-usb.xml
+++ b/nixos/doc/manual/installation/installing-usb.xml
@@ -7,10 +7,18 @@
 <title>Booting from a USB Drive</title>
 
 <para>For systems without CD drive, the NixOS live CD can be booted from
-a USB stick. For non-UEFI installations,
-<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>
-will work. For UEFI installations, you should mount the ISO, copy its contents
-verbatim to your drive, then either:
+a USB stick. You can use the <command>dd</command> utility to write the image:
+<command>dd if=<replaceable>path-to-image</replaceable>
+of=<replaceable>/dev/sdb</replaceable></command>. Be careful about specifying the
+correct drive; you can use the <command>lsblk</command> command to get a list of
+block devices.</para>
+
+<para>The <command>dd</command> utility will write the image verbatim to the drive,
+making it the recommended option for both UEFI and non-UEFI installations. For
+non-UEFI installations, you can alternatively use
+<link xlink:href="http://unetbootin.sourceforge.net/">unetbootin</link>. If you
+cannot use <command>dd</command> for a UEFI installation, you can also mount the
+ISO, copy its contents verbatim to your drive, then either:
 
 <itemizedlist>
   <listitem>

From 659c240be805f004e4cc3a436d32f91a1894a956 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 2 Apr 2016 18:43:32 +0200
Subject: [PATCH 644/857] picosat: 960 -> 965

---
 pkgs/applications/science/logic/picosat/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index fb5acc64c4dc6..e2b347798c2b5 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -2,15 +2,14 @@
 
 stdenv.mkDerivation rec {
   name    = "picosat-${version}";
-  version = "960";
+  version = "965";
 
   src = fetchurl {
     url = "http://fmv.jku.at/picosat/${name}.tar.gz";
-    sha256 = "05z8cfjk84mkna5ryqlq2jiksjifg3jhlgbijaq36sbn0i51iczd";
+    sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";
   };
 
-  dontAddPrefix = true;
-  configureFlags = "--shared";
+  configurePhase = "./configure.sh --shared";
 
   installPhase = ''
    mkdir -p $out/bin $out/lib $out/include/picosat

From e336cd003a03611a0e04a6d77547c912f4252205 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 2 Apr 2016 18:45:47 +0200
Subject: [PATCH 645/857] picosat: enable proof output and install various
 utils

---
 pkgs/applications/science/logic/picosat/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/picosat/default.nix b/pkgs/applications/science/logic/picosat/default.nix
index e2b347798c2b5..070664980dccf 100644
--- a/pkgs/applications/science/logic/picosat/default.nix
+++ b/pkgs/applications/science/logic/picosat/default.nix
@@ -9,12 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "0m578rpa5rdn08d10kr4lbsdwp4402hpavrz6n7n53xs517rn5hm";
   };
 
-  configurePhase = "./configure.sh --shared";
+  configurePhase = "./configure.sh --shared --trace";
 
   installPhase = ''
    mkdir -p $out/bin $out/lib $out/include/picosat
-   cp picomus "$out"/bin
-   cp picosat "$out"/bin
+   cp picomus picomcs picosat picogcnf "$out"/bin
 
    cp libpicosat.a "$out"/lib
    cp libpicosat.so "$out"/lib

From cbca7d5707cc409c60cfc517feb679a80c82e5e2 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sat, 2 Apr 2016 18:56:32 +0200
Subject: [PATCH 646/857] Clean-up abc package expressions.

---
 pkgs/development/compilers/abc/default.nix | 38 +++++++++++-----------
 pkgs/top-level/all-packages.nix            |  9 +----
 2 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/abc/default.nix b/pkgs/development/compilers/abc/default.nix
index 1a71b808827ee..1340e8b5c1a04 100644
--- a/pkgs/development/compilers/abc/default.nix
+++ b/pkgs/development/compilers/abc/default.nix
@@ -1,23 +1,6 @@
-{stdenv, fetchurl, javaCup, jre, apacheAnt, patches} :
-
-let { 
-  body =
-    stdenv.mkDerivation {
-      name = "abc-1.2.0";
-      builder = ./builder.sh;
-
-      src = fetchurl {
-        url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
-        md5 = "aef9e8eac860f904f2a841e18770dc47";
-      };
-
-      inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd patches;
-
-      meta = {
-        description = "The AspectBench Compiler for AspectJ";
-      };
-    };
+{stdenv, fetchurl, javaCup, jre, apacheAnt}:
 
+let
   soot =
     import ./soot {
       inherit stdenv fetchurl apacheAnt polyglot jasmin;
@@ -76,4 +59,21 @@ let {
         md5 = "9810ad8762101ea691a895f0a6b7a5c3";
       };
     };
+in
+
+stdenv.mkDerivation {
+  name = "abc-1.2.0";
+  builder = ./builder.sh;
+
+  src = fetchurl {
+    url = http://abc.comlab.ox.ac.uk/dists/1.2.0/files/abc-1.2.0-src.tar.gz;
+    md5 = "aef9e8eac860f904f2a841e18770dc47";
+  };
+
+  inherit apacheAnt polyglot soot javaCup xact jasmin jre javabdd paddle jedd;
+  patches = [];
+
+  meta = {
+    description = "The AspectBench Compiler for AspectJ";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7df281904f294..ae800662444a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3924,14 +3924,7 @@ in
 
   ### DEVELOPMENT / COMPILERS
 
-  abc =
-    abcPatchable [];
-
-  abcPatchable = patches :
-    callPackage ../development/compilers/abc/default.nix {
-      inherit patches;
-      javaCup = callPackage ../development/libraries/java/cup { };
-    };
+  abc = callPackage ../development/compilers/abc/default.nix { };
 
   aldor = callPackage ../development/compilers/aldor { };
 

From 2d3fdc5d4126bcbe6e059c1ee1988e8239f578d9 Mon Sep 17 00:00:00 2001
From: Tristan Hume <tris.hume@gmail.com>
Date: Sat, 2 Apr 2016 13:45:33 -0400
Subject: [PATCH 647/857] rustPackages: 2016-03-22 -> 2016-04-02

---
 pkgs/top-level/rust-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 2b3b98dba63da..a829445d7b56f 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-03-22";
-  rev = "f28cdedb698cf76f513fb4514b5ed2892ec89b2f";
+  version = "2016-04-02";
+  rev = "b705d049d78f96bc27c58ccec7902e65d90826bd";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "05j43pgdlf554y9r781xdc5la55anwiq6k7vml9icak699ywfxqq";
+      sha256 = "1aspn79i1rw9migw7j0m12ghdq9cqhq8n2vzxy6hy1l728j3ykdp";
   };
 
 in

From b573693c03b104d9ab0ebef9ffb76e6da49072d1 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 2 Apr 2016 16:37:54 -0400
Subject: [PATCH 648/857] crashplan: 4.6.0 -. 4.6.0-r2

---
 pkgs/applications/backup/crashplan/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index e89de9b4c6aad..b9566e9c535f3 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,13 +1,15 @@
 { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
 
-let version = "4.6.0";
+let
+  version = "4.6.0";
+  rev = "2"; #tracks unversioned changes that occur on download.code42.com from time to time
 
 in stdenv.mkDerivation rec {
-  name = "crashplan-${version}";
+  name = "crashplan-${version}-r${rev}";
 
   crashPlanArchive = fetchurl {
     url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
-    sha256 = "0h9zk6i1pdvl101c8l4v4x6i7q4wkmkqp2dkm0lq7ha96lrvac47";
+    sha256 = "13rmmdj048r8k4v7ig4i6pnvwyzc1vasfgksf070bx6ksklgbq47";
   };
 
   srcs = [ crashPlanArchive ];

From 213a8a1e9658778101195e783cdfb91eb81036b3 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 2 Apr 2016 16:40:16 -0400
Subject: [PATCH 649/857] crashplan: fix vardir file existence check

---
 nixos/modules/services/backup/crashplan.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix
index 46d4c5192d9e1..94aa3b17b663a 100644
--- a/nixos/modules/services/backup/crashplan.nix
+++ b/nixos/modules/services/backup/crashplan.nix
@@ -50,7 +50,7 @@ with lib;
         ensureDir ${crashplan.vardir}/log 777
         cp -avn ${crashplan}/conf.template/* ${crashplan.vardir}/conf
         for x in app.asar bin EULA.txt install.vars lang lib libjniwrap64.so libjniwrap.so libjtux64.so libjtux.so libmd564.so libmd5.so share skin upgrade; do
-          if [ -e $x ]; then
+          if [ -e ${crashplan.vardir}/$x ]; then
             true;
           else
             ln -s ${crashplan}/$x ${crashplan.vardir}/$x;

From b11d8590d0cb3e2871bd12d0c9cb9c87155e4b49 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Fri, 1 Apr 2016 19:25:54 -0500
Subject: [PATCH 650/857] rebar3-nix-bootstrap: correct homepage URL

s/erl-nix/erlang-nix/
---
 pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
index 39ec59e849f22..ed38d573abf1e 100644
--- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
+++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     meta = {
       description = "Shim command to help bootstrap a rebar3 project on Nix";
       license = stdenv.lib.licenses.asl20;
-      homepage = "https://github.com/erl-nix/rebar3-nix-bootstrap";
+      homepage = "https://github.com/erlang-nix/rebar3-nix-bootstrap";
       maintainers = with stdenv.lib.maintainers; [ ericbmerritt ];
     };
 }

From e549aad2f27b310e50cf592410e6d327b228ad58 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sat, 2 Apr 2016 15:46:58 -0500
Subject: [PATCH 651/857] elixir: 1.2.3 -> 1.2.4

---
 pkgs/development/interpreters/elixir/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 3977b32bad708..a9854c7c49347 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "09s8469830s4070i0m04fxdhqimkdyc5k9jylm5vpfz9l3z4wvl8";
+    sha256 = "16759ff84d08b480b7e5499716e663b2fffd26e20cf2863de5613bc7bb05c817";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From c8865465cceaa215386c281af165f5f30f6bb8bb Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Sun, 27 Mar 2016 23:01:08 -0700
Subject: [PATCH 652/857] distcc: add libiberty as a buildInput

---
 pkgs/development/tools/misc/distcc/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/distcc/default.nix b/pkgs/development/tools/misc/distcc/default.nix
index cf9d7a0192041..ed3ad45c463a8 100644
--- a/pkgs/development/tools/misc/distcc/default.nix
+++ b/pkgs/development/tools/misc/distcc/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand, gcc, autoconf, automake, which, procps
+{ stdenv, fetchFromGitHub, popt, avahi, pkgconfig, python, gtk, runCommand
+, gcc, autoconf, automake, which, procps, libiberty_static
 , sysconfDir ? ""   # set this parameter to override the default value $out/etc
 , static ? false
 }:
@@ -15,7 +16,7 @@ let
       sha256 = "1vj31wcdas8wy52hy6749mlrca9v6ynycdiigx5ay8pnya9z73c6";
     };
 
-    buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps];
+    buildInputs = [popt avahi pkgconfig python gtk autoconf automake pkgconfig which procps libiberty_static];
     preConfigure =
     ''
       export CPATH=$(ls -d ${gcc.cc}/lib/gcc/*/${gcc.cc.version}/plugin/include)

From 4a75df939579a9bd274826125522456fb48b7031 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Sat, 2 Apr 2016 23:07:39 +0200
Subject: [PATCH 653/857] gnaural: build with gcc49

---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae800662444a1..b12d4ac17c3e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1652,7 +1652,9 @@ in
 
   gmvault = callPackage ../tools/networking/gmvault { };
 
-  gnaural = callPackage ../applications/audio/gnaural { };
+  gnaural = callPackage ../applications/audio/gnaural {
+    stdenv = overrideCC stdenv gcc49;
+  };
 
   gnokii = callPackage ../tools/misc/gnokii { };
 

From 1dae112bb0b9d34e0e989ebd3ddd00c298233a24 Mon Sep 17 00:00:00 2001
From: James Earl Douglas <james@earldouglas.com>
Date: Sat, 2 Apr 2016 15:26:10 -0600
Subject: [PATCH 654/857] irssi: 0.8.17 -> 0.8.19

This enables [SASL authentication][1], which was added in 0.8.18.

Tested via `nix-env -f /path/to/nixpkgs -i irssi`, followed by running
`irssi`.

[1]: https://wiki.archlinux.org/index.php/Irssi#Authenticating_with_SASL
---
 pkgs/applications/networking/irc/irssi/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix
index 8c26bf8d10e95..d6b57b6cb0d7b 100644
--- a/pkgs/applications/networking/irc/irssi/default.nix
+++ b/pkgs/applications/networking/irc/irssi/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgconfig, ncurses, glib, openssl, perl, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = "irssi-0.8.17";
+
+  version = "0.8.19";
+  name = "irssi-${version}";
 
   src = fetchurl {
-    urls = [ "https://distfiles.macports.org/irssi/${name}.tar.bz2"
-             "http://irssi.org/files/${name}.tar.bz2"
-           ];
-    sha256 = "01v82q2pfiimx6lh271kdvgp8hl4pahc3srg04fqzxgdsb5015iw";
+    urls = [ "https://github.com/irssi/irssi/releases/download/${version}/${name}.tar.gz" ];
+    sha256 = "0ny8dry1b8siyc5glaxcwzng0d2mxnwxk74v64f8xplqhrvlnkzy";
   };
 
   buildInputs = [ pkgconfig ncurses glib openssl perl libintlOrEmpty ];

From 36135033b6485b05cc5370a0ff0845c518a60542 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Sun, 3 Apr 2016 00:46:23 +0200
Subject: [PATCH 655/857] mini-httpd: add -ansi to CFLAGS

---
 pkgs/servers/http/mini-httpd/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index 4cba9bc066878..5425ffb919f4a 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1x4b6x40ymbaamqqq9p97lc0mnah4q7bza04fjs35c8agpm19zir";
   };
 
+  configureFlagsArray = [ "CFLAGS=-ansi" ];
+
   buildInputs = [ boost ];
 
   enableParallelBuilding = true;

From 270c0eb097d48e652cd6ea1f6c10fe4a4c1abbc6 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 2 Apr 2016 19:37:38 -0400
Subject: [PATCH 656/857] salt: init at 2015.8.8

Also init salttesting at 2015.7.10 as a build dependency.
---
 pkgs/tools/admin/salt/default.nix             | 51 +++++++++++++++++++
 .../admin/salt/fix-libcrypto-loading.patch    | 11 ++++
 pkgs/tools/admin/salt/testing.nix             | 24 +++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 4 files changed, 90 insertions(+)
 create mode 100644 pkgs/tools/admin/salt/default.nix
 create mode 100644 pkgs/tools/admin/salt/fix-libcrypto-loading.patch
 create mode 100644 pkgs/tools/admin/salt/testing.nix

diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix
new file mode 100644
index 0000000000000..254b7b9374eb0
--- /dev/null
+++ b/pkgs/tools/admin/salt/default.nix
@@ -0,0 +1,51 @@
+{
+  stdenv, fetchurl, pythonPackages, openssl,
+
+  # Many Salt modules require various Python modules to be installed,
+  # passing them in this array enables Salt to find them.
+  extraInputs ? []
+}:
+
+pythonPackages.buildPythonApplication rec {
+  name = "salt-${version}";
+  version = "2015.8.8";
+
+  disabled = pythonPackages.isPy3k;
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/s/salt/${name}.tar.gz";
+    sha256 = "1xcfcs50pyammb60myph4f8bi2r6iwkxwsnnhrjwvkv2ymxwxv5j";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    futures
+    jinja2
+    markupsafe
+    msgpack
+    pycrypto
+    pyyaml
+    pyzmq
+    requests
+    salttesting
+    tornado
+  ] ++ extraInputs;
+
+  patches = [ ./fix-libcrypto-loading.patch ];
+
+  postPatch = ''
+    substituteInPlace "salt/utils/rsax931.py" \
+      --subst-var-by "libcrypto" "${openssl}/lib/libcrypto.so"
+  '';
+
+  # The tests fail due to socket path length limits at the very least;
+  # possibly there are more issues but I didn't leave the test suite running
+  # as is it rather long.
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://saltstack.com/;
+    description = "Portable, distributed, remote execution and configuration management system";
+    maintainers = with maintainers; [ aneeshusa ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/tools/admin/salt/fix-libcrypto-loading.patch b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
new file mode 100644
index 0000000000000..c5cc1bde5d077
--- /dev/null
+++ b/pkgs/tools/admin/salt/fix-libcrypto-loading.patch
@@ -0,0 +1,11 @@
+diff --git a/salt/utils/rsax931.py b/salt/utils/rsax931.py
+index 9eb1f4a..d764f7a 100644
+--- a/salt/utils/rsax931.py
++++ b/salt/utils/rsax931.py
+@@ -36,7 +36,7 @@ def _load_libcrypto():
+                 'libcrypto.so*'))
+             lib = lib[0] if len(lib) > 0 else None
+         if lib:
+-            return cdll.LoadLibrary(lib)
++            return cdll.LoadLibrary('@libcrypto@')
+         raise OSError('Cannot locate OpenSSL libcrypto')
diff --git a/pkgs/tools/admin/salt/testing.nix b/pkgs/tools/admin/salt/testing.nix
new file mode 100644
index 0000000000000..8c65defcab58c
--- /dev/null
+++ b/pkgs/tools/admin/salt/testing.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonApplication rec {
+  name = "SaltTesting-${version}";
+  version = "2015.7.10";
+
+  disabled = pythonPackages.isPy3k;
+
+  propagatedBuildInputs = with pythonPackages; [
+    six
+  ];
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/S/SaltTesting/${name}.tar.gz";
+    sha256 = "0p0y8kb77pis18rcig1kf9dnns4bnfa3mr91q40lq4mw63l1b34h";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/saltstack/salt-testing;
+    description = "Common testing tools used in the Salt Stack projects";
+    maintainers = with maintainers; [ aneeshusa ];
+    license = licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 24279c41088d4..e3b903471147f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20299,6 +20299,10 @@ in modules // {
     };
   };
 
+  salt = callPackage ../tools/admin/salt {};
+
+  salttesting = callPackage ../tools/admin/salt/testing.nix {};
+
   sandboxlib = buildPythonPackage rec {
     name = "sandboxlib-${version}";
     version = "0.31";

From 375c410d071bd5773519ef8d6283191b07bb98b1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Apr 2016 04:14:19 +0300
Subject: [PATCH 657/857] userFHSEnv: add passthru, rename meta

---
 pkgs/build-support/build-fhs-userenv/default.nix | 9 +++++----
 pkgs/top-level/all-packages.nix                  | 5 +++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index a7e1bd11977aa..a38f0a4f623da 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -1,5 +1,5 @@
 { runCommand, lib, writeText, writeScriptBin, stdenv, ruby } :
-{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", importMeta ? {} } :
+{ env, runScript ? "bash", extraBindMounts ? [], extraInstallCommands ? "", meta ? {}, passthru ? {} } :
 
 let
   name = env.pname;
@@ -27,9 +27,9 @@ let
   '';
 
 in runCommand name {
-  meta = importMeta;
-  passthru.env =
-    runCommand "${name}-shell-env" {
+  inherit meta;
+  passthru = passthru // {
+    env = runCommand "${name}-shell-env" {
       shellHook = ''
         export CHROOTENV_EXTRA_BINDS="${lib.concatStringsSep ":" extraBindMounts}:$CHROOTENV_EXTRA_BINDS"
         exec ${chroot-user}/bin/chroot-user ${env} bash -l ${init "bash"} "$(pwd)"
@@ -40,6 +40,7 @@ in runCommand name {
       echo >&2 ""
       exit 1
     '';
+  };
 } ''
   mkdir -p $out/bin
   cat <<EOF >$out/bin/${name}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae800662444a1..60d06c4b386a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -134,11 +134,12 @@ in
   };
 
   buildFHSUserEnv = args: userFHSEnv {
-    env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" ]);
+    env = buildFHSEnv (removeAttrs args [ "runScript" "extraBindMounts" "extraInstallCommands" "meta" "passthru" ]);
     runScript = args.runScript or "bash";
     extraBindMounts = args.extraBindMounts or [];
     extraInstallCommands = args.extraInstallCommands or "";
-    importMeta = args.meta or {};
+    meta = args.meta or {};
+    passthru = args.passthru or {};
   };
 
   buildMaven = callPackage ../build-support/build-maven.nix {};

From 23fad46b76f305250ef451a97519fe026a4d5f59 Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Sat, 2 Apr 2016 19:02:54 -0700
Subject: [PATCH 658/857] owncloudclient: 1.7.1 -> 2.1.1

---
 .../networking/owncloud-client/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 5841fe7c512e1..8963f8dc01d09 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, neon, qtkeychain, sqlite }:
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, qtkeychain, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "owncloud-client" + "-" + version;
 
-  version = "1.7.1";
+  version = "2.1.1";
 
   src = fetchurl {
-    url = "https://download.owncloud.com/desktop/stable/mirall-${version}.tar.bz2";
-    sha256 = "0n9gv97jqval7xjyix2lkywvmvvfv052s0bd1i8kybdl9rwca6yf";
+    url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
+    sha256 = "4e7cfeb72ec565392e7968f352c4a7f0ef2988cc577ebdfd668a3887d320b1cb";
   };
 
   buildInputs =
-    [ cmake qt4 pkgconfig neon qtkeychain sqlite];
+    [ cmake qt4 pkgconfig qtkeychain sqlite];
 
   #configurePhase = ''
   #  mkdir build

From 6a563a424077c7ed07f22ded940cce9ff9a27a2e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 2 Apr 2016 21:48:07 -0500
Subject: [PATCH 659/857] perlPackages.W3CLinkChecker: Add HTTPS support

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 5568d45e7cfbf..3a257dab37c96 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13331,7 +13331,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [
       LWP ConfigGeneral NetIP TermReadKey Perl5lib
-      CryptSSLeay CSSDOM ];
+      CryptSSLeay CSSDOM LWPProtocolHttps ];
     meta = {
       homepage = http://validator.w3.org/checklink;
       description = "A tool to check links and anchors in Web pages or full Web sites";

From 977529f35a13f712caa04eb5dfe938d7522fc633 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 3 Apr 2016 11:29:17 +0200
Subject: [PATCH 660/857] calibre: 2.53.0 -> 2.54.0

---
 pkgs/applications/misc/calibre/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index e66f260af969b..bae4c83fb2b38 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.53.0";
+  version = "2.54.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0rvfh39a6j5r398p6xzrbzvhxapm1iyhc0d46xk5fwa52kscadhz";
+    sha256 = "1r2cxnqiqnx51gbw283z8lz58i9zpvbf0a5ncrg5b2i9bphdiq79";
   };
 
   inherit python;

From b8755a4cdf8dd426ac642c006825d302dfe5f4b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 3 Apr 2016 12:07:35 +0200
Subject: [PATCH 661/857] kodiPlugins.svtplay: 4.0.23 -> 4.0.24

---
 pkgs/applications/video/kodi/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 0ad638dd7054e..bb826011e25d5 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -142,14 +142,14 @@ in
 
     plugin = "svtplay";
     namespace = "plugin.video.svtplay";
-    version = "4.0.23";
+    version = "4.0.24";
 
     src = fetchFromGitHub {
       name = plugin + "-" + version + ".tar.gz";
       owner = "nilzen";
       repo = "xbmc-" + plugin;
-      rev = "80b6d241adb046c105ceb63d637da3f7f3684f1a";
-      sha256 = "1236kanzl4dra78whpwic1r5iifaj3f27qycia9jr54z01id083s";
+      rev = "e66e2af6529e3ffd030ad486c849894a9ffdeb45";
+      sha256 = "01nq6gac83q6ayhqcj1whvk58pzrm1haw801s321f4vc8gswag56";
     };
 
     meta = with stdenv.lib; {

From 64a9bd37e65cc7856a5ef4d74be395682699e1e8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Sun, 3 Apr 2016 00:03:03 +0800
Subject: [PATCH 662/857] networkmanager: 1.0.6 -> 1.0.12

Also pulls in networkmanager-applet at 1.0.10 as it is no longer in sync with the NM version.
---
 pkgs/tools/networking/network-manager-applet/default.nix | 6 ++++--
 pkgs/tools/networking/network-manager/default.nix        | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/network-manager-applet/default.nix b/pkgs/tools/networking/network-manager-applet/default.nix
index 93ab1266c6ba8..d2e2215831b73 100644
--- a/pkgs/tools/networking/network-manager-applet/default.nix
+++ b/pkgs/tools/networking/network-manager-applet/default.nix
@@ -6,7 +6,9 @@
 let
   pn = "network-manager-applet";
   major = "1.0";
-  version = networkmanager.version;
+  # With version 1.0.12 of NM, we are no longer in sync
+  # version = "${networkmanager.version}.10";
+  version = "${major}.10";
 in
 
 stdenv.mkDerivation rec {
@@ -14,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pn}/${major}/${name}.tar.xz";
-    sha256 = "1yj0m6fb9v12d0di0rfmk3hx1vmygjkiff2c476rf792sbh56kax";
+    sha256 = "1szh5jyijxm6z55irkp5s44pwah0nikss40mx7pvpk38m8zaqidh";
   };
 
   configureFlags = [ "--sysconfdir=/etc" ];
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index c23b818e048f3..eeaff63377910 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -6,16 +6,18 @@
 
 stdenv.mkDerivation rec {
   name = "network-manager-${version}";
-  version = "1.0.6";
+  version = "1.0.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/1.0/NetworkManager-${version}.tar.xz";
-    sha256 = "38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd";
+    sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs";
   };
 
   preConfigure = ''
     substituteInPlace tools/glib-mkenums --replace /usr/bin/perl ${perl}/bin/perl
     substituteInPlace src/NetworkManagerUtils.c --replace /sbin/modprobe /run/current-system/sw/sbin/modprobe
+    substituteInPlace data/84-nm-drivers.rules \
+      --replace /bin/sh ${stdenv.shell}
     substituteInPlace data/85-nm-unmanaged.rules \
       --replace /bin/sh ${stdenv.shell} \
       --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \

From 4087e99886edb800bfd68a2f3ad6c9b4fafb67d9 Mon Sep 17 00:00:00 2001
From: Silvio Frischknecht <github@lupux.ch>
Date: Sun, 3 Apr 2016 14:08:04 +0200
Subject: [PATCH 663/857] psi: fix remove psimedia and spellchecker

spellchecker (aspell -> enchant)
---
 .../instant-messengers/psi/default.nix        | 18 +---
 .../instant-messengers/psi/glib-2.32.patch    | 54 ------------
 .../psi/linux-headers.patch                   | 86 -------------------
 .../instant-messengers/psi/psimedia.nix       | 27 ------
 4 files changed, 3 insertions(+), 182 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/psi/linux-headers.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/psi/psimedia.nix

diff --git a/pkgs/applications/networking/instant-messengers/psi/default.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 784bda5e0cd43..7fabfa5f77225 100644
--- a/pkgs/applications/networking/instant-messengers/psi/default.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM
-, libICE, qca2, pkgconfig, liboil, speex, callPackage, which, glib
+{ stdenv, fetchurl, enchant, qt4, zlib, sox, libX11, xproto, libSM
+, libICE, qca2, pkgconfig, callPackage, which, glib
 , libXScrnSaver, scrnsaverproto
 }:
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ aspell qt4 zlib sox libX11 xproto libSM libICE
+    [ enchant qt4 zlib sox libX11 xproto libSM libICE
       qca2 pkgconfig which glib scrnsaverproto libXScrnSaver
     ];
 
@@ -20,20 +20,8 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS="-lqca";
 
-  psiMedia = callPackage ./psimedia.nix { };
-
   enableParallelBuilding = true;
 
-  configureFlags = [
-    "--with-aspell-inc=${aspell}/include"
-    ];
-
-  postInstall = ''
-    PSI_PLUGINS="$out/lib/psi/plugins"
-    mkdir -p "$PSI_PLUGINS"
-    ln -s "${psiMedia}"/share/psi/plugins/*.so "$PSI_PLUGINS"
-  '';
-
   meta = {
     description = "Psi, an XMPP (Jabber) client";
     maintainers = [ stdenv.lib.maintainers.raskin ];
diff --git a/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch b/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch
deleted file mode 100644
index 49988c253bdb4..0000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/glib-2.32.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-http://sources2.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-im/psimedia/files/psimedia-1.0.3-glib2.32.patch?view=log
-
-Index: psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
-===================================================================
---- psimedia-1.0.3.orig/gstprovider/gstcustomelements/gstcustomelements.h
-+++ psimedia-1.0.3/gstprovider/gstcustomelements/gstcustomelements.h
-@@ -21,7 +21,7 @@
- #ifndef GSTCUSTOMELEMENTS_H
- #define GSTCUSTOMELEMENTS_H
- 
--#include <glib/gthread.h>
-+#include <glib.h>
- #include <gst/gst.h>
- #include <gst/base/gstpushsrc.h>
- #include <gst/video/video.h>
-Index: psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
-===================================================================
---- psimedia-1.0.3.orig/gstprovider/gstelements/static/gstelements.h
-+++ psimedia-1.0.3/gstprovider/gstelements/static/gstelements.h
-@@ -21,7 +21,7 @@
- #ifndef PSI_GSTELEMENTS_H
- #define PSI_GSTELEMENTS_H
- 
--#include <glib/gmacros.h>
-+#include <glib.h>
- 
- G_BEGIN_DECLS
- 
-Index: psimedia-1.0.3/gstprovider/gstthread.h
-===================================================================
---- psimedia-1.0.3.orig/gstprovider/gstthread.h
-+++ psimedia-1.0.3/gstprovider/gstthread.h
-@@ -22,7 +22,7 @@
- #define PSI_GSTTHREAD_H
- 
- #include <QThread>
--#include <glib/gmain.h>
-+#include <glib.h>
- 
- namespace PsiMedia {
- 
-Index: psimedia-1.0.3/gstprovider/rwcontrol.h
-===================================================================
---- psimedia-1.0.3.orig/gstprovider/rwcontrol.h
-+++ psimedia-1.0.3/gstprovider/rwcontrol.h
-@@ -28,7 +28,7 @@
- #include <QMutex>
- #include <QWaitCondition>
- #include <QTimer>
--#include <glib/gmain.h>
-+#include <glib.h>
- #include "psimediaprovider.h"
- #include "rtpworker.h"
- 
diff --git a/pkgs/applications/networking/instant-messengers/psi/linux-headers.patch b/pkgs/applications/networking/instant-messengers/psi/linux-headers.patch
deleted file mode 100644
index a5386b3e111ee..0000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/linux-headers.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-http://pkgs.fedoraproject.org/gitweb/?p=psimedia.git;a=blob_plain;f=psimedia-remove-v4l.patch;hb=HEAD
-
---- a/gstprovider/deviceenum/deviceenum_unix.cpp
-+++ b/gstprovider/deviceenum/deviceenum_unix.cpp
-@@ -35,7 +35,7 @@
- # include <sys/stat.h>
- # include <dirent.h>
- # include <sys/ioctl.h>
--# include <linux/videodev.h>
-+# include <linux/videodev2.h>
- #endif
- 
- namespace DeviceEnum {
-@@ -478,72 +478,7 @@
- // v4l detection scheme adapted from PWLib (used by Ekiga/Gnomemeeting)
- static QList<Item> get_v4l_items()
- {
--#ifdef Q_OS_LINUX
--	QList<Item> out;
--
--	QList<V4LName> list = get_v4l_names("/sys/class/video4linux", true);
--	if(list.isEmpty())
--		list = get_v4l_names("/proc/video/dev", false);
--
--	// if we can't find anything, then do a raw scan for possibilities
--	if(list.isEmpty())
--	{
--		QStringList possible = scan_for_videodevs("/dev");
--		foreach(QString str, possible)
--		{
--			V4LName v;
--			v.dev = str;
--			list += v;
--		}
--	}
--
--	for(int n = 0; n < list.count(); ++n)
--	{
--		V4LName &v = list[n];
--
--		// if we already have a friendly name then we'll skip the confirm
--		//   in order to save resources.  the only real drawback here that
--		//   I can think of is if the device isn't a capture type.  but
--		//   what does it mean to have a V4L device that isn't capture??
--		if(v.friendlyName.isEmpty())
--		{
--			int fd = open(QFile::encodeName(v.dev).data(), O_RDONLY | O_NONBLOCK);
--			if(fd == -1)
--				continue;
--
--			// get video capabilities and close
--			struct video_capability caps;
--			memset(&caps, 0, sizeof(caps));
--			int ret = ioctl(fd, VIDIOCGCAP, &caps);
--			close(fd);
--			if(ret == -1)
--				continue;
--
--			if(!(caps.type & VID_TYPE_CAPTURE))
--				continue;
--
--			v.friendlyName = caps.name;
--		}
--
--		Item i;
--		i.type = Item::Video;
--		i.dir = Item::Input;
--		i.name = v.friendlyName;
--		i.driver = "v4l";
--		i.id = v.dev;
--
--		// HACK
--		if(v.friendlyName == "Labtec Webcam Notebook")
--			i.explicitCaptureSize = QSize(640, 480);
--
--		out += i;
--	}
--
--	return out;
--#else
--	// return empty list if non-linux
- 	return QList<Item>();
--#endif
- }
- 
- static QList<Item> get_v4l2_items()
diff --git a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix b/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
deleted file mode 100644
index aa54053c67f44..0000000000000
--- a/pkgs/applications/networking/instant-messengers/psi/psimedia.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, qt4, gstreamer, gst_plugins_base, liboil, speex, which
-, glib, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "psimedia-1.0.3";
-
-  src = fetchurl {
-    url = "http://delta.affinix.com/download/psimedia/${name}.tar.bz2";
-    sha256 = "0fxjdz8afh75gfx2msysb1gss6zx578l3224jvc9jhm99w1ii781";
-  };
-
-  patches = [ ./glib-2.32.patch ./linux-headers.patch ];
-
-  buildInputs = [ qt4 gstreamer gst_plugins_base liboil speex which glib pkgconfig ];
-
-  configurePhase = ''./configure'';
-
-  postBuild = ''
-    TARGET="$out/share/psi/plugins"
-    mkdir -p "$TARGET"
-    cp gstprovider/*.so "$TARGET"/
-  '';
-
-  meta = {
-    description = "Psi Media, a plugin to provide Voice/Video over XMPP";
-  };
-}

From 192e0c714164a2e537ba3566306c24d9ff888ace Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Apr 2016 04:19:00 +0300
Subject: [PATCH 664/857] steam-run: add derivation

---
 pkgs/games/steam/chrootenv.nix  | 80 +++++++++++++++++++++------------
 pkgs/games/steam/default.nix    |  7 ++-
 pkgs/top-level/all-packages.nix |  3 ++
 3 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 8bb73fc5cef37..4bb81d30027e0 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,4 +1,5 @@
-{ lib, buildFHSUserEnv, steam
+{ stdenv, lib, writeScript, buildFHSUserEnv, steam
+, steam-runtime, steam-runtime-i686 ? null
 , withJava ? false
 , withPrimus ? false
 , nativeOnly ? false
@@ -6,10 +7,11 @@
 , newStdcpp ? false
 }:
 
-buildFHSUserEnv {
-  name = "steam";
+let
+  self = {
+    name = "steam";
 
-  targetPkgs = pkgs: with pkgs; [
+    targetPkgs = pkgs: with pkgs; [
       steamPackages.steam
       steamPackages.steam-fonts
       # License agreement
@@ -22,15 +24,13 @@ buildFHSUserEnv {
       which
       # Needed by gdialog, including in the steam-runtime
       perl
-    ]
-    ++ lib.optional withJava jdk
-    ++ lib.optional withPrimus (primus.override {
-      stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
-      stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
-    })
-    ;
+    ] ++ lib.optional withJava jdk
+      ++ lib.optional withPrimus (primus.override {
+           stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];
+           stdenv_i686 = overrideInStdenv pkgsi686Linux.stdenv [ useOldCXXAbi ];
+         });
 
-  multiPkgs = pkgs: with pkgs; [
+    multiPkgs = pkgs: with pkgs; [
       # These are required by steam with proper errors
       xlibs.libXcomposite
       xlibs.libXtst
@@ -49,23 +49,47 @@ buildFHSUserEnv {
       })
     ];
 
-  extraBuildCommands = ''
-    mkdir -p steamrt
+    extraBuildCommands = ''
+      mkdir -p steamrt
+      ln -s ../lib/steam-runtime steamrt/${steam-runtime.arch}
+      ${lib.optionalString (steam-runtime-i686 != null) ''
+        ln -s ../lib32/steam-runtime steamrt/${steam-runtime-i686.arch}
+      ''}
+    '';
 
-    ln -s ../lib64/steam-runtime steamrt/amd64
-    ln -s ../lib32/steam-runtime steamrt/i386
-  '';
+    extraInstallCommands = ''
+      mkdir -p $out/share/applications
+      ln -s ${steam}/share/icons $out/share
+      ln -s ${steam}/share/pixmaps $out/share
+      sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
+    '';
 
-  extraInstallCommands = ''
-    mkdir -p $out/share/applications
-    ln -s ${steam}/share/icons $out/share
-    ln -s ${steam}/share/pixmaps $out/share
-    sed "s,/usr/bin/steam,$out/bin/steam,g" ${steam}/share/applications/steam.desktop > $out/share/applications/steam.desktop
-  '';
+    profile = ''
+      export STEAM_RUNTIME=/steamrt
+    '';
 
-  profile = ''
-    export STEAM_RUNTIME=/steamrt
-  '';
+    runScript = "steam";
 
-  runScript = "steam";
-}
+    passthru.run = buildFHSUserEnv (self // {
+      name = "steam-run";
+
+      runScript =
+        let ldPath = map (x: "/steamrt/${steam-runtime.arch}/" + x) steam-runtime.libs
+                   ++ lib.optionals (steam-runtime-i686 != null) (map (x: "/steamrt/${steam-runtime-i686.arch}/" + x) steam-runtime-i686.libs);
+        in writeScript "steam-run" ''
+          #!${stdenv.shell}
+          run="$1"
+          if [ "$run" = "" ]; then
+            echo "Usage: steam-run command-to-run args..." >&2
+            exit 1
+          fi
+          shift
+          export LD_LIBRARY_PATH=${lib.concatStringsSep ":" ldPath}:$LD_LIBRARY_PATH
+          exec "$run" "$@"
+        '';
+
+      passthru = {};
+    });
+  };
+
+in buildFHSUserEnv self
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index 64f8cfe2c2872..ae3fe561272f0 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -7,8 +7,13 @@ let
     steam-runtime = callPackage ./runtime.nix { };
     steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
     steam = callPackage ./steam.nix { };
-    steam-chrootenv = callPackage ./chrootenv.nix { };
     steam-fonts = callPackage ./fonts.nix { };
+    steam-chrootenv = callPackage ./chrootenv.nix {
+      steam-runtime-i686 =
+        if pkgs.system == "x86_64-linux"
+        then pkgs.pkgsi686Linux.steamPackages.steam-runtime
+        else null;
+    };
   };
 
 in self
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60d06c4b386a5..f60d47abf916a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14896,12 +14896,15 @@ in
   stockfish = callPackage ../games/stockfish { };
 
   steamPackages = callPackage ../games/steam { };
+
   steam = steamPackages.steam-chrootenv.override {
     # DEPRECATED
     withJava = config.steam.java or false;
     withPrimus = config.steam.primus or false;
   };
 
+  steam-run = steam.run;
+
   stepmania = callPackage ../games/stepmania { };
 
   stuntrally = callPackage ../games/stuntrally { };

From 3dfe4297ae090f74b4cab1b4f33cf8e0ed236739 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 3 Apr 2016 14:10:35 +0100
Subject: [PATCH 665/857] racket: 6.3 -> 6.4

---
 pkgs/development/interpreters/racket/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 748482b1bf089..03d646a3b4d6a 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -37,11 +37,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "racket-${version}";
-  version = "6.3";
+  version = "6.4";
 
   src = fetchurl {
     url = "http://mirror.racket-lang.org/installers/${version}/${name}-src.tgz";
-    sha256 = "0f21vnads6wsrzimfja969gf3pkl60s0rdfrjf9s70lcy9x0jz4i";
+    sha256 = "1qyzq91r1kzk2k0faggqd5idwmsxizkjbdgxn6ik9iwwsjycxbw6";
   };
 
   FONTCONFIG_FILE = fontsConf;

From 00eb2a0a9025e027b50827815e09e323217d0ddd Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 3 Apr 2016 09:07:33 -0500
Subject: [PATCH 666/857] srtp: 1.5.2 -> 1.5.4 for CVE-2015-6360

Prevent potential DoS attack due to lack of bounds
checking on RTP header CSRC count and extension header
length. Credit goes to Randell Jesup and the Firefox team
for reporting this issue.

https://www.rapid7.com/db/vulnerabilities/freebsd-vid-6171eb07-d8a9-11e5-b2bd-002590263bf5
---
 pkgs/development/libraries/srtp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/srtp/default.nix b/pkgs/development/libraries/srtp/default.nix
index 98cf160e8b51f..ba213dc98e76d 100644
--- a/pkgs/development/libraries/srtp/default.nix
+++ b/pkgs/development/libraries/srtp/default.nix
@@ -5,13 +5,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libsrtp-${version}";
-  version = "1.5.2";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "libsrtp";
     rev = "v${version}";
-    sha256 = "0iy1il72gnjcwbi16wf4kzdqs1xx8is9qvs6m49pg37218s26gdw";
+    sha256 = "0s029m4iw0nsvnsm2hlz8yajrasdvf315iv2dw8mfm7nhbshwsqa";
   };
 
   buildInputs = [ pkgconfig ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   ] ++ optional (openssl != null) "--enable-openssl";
 
   postInstall = ''
-    rmdir $out/bin
+    rm -rf $out/bin
   '';
 
   meta = {

From b375260adde0d0c5acd3037800a9a3b47a522200 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 3 Apr 2016 16:39:30 +0200
Subject: [PATCH 667/857] svtplay-dl: 0.30.2016.02.08 -> 1.0

---
 pkgs/tools/misc/svtplay-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 270e1c0cb62ab..f8c087aa757b5 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.30.2016.02.08";
+  version = "1.0";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "0nkgc43lf06h0w8k4zm5pdzp6r6jjc6j94ciljcm8333n0ykfzpr";
+    sha256 = "0chvljmhj7waq3dfyciiyk3i18hmrczc70qfyhn2ycq0k0nbn0jj";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From 7b06260c1ccfacc43bf9ba6f9209e7679a52b611 Mon Sep 17 00:00:00 2001
From: mucaho <mkucko@gmail.com>
Date: Sun, 3 Apr 2016 16:04:31 +0100
Subject: [PATCH 668/857] electron: make it compatible with vscode

Use patchelf instead of wrapProgram to inject lookup path of shared
libraries.
Allow the nix expression to be called with optional version argument.
---
 pkgs/development/tools/electron/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index dd7dabf2bf28d..aae4b413c3d95 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
+{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
 , cairo, cups, expat, libgpgerror, nspr, gconf, nss, xorg, libcap, unzip
 , systemd, libnotify
+, version ? "0.36.2", sha256 ? "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d", ...
 }:
 let
   atomEnv = buildEnv {
@@ -16,15 +17,15 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "electron-${version}";
-  version = "0.36.2";
+  inherit version;
 
   src = fetchurl {
     url = "https://github.com/atom/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-    sha256 = "01d78j8dfrdygm1r141681b3bfz1f1xqg9vddz7j52z1mlfv9f1d";
+    inherit sha256;
     name = "${name}.zip";
   };
 
-  buildInputs = [ atomEnv makeWrapper unzip ];
+  buildInputs = [ atomEnv unzip ];
 
   phases = [ "installPhase" "fixupPhase" ];
 
@@ -35,8 +36,12 @@ in stdenv.mkDerivation rec {
     unzip -d $out/bin $src
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
     $out/bin/electron
-    wrapProgram $out/bin/electron \
-    --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64"
+  '';
+
+  postFixup = ''
+    patchelf \
+    --set-rpath "${atomEnv}/lib:${atomEnv}/lib64:$out/bin:$(patchelf --print-rpath $out/bin/electron)" \
+    $out/bin/electron
   '';
 
   meta = with stdenv.lib; {

From 411408f74c80274ad446d7f130289aee60f97863 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 3 Apr 2016 17:36:27 +0000
Subject: [PATCH 669/857] Fix typo in service.syncthing.dataDir description.

---
 nixos/doc/manual/release-notes/rl-1603.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1603.xml b/nixos/doc/manual/release-notes/rl-1603.xml
index faee3a407daec..1528c8a724633 100644
--- a/nixos/doc/manual/release-notes/rl-1603.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -348,7 +348,7 @@ $TTL 1800
     <para>
     <literal>service.syncthing.dataDir</literal> options now has to point
     to exact folder where syncthing is writing to. Example configuration should
-    loook something like:
+    look something like:
     </para>
     <programlisting>
 services.syncthing = {

From 8949de8cfda05158b56f3e9785017070edf8acdf Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Sat, 2 Apr 2016 22:14:05 -0700
Subject: [PATCH 670/857] rakudo-star: 2015.11 -> 2016.01

Support for the JVM backend has been temporarily switched off as
it's not fully functional yet and upstream recommends against
using it.
---
 pkgs/development/interpreters/rakudo/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index cd1631e23a16e..e1d1ccba47121 100644
--- a/pkgs/development/interpreters/rakudo/default.nix
+++ b/pkgs/development/interpreters/rakudo/default.nix
@@ -1,18 +1,18 @@
-{ stdenv, fetchurl, perl, jdk, icu, zlib, gmp, readline }:
+{ stdenv, fetchurl, perl, icu, zlib, gmp, readline }:
 
 stdenv.mkDerivation rec {
   name = "rakudo-star-${version}";
-  version = "2015.11";
+  version = "2016.01";
 
   src = fetchurl {
     url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
-    sha256 = "1rzabg8daxf2g4l1njhdv3gfav91mp3y9my0mpz2xw06cxqfsjki";
+    sha256 = "feb385c5d05166061f413882e442d3a0ec53884918768940d3f00bb63bc85497";
   };
 
-  buildInputs = [ icu zlib gmp readline jdk perl ];
+  buildInputs = [ icu zlib gmp readline perl ];
   configureScript = "perl ./Configure.pl";
   configureFlags =
-    [ "--backends=moar,jvm"
+    [ "--backends=moar"
       "--gen-moar"
       "--gen-nqp"
     ];

From aa38510267ffb2e67ec2825b5f74dcb6fe5ea154 Mon Sep 17 00:00:00 2001
From: mucaho <mkucko@gmail.com>
Date: Sun, 3 Apr 2016 16:07:05 +0100
Subject: [PATCH 671/857] vscode: init at 0.10.10

---
 pkgs/applications/editors/vscode/default.nix | 97 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 +
 2 files changed, 101 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/default.nix

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
new file mode 100644
index 0000000000000..c1903f0c5cf25
--- /dev/null
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -0,0 +1,97 @@
+{ callPackage, stdenv, fetchurl, makeWrapper
+, jq, xlibs, gtk, python, nodejs
+, ...
+} @ args:
+
+let
+  electron = callPackage ../../../development/tools/electron/default.nix (args // rec {
+    version = "0.35.6";
+    sha256 = "1bwn14769nby04zkza9jphsya2p6fjnkm1k2y4h5y2l4gnqdvmx0";
+  });
+in
+  stdenv.mkDerivation rec {
+    name = "vscode-${version}";
+    version = "0.10.10";
+
+    src = fetchurl {
+      url = "https://github.com/Microsoft/vscode/archive/${version}.tar.gz";
+      sha256 = "1mzkip6621111xwwksqjad1kgpbhna4dhpkf6cnj2r18dkk2jmcw";
+    };
+
+    buildInputs = [ makeWrapper jq xlibs.libX11 xlibs.xproto gtk python nodejs electron ];
+
+    extensionGalleryJSON = ''
+      {
+        \"extensionsGallery\": {
+          \"serviceUrl\": \"https://marketplace.visualstudio.com/_apis/public/gallery\",
+          \"cacheUrl\": \"https://vscode.blob.core.windows.net/gallery/index\",
+          \"itemUrl\": \"https://marketplace.visualstudio.com/items\"
+        }
+      }
+    '';
+
+    configurePhase = ''
+      # PATCH SCRIPT SHEBANGS
+      echo "PATCH SCRIPT SHEBANGS"
+      patchShebangs ./scripts
+
+      # ADD EXTENSION GALLERY URLS TO APPLICATION CONFIGURATION
+      echo "AUGMENT APPLICATION CONFIGURATION"
+      echo "$(cat ./product.json) ${extensionGalleryJSON}" | jq -s add  > tmpFile && \
+        mv tmpFile ./product.json
+    '';
+
+    buildPhase  = ''
+      # INSTALL COMPILE- & RUN-TIME DEPENDENCIES
+      echo "INSTALL COMPILE- & RUN-TIME DEPENDENCIES"
+      mkdir -p ./tmp
+      HOME=./tmp ./scripts/npm.sh install
+
+      # COMPILE SOURCES
+      echo "COMPILE SOURCES"
+      ./node_modules/.bin/gulp
+    '';
+
+    doCheck = true;
+    checkPhase = ''
+      # CHECK APPLICATION
+      echo "CHECK APPLICATION"
+      ATOM_SHELL_INTERNAL_RUN_AS_NODE=1 ${electron}/bin/electron ./node_modules/.bin/_mocha
+    '';
+
+    installPhase = ''
+      # COPY FILES NEEDED FOR RUNNING APPLICATION TO OUT DIRECTORY
+      echo "COPY FILES NEEDED FOR RUNNING APPLICATION TO OUT DIRECTORY"
+      mkdir -p "$out"
+      cp -R ./.vscode "$out"/.vscode
+      cp -R ./extensions "$out"/extensions
+      cp -R ./out "$out"/out
+      cp -R ./node_modules "$out"/node_modules
+      cp ./package.json "$out"/package.json
+      cp ./product.json "$out"/product.json
+      cp ./tslint.json "$out"/tslint.json
+      # COPY LEGAL STUFF
+      cp ./LICENSE.txt "$out"/LICENSE.txt
+      cp ./OSSREADME.json "$out"/OSSREADME.json
+      cp ./ThirdPartyNotices.txt "$out"/ThirdPartyNotices.txt
+
+      # CREATE RUNNER SCRIPT
+      echo "CREATE RUNNER SCRIPT"
+      mkdir -p "$out"/bin
+      makeWrapper "${electron}/bin/electron" "$out/bin/vscode" \
+      --set VSCODE_DEV 1 \
+      --add-flags "$out"
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Visual Studio Code is an open source source code editor developed by Microsoft for Windows, Linux and OS X.";
+      longDescription = ''
+        Visual Studio Code is an open source source code editor developed by Microsoft for Windows, Linux and OS X.
+        It includes support for debugging, embedded Git control, syntax highlighting, intelligent code completion, snippets, and code refactoring.
+        It is also customizable, so users can change the editor's theme, keyboard shortcuts, and preferences.
+      '';
+      homepage = http://code.visualstudio.com/;
+      license = licenses.mit;
+      platforms = [ "x86_64-linux" ];
+    };
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4628630b533bd..fdd9eb8f9e3b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14111,6 +14111,10 @@ in
 
   vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
 
+  vscode = callPackage ../applications/editors/vscode {
+    gconf = pkgs.gnome.GConf;
+  };
+
   vue = callPackage ../applications/misc/vue { };
 
   vwm = callPackage ../applications/window-managers/vwm { };

From 2b199537b7fc49a742c4650be55e52be99deed71 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sun, 3 Apr 2016 21:11:38 +0200
Subject: [PATCH 672/857] emacsWithPackages: move bin and site-lisp to private
 share directory

This is to avoid unwanted side effects when installing a wrapped emacs in the environment:

  * All executables in the dependencies become available in the user environment
  * All site-lisp binaries in the dependencies become accessible to unwrapped emacs

Also, both bin and site-lisp would generate conflicts so installing a wrapped emacs becomes really cumbersome
---
 pkgs/build-support/emacs/wrapper.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index efee43d852eae..7a85cfa1ed4f1 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -52,7 +52,8 @@ stdenv.mkDerivation {
   phases = [ "installPhase" ];
   installPhase = ''
     mkdir -p $out/bin
-    mkdir -p $out/share/emacs/site-lisp
+    mkdir -p $out/share/emacs-with-packages/bin
+    mkdir -p $out/share/emacs-with-packages/site-lisp
 
     local requires
     for pkg in $explicitRequires; do
@@ -60,29 +61,32 @@ stdenv.mkDerivation {
     done
     # requires now holds all requested packages and their transitive dependencies
 
-    siteStart="$out/share/emacs/site-lisp/site-start.el"
+    siteStart="$out/share/emacs-with-packages/site-lisp/site-start.el"
 
     # Begin the new site-start.el by loading the original, which sets some
     # NixOS-specific paths. Paths are searched in the reverse of the order
     # they are specified in, so user and system profile paths are searched last.
     cat >"$siteStart" <<EOF
 (load-file "$emacs/share/emacs/site-lisp/site-start.el")
-(add-to-list 'load-path "$out/share/emacs/site-lisp")
+(add-to-list 'load-path "$out/share/emacs-with-packages/site-lisp")
+(add-to-list 'exec-path "$out/share/emacs-with-packages/bin")
 EOF
 
     linkPath() {
       local pkg=$1
-      local path=$2
+      local origin_path=$2
+      local dest_path=$3
+
       # Add the path to the search path list, but only if it exists
-      if [[ -d "$pkg/$path" ]]; then
-        lndir -silent "$pkg/$path" "$out/$path"
+      if [[ -d "$pkg/$origin_path" ]]; then
+        lndir -silent "$pkg/$origin_path" "$out/$dest_path"
       fi
     }
 
     # Add a package's paths to site-start.el
     linkEmacsPackage() {
-      linkPath "$1" "bin"
-      linkPath "$1" "share/emacs/site-lisp"
+      linkPath "$1" "bin" "share/emacs-with-packages/bin"
+      linkPath "$1" "share/emacs/site-lisp" "share/emacs-with-packages/site-lisp"
     }
 
     # First, link all the explicitly-required packages.
@@ -103,7 +107,7 @@ EOF
       local progname=$(basename "$prog")
       rm -f "$out/bin/$progname"
       makeWrapper "$prog" "$out/bin/$progname" \
-        --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:"
+        --suffix EMACSLOADPATH ":" "$out/share/emacs-with-packages/site-lisp:"
     done
 
     mkdir -p $out/share

From 5ef5e59c567a9c2c1068c496a3a540897fb7728e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sun, 3 Apr 2016 19:14:31 +0000
Subject: [PATCH 673/857] linux_testing: 4.6-rc1 -> 4.6-rc2

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index e58230712a95f..e3edaa43b8cd2 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.6-rc1";
-  modDirVersion = "4.6.0-rc1";
+  version = "4.6-rc2";
+  modDirVersion = "4.6.0-rc2";
   extraMeta.branch = "4.6";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1y73sjd7i48d1c8x52z59imx8g8d00wy67r5666cvwqrq8d407h0";
+    sha256 = "0zihk9s1rkgmn0ghiz9xkg0w88w524af5mmad45rbxhm5751nxcr";
   };
 
   features.iwlwifi = true;

From f1b0d6410ea7cb51d126413146b5f6e74b102929 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sun, 3 Apr 2016 21:21:50 +0200
Subject: [PATCH 674/857] emacsWithPackages: reduce some duplication

---
 pkgs/build-support/emacs/wrapper.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index 7a85cfa1ed4f1..7be4d21bfa8dc 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -51,9 +51,11 @@ stdenv.mkDerivation {
   inherit emacs explicitRequires;
   phases = [ "installPhase" ];
   installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/share/emacs-with-packages/bin
-    mkdir -p $out/share/emacs-with-packages/site-lisp
+    readonly SHARE="share/emacs-with-packages"
+
+    mkdir -p "$out/bin"
+    mkdir -p "$out/$SHARE/bin"
+    mkdir -p "$out/$SHARE/site-lisp"
 
     local requires
     for pkg in $explicitRequires; do
@@ -61,15 +63,15 @@ stdenv.mkDerivation {
     done
     # requires now holds all requested packages and their transitive dependencies
 
-    siteStart="$out/share/emacs-with-packages/site-lisp/site-start.el"
+    siteStart="$out/$SHARE/site-lisp/site-start.el"
 
     # Begin the new site-start.el by loading the original, which sets some
     # NixOS-specific paths. Paths are searched in the reverse of the order
     # they are specified in, so user and system profile paths are searched last.
     cat >"$siteStart" <<EOF
 (load-file "$emacs/share/emacs/site-lisp/site-start.el")
-(add-to-list 'load-path "$out/share/emacs-with-packages/site-lisp")
-(add-to-list 'exec-path "$out/share/emacs-with-packages/bin")
+(add-to-list 'load-path "$out/$SHARE/site-lisp")
+(add-to-list 'exec-path "$out/$SHARE/bin")
 EOF
 
     linkPath() {
@@ -85,8 +87,8 @@ EOF
 
     # Add a package's paths to site-start.el
     linkEmacsPackage() {
-      linkPath "$1" "bin" "share/emacs-with-packages/bin"
-      linkPath "$1" "share/emacs/site-lisp" "share/emacs-with-packages/site-lisp"
+      linkPath "$1" "bin" "$SHARE/bin"
+      linkPath "$1" "share/emacs/site-lisp" "$SHARE/site-lisp"
     }
 
     # First, link all the explicitly-required packages.
@@ -107,7 +109,7 @@ EOF
       local progname=$(basename "$prog")
       rm -f "$out/bin/$progname"
       makeWrapper "$prog" "$out/bin/$progname" \
-        --suffix EMACSLOADPATH ":" "$out/share/emacs-with-packages/site-lisp:"
+        --suffix EMACSLOADPATH ":" "$out/$SHARE/site-lisp:"
     done
 
     mkdir -p $out/share

From 9d8d87591814c1786e6a7f77f0978c0f2c194432 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Mon, 4 Apr 2016 00:37:24 +0200
Subject: [PATCH 675/857] libtorrentRasterbar: 1.0.6 -> 1.0.9

---
 pkgs/development/libraries/libtorrent-rasterbar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libtorrent-rasterbar/default.nix b/pkgs/development/libraries/libtorrent-rasterbar/default.nix
index 725b98cdae65e..e2809e9d483b8 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.6";
-  sha256 = "1qypc5lx82vlqm9016knxx8khxpc9dy78a0q2x5jmxjk8v6g994r";
+  version = "1.0.9";
+  sha256 = "1kfydlvmx4pgi5lpbhqr4p3jr78p3f61ic32046mkp4yfyydrspl";
 })

From c03c2acc937b3d8f6148d841982353a820ef4049 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 30 Mar 2016 00:55:42 +0200
Subject: [PATCH 676/857] pythonPackages/yolk: init at 0.4.3

---
 .../python-modules/yolk/default.nix           | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/yolk/default.nix

diff --git a/pkgs/development/python-modules/yolk/default.nix b/pkgs/development/python-modules/yolk/default.nix
new file mode 100644
index 0000000000000..7cfcb1e0f0d05
--- /dev/null
+++ b/pkgs/development/python-modules/yolk/default.nix
@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonApplication, pythonPackages }:
+
+with lib;
+
+buildPythonApplication rec {
+  name = "yolk-${version}";
+  version = "0.4.3";
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/y/yolk/yolk-${version}.tar.gz";
+    sha256 = "1f6xwx210jnl5nq0m3agh2p1cxmaizawaf3fwq43q4yw050fn1qw";
+  };
+
+  buildInputs = with pythonPackages; [ nose ];
+
+  meta = {
+    description = "Command-line tool for querying PyPI and Python packages installed on your system";
+    homepage = "https://github.com/cakebread/yolk";
+    maintainer = with maintainers; [ profpatsch ];
+    license = licenses.bsd3;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfaf8819af16c..066b443c4303c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9413,10 +9413,12 @@ in
 
   slowaes = pythonPackages.slowaes;
 
+  twisted = pythonPackages.twisted;
+
   wxPython = pythonPackages.wxPython;
   wxPython28 = pythonPackages.wxPython28;
 
-  twisted = pythonPackages.twisted;
+  yolk = callPackage ../development/python-modules/yolk {};
 
   ZopeInterface = pythonPackages.zope_interface;
 

From 0c195db5dd33d3c2ab5e690659ba8d34fa70579d Mon Sep 17 00:00:00 2001
From: mucaho <mkucko@gmail.com>
Date: Mon, 4 Apr 2016 02:49:58 +0100
Subject: [PATCH 677/857] vscode: shrink derivation size

Prune out compile-time dependencies.
---
 pkgs/applications/editors/vscode/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/default.nix b/pkgs/applications/editors/vscode/default.nix
index c1903f0c5cf25..64b46c2ac6ecd 100644
--- a/pkgs/applications/editors/vscode/default.nix
+++ b/pkgs/applications/editors/vscode/default.nix
@@ -42,8 +42,8 @@ in
     '';
 
     buildPhase  = ''
-      # INSTALL COMPILE- & RUN-TIME DEPENDENCIES
-      echo "INSTALL COMPILE- & RUN-TIME DEPENDENCIES"
+      # BUILD COMPILE- & RUN-TIME DEPENDENCIES
+      echo "BUILD COMPILE- & RUN-TIME DEPENDENCIES"
       mkdir -p ./tmp
       HOME=./tmp ./scripts/npm.sh install
 
@@ -60,6 +60,10 @@ in
     '';
 
     installPhase = ''
+      # PRUNE COMPILE-TIME DEPENDENCIES
+      echo "PRUNE COMPILE-TIME DEPENDENCIES"
+      npm prune --production
+
       # COPY FILES NEEDED FOR RUNNING APPLICATION TO OUT DIRECTORY
       echo "COPY FILES NEEDED FOR RUNNING APPLICATION TO OUT DIRECTORY"
       mkdir -p "$out"

From 9f882729bff0380a171b97cb096c86fb2d7cb60d Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sun, 3 Apr 2016 14:22:41 +0800
Subject: [PATCH 678/857] emacsPackages: remove outdated helm

---
 pkgs/top-level/emacs-packages.nix | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 49a4c6ffb1e02..3407a92e6a022 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -963,22 +963,6 @@ let
     };
   };
 
-  helm = melpaBuild rec {
-    pname   = "helm";
-    version = "20150105";
-    src = fetchFromGitHub {
-      owner  = "emacs-helm";
-      repo   = pname;
-      rev    = "e5608ad86e7ca72446a4b1aa0faf604200ffe895";
-      sha256 = "0n2kr6pyzcsi8pq6faxz2y8kicz1gmvj98fzzlq3a107dqqp25ay";
-    };
-    packageRequires = [ async ];
-    meta = {
-      description = "An incremental completion and selection narrowing framework for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   helm-bibtex = melpaBuild rec {
     pname = "helm-bibtex";
     version = "20151125";

From c251f82de940b1408c681f916e79e6b9bcd53c35 Mon Sep 17 00:00:00 2001
From: Christoph Ruegge <c.ruegge@math.uni-goettingen.de>
Date: Mon, 4 Apr 2016 11:03:02 +0200
Subject: [PATCH 679/857] emacs25pre: call autogen.sh before configuring

---
 pkgs/applications/editors/emacs-25/builder.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/emacs-25/builder.sh b/pkgs/applications/editors/emacs-25/builder.sh
index 984a61df6f3b8..545520cca7c0e 100644
--- a/pkgs/applications/editors/emacs-25/builder.sh
+++ b/pkgs/applications/editors/emacs-25/builder.sh
@@ -5,6 +5,8 @@ source $stdenv/setup
 # *our* versions, not the ones found in the system, as it would do by default.
 # On other platforms, this appears to be unnecessary.
 preConfigure() {
+    ./autogen.sh
+
     for i in Makefile.in ./src/Makefile.in ./lib-src/Makefile.in ./leim/Makefile.in; do
         substituteInPlace $i --replace /bin/pwd pwd
     done

From 7da757abfbe3b745e5ee3e028b22db5364ed5f20 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 12:13:06 +0200
Subject: [PATCH 680/857] pythonPackages.ColanderAlchemy: 0.2.0 -> 0.3.3

---
 pkgs/top-level/python-packages.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d99977c54b5db..4d5787159d2b3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3383,18 +3383,16 @@ in modules // {
 
 
   ColanderAlchemy = buildPythonPackage rec {
-    name = "ColanderAlchemy-0.2.0";
+    name = "ColanderAlchemy-${version}";
+    version = "0.3.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/C/ColanderAlchemy/${name}.tar.gz";
-      sha256 = "d10e97b5f4648dcdc38c5e5c9f9b77fe39c8fa7f594d89d558b0d82e5631bfd7";
+      sha256 = "11wcni2xmfmy001rj62q2pwf305vvngkrfm5c4zlwvgbvlsrvnnw";
     };
 
     buildInputs = with self; [ unittest2 ];
-    propagatedBuildInputs = with self; [ colander sqlalchemy9 ];
-
-    # string: argument name cannot be overridden via info kwarg.
-    doCheck = false;
+    propagatedBuildInputs = with self; [ colander sqlalchemy ];
 
     meta = {
       description = "Autogenerate Colander schemas based on SQLAlchemy models";

From e39f072ce3db17b4a6b19523d56f54d19bc2b98c Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 4 Apr 2016 02:35:45 +0200
Subject: [PATCH 681/857] sent: optional `patches` argument

sent (like most suckless tools) is configured by recompiling with some
header changes. This eases the configuration.
---
 pkgs/applications/misc/sent/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/sent/default.nix b/pkgs/applications/misc/sent/default.nix
index 9e07c0dd4c88b..c6430af55608d 100644
--- a/pkgs/applications/misc/sent/default.nix
+++ b/pkgs/applications/misc/sent/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libpng, libX11, libXft }:
+{ stdenv, fetchurl, libpng, libX11, libXft
+, patches ? [] }:
 
 stdenv.mkDerivation rec {
   name = "sent-0.2";
@@ -10,6 +11,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libpng libX11 libXft ];
 
+  inherit patches;
+
   installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {

From 3d7d1c4d73c72e029a4447ebece70ca4cc687ee2 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 13:53:06 +0200
Subject: [PATCH 682/857] pythonPackages.pymysqlsa: update sqlalchemy
 dependency

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4d5787159d2b3..0976ff3dc26f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12438,7 +12438,7 @@ in modules // {
     name = "pymysqlsa-${version}";
     version = "1.0";
 
-    propagatedBuildInputs = with self; [ pymysql sqlalchemy9 ];
+    propagatedBuildInputs = with self; [ pymysql sqlalchemy ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pymysql_sa/pymysql_sa-1.0.tar.gz";

From 4aea84b26f422edca359f2608b174b4a0e9960d3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 13:59:27 +0200
Subject: [PATCH 683/857] zope.sqlalchemy: 0.7.5 -> 0.7.6

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0976ff3dc26f4..451358b3b6911 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23362,17 +23362,17 @@ in modules // {
 
 
   zope_sqlalchemy = buildPythonPackage rec {
-    name = "zope.sqlalchemy-0.7.5";
+    name = "zope.sqlalchemy-0.7.6";
 
     doCheck = !isPyPy; # https://github.com/zopefoundation/zope.sqlalchemy/issues/12
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.sqlalchemy/${name}.zip";
-      sha256 = "e196d1b2cf796f46e2c6127717e359ddd35d8d084a8ba059f0f0fabff245b9e1";
+      sha256 = "0vxhpdvzihsmg63aralmc7hx62lzrsnlxvskvlcr4mkwzwb22haj";
     };
 
     buildInputs = with self; [ zope_testing zope_interface ];
-    propagatedBuildInputs = with self; [ sqlalchemy9 transaction ];
+    propagatedBuildInputs = with self; [ sqlalchemy transaction ];
 
     meta = {
       maintainers = with maintainers; [ garbas iElectric ];

From 4f39e03d61d128c3473711a79e5e28df1546d784 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 14:09:56 +0200
Subject: [PATCH 684/857] pythonPackages.flexget: bump sqlalchemy dependency

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 451358b3b6911..603daf6446a5f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9179,7 +9179,7 @@ in modules // {
     doCheck = false;
 
     buildInputs = with self; [ nose ];
-    propagatedBuildInputs = with self; [ paver feedparser sqlalchemy9 pyyaml rpyc
+    propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc
 	    beautifulsoup_4_1_3 html5lib pyrss2gen pynzb progressbar jinja2 flask
 	    cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3
       guessit pathpy apscheduler ]

From f5a86eaf31cb65e8f687fff82b1a7b26b4e47e05 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 14:10:43 +0200
Subject: [PATCH 685/857] pythonPackages.apscheduler: bump sqlalchemy
 dependency

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 603daf6446a5f..2abcb7a0f7e54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -875,7 +875,7 @@ in modules // {
 
     buildInputs = with self; [
       pytest
-      sqlalchemy9
+      sqlalchemy
       tornado
       twisted
       mock

From 24269a9b0fdc66bb3ace4bdf922652c1f28e8a74 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 14:11:22 +0200
Subject: [PATCH 686/857] pythonPackages.docker_registry: bump sqlalchemy
 dependency

---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2abcb7a0f7e54..f1e1be3da35ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4992,7 +4992,7 @@ in modules // {
     doCheck = false; # requires redis server
     propagatedBuildInputs = with self; [
       setuptools docker_registry_core blinker flask gevent gunicorn pyyaml
-      requests2 rsa sqlalchemy9 setuptools backports_lzma m2crypto
+      requests2 rsa sqlalchemy setuptools backports_lzma m2crypto
     ];
 
     patchPhase = "> requirements/main.txt";

From 2b4f951f5efe2013508e10dcac4dc737e6d0f52b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 14:14:41 +0200
Subject: [PATCH 687/857] pythonPackages.serversyncstorage: 1.5.11 -> 1.5.13

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f1e1be3da35ac..0e1dc70586885 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24849,17 +24849,17 @@ in modules // {
 
   serversyncstorage = buildPythonPackage rec {
     name = "serversyncstorage-${version}";
-    version = "1.5.11";
+    version = "1.5.13";
     disabled = !isPy27;
 
     src = pkgs.fetchgit {
       url = https://github.com/mozilla-services/server-syncstorage.git;
       rev = "refs/tags/${version}";
-      sha256 = "1byq2k2f36f1jli9599ygfm2qsb4adl9140sxjpgfjbznb74q90q";
+      sha256 = "06ss88j2gkgqchwd51fwynf2i41ssazs2xwiin8g7p8bc517ywmq";
     };
 
     propagatedBuildInputs = with self; [
-      pyramid sqlalchemy9 simplejson mozsvc cornice pyramid_hawkauth pymysql
+      pyramid sqlalchemy simplejson mozsvc cornice pyramid_hawkauth pymysql
       pymysqlsa umemcache WSGIProxy requests pybrowserid
     ];
     buildInputs = with self; [ testfixtures unittest2  ];

From 43c60d6c7c0863c580c22566bb320a4806920f65 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 14:15:58 +0200
Subject: [PATCH 688/857] pythonPackages.syncserver: 1.5.0 -> 1.5.2

---
 pkgs/top-level/python-packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0e1dc70586885..bf5a857ca6ae7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24826,18 +24826,18 @@ in modules // {
 
   syncserver = buildPythonPackage rec {
     name = "syncserver-${version}";
-    version = "1.5.0";
+    version = "1.5.2";
     disabled = ! isPy27;
 
     src = pkgs.fetchgit {
       url = https://github.com/mozilla-services/syncserver.git;
       rev = "refs/tags/${version}";
-      sha256 = "1xljylycxg7351hmqh7aa6fvvsjg06zvd4r7hcjqyd0k0sxvk7y6";
+      sha256 = "002if8wk3bhz70zycggvp5qfvr1n2c6i27wnzj317wlkkjmcknx7";
     };
 
     buildInputs = with self; [ unittest2 ];
     propagatedBuildInputs = with self; [
-      cornice gunicorn pyramid requests simplejson sqlalchemy9 mozsvc tokenserver
+      cornice gunicorn pyramid requests simplejson sqlalchemy mozsvc tokenserver
       serversyncstorage configparser
     ];
 

From a540d2b3a1e17b407b0b908424b8956835c31285 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 4 Apr 2016 14:16:22 +0200
Subject: [PATCH 689/857] pythonPackages.sqlalchemy9: drop

---
 pkgs/top-level/python-packages.nix | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf5a857ca6ae7..578be04bf87ef 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20727,32 +20727,6 @@ in modules // {
     };
   };
 
-  sqlalchemy9 = buildPythonPackage rec {
-    name = "SQLAlchemy-0.9.9";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
-      sha256 = "14az6hhrz4bgnicz4q373z119zmaf7j5zxl1jfbfl5lix5m1z9bj";
-    };
-
-    buildInputs = with self; [ nose mock ]
-      ++ stdenv.lib.optional doCheck pysqlite;
-    propagatedBuildInputs = with self; [ modules.sqlite3 ];
-
-    # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
-    # acceptable reason to make all dependents unavailable on Python 3 as well
-    doCheck = !(isPyPy || isPy3k);
-
-    checkPhase = ''
-      ${python.executable} sqla_nose.py
-    '';
-
-    meta = {
-      homepage = http://www.sqlalchemy.org/;
-      description = "A Python SQL toolkit and Object Relational Mapper";
-    };
-  };
-
   sqlalchemy = buildPythonPackage rec {
     name = "SQLAlchemy-${version}";
     version = "1.0.12";

From 2c0310d8d8e84967418aa4224f00664966161608 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 31 Mar 2016 14:00:50 -0500
Subject: [PATCH 690/857] xapian10/xapianBindings10: Remove, 5 years old.

---
 pkgs/development/libraries/xapian/1.0.x.nix   | 19 -----
 .../libraries/xapian/bindings/1.0.x.nix       | 73 -------------------
 pkgs/top-level/all-packages.nix               | 15 ++--
 3 files changed, 5 insertions(+), 102 deletions(-)
 delete mode 100644 pkgs/development/libraries/xapian/1.0.x.nix
 delete mode 100644 pkgs/development/libraries/xapian/bindings/1.0.x.nix

diff --git a/pkgs/development/libraries/xapian/1.0.x.nix b/pkgs/development/libraries/xapian/1.0.x.nix
deleted file mode 100644
index b89900d2b05ee..0000000000000
--- a/pkgs/development/libraries/xapian/1.0.x.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, zlib }:
-
-stdenv.mkDerivation {
-  name = "xapian-1.0.23";
-
-  src = fetchurl {
-    url = http://oligarchy.co.uk/xapian/1.0.23/xapian-core-1.0.23.tar.gz;
-    sha256 = "0aed7296bd56b4b49aba944cc744e1e76fff8cfb0a70fd5b1f49d4c62a97ecc6";
-  };
-
-  buildInputs = [ zlib ];
-
-  meta = { 
-    description = "Xapian Probabilistic Information Retrieval library";
-    homepage = "http://xapian.org";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/development/libraries/xapian/bindings/1.0.x.nix b/pkgs/development/libraries/xapian/bindings/1.0.x.nix
deleted file mode 100644
index 5d69f73d7973a..0000000000000
--- a/pkgs/development/libraries/xapian/bindings/1.0.x.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ stdenv, composableDerivation, fetchurl, xapian10, pkgconfig
-, python ? null, php ? null, ruby ? null }:
-
-let inherit (composableDerivation) wwf; in
-
-composableDerivation.composableDerivation {} rec {
-
-  name = "xapian-bindings-1.0.23";
-
-  src = fetchurl {
-    url = "http://oligarchy.co.uk/xapian/1.0.23/${name}.tar.gz";
-    sha256 = "6028123c3cd9bfc380b672b89f5420f7d5c063fc3511dee4dd5d34033ccb6911";
-  };
-
-  buildInputs = [ xapian10 pkgconfig ];
-
-  # most interpreters aren't tested yet.. (see python for example how to do it)
-  flags =
-         wwf {
-           name = "python";
-           enable = {
-            buildInputs = [ python ];
-            # export same env vars as in pythonNew
-            preConfigure = ''
-              export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages
-              mkdir -p $out/nix-support
-              echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook 
-              echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook 
-            '';
-           };
-         }
-      // wwf {
-           name = "php";
-           enable = {
-             buildInputs = [ php ];
-             preConfigure = ''
-               export PHP_EXTENSION_DIR=$out/lib/php # TODO use a sane directory. Its not used anywhere by now
-             '';
-           };
-         }
-      // wwf {
-           name = "ruby";
-           enable = {
-             buildInputs = [ ruby ];
-             preConfigure = ''
-               export RUBY_LIB=$out/${ruby.libPath}
-               export RUBY_LIB_ARCH=$RUBY_LIB
-               mkdir -p $out/nix-support
-               echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook 
-               echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook 
-             '';
-           };
-         }
-
-      # note: see configure --help to get see which env vars can be used
-      # // wwf { name = "tcl";     enable = { buildInputs = [ tcl ];};}
-      # // wwf { name = "csharp"; }
-      # // wwf { name = "java"; }
-      ;
-
-  cfg = {
-    pythonSupport = true;
-    phpSupport = true;
-    rubySupport = true;
-  };
-
-  meta = { 
-    description = "Bindings for the Xapian library";
-    homepage = xapian10.meta.homepage;
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.chaoflow ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19631d7fc56a5..65f793dc5baed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1590,11 +1590,11 @@ in
     gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true;  };
 
     gazebo7 = callPackage ../applications/science/robotics/gazebo { };
-  
+
     gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; };
 
   };
-  
+
   # at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility
   gazebo = gazeboSimulator.gazebo6;
 
@@ -1938,12 +1938,12 @@ in
 
   ifuse = callPackage ../tools/filesystems/ifuse/default.nix { };
 
-  ignition = recurseIntoAttrs { 
+  ignition = recurseIntoAttrs {
 
     math = callPackage ../development/libraries/ignition-math { };
-  
+
     math2 = ignition.math;
-  
+
     transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { };
 
     transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { };
@@ -9045,11 +9045,6 @@ in
   xapianBindings = callPackage ../development/libraries/xapian/bindings {  # TODO perl php Java, tcl, C#, python
   };
 
-  xapian10 = callPackage ../development/libraries/xapian/1.0.x.nix { };
-
-  xapianBindings10 = callPackage ../development/libraries/xapian/bindings/1.0.x.nix {  # TODO perl php Java, tcl, C#, python
-  };
-
   xapian-omega = callPackage ../tools/misc/xapian-omega {};
 
   xavs = callPackage ../development/libraries/xavs { };

From 2b462dc2ef2be506c53b86fdfd3c3cb9b0e235cd Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 31 Mar 2016 13:32:27 -0500
Subject: [PATCH 691/857] xapian-bindings: build against php56

xapian-bindings does not support php7, as SWIG doesn't support PHP 7.0
yet, according to https://xapian.org/docs/bindings/php/
---
 pkgs/development/libraries/xapian/bindings/default.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix                        |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 740b71c59a7d7..7abf5a1a063bf 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -24,8 +24,8 @@ composableDerivation.composableDerivation {} rec {
             preConfigure = ''
               export PYTHON_LIB=$out/lib/${python.libPrefix}/site-packages
               mkdir -p $out/nix-support
-              echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook 
-              echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook 
+              echo "export NIX_PYTHON_SITES=\"$out:\$NIX_PYTHON_SITES\"" >> $out/nix-support/setup-hook
+              echo "export PYTHONPATH=\"$PYTHON_LIB:\$PYTHONPATH\"" >> $out/nix-support/setup-hook
             '';
            };
          }
@@ -46,8 +46,8 @@ composableDerivation.composableDerivation {} rec {
                export RUBY_LIB=$out/${ruby.libPath}
                export RUBY_LIB_ARCH=$RUBY_LIB
                mkdir -p $out/nix-support
-               echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook 
-               echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook 
+               echo "export RUBYLIB=\"$RUBY_LIB:\$RUBYLIB\"" >> $out/nix-support/setup-hook
+               echo "export GEM_PATH=\"$out:\$GEM_PATH\"" >> $out/nix-support/setup-hook
              '';
            };
          }
@@ -64,7 +64,7 @@ composableDerivation.composableDerivation {} rec {
     rubySupport = true;
   };
 
-  meta = { 
+  meta = {
     description = "Bindings for the Xapian library";
     homepage = xapian.meta.homepage;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65f793dc5baed..7eb48fe9a7e97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9043,6 +9043,7 @@ in
   xapian = callPackage ../development/libraries/xapian { };
 
   xapianBindings = callPackage ../development/libraries/xapian/bindings {  # TODO perl php Java, tcl, C#, python
+    php = php56;
   };
 
   xapian-omega = callPackage ../tools/misc/xapian-omega {};

From e3a335dd37693b5d06adc7065b1395b36b049730 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 31 Mar 2016 13:54:13 -0500
Subject: [PATCH 692/857] xapian-bindings:1.2.8 -> 1.2.23

---
 pkgs/development/libraries/xapian/bindings/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index 7abf5a1a063bf..a1274b380f737 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -5,11 +5,11 @@ let inherit (composableDerivation) wwf; in
 
 composableDerivation.composableDerivation {} rec {
 
-  name = "xapian-bindings-1.2.8";
+  name = "xapian-bindings-1.2.23";
 
   src = fetchurl {
-    url = "http://oligarchy.co.uk/xapian/1.2.8/${name}.tar.gz";
-    sha256 = "eb740c619c75d288e65a1c2f86faecdca53d44d3f9896bcc080085839887b124";
+    url = "http://oligarchy.co.uk/xapian/1.2.23/${name}.tar.xz";
+    sha256 = "05929d9bq9df25kh2i6gk2w09w7p5qknf9cc7mrm2g46finbbd0r";
   };
 
   buildInputs = [ xapian pkgconfig zlib ];

From 374709f30817e8aa3c006cda9003c4559a9c3013 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 31 Mar 2016 14:05:20 -0500
Subject: [PATCH 693/857] xapian: 1.2.21 -> 1.2.23 and disable PHP support in
 xapianBindings

xapianBindings hasn't been building against PHP for a few months now,
and no other packages in nixpkgs expects PHP support at this time.
---
 pkgs/development/libraries/xapian/bindings/default.nix | 2 +-
 pkgs/development/libraries/xapian/default.nix          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/xapian/bindings/default.nix b/pkgs/development/libraries/xapian/bindings/default.nix
index a1274b380f737..ed7c1e046d559 100644
--- a/pkgs/development/libraries/xapian/bindings/default.nix
+++ b/pkgs/development/libraries/xapian/bindings/default.nix
@@ -60,7 +60,7 @@ composableDerivation.composableDerivation {} rec {
 
   cfg = {
     pythonSupport = true;
-    phpSupport = true;
+    phpSupport = false;
     rubySupport = true;
   };
 
diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix
index 89f97292d39d8..8a09d835f3da0 100644
--- a/pkgs/development/libraries/xapian/default.nix
+++ b/pkgs/development/libraries/xapian/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "xapian-${version}";
-  version = "1.2.21";
+  version = "1.2.23";
 
   src = fetchurl {
     url = "http://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz";
-    sha256 = "0grd2s6gf8yzqwdaa50g57j9d81mxkrrpkyldm2shgyizdc8gx33";
+    sha256 = "0z9lhvfaazzmd611bnii9a0d19sqnjs0s9vbcgjhcv8s9spax0wp";
   };
 
   outputs = [ "out" "doc" ];

From 2ec1d2c7386ae33ff06c64714763dbae63a57dbe Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 31 Mar 2016 14:58:48 -0500
Subject: [PATCH 694/857] sup: 0.20.0 -> 0.22.1

---
 .../networking/mailreaders/sup/Gemfile        |   3 +-
 .../networking/mailreaders/sup/Gemfile.lock   |  29 ++--
 .../networking/mailreaders/sup/default.nix    |   7 +-
 .../networking/mailreaders/sup/gemset.nix     | 127 ++++++++++--------
 pkgs/top-level/all-packages.nix               |   2 +-
 5 files changed, 100 insertions(+), 68 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile b/pkgs/applications/networking/mailreaders/sup/Gemfile
index a57feb5d21f34..bc37456ae58e6 100644
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile
+++ b/pkgs/applications/networking/mailreaders/sup/Gemfile
@@ -1,8 +1,9 @@
 source "https://rubygems.org"
 
+gem 'rake'
 gem 'sup'
 gem 'gpgme'
 
 # Sup tries to `xapian-ruby` in its extconf instead of listing it as a
 # dependency.
-gem 'xapian-ruby', "~> 1.2.15"
+gem 'xapian-ruby', "~> 1.2.22"
diff --git a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
index fe8746b9f7240..0691919ba1822 100644
--- a/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
+++ b/pkgs/applications/networking/mailreaders/sup/Gemfile.lock
@@ -2,33 +2,40 @@ GEM
   remote: https://rubygems.org/
   specs:
     chronic (0.9.1)
-    gpgme (2.0.7)
-      mini_portile (>= 0.5.0, <= 0.6.0)
-    highline (1.6.21)
-    locale (2.1.0)
+    gpgme (2.0.12)
+      mini_portile2 (~> 2.1.0)
+    highline (1.7.8)
+    locale (2.1.2)
     lockfile (2.1.3)
-    mime-types (1.25.1)
-    mini_portile (0.6.0)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
+    mini_portile2 (2.1.0)
     ncursesw (1.4.9)
+    rake (11.1.2)
     rmail-sup (1.0.1)
-    sup (0.20.0)
+    sup (0.22.1)
       chronic (~> 0.9.1)
       highline
       locale (~> 2.0)
       lockfile
-      mime-types (~> 1.0)
+      mime-types (> 2.0)
       ncursesw (~> 1.4.0)
       rmail-sup (~> 1.0.1)
       trollop (>= 1.12)
       unicode (~> 0.4.4)
-    trollop (2.1.1)
+    trollop (2.1.2)
     unicode (0.4.4.2)
-    xapian-ruby (1.2.19.1)
+    xapian-ruby (1.2.22)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   gpgme
+  rake
   sup
-  xapian-ruby (~> 1.2.15)
+  xapian-ruby (~> 1.2.22)
+
+BUNDLED WITH
+   1.10.6
diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix
index f7aff8a4d0c23..b7ac621eb6db8 100644
--- a/pkgs/applications/networking/mailreaders/sup/default.nix
+++ b/pkgs/applications/networking/mailreaders/sup/default.nix
@@ -2,9 +2,14 @@
 , pkgconfig, which }:
 
 bundlerEnv {
-  name = "sup-0.20.0";
+  name = "sup-0.22.1";
 
   inherit ruby;
+
+  # Updated with:
+  # nix-shell -p bundix -p bundler -p ncurses -p ruby -p which -p zlib -p libuuid
+  # bundle install --path ./vendor
+  # bundix
   gemfile = ./Gemfile;
   lockfile = ./Gemfile.lock;
   gemset = ./gemset.nix;
diff --git a/pkgs/applications/networking/mailreaders/sup/gemset.nix b/pkgs/applications/networking/mailreaders/sup/gemset.nix
index e39da3dac85e0..babc063d63465 100644
--- a/pkgs/applications/networking/mailreaders/sup/gemset.nix
+++ b/pkgs/applications/networking/mailreaders/sup/gemset.nix
@@ -1,107 +1,126 @@
 {
-  "chronic" = {
-    version = "0.9.1";
+  xapian-ruby = {
+    version = "1.2.22";
     source = {
       type = "gem";
-      sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xbarnxmhy6r0rxpspn4wk85j183w6b18nah73djcs06b3gfas15";
     };
+    dependencies = [ "rake" ];
   };
-  "gpgme" = {
-    version = "2.0.7";
+  unicode = {
+    version = "0.4.4.2";
     source = {
       type = "gem";
-      sha256 = "1p84zhiri2ihcld7py9mwc2kg5xs5da8fk11zhndrhmw05yvf5mr";
+      remotes = ["https://rubygems.org"];
+      sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
     };
-    dependencies = [
-      "mini_portile"
-    ];
   };
-  "highline" = {
-    version = "1.6.21";
+  trollop = {
+    version = "2.1.2";
     source = {
       type = "gem";
-      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
     };
   };
-  "locale" = {
-    version = "2.1.0";
+  sup = {
+    version = "0.22.1";
     source = {
       type = "gem";
-      sha256 = "18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj";
+      remotes = ["https://rubygems.org"];
+      sha256 = "17s2sxismf46zdhgr6g2v53fw9f3sp1ijx7xdw3wx8qpcsgazcgi";
     };
+    dependencies = ["chronic" "highline" "locale" "lockfile" "mime-types" "ncursesw" "rmail-sup" "trollop" "unicode" "rake" ];
   };
-  "lockfile" = {
-    version = "2.1.3";
+  rmail-sup = {
+    version = "1.0.1";
     source = {
       type = "gem";
-      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
     };
   };
-  "mime-types" = {
-    version = "1.25.1";
+  rake = {
+    version = "11.1.2";
     source = {
       type = "gem";
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jfmy7kd543ldi3d4fg35a1w7q6jikpnzxqj4bzchfbn94cbabqz";
     };
   };
-  "mini_portile" = {
-    version = "0.6.0";
+  ncursesw = {
+    version = "1.4.9";
     source = {
       type = "gem";
-      sha256 = "09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn";
+      remotes = ["https://rubygems.org"];
+      sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
     };
   };
-  "ncursesw" = {
-    version = "1.4.9";
+  mini_portile2 = {
+    version = "2.1.0";
     source = {
       type = "gem";
-      sha256 = "154cls3b237imdbhih7rni5p85nw6mpbpkzdw08jxzvqaml7q093";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y25adxb1hgg1wb2rn20g3vl07qziq6fz364jc5694611zz863hb";
     };
   };
-  "rmail-sup" = {
-    version = "1.0.1";
+  mime-types-data = {
+    version = "3.2016.0221";
     source = {
       type = "gem";
-      sha256 = "1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g";
+      remotes = ["https://rubygems.org"];
+      sha256 = "05ygjn0nnfh6yp1wsi574jckk95wqg9a6g598wk4svvrkmkrzkpn";
     };
   };
-  "sup" = {
-    version = "0.20.0";
+  mime-types = {
+    version = "3.0";
     source = {
       type = "gem";
-      sha256 = "1lpqgrqkv29xr1h1142qsbmknlshpgys7fc3w1nkyhib8s3ikamg";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1snjc38a9vqvy8j41xld1i1byq9prbl955pbjw7dxqcfcirqlzra";
     };
-    dependencies = [
-      "chronic"
-      "highline"
-      "locale"
-      "lockfile"
-      "mime-types"
-      "ncursesw"
-      "rmail-sup"
-      "trollop"
-      "unicode"
-    ];
+    dependencies = ["mime-types-data"];
   };
-  "trollop" = {
-    version = "2.1.1";
+  lockfile = {
+    version = "2.1.3";
     source = {
       type = "gem";
-      sha256 = "0z5dvh7glwqjprlihsjx67hfzy4whsjfhqj9akyyrby9q5va1i4k";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr";
     };
   };
-  "unicode" = {
-    version = "0.4.4.2";
+  locale = {
+    version = "2.1.2";
     source = {
       type = "gem";
-      sha256 = "15fggljzan8zvmr8h12b5m7pcj1gvskmmnx367xs4p0rrpnpil8g";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sls9bq4krx0fmnzmlbn64dw23c4d6pz46ynjzrn9k8zyassdd0x";
     };
   };
-  "xapian-ruby" = {
-    version = "1.2.19.1";
+  highline = {
+    version = "1.7.8";
     source = {
       type = "gem";
-      sha256 = "1crfrmc8kf6qq1xcfcmgf213zg66badpg4d86n7y9x3i1f5lxlbv";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+    };
+  };
+  gpgme = {
+    version = "2.0.12";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a04a76dw9dias0a8rp6dyk3vx2y024gim40lg2md6zdh2m1kx85";
+    };
+    dependencies = ["mini_portile2"];
+  };
+  chronic = {
+    version = "0.9.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eb48fe9a7e97..4d3e764ee529f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13187,7 +13187,7 @@ in
   smtube = qt5.callPackage ../applications/video/smtube {};
 
   sup = callPackage ../applications/networking/mailreaders/sup {
-    ruby = ruby_1_9.override { cursesSupport = true; };
+    ruby = ruby_2_3.override { cursesSupport = true; };
   };
 
   synapse = callPackage ../applications/misc/synapse {

From 2ce26f4f94b6a80efe3a0daf448c76daaeb1b73a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 31 Mar 2016 21:32:34 -0500
Subject: [PATCH 695/857] kiwix: mark as broken

Compiling is now emitting:

    ../common/kiwix/kiwix_serve-searcher.o: In function `kiwix::Searcher::getHtml[abi:cxx11]()':
    /tmp/nix-build-kiwix-0.9.drv-0/kiwix-0.9/src/server/../common/kiwix/searcher.cpp:142: undefined reference to `CTPP::CDT::operator[](std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)'
    ... snip ...
    /tmp/nix-build-kiwix-0.9.drv-0/kiwix-0.9/src/server/../common/kiwix/searcher.cpp:191: undefined reference to `CTPP::CDT::operator=(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)'
    /tmp/nix-build-kiwix-0.9.drv-0/kiwix-0.9/src/server/../common/kiwix/searcher.cpp:201: undefined reference to `CTPP::SimpleVM::Run(CTPP::CDT&, CTPP::VMLoader const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >&, CTPP::Logger&)'
    collect2: error: ld returned 1 exit status
    Makefile:506: recipe for target 'kiwix-serve' failed
    make[2]: *** [kiwix-serve] Error 1
    make[2]: Leaving directory '/tmp/nix-build-kiwix-0.9.drv-0/kiwix-0.9/src/server'
    Makefile:396: recipe for target 'all-recursive' failed
    make[1]: *** [all-recursive] Error 1
    make[1]: Leaving directory '/tmp/nix-build-kiwix-0.9.drv-0/kiwix-0.9/src'
    Makefile:456: recipe for target 'all-recursive' failed
    make: *** [all-recursive] Error 1
---
 pkgs/applications/misc/kiwix/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 30db6a45ea1b9..aa8492544dcc1 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -106,5 +106,6 @@ stdenv.mkDerivation rec {
     homepage = http://kiwix.org;
     license = licenses.gpl3;
     maintainers = with maintainers; [ robbinch ];
+    broken = true;
   };
 }

From 5024e035428960b6177ab9c90879eb648f41ffa2 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 1 Apr 2016 16:48:11 -0500
Subject: [PATCH 696/857] pythonPackages.pyramid_beaker: 0.7 -> 0.8, mark as
 broken

Beaker was updated to 1.8.0 which caused pyramid_beaker to fail tests.
0.8 was released in 2013.
---
 pkgs/top-level/python-packages.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3b903471147f..f55d60a21ba54 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7099,11 +7099,11 @@ in modules // {
 
 
   pyramid_beaker = buildPythonPackage rec {
-    name = "pyramid_beaker-0.7";
+    name = "pyramid_beaker-0.8";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyramid_beaker/${name}.tar.gz";
-      sha256 = "c76578dac3ea717e9ca89c327daf13975987d0b8827d15157319c20614fab74a";
+      sha256 = "0hflx3qkcdml1mwpq53sz46s7jickpfn0zy0ns2c7j445j66bp3p";
     };
 
     propagatedBuildInputs = with self; [ beaker pyramid ];
@@ -7111,6 +7111,7 @@ in modules // {
     meta = {
       maintainers = with maintainers; [ iElectric ];
       platforms = platforms.all;
+      broken = true;
     };
   };
 

From 8e0f0776aac2c05ff02b64c7015dc91828a07e58 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Apr 2016 15:06:32 +0200
Subject: [PATCH 697/857] mini-httpd: update to version 1.6

---
 pkgs/servers/http/mini-httpd/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index 5425ffb919f4a..7fb6a16dd1c38 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl, boost }:
 
 stdenv.mkDerivation rec {
-  name = "mini-httpd-1.5";
+  name = "mini-httpd-1.6";
 
   src = fetchurl {
-    url = "mirror://savannah/mini-httpd/${name}.tar.gz";
-    sha256 = "1x4b6x40ymbaamqqq9p97lc0mnah4q7bza04fjs35c8agpm19zir";
+    url = "http://download-mirror.savannah.gnu.org/releases/mini-httpd/${name}.tar.gz";
+    sha256 = "04azr1qa70l0fnpbx7nmyxz1lkykjjs2b6p4lhkpg86hs3lrmxly";
   };
 
-  configureFlagsArray = [ "CFLAGS=-ansi" ];
-
   buildInputs = [ boost ];
 
   enableParallelBuilding = true;

From 399d2bca32b5ddb0bed74c6acb96aee0ef598183 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Mon, 4 Apr 2016 15:11:00 +0200
Subject: [PATCH 698/857] mosh: fix segfaulting issue

Discussion on this issue at https://github.com/mobile-shell/mosh/issues/727 and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=817929#35
---
 pkgs/tools/networking/mosh/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index ec2f8d78dc672..80feeafdbca49 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, zlib, boost, protobuf, ncurses, pkgconfig, IOTty
-, makeWrapper, perl, openssl }:
+, makeWrapper, perl, openssl, autoreconfHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   name = "mosh-1.2.5";
@@ -9,7 +9,16 @@ stdenv.mkDerivation rec {
     sha256 = "1qsb0y882yfgwnpy6f98pi5xqm6kykdsrxzvaal37hs7szjhky0s";
   };
 
-  buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
+  buildInputs = [ autoreconfHook boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl openssl ];
+
+  patches = [
+    # remove automake detection macro patch on next release as it is already on mosh master
+    (fetchpatch {
+      name = "fix_automake_detection_macro.patch";
+      url = "https://github.com/mobile-shell/mosh/commit/a47917b97606a03f6bbf0cafd1fcd495b0229790.patch";
+      sha256 = "0ib200ffvbnns125xd58947fyxdx31m06rmnzqmxpxcnjza7k404";
+    })
+  ];
 
   postInstall = ''
       wrapProgram $out/bin/mosh --prefix PERL5LIB : $PERL5LIB

From 0c0aa0413a43bcd4d2e1a6e57997bb5cb7a27262 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Mar 2016 11:33:23 +0200
Subject: [PATCH 699/857] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20160308-5-g3e915af using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/57b937334dd073fc3efa850aaa81bdafbf88ec51
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/7a74143acf6bc16cbcf2ba3b33045a9f3fb92641
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/658d91e0e001d2b5f47d5670a3f0d5299126aa0e
---
 .../haskell-modules/configuration-lts-0.0.nix |   49 +
 .../haskell-modules/configuration-lts-0.1.nix |   49 +
 .../haskell-modules/configuration-lts-0.2.nix |   49 +
 .../haskell-modules/configuration-lts-0.3.nix |   49 +
 .../haskell-modules/configuration-lts-0.4.nix |   49 +
 .../haskell-modules/configuration-lts-0.5.nix |   49 +
 .../haskell-modules/configuration-lts-0.6.nix |   49 +
 .../haskell-modules/configuration-lts-0.7.nix |   49 +
 .../haskell-modules/configuration-lts-1.0.nix |   49 +
 .../haskell-modules/configuration-lts-1.1.nix |   49 +
 .../configuration-lts-1.10.nix                |   49 +
 .../configuration-lts-1.11.nix                |   49 +
 .../configuration-lts-1.12.nix                |   50 +
 .../configuration-lts-1.13.nix                |   50 +
 .../configuration-lts-1.14.nix                |   50 +
 .../configuration-lts-1.15.nix                |   50 +
 .../haskell-modules/configuration-lts-1.2.nix |   49 +
 .../haskell-modules/configuration-lts-1.4.nix |   49 +
 .../haskell-modules/configuration-lts-1.5.nix |   49 +
 .../haskell-modules/configuration-lts-1.7.nix |   49 +
 .../haskell-modules/configuration-lts-1.8.nix |   49 +
 .../haskell-modules/configuration-lts-1.9.nix |   49 +
 .../haskell-modules/configuration-lts-2.0.nix |   50 +
 .../haskell-modules/configuration-lts-2.1.nix |   50 +
 .../configuration-lts-2.10.nix                |   50 +
 .../configuration-lts-2.11.nix                |   50 +
 .../configuration-lts-2.12.nix                |   50 +
 .../configuration-lts-2.13.nix                |   50 +
 .../configuration-lts-2.14.nix                |   51 +
 .../configuration-lts-2.15.nix                |   52 +
 .../configuration-lts-2.16.nix                |   52 +
 .../configuration-lts-2.17.nix                |   52 +
 .../configuration-lts-2.18.nix                |   52 +
 .../configuration-lts-2.19.nix                |   52 +
 .../haskell-modules/configuration-lts-2.2.nix |   50 +
 .../configuration-lts-2.20.nix                |   52 +
 .../configuration-lts-2.21.nix                |   54 +
 .../configuration-lts-2.22.nix                |   54 +
 .../haskell-modules/configuration-lts-2.3.nix |   50 +
 .../haskell-modules/configuration-lts-2.4.nix |   50 +
 .../haskell-modules/configuration-lts-2.5.nix |   50 +
 .../haskell-modules/configuration-lts-2.6.nix |   50 +
 .../haskell-modules/configuration-lts-2.7.nix |   50 +
 .../haskell-modules/configuration-lts-2.8.nix |   50 +
 .../haskell-modules/configuration-lts-2.9.nix |   50 +
 .../haskell-modules/configuration-lts-3.0.nix |   57 +-
 .../haskell-modules/configuration-lts-3.1.nix |   57 +-
 .../configuration-lts-3.10.nix                |   62 +-
 .../configuration-lts-3.11.nix                |   63 +-
 .../configuration-lts-3.12.nix                |   63 +-
 .../configuration-lts-3.13.nix                |   63 +-
 .../configuration-lts-3.14.nix                |   63 +-
 .../configuration-lts-3.15.nix                |   63 +-
 .../configuration-lts-3.16.nix                |   63 +-
 .../configuration-lts-3.17.nix                |   64 +-
 .../configuration-lts-3.18.nix                |   64 +-
 .../configuration-lts-3.19.nix                |   65 +-
 .../haskell-modules/configuration-lts-3.2.nix |   58 +-
 .../configuration-lts-3.20.nix                |   65 +-
 .../configuration-lts-3.21.nix                |   68 +-
 .../configuration-lts-3.22.nix                |   68 +-
 .../haskell-modules/configuration-lts-3.3.nix |   61 +-
 .../haskell-modules/configuration-lts-3.4.nix |   61 +-
 .../haskell-modules/configuration-lts-3.5.nix |   61 +-
 .../haskell-modules/configuration-lts-3.6.nix |   61 +-
 .../haskell-modules/configuration-lts-3.7.nix |   61 +-
 .../haskell-modules/configuration-lts-3.8.nix |   62 +-
 .../haskell-modules/configuration-lts-3.9.nix |   62 +-
 .../haskell-modules/configuration-lts-4.0.nix |   81 +
 .../haskell-modules/configuration-lts-4.1.nix |   82 +
 .../haskell-modules/configuration-lts-4.2.nix |   88 +
 .../haskell-modules/configuration-lts-5.0.nix |  101 +
 .../haskell-modules/configuration-lts-5.1.nix |  105 +
 .../configuration-lts-5.10.nix                | 8004 +++++++++++++++++
 .../configuration-lts-5.11.nix                | 7968 ++++++++++++++++
 .../haskell-modules/configuration-lts-5.2.nix |  105 +
 .../haskell-modules/configuration-lts-5.3.nix |  107 +
 .../haskell-modules/configuration-lts-5.4.nix |  108 +
 .../haskell-modules/configuration-lts-5.5.nix |  110 +
 .../haskell-modules/configuration-lts-5.6.nix |  113 +
 .../haskell-modules/configuration-lts-5.7.nix |  115 +
 .../haskell-modules/configuration-lts-5.8.nix |  116 +
 .../haskell-modules/configuration-lts-5.9.nix |  120 +
 .../haskell-modules/hackage-packages.nix      | 3515 ++++++--
 84 files changed, 23903 insertions(+), 623 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.10.nix
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.11.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 4288e9417f7d0..c9f34e1b44e09 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1464,6 +1465,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1621,6 +1623,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1715,6 +1718,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1741,6 +1745,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2257,6 +2262,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_8";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2400,6 +2406,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2430,6 +2438,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2777,6 +2786,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2859,6 +2869,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2936,6 +2947,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3129,6 +3141,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3364,6 +3377,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3551,6 +3565,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4194,6 +4212,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4851,6 +4870,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4898,6 +4918,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5044,6 +5065,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5101,6 +5124,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5179,6 +5203,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5333,6 +5358,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5645,6 +5671,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5731,6 +5758,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5941,6 +5969,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6026,6 +6055,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6796,6 +6826,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6945,6 +6976,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7010,6 +7042,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7103,6 +7136,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7209,6 +7243,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7351,6 +7386,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7380,11 +7417,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7630,6 +7669,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7750,6 +7790,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -8000,6 +8041,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8067,6 +8109,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8316,6 +8361,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8622,6 +8668,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8916,6 +8963,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -9000,6 +9048,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 73a65c8b5a756..23e86decbbc64 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1464,6 +1465,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1621,6 +1623,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1715,6 +1718,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1741,6 +1745,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2257,6 +2262,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2400,6 +2406,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2430,6 +2438,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2777,6 +2786,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2859,6 +2869,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2936,6 +2947,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3129,6 +3141,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3364,6 +3377,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3551,6 +3565,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4194,6 +4212,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4851,6 +4870,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4898,6 +4918,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5044,6 +5065,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5101,6 +5124,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5179,6 +5203,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5333,6 +5358,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5645,6 +5671,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5731,6 +5758,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5941,6 +5969,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6026,6 +6055,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6796,6 +6826,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6945,6 +6976,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7010,6 +7042,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7103,6 +7136,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7209,6 +7243,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7351,6 +7386,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7380,11 +7417,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7630,6 +7669,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7750,6 +7790,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -8000,6 +8041,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8067,6 +8109,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8316,6 +8361,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8622,6 +8668,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8916,6 +8963,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -9000,6 +9048,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 6e6eb1960fb46..fa44bb2ff7db5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1464,6 +1465,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1621,6 +1623,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1715,6 +1718,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1741,6 +1745,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2257,6 +2262,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2400,6 +2406,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2430,6 +2438,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2777,6 +2786,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2859,6 +2869,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2936,6 +2947,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3129,6 +3141,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3364,6 +3377,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3551,6 +3565,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4194,6 +4212,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4851,6 +4870,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4898,6 +4918,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5044,6 +5065,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5101,6 +5124,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5179,6 +5203,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5333,6 +5358,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5645,6 +5671,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5731,6 +5758,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5941,6 +5969,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6026,6 +6055,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6796,6 +6826,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6945,6 +6976,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7010,6 +7042,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7103,6 +7136,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7209,6 +7243,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7351,6 +7386,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7380,11 +7417,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7630,6 +7669,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7750,6 +7790,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -8000,6 +8041,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8067,6 +8109,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8316,6 +8361,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8622,6 +8668,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8916,6 +8963,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -9000,6 +9048,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index dd2c73dd9e73d..04a693eb708df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1464,6 +1465,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1621,6 +1623,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1715,6 +1718,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1741,6 +1745,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2257,6 +2262,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2400,6 +2406,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2430,6 +2438,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2777,6 +2786,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2859,6 +2869,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2936,6 +2947,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3129,6 +3141,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3364,6 +3377,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3551,6 +3565,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4194,6 +4212,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4851,6 +4870,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4898,6 +4918,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5044,6 +5065,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5101,6 +5124,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5179,6 +5203,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5333,6 +5358,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5645,6 +5671,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5731,6 +5758,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5941,6 +5969,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6026,6 +6055,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6796,6 +6826,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6945,6 +6976,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7010,6 +7042,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7103,6 +7136,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7209,6 +7243,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7351,6 +7386,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7380,11 +7417,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7630,6 +7669,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7750,6 +7790,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -8000,6 +8041,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8067,6 +8109,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8316,6 +8361,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8622,6 +8668,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8916,6 +8963,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -9000,6 +9048,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 40c40c0771a39..72c9814bbfd0d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1464,6 +1465,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1621,6 +1623,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1715,6 +1718,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1741,6 +1745,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2257,6 +2262,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2400,6 +2406,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2430,6 +2438,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2776,6 +2785,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2858,6 +2868,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2935,6 +2946,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3128,6 +3140,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3363,6 +3376,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3550,6 +3564,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4191,6 +4209,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4848,6 +4867,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4895,6 +4915,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5041,6 +5062,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5098,6 +5121,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5176,6 +5200,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5330,6 +5355,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5642,6 +5668,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5728,6 +5755,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5938,6 +5966,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6023,6 +6052,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6793,6 +6823,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6942,6 +6973,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7007,6 +7039,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7100,6 +7133,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7205,6 +7239,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7347,6 +7382,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7376,11 +7413,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7626,6 +7665,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7746,6 +7786,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7996,6 +8037,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8063,6 +8105,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8312,6 +8357,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8618,6 +8664,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8912,6 +8959,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8996,6 +9044,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 5ba1a29c13ba2..7a4a99d0f76ad 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1464,6 +1465,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1621,6 +1623,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1715,6 +1718,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1741,6 +1745,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2257,6 +2262,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2400,6 +2406,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2430,6 +2438,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2776,6 +2785,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2858,6 +2868,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2935,6 +2946,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3128,6 +3140,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3363,6 +3376,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3550,6 +3564,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4191,6 +4209,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4848,6 +4867,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4895,6 +4915,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5041,6 +5062,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5098,6 +5121,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5176,6 +5200,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5330,6 +5355,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5642,6 +5668,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5728,6 +5755,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5938,6 +5966,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6023,6 +6052,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6793,6 +6823,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6942,6 +6973,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7007,6 +7039,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7100,6 +7133,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7205,6 +7239,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7347,6 +7382,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7376,11 +7413,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7626,6 +7665,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7746,6 +7786,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7996,6 +8037,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8063,6 +8105,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8312,6 +8357,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8618,6 +8664,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8912,6 +8959,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8996,6 +9044,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 893b313246320..ff3fa0160c87e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1463,6 +1464,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1620,6 +1622,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1714,6 +1717,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1740,6 +1744,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2256,6 +2261,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2399,6 +2405,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2429,6 +2437,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2775,6 +2784,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2857,6 +2867,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2934,6 +2945,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3127,6 +3139,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3362,6 +3375,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3549,6 +3563,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4189,6 +4207,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4846,6 +4865,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4893,6 +4913,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5039,6 +5060,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5096,6 +5119,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5174,6 +5198,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5328,6 +5353,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5640,6 +5666,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5726,6 +5753,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5936,6 +5964,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6021,6 +6050,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6791,6 +6821,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6940,6 +6971,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7005,6 +7037,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7098,6 +7131,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7202,6 +7236,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7344,6 +7379,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7373,11 +7410,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7623,6 +7662,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7743,6 +7783,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7993,6 +8034,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8060,6 +8102,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8309,6 +8354,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8615,6 +8661,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8909,6 +8956,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8993,6 +9041,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 086a8f96caa61..81919a2c579b4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1463,6 +1464,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1620,6 +1622,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1714,6 +1717,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1740,6 +1744,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2256,6 +2261,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2399,6 +2405,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2429,6 +2437,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2775,6 +2784,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2857,6 +2867,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2934,6 +2945,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3127,6 +3139,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3362,6 +3375,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3549,6 +3563,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4189,6 +4207,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4846,6 +4865,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4893,6 +4913,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5039,6 +5060,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5096,6 +5119,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5174,6 +5198,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5328,6 +5353,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5640,6 +5666,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5726,6 +5753,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5936,6 +5964,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6021,6 +6050,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6791,6 +6821,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6940,6 +6971,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -7005,6 +7037,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7098,6 +7131,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7202,6 +7236,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7344,6 +7379,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7373,11 +7410,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7623,6 +7662,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7743,6 +7783,7 @@ self: super: {
   "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7993,6 +8034,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8060,6 +8102,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8309,6 +8354,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8615,6 +8661,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8909,6 +8956,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8993,6 +9041,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index aa31bb4fc7a5c..2fe027de4db70 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1129,6 +1129,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1460,6 +1461,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1617,6 +1619,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1710,6 +1713,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1736,6 +1740,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2250,6 +2255,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2393,6 +2399,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2422,6 +2430,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2768,6 +2777,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2850,6 +2860,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2927,6 +2938,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3119,6 +3131,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3354,6 +3367,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3541,6 +3555,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4181,6 +4199,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4837,6 +4856,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4884,6 +4904,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5030,6 +5051,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5087,6 +5110,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5165,6 +5189,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5319,6 +5344,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5631,6 +5657,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5717,6 +5744,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5927,6 +5955,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6012,6 +6041,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6782,6 +6812,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6931,6 +6962,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6996,6 +7028,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7089,6 +7122,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7192,6 +7226,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7334,6 +7369,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7363,11 +7400,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7613,6 +7652,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7732,6 +7772,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7982,6 +8023,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8049,6 +8091,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8298,6 +8343,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8603,6 +8649,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8897,6 +8944,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8981,6 +9029,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 51578a50705b8..d9e3fbfd0d1b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1129,6 +1129,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1460,6 +1461,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1617,6 +1619,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1710,6 +1713,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1736,6 +1740,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2249,6 +2254,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2392,6 +2398,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2420,6 +2428,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2766,6 +2775,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2847,6 +2857,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2924,6 +2935,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3116,6 +3128,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3351,6 +3364,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3538,6 +3552,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4177,6 +4195,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4831,6 +4850,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4878,6 +4898,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5024,6 +5045,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5081,6 +5104,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5159,6 +5183,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5313,6 +5338,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5625,6 +5651,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5711,6 +5738,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5920,6 +5948,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6005,6 +6034,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6775,6 +6805,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6924,6 +6955,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6989,6 +7021,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7082,6 +7115,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7185,6 +7219,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7327,6 +7362,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7356,11 +7393,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7605,6 +7644,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7724,6 +7764,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7973,6 +8014,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8040,6 +8082,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8286,6 +8331,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8590,6 +8636,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8884,6 +8931,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8968,6 +9016,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 3a67b223ac75b..0caa96182cf6b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3343,6 +3356,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3529,6 +3543,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4166,6 +4184,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4820,6 +4839,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4862,6 +4882,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5008,6 +5029,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5065,6 +5088,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5143,6 +5167,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5297,6 +5322,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5608,6 +5634,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5694,6 +5721,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5903,6 +5931,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5987,6 +6016,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6755,6 +6785,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6904,6 +6935,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6968,6 +7000,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7061,6 +7094,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7164,6 +7198,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7306,6 +7341,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7335,11 +7372,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7582,6 +7621,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7701,6 +7741,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7950,6 +7991,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8017,6 +8059,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8261,6 +8306,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8563,6 +8609,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8856,6 +8903,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8939,6 +8987,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index d2edd343231a3..823ad98d5a45c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3342,6 +3355,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3528,6 +3542,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4165,6 +4183,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4819,6 +4838,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4860,6 +4880,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5005,6 +5026,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5062,6 +5085,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5140,6 +5164,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5294,6 +5319,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5604,6 +5630,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5690,6 +5717,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5899,6 +5927,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5983,6 +6012,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6751,6 +6781,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6900,6 +6931,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6964,6 +6996,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7057,6 +7090,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7160,6 +7194,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7302,6 +7337,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7331,11 +7368,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7578,6 +7617,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7697,6 +7737,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7946,6 +7987,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8013,6 +8055,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8257,6 +8302,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8559,6 +8605,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8852,6 +8899,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8935,6 +8983,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 52b17245d4765..fb53e677c0df2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3342,6 +3355,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3528,6 +3542,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4165,6 +4183,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4818,6 +4837,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4859,6 +4879,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5004,6 +5025,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5061,6 +5084,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5139,6 +5163,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5293,6 +5318,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5603,6 +5629,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5689,6 +5716,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5898,6 +5926,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5982,6 +6011,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6750,6 +6780,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6899,6 +6930,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6963,6 +6995,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7056,6 +7089,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7159,6 +7193,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7301,6 +7336,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7330,11 +7367,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7577,6 +7616,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7696,6 +7736,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7945,6 +7986,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8012,6 +8054,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8182,6 +8227,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_4_2_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8255,6 +8301,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8557,6 +8604,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8850,6 +8898,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8933,6 +8982,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index f52251d185c3d..3aeeafdfe7060 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3342,6 +3355,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3528,6 +3542,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4164,6 +4182,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4817,6 +4836,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4858,6 +4878,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5003,6 +5024,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5060,6 +5083,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5138,6 +5162,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5292,6 +5317,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5602,6 +5628,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5688,6 +5715,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5897,6 +5925,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5981,6 +6010,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6749,6 +6779,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6898,6 +6929,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6962,6 +6994,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7055,6 +7088,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7158,6 +7192,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7300,6 +7335,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7329,11 +7366,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7576,6 +7615,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7695,6 +7735,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7944,6 +7985,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8011,6 +8053,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8180,6 +8225,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_4_2_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8253,6 +8299,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8555,6 +8602,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8848,6 +8896,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8931,6 +8980,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 159383635a0cd..223f1b85355be 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1127,6 +1127,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1458,6 +1459,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1614,6 +1616,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1707,6 +1710,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1733,6 +1737,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2244,6 +2249,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2387,6 +2393,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2413,6 +2421,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2759,6 +2768,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2840,6 +2850,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2917,6 +2928,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3109,6 +3121,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3339,6 +3352,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3525,6 +3539,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4161,6 +4179,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4814,6 +4833,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4855,6 +4875,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5000,6 +5021,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5057,6 +5080,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5135,6 +5159,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5289,6 +5314,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5599,6 +5625,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5685,6 +5712,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5893,6 +5921,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5977,6 +6006,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6745,6 +6775,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6893,6 +6924,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6957,6 +6989,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7050,6 +7083,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7153,6 +7187,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7295,6 +7330,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7324,11 +7361,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7571,6 +7610,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7690,6 +7730,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7939,6 +7980,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8006,6 +8048,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8175,6 +8220,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_4_2_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8248,6 +8294,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8550,6 +8597,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8843,6 +8891,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8926,6 +8975,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index c50ca30fa777c..f9e492cad0325 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1126,6 +1126,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1457,6 +1458,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1613,6 +1615,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1706,6 +1709,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1732,6 +1736,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2242,6 +2247,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2385,6 +2391,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2411,6 +2419,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2756,6 +2765,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2837,6 +2847,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2914,6 +2925,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3105,6 +3117,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3335,6 +3348,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3521,6 +3535,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4157,6 +4175,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4810,6 +4829,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4851,6 +4871,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4996,6 +5017,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5053,6 +5076,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5131,6 +5155,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5285,6 +5310,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5595,6 +5621,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5681,6 +5708,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5889,6 +5917,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5973,6 +6002,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6739,6 +6769,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6886,6 +6917,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6950,6 +6982,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7043,6 +7076,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7146,6 +7180,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7288,6 +7323,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7317,11 +7354,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7564,6 +7603,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7683,6 +7723,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7930,6 +7971,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -7997,6 +8039,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8166,6 +8211,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_4_2_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8239,6 +8285,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8541,6 +8588,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8834,6 +8882,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8916,6 +8965,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index f4fd2cd85764d..f579b92feee19 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1129,6 +1129,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1460,6 +1461,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1617,6 +1619,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1710,6 +1713,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1736,6 +1740,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2248,6 +2253,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2391,6 +2397,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2418,6 +2426,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2764,6 +2773,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2845,6 +2855,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2922,6 +2933,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3114,6 +3126,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3349,6 +3362,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3535,6 +3549,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4174,6 +4192,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4828,6 +4847,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4875,6 +4895,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5021,6 +5042,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5078,6 +5101,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5156,6 +5180,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5310,6 +5335,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5622,6 +5648,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5708,6 +5735,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5917,6 +5945,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -6002,6 +6031,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6771,6 +6801,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6920,6 +6951,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6984,6 +7016,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7077,6 +7110,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7180,6 +7214,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7322,6 +7357,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7351,11 +7388,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7599,6 +7638,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7718,6 +7758,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7967,6 +8008,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8034,6 +8076,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8280,6 +8325,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8584,6 +8630,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8878,6 +8925,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8962,6 +9010,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index fb9749c948604..51e84ca38738e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2247,6 +2252,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2390,6 +2396,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2417,6 +2425,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2763,6 +2772,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2844,6 +2854,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2921,6 +2932,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3113,6 +3125,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3347,6 +3360,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3533,6 +3547,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4171,6 +4189,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4825,6 +4844,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4872,6 +4892,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5018,6 +5039,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5075,6 +5098,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5153,6 +5177,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5307,6 +5332,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5619,6 +5645,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5705,6 +5732,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5914,6 +5942,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5998,6 +6027,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6767,6 +6797,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6916,6 +6947,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6980,6 +7012,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7073,6 +7106,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7176,6 +7210,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7318,6 +7353,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7347,11 +7384,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7595,6 +7634,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7714,6 +7754,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7963,6 +8004,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8030,6 +8072,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8275,6 +8320,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8579,6 +8625,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8873,6 +8920,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8957,6 +9005,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 4e3b2b6eec389..ec297f09670ea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3346,6 +3359,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3532,6 +3546,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4170,6 +4188,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4824,6 +4843,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4871,6 +4891,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5017,6 +5038,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_0_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5074,6 +5097,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5152,6 +5176,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5306,6 +5331,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5618,6 +5644,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5704,6 +5731,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5913,6 +5941,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5997,6 +6026,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6766,6 +6796,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6915,6 +6946,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6979,6 +7011,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7072,6 +7105,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7175,6 +7209,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7317,6 +7352,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7346,11 +7383,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7594,6 +7633,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7713,6 +7753,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7962,6 +8003,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8029,6 +8071,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8274,6 +8319,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8577,6 +8623,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8870,6 +8917,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8954,6 +9002,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index fe328d71f91bd..c91d1e3d33f7d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3346,6 +3359,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3532,6 +3546,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4170,6 +4188,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4824,6 +4843,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4866,6 +4886,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5012,6 +5033,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5069,6 +5092,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5147,6 +5171,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5301,6 +5326,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5613,6 +5639,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5699,6 +5726,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5908,6 +5936,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5992,6 +6021,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6761,6 +6791,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6910,6 +6941,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6974,6 +7006,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7067,6 +7100,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7170,6 +7204,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7312,6 +7347,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7341,11 +7378,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7589,6 +7628,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7708,6 +7748,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7957,6 +7998,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8024,6 +8066,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8269,6 +8314,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8572,6 +8618,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8865,6 +8912,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8949,6 +8997,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index d14e5b4a2f1a7..a6ba689d7510b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3344,6 +3357,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3530,6 +3544,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4167,6 +4185,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4821,6 +4840,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4863,6 +4883,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5009,6 +5030,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5066,6 +5089,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5144,6 +5168,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5298,6 +5323,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5609,6 +5635,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5695,6 +5722,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5904,6 +5932,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5988,6 +6017,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6757,6 +6787,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6906,6 +6937,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6970,6 +7002,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7063,6 +7096,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7166,6 +7200,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7308,6 +7343,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7337,11 +7374,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7585,6 +7624,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7704,6 +7744,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7953,6 +7994,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8020,6 +8062,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8265,6 +8310,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8567,6 +8613,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8860,6 +8907,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8944,6 +8992,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index e41abe399da22..dac67df3b5af4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1128,6 +1128,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1459,6 +1460,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1616,6 +1618,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1709,6 +1712,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1735,6 +1739,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2246,6 +2251,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2389,6 +2395,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2416,6 +2424,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = dontDistribute super."cryptol";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2762,6 +2771,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2843,6 +2853,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2920,6 +2931,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = dontDistribute super."effect-handlers";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3112,6 +3124,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3343,6 +3356,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3529,6 +3543,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4166,6 +4184,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4820,6 +4839,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4862,6 +4882,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -5008,6 +5029,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5065,6 +5088,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5143,6 +5167,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5297,6 +5322,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5608,6 +5634,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5694,6 +5721,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5903,6 +5931,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5987,6 +6016,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6756,6 +6786,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6905,6 +6936,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6969,6 +7001,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -7062,6 +7095,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7165,6 +7199,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7307,6 +7342,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7336,11 +7373,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7584,6 +7623,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7703,6 +7743,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7952,6 +7993,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
@@ -8019,6 +8061,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8264,6 +8309,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8566,6 +8612,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8859,6 +8906,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8943,6 +8991,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 76cdad114a398..35052e2ee2b61 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1120,6 +1120,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1449,6 +1450,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1605,6 +1607,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1698,6 +1701,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1724,6 +1728,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2231,6 +2236,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2373,6 +2379,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2398,6 +2406,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_1";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2743,6 +2752,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2824,6 +2834,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2901,6 +2912,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3092,6 +3104,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3320,6 +3333,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3506,6 +3520,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4140,6 +4158,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4790,6 +4809,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4828,6 +4848,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4971,6 +4992,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5028,6 +5051,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5104,6 +5128,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5256,6 +5281,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2";
@@ -5562,6 +5588,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5648,6 +5675,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5851,6 +5879,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_3";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5934,6 +5963,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6693,6 +6723,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6841,6 +6872,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6905,6 +6937,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6998,6 +7031,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7101,6 +7135,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7243,6 +7278,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7272,11 +7309,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7517,6 +7556,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7633,6 +7673,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7880,6 +7921,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_0_2";
@@ -7945,6 +7987,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8114,6 +8159,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8187,6 +8233,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8488,6 +8535,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8779,6 +8827,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8860,6 +8909,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index e9b6c46cb6913..44fac410f440b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1120,6 +1120,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1449,6 +1450,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1605,6 +1607,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1698,6 +1701,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1724,6 +1728,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2230,6 +2235,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2372,6 +2378,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2397,6 +2405,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_1";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2742,6 +2751,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2823,6 +2833,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2900,6 +2911,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3091,6 +3103,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3319,6 +3332,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3505,6 +3519,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4139,6 +4157,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4789,6 +4808,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4827,6 +4847,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4970,6 +4991,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5027,6 +5050,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5103,6 +5127,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5255,6 +5280,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2";
@@ -5561,6 +5587,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5647,6 +5674,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5850,6 +5878,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5933,6 +5962,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6692,6 +6722,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6840,6 +6871,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6904,6 +6936,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6997,6 +7030,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7100,6 +7134,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7242,6 +7277,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7271,11 +7308,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7516,6 +7555,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7632,6 +7672,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7879,6 +7920,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_0_2";
@@ -7944,6 +7986,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8113,6 +8158,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8186,6 +8232,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8487,6 +8534,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8777,6 +8825,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8858,6 +8907,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 04377238e10d3..c65458eba36d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1444,6 +1445,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1597,6 +1599,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1689,6 +1692,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1715,6 +1719,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2219,6 +2224,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2360,6 +2366,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2385,6 +2393,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2729,6 +2738,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2810,6 +2820,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2886,6 +2897,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3076,6 +3088,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3302,6 +3315,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3488,6 +3502,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4120,6 +4138,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4768,6 +4787,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4805,6 +4825,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4948,6 +4969,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5005,6 +5028,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5079,6 +5103,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5231,6 +5256,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5536,6 +5562,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5619,6 +5646,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5822,6 +5850,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5906,6 +5935,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6661,6 +6691,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6808,6 +6839,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6872,6 +6904,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6965,6 +6998,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7067,6 +7101,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7208,6 +7243,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7237,11 +7274,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7482,6 +7521,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7597,6 +7637,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7839,6 +7880,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7902,6 +7944,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8071,6 +8116,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8144,6 +8190,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8443,6 +8490,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8733,6 +8781,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8813,6 +8862,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index ed39707ac2013..f68e86a6cd5e6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1443,6 +1444,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1596,6 +1598,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1688,6 +1691,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1714,6 +1718,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2218,6 +2223,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2359,6 +2365,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2384,6 +2392,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2728,6 +2737,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2809,6 +2819,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2885,6 +2896,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3075,6 +3087,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3301,6 +3314,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3486,6 +3500,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4118,6 +4136,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4765,6 +4784,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4802,6 +4822,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4945,6 +4966,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5002,6 +5025,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5075,6 +5099,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5227,6 +5252,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5532,6 +5558,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5615,6 +5642,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5817,6 +5845,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5901,6 +5930,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6655,6 +6685,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6802,6 +6833,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6866,6 +6898,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6959,6 +6992,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7060,6 +7094,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7201,6 +7236,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7230,11 +7267,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7475,6 +7514,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7590,6 +7630,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7831,6 +7872,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7893,6 +7935,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8062,6 +8107,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8135,6 +8181,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8434,6 +8481,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8724,6 +8772,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8804,6 +8853,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 3084bd6e5b8da..732219ccf6ee5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1443,6 +1444,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1596,6 +1598,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1688,6 +1691,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1714,6 +1718,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2218,6 +2223,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2359,6 +2365,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2384,6 +2392,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2728,6 +2737,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2809,6 +2819,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2885,6 +2896,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3075,6 +3087,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3301,6 +3314,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3486,6 +3500,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4118,6 +4136,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4765,6 +4784,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4802,6 +4822,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4945,6 +4966,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5002,6 +5025,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5075,6 +5099,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5227,6 +5252,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5532,6 +5558,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5615,6 +5642,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5817,6 +5845,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5901,6 +5930,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6655,6 +6685,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6802,6 +6833,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6866,6 +6898,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6959,6 +6992,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7060,6 +7094,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7201,6 +7236,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7230,11 +7267,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7474,6 +7513,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7589,6 +7629,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7830,6 +7871,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7892,6 +7934,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8061,6 +8106,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8134,6 +8180,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8433,6 +8480,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8723,6 +8771,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8803,6 +8852,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index fe188ea6fb0bf..e2c60ce548f93 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1443,6 +1444,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1596,6 +1598,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1688,6 +1691,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1714,6 +1718,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2218,6 +2223,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2359,6 +2365,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2384,6 +2392,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2728,6 +2737,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2809,6 +2819,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2885,6 +2896,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3075,6 +3087,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3301,6 +3314,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3486,6 +3500,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4117,6 +4135,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4764,6 +4783,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4801,6 +4821,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4943,6 +4964,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5000,6 +5023,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5073,6 +5097,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5225,6 +5250,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_2";
@@ -5530,6 +5556,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5613,6 +5640,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5815,6 +5843,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5899,6 +5928,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6653,6 +6683,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6800,6 +6831,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6864,6 +6896,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6957,6 +6990,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7058,6 +7092,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7199,6 +7234,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7228,11 +7265,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7472,6 +7511,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7587,6 +7627,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7828,6 +7869,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7890,6 +7932,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8059,6 +8104,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8132,6 +8178,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8431,6 +8478,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8721,6 +8769,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8801,6 +8850,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 280d11093337f..955d6f57c9b5e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1442,6 +1444,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1595,6 +1598,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1687,6 +1691,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1713,6 +1718,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2217,6 +2223,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2358,6 +2365,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2383,6 +2392,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2727,6 +2737,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2808,6 +2819,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2884,6 +2896,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3074,6 +3087,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3299,6 +3313,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3484,6 +3499,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4115,6 +4134,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4761,6 +4781,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4798,6 +4819,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4940,6 +4962,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4997,6 +5021,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5070,6 +5095,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5222,6 +5248,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_2";
@@ -5527,6 +5554,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5610,6 +5638,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5812,6 +5841,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5896,6 +5926,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6650,6 +6681,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6797,6 +6829,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6861,6 +6894,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6954,6 +6988,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7055,6 +7090,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7196,6 +7232,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7225,11 +7263,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7468,6 +7508,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7583,6 +7624,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7824,6 +7866,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7886,6 +7929,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8055,6 +8101,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8128,6 +8175,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8427,6 +8475,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8717,6 +8766,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8796,6 +8846,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index baed9b4b6d26b..0437a69aa2409 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1442,6 +1444,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1595,6 +1598,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1687,6 +1691,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1713,6 +1718,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2217,6 +2223,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2358,6 +2365,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2383,6 +2392,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2727,6 +2737,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2808,6 +2819,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2884,6 +2896,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3073,6 +3086,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3298,6 +3312,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3483,6 +3498,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4114,6 +4133,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4760,6 +4780,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4797,6 +4818,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4939,6 +4961,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4996,6 +5020,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5069,6 +5094,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5221,6 +5247,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_2";
@@ -5526,6 +5553,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5609,6 +5637,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5810,6 +5839,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5894,6 +5924,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6648,6 +6679,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6795,6 +6827,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6859,6 +6892,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6952,6 +6986,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7053,6 +7088,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7194,6 +7230,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7223,11 +7261,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7466,6 +7506,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7581,6 +7622,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7821,6 +7863,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7883,6 +7926,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8052,6 +8098,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8125,6 +8172,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8424,6 +8472,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8714,6 +8763,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8793,6 +8843,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8952,6 +9003,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index d439bfd44ad0f..3a4182ab419b5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1442,6 +1444,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1595,6 +1598,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1687,6 +1691,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1713,6 +1718,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2216,6 +2222,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2356,6 +2363,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2381,6 +2390,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2724,6 +2734,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2805,6 +2816,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2881,6 +2893,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3070,6 +3083,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3294,6 +3308,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3479,6 +3494,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4110,6 +4129,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4756,6 +4776,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4793,6 +4814,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4935,6 +4957,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4992,6 +5016,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5065,6 +5090,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5217,6 +5243,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_2";
@@ -5521,6 +5548,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5604,6 +5632,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5805,6 +5834,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5889,6 +5919,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6643,6 +6674,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6790,6 +6822,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6854,6 +6887,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6947,6 +6981,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7048,6 +7083,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7189,6 +7225,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7218,11 +7256,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7461,6 +7501,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7576,6 +7617,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7816,6 +7858,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7878,6 +7921,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8047,6 +8093,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8120,6 +8167,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8419,6 +8467,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8709,6 +8758,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8788,6 +8838,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8947,6 +8998,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 97a5b4aa520c3..7fb1662007cfd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1441,6 +1443,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1594,6 +1597,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1686,6 +1690,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1712,6 +1717,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2214,6 +2220,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2354,6 +2361,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2379,6 +2388,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2722,6 +2732,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2803,6 +2814,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2879,6 +2891,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3067,6 +3080,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3290,6 +3304,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3475,6 +3490,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4106,6 +4125,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4752,6 +4772,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4789,6 +4810,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4931,6 +4953,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4988,6 +5012,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5061,6 +5086,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5213,6 +5239,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_3";
@@ -5517,6 +5544,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5600,6 +5628,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5801,6 +5830,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5885,6 +5915,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6638,6 +6669,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6785,6 +6817,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6849,6 +6882,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6942,6 +6976,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7043,6 +7078,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7184,6 +7220,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7213,11 +7251,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7456,6 +7496,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7571,6 +7612,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7811,6 +7853,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7873,6 +7916,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8042,6 +8088,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8115,6 +8162,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8414,6 +8462,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8704,6 +8753,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8783,6 +8833,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8942,6 +8993,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 3a61f20966d5d..cc0104ece73d0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1441,6 +1443,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1594,6 +1597,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1686,6 +1690,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1712,6 +1717,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2213,6 +2219,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2353,6 +2360,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2378,6 +2387,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2721,6 +2731,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2802,6 +2813,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2877,6 +2889,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3065,6 +3078,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3288,6 +3302,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3473,6 +3488,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4104,6 +4123,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4750,6 +4770,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4787,6 +4808,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4929,6 +4951,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4986,6 +5010,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5059,6 +5084,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5211,6 +5237,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_3";
@@ -5515,6 +5542,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5598,6 +5626,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5799,6 +5828,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5883,6 +5913,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6635,6 +6666,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6782,6 +6814,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6846,6 +6879,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6939,6 +6973,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7040,6 +7075,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7181,6 +7217,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7210,11 +7248,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7453,6 +7493,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7568,6 +7609,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7807,6 +7849,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7869,6 +7912,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8038,6 +8084,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8111,6 +8158,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8410,6 +8458,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8700,6 +8749,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8779,6 +8829,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8937,6 +8988,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index a133f8e5ed989..5773930cf3e43 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1441,6 +1443,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1594,6 +1597,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1686,6 +1690,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1712,6 +1717,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2213,6 +2219,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2353,6 +2360,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2378,6 +2387,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2721,6 +2731,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2802,6 +2813,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2877,6 +2889,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3065,6 +3078,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3287,6 +3301,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3472,6 +3487,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4103,6 +4122,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4749,6 +4769,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4786,6 +4807,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4928,6 +4950,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4985,6 +5009,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5058,6 +5083,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5210,6 +5236,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_3";
@@ -5514,6 +5541,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5597,6 +5625,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5797,6 +5826,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5881,6 +5911,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6633,6 +6664,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6780,6 +6812,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6844,6 +6877,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6937,6 +6971,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7038,6 +7073,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7179,6 +7215,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7208,11 +7246,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7451,6 +7491,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7565,6 +7606,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7804,6 +7846,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7866,6 +7909,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8035,6 +8081,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8108,6 +8155,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8407,6 +8455,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8697,6 +8746,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8775,6 +8825,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8933,6 +8984,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index cf59852c6e9bf..1bbf520af396e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1119,6 +1119,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1448,6 +1449,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1604,6 +1606,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1697,6 +1700,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1723,6 +1727,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2227,6 +2232,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2369,6 +2375,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2394,6 +2402,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_1";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2739,6 +2748,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2820,6 +2830,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2897,6 +2908,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3088,6 +3100,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3316,6 +3329,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3502,6 +3516,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4136,6 +4154,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4786,6 +4805,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4824,6 +4844,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4967,6 +4988,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5024,6 +5047,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5100,6 +5124,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5252,6 +5277,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5558,6 +5584,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5644,6 +5671,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5847,6 +5875,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5930,6 +5959,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6689,6 +6719,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6837,6 +6868,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6901,6 +6933,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6994,6 +7027,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7097,6 +7131,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7239,6 +7274,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7268,11 +7305,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7513,6 +7552,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7629,6 +7669,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7876,6 +7917,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7941,6 +7983,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8110,6 +8155,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8183,6 +8229,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8484,6 +8531,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8774,6 +8822,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8854,6 +8903,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 28ce83e8ad8f4..c0352e149a957 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1441,6 +1443,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1594,6 +1597,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1686,6 +1690,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1712,6 +1717,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2212,6 +2218,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2352,6 +2359,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2377,6 +2386,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2720,6 +2730,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2801,6 +2812,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2876,6 +2888,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3064,6 +3077,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3286,6 +3300,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3471,6 +3486,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4102,6 +4121,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4748,6 +4768,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4785,6 +4806,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4927,6 +4949,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4984,6 +5008,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5057,6 +5082,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5209,6 +5235,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_3";
@@ -5513,6 +5540,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5596,6 +5624,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5796,6 +5825,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5880,6 +5910,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6631,6 +6662,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6778,6 +6810,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6842,6 +6875,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6935,6 +6969,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7036,6 +7071,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7177,6 +7213,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7206,11 +7244,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7448,6 +7488,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7562,6 +7603,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7801,6 +7843,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7863,6 +7906,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8032,6 +8078,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8105,6 +8152,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8404,6 +8452,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8694,6 +8743,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8772,6 +8822,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8930,6 +8981,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 014013bcd5d7c..095d670ff4490 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1441,6 +1443,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1594,6 +1597,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1686,6 +1690,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1712,6 +1717,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2212,6 +2218,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2352,6 +2359,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2377,6 +2386,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2720,6 +2730,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2801,6 +2812,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2876,6 +2888,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3064,6 +3077,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3286,6 +3300,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3471,6 +3486,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4102,6 +4121,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4748,6 +4768,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4785,6 +4806,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4927,6 +4949,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4984,6 +5008,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5057,6 +5082,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5209,6 +5235,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_3";
@@ -5513,6 +5540,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5596,6 +5624,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5796,6 +5825,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5880,6 +5910,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6630,6 +6661,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6777,6 +6809,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6841,6 +6874,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6934,6 +6968,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7035,6 +7070,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7176,6 +7212,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7205,11 +7243,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7447,6 +7487,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7561,6 +7602,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7800,6 +7842,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7862,6 +7905,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8031,6 +8077,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8104,6 +8151,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8403,6 +8451,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8455,10 +8504,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8691,6 +8742,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8769,6 +8821,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8926,6 +8979,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index a17f9ef401da7..32692917f7430 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1202,6 +1203,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1441,6 +1443,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1594,6 +1597,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1686,6 +1690,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1712,6 +1717,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2212,6 +2218,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2352,6 +2359,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2377,6 +2386,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2720,6 +2730,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2801,6 +2812,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2876,6 +2888,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3064,6 +3077,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3286,6 +3300,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3471,6 +3486,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4102,6 +4121,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4747,6 +4767,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4784,6 +4805,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4926,6 +4948,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4983,6 +5007,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5056,6 +5081,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5208,6 +5234,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_3";
@@ -5512,6 +5539,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5595,6 +5623,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5795,6 +5824,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5879,6 +5909,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6629,6 +6660,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6776,6 +6808,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6840,6 +6873,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6933,6 +6967,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7034,6 +7069,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7175,6 +7211,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7204,11 +7242,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7446,6 +7486,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7560,6 +7601,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7799,6 +7841,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7861,6 +7904,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8030,6 +8076,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8103,6 +8150,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8402,6 +8450,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8454,10 +8503,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8690,6 +8741,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8768,6 +8820,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8925,6 +8978,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index aa2ca3a0f7438..e0656f801a000 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1119,6 +1119,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1448,6 +1449,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1604,6 +1606,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1697,6 +1700,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1723,6 +1727,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2227,6 +2232,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2369,6 +2375,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2394,6 +2402,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2739,6 +2748,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2820,6 +2830,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2897,6 +2908,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3088,6 +3100,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3315,6 +3328,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3501,6 +3515,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4135,6 +4153,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4785,6 +4804,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4822,6 +4842,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4965,6 +4986,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5022,6 +5045,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5098,6 +5122,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5250,6 +5275,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5556,6 +5582,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5642,6 +5669,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5845,6 +5873,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5928,6 +5957,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6687,6 +6717,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6835,6 +6866,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6899,6 +6931,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6992,6 +7025,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7095,6 +7129,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7237,6 +7272,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7266,11 +7303,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7511,6 +7550,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7627,6 +7667,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7874,6 +7915,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7939,6 +7981,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8108,6 +8153,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8181,6 +8227,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8482,6 +8529,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8772,6 +8820,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8852,6 +8901,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index b0cba8f674e6f..37cee09e9df8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1119,6 +1119,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1448,6 +1449,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1604,6 +1606,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1696,6 +1699,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1722,6 +1726,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2226,6 +2231,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2368,6 +2374,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2393,6 +2401,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2738,6 +2747,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2819,6 +2829,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2896,6 +2907,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3087,6 +3099,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3314,6 +3327,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3500,6 +3514,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4134,6 +4152,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4784,6 +4803,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4821,6 +4841,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4964,6 +4985,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5021,6 +5044,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5097,6 +5121,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5249,6 +5274,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5555,6 +5581,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5641,6 +5668,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5844,6 +5872,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5927,6 +5956,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6685,6 +6715,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6833,6 +6864,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6897,6 +6929,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6990,6 +7023,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7092,6 +7126,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7234,6 +7269,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7263,11 +7300,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7508,6 +7547,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7624,6 +7664,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7871,6 +7912,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7936,6 +7978,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8105,6 +8150,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8178,6 +8224,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8479,6 +8526,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8769,6 +8817,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8849,6 +8898,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 8b915c3fa3f8d..2513667b84fcb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1119,6 +1119,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1448,6 +1449,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1604,6 +1606,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1696,6 +1699,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1722,6 +1726,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2226,6 +2231,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2367,6 +2373,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2392,6 +2400,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2737,6 +2746,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2818,6 +2828,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2895,6 +2906,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3086,6 +3098,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3313,6 +3326,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3499,6 +3513,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4133,6 +4151,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4783,6 +4802,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4820,6 +4840,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4963,6 +4984,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5020,6 +5043,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5096,6 +5120,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5248,6 +5273,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5554,6 +5580,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5640,6 +5667,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5843,6 +5871,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5926,6 +5955,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6684,6 +6714,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6832,6 +6863,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6896,6 +6928,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6989,6 +7022,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7091,6 +7125,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7233,6 +7268,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7262,11 +7299,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7507,6 +7546,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7623,6 +7663,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7870,6 +7911,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7935,6 +7977,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8104,6 +8149,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8177,6 +8223,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8478,6 +8525,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8768,6 +8816,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8848,6 +8897,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 07ee07a13bbf6..ca9274f22032a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1117,6 +1117,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1446,6 +1447,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1601,6 +1603,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1693,6 +1696,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1719,6 +1723,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2223,6 +2228,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2364,6 +2370,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2389,6 +2397,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2734,6 +2743,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2815,6 +2825,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2892,6 +2903,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3083,6 +3095,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3310,6 +3323,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3496,6 +3510,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4128,6 +4146,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4778,6 +4797,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4815,6 +4835,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4958,6 +4979,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5015,6 +5038,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5091,6 +5115,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5243,6 +5268,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5549,6 +5575,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5635,6 +5662,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5838,6 +5866,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5921,6 +5950,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6678,6 +6708,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6826,6 +6857,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6890,6 +6922,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6983,6 +7016,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7085,6 +7119,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7227,6 +7262,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7256,11 +7293,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7501,6 +7540,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7617,6 +7657,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7864,6 +7905,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7929,6 +7971,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8098,6 +8143,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8171,6 +8217,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8470,6 +8517,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8760,6 +8808,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8840,6 +8889,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 7e52dd04e2c1e..3b897d0c05d44 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1116,6 +1116,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1445,6 +1446,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1600,6 +1602,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1692,6 +1695,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1718,6 +1722,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2222,6 +2227,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2363,6 +2369,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2388,6 +2396,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2733,6 +2742,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2814,6 +2824,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2891,6 +2902,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3082,6 +3094,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3309,6 +3322,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3495,6 +3509,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4127,6 +4145,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4777,6 +4796,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4814,6 +4834,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4957,6 +4978,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5014,6 +5037,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5090,6 +5114,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5242,6 +5267,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5548,6 +5574,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5634,6 +5661,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5837,6 +5865,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5921,6 +5950,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6678,6 +6708,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6826,6 +6857,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6890,6 +6922,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6983,6 +7016,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7085,6 +7119,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7227,6 +7262,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7256,11 +7293,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7501,6 +7540,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7617,6 +7657,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7864,6 +7905,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7929,6 +7971,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8098,6 +8143,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8171,6 +8217,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8470,6 +8517,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8760,6 +8808,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8840,6 +8889,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 1bc128eec5b5e..cf8d90016cd6e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1444,6 +1445,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1599,6 +1601,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1691,6 +1694,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1717,6 +1721,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2221,6 +2226,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2362,6 +2368,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2387,6 +2395,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2732,6 +2741,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2813,6 +2823,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2890,6 +2901,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3081,6 +3093,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3307,6 +3320,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3493,6 +3507,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4125,6 +4143,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4775,6 +4794,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4812,6 +4832,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4955,6 +4976,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5012,6 +5035,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5088,6 +5112,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5240,6 +5265,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5546,6 +5572,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5632,6 +5659,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5835,6 +5863,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_4";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5919,6 +5948,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6676,6 +6706,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6824,6 +6855,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6888,6 +6920,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6981,6 +7014,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7083,6 +7117,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7224,6 +7259,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7253,11 +7290,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7498,6 +7537,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7613,6 +7653,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7858,6 +7899,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7923,6 +7965,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8092,6 +8137,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8165,6 +8211,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8464,6 +8511,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8754,6 +8802,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8834,6 +8883,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 752611fe2997d..66d9d8e55843a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1115,6 +1115,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1444,6 +1445,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1597,6 +1599,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1689,6 +1692,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1715,6 +1719,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2219,6 +2224,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2360,6 +2366,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2385,6 +2393,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_2";
   "cryptonite" = dontDistribute super."cryptonite";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2730,6 +2739,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2811,6 +2821,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2887,6 +2898,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -3077,6 +3089,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3303,6 +3316,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3489,6 +3503,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4121,6 +4139,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4769,6 +4788,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = dontDistribute super."hvect";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4806,6 +4826,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4949,6 +4970,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -5006,6 +5029,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -5082,6 +5106,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5234,6 +5259,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_10_2_1";
@@ -5539,6 +5565,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5624,6 +5651,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5827,6 +5855,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_5";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5911,6 +5940,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur-hash" = dontDistribute super."murmur-hash";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
@@ -6667,6 +6697,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6815,6 +6846,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6879,6 +6911,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6972,6 +7005,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -7074,6 +7108,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7215,6 +7250,8 @@ self: super: {
   "scalpel" = dontDistribute super."scalpel";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7244,11 +7281,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
   "scrz" = dontDistribute super."scrz";
@@ -7489,6 +7528,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7604,6 +7644,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7847,6 +7888,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
@@ -7910,6 +7952,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -8079,6 +8124,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_3";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -8152,6 +8198,7 @@ self: super: {
   "timeit" = dontDistribute super."timeit";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8451,6 +8498,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8741,6 +8789,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8821,6 +8870,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 2621b68272531..4cfcd2d3702fd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1093,6 +1093,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1179,6 +1180,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1406,6 +1408,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1553,6 +1556,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1645,6 +1649,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1666,6 +1671,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2050,7 +2056,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2156,6 +2161,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2294,6 +2300,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2319,6 +2327,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2654,6 +2663,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2732,6 +2742,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2806,6 +2817,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2988,6 +3000,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3203,6 +3216,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3387,6 +3401,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4011,6 +4029,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4646,6 +4665,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4658,6 +4678,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4682,6 +4703,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4815,6 +4837,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4868,6 +4892,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4940,6 +4965,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5081,6 +5107,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11";
@@ -5376,6 +5403,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5457,6 +5485,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5650,6 +5679,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_6";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5729,6 +5759,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6459,6 +6490,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6605,6 +6637,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6667,6 +6700,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6709,6 +6743,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6757,6 +6792,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6861,6 +6897,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -7002,6 +7039,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7031,11 +7070,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7265,6 +7306,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7381,6 +7423,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7610,6 +7653,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_1";
@@ -7672,6 +7716,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7839,6 +7886,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7909,6 +7957,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8200,6 +8249,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8249,10 +8299,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8481,6 +8533,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8558,6 +8611,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8706,6 +8760,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index c22456e3fde08..e713814ec7d8c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1093,6 +1093,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1178,6 +1179,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1405,6 +1407,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1552,6 +1555,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1644,6 +1648,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1665,6 +1670,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2049,7 +2055,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2155,6 +2160,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2293,6 +2299,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2318,6 +2326,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2653,6 +2662,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2731,6 +2741,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2805,6 +2816,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2987,6 +2999,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3200,6 +3213,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3384,6 +3398,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4008,6 +4026,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4643,6 +4662,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4655,6 +4675,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4679,6 +4700,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4812,6 +4834,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4865,6 +4889,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4937,6 +4962,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5078,6 +5104,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11";
@@ -5373,6 +5400,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5453,6 +5481,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5646,6 +5675,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_6";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5725,6 +5755,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6453,6 +6484,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6599,6 +6631,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6661,6 +6694,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6703,6 +6737,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6751,6 +6786,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6854,6 +6890,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6995,6 +7032,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7024,11 +7063,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7258,6 +7299,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7374,6 +7416,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7603,6 +7646,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_1";
@@ -7665,6 +7709,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7832,6 +7879,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7902,6 +7950,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8193,6 +8242,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8242,10 +8292,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8473,6 +8525,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8550,6 +8603,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8698,6 +8752,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index b4429e6581169..8a9e724f6bd5e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1175,6 +1176,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1312,6 +1314,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1397,6 +1400,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1544,6 +1548,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1635,6 +1640,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1656,6 +1662,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2038,7 +2045,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2144,6 +2150,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2281,6 +2288,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2306,6 +2315,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2637,6 +2647,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2713,6 +2724,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2786,6 +2798,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2968,6 +2981,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3178,6 +3192,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3361,6 +3376,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3982,6 +4001,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4614,6 +4634,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4626,6 +4647,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4650,6 +4672,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4781,6 +4804,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4834,6 +4859,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4906,6 +4932,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5044,6 +5071,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5337,6 +5365,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5370,6 +5399,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5416,6 +5446,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5608,6 +5639,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_8";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5685,6 +5717,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6236,6 +6269,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6403,6 +6437,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6548,6 +6583,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6610,6 +6646,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6652,6 +6689,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6699,6 +6737,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6802,6 +6841,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6943,6 +6983,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6972,11 +7014,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7205,6 +7249,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7319,6 +7364,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7546,6 +7592,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7608,6 +7655,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7652,6 +7702,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7770,6 +7821,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7840,6 +7892,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8129,6 +8182,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8177,10 +8231,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8404,6 +8460,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8478,6 +8535,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8585,6 +8643,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
@@ -8625,6 +8684,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 512e50b34c99f..62e2926a48053 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1175,6 +1176,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1312,6 +1314,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1397,6 +1400,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1544,6 +1548,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1635,6 +1640,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1656,6 +1662,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2037,7 +2044,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2143,6 +2149,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2280,6 +2287,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2305,6 +2314,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2636,6 +2646,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2712,6 +2723,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2785,6 +2797,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2966,6 +2979,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3176,6 +3190,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3359,6 +3374,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3980,6 +3999,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4612,6 +4632,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4624,6 +4645,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4648,6 +4670,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4779,6 +4802,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4832,6 +4857,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4904,6 +4930,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5042,6 +5069,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5335,6 +5363,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5368,6 +5397,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5414,6 +5444,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5606,6 +5637,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_8";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5683,6 +5715,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6233,6 +6266,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6400,6 +6434,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6545,6 +6580,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6607,6 +6643,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6649,6 +6686,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6696,6 +6734,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6799,6 +6838,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6940,6 +6980,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6969,11 +7011,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7097,6 +7141,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7201,6 +7246,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7315,6 +7361,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7542,6 +7589,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7604,6 +7652,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7648,6 +7699,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7766,6 +7818,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7836,6 +7889,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8125,6 +8179,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8173,10 +8228,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8400,6 +8457,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8474,6 +8532,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8581,6 +8640,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
@@ -8621,6 +8681,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 82434379c760e..94b60c2c96dba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1175,6 +1176,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1312,6 +1314,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1397,6 +1400,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1544,6 +1548,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1635,6 +1640,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1656,6 +1662,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2036,7 +2043,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2142,6 +2148,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2279,6 +2286,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2304,6 +2313,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2635,6 +2645,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2711,6 +2722,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2784,6 +2796,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2965,6 +2978,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3175,6 +3189,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3358,6 +3373,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3978,6 +3997,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4610,6 +4630,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4622,6 +4643,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4646,6 +4668,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4777,6 +4800,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4830,6 +4855,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4902,6 +4928,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5040,6 +5067,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5333,6 +5361,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5366,6 +5395,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5412,6 +5442,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5604,6 +5635,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_8";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5681,6 +5713,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6230,6 +6263,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6397,6 +6431,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6542,6 +6577,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6604,6 +6640,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6646,6 +6683,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6693,6 +6731,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6796,6 +6835,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6937,6 +6977,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6966,11 +7008,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7094,6 +7138,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7198,6 +7243,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7312,6 +7358,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7539,6 +7586,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7601,6 +7649,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7645,6 +7696,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7761,6 +7813,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7831,6 +7884,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8120,6 +8174,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8168,10 +8223,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8395,6 +8452,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8469,6 +8527,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8576,6 +8635,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
@@ -8616,6 +8676,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index b75f071de1137..cf466c69874d0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1175,6 +1176,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1312,6 +1314,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1397,6 +1400,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1544,6 +1548,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1635,6 +1640,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1656,6 +1662,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2036,7 +2043,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2142,6 +2148,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2279,6 +2286,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2304,6 +2313,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2635,6 +2645,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2711,6 +2722,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2784,6 +2796,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2965,6 +2978,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3175,6 +3189,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3358,6 +3373,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3978,6 +3997,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4609,6 +4629,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4621,6 +4642,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4645,6 +4667,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4776,6 +4799,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4829,6 +4854,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4901,6 +4927,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5039,6 +5066,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5331,6 +5359,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5364,6 +5393,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5410,6 +5440,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5602,6 +5633,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5679,6 +5711,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6227,6 +6260,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6394,6 +6428,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6539,6 +6574,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6601,6 +6637,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6643,6 +6680,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6690,6 +6728,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6793,6 +6832,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6934,6 +6974,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6963,11 +7005,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7091,6 +7135,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7195,6 +7240,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7309,6 +7355,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7536,6 +7583,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7598,6 +7646,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7642,6 +7693,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7758,6 +7810,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7828,6 +7881,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8117,6 +8171,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8165,10 +8220,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8391,6 +8448,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8465,6 +8523,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8572,6 +8631,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
@@ -8612,6 +8672,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index fc89326dea88f..32219a6d0e01c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1089,6 +1089,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1173,6 +1174,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1310,6 +1312,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1395,6 +1398,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1542,6 +1546,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1633,6 +1638,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1654,6 +1660,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2033,7 +2040,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2139,6 +2145,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2275,6 +2282,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2300,6 +2309,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2629,6 +2639,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2705,6 +2716,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2778,6 +2790,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2959,6 +2972,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3169,6 +3183,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3352,6 +3367,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3972,6 +3991,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4602,6 +4622,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4614,6 +4635,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4638,6 +4660,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4769,6 +4792,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4822,6 +4847,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4894,6 +4920,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5032,6 +5059,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5324,6 +5352,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5357,6 +5386,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5403,6 +5433,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5595,6 +5626,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5672,6 +5704,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6220,6 +6253,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6387,6 +6421,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6532,6 +6567,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6594,6 +6630,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6636,6 +6673,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6683,6 +6721,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6786,6 +6825,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6927,6 +6967,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6956,11 +6998,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7084,6 +7128,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7188,6 +7233,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7302,6 +7348,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7529,6 +7576,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7591,6 +7639,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7635,6 +7686,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7751,6 +7803,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7821,6 +7874,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8110,6 +8164,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8158,10 +8213,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8383,6 +8440,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8457,6 +8515,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8564,6 +8623,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
@@ -8604,6 +8664,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index cb77599cc2f7e..a2b9591f31720 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1089,6 +1089,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1173,6 +1174,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1310,6 +1312,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1395,6 +1398,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1542,6 +1546,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1633,6 +1638,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1654,6 +1660,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2033,7 +2040,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2139,6 +2145,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2275,6 +2282,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2300,6 +2309,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2629,6 +2639,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2705,6 +2716,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2778,6 +2790,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2959,6 +2972,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3169,6 +3183,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3352,6 +3367,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3971,6 +3990,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4599,6 +4619,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4611,6 +4632,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4635,6 +4657,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4766,6 +4789,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4819,6 +4844,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4891,6 +4917,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5029,6 +5056,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5321,6 +5349,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5354,6 +5383,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5400,6 +5430,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5592,6 +5623,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5669,6 +5701,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6217,6 +6250,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6384,6 +6418,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6529,6 +6564,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6591,6 +6627,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6633,6 +6670,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6680,6 +6718,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6783,6 +6822,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6924,6 +6964,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6953,11 +6995,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7080,6 +7124,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7184,6 +7229,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7298,6 +7344,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7525,6 +7572,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7587,6 +7635,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7631,6 +7682,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7747,6 +7799,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7817,6 +7870,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8106,6 +8160,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8154,10 +8209,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8379,6 +8436,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8453,6 +8511,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8560,6 +8619,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
@@ -8600,6 +8660,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 3954f26e4983b..37e610e5cf0ae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1088,6 +1088,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1172,6 +1173,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_5";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1309,6 +1311,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1394,6 +1397,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1541,6 +1545,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1632,6 +1637,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1653,6 +1659,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2032,7 +2039,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2138,6 +2144,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2274,6 +2281,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2299,6 +2308,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2628,6 +2638,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2704,6 +2715,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2777,6 +2789,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2957,6 +2970,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3167,6 +3181,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3350,6 +3365,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3968,6 +3987,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4596,6 +4616,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4608,6 +4629,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4632,6 +4654,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4763,6 +4786,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4816,6 +4841,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4888,6 +4914,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5026,6 +5053,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5317,6 +5345,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5350,6 +5379,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5396,6 +5426,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5587,6 +5618,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5664,6 +5696,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6212,6 +6245,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6378,6 +6412,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6523,6 +6558,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6585,6 +6621,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6627,6 +6664,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6673,6 +6711,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6776,6 +6815,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6917,6 +6957,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6946,11 +6988,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7073,6 +7117,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7177,6 +7222,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7291,6 +7337,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7518,6 +7565,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7580,6 +7628,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7623,6 +7674,7 @@ self: super: {
   "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7738,6 +7790,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7807,6 +7860,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8096,6 +8150,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8144,10 +8199,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8369,6 +8426,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8443,6 +8501,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8550,6 +8609,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_8";
@@ -8590,6 +8650,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 815030d9dccab..0e567b86b4982 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1088,6 +1088,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1172,6 +1173,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_6";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1309,6 +1311,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1393,6 +1396,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1540,6 +1544,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1631,6 +1636,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1652,6 +1658,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2031,7 +2038,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2137,6 +2143,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2273,6 +2280,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2298,6 +2307,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2627,6 +2637,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2703,6 +2714,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2776,6 +2788,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2956,6 +2969,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3166,6 +3180,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3349,6 +3364,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3966,6 +3985,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4594,6 +4614,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4606,6 +4627,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4630,6 +4652,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4760,6 +4783,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4813,6 +4838,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4885,6 +4911,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5023,6 +5050,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5313,6 +5341,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5346,6 +5375,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5392,6 +5422,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5582,6 +5613,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5659,6 +5691,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6207,6 +6240,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6373,6 +6407,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6518,6 +6553,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6580,6 +6616,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6622,6 +6659,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6668,6 +6706,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6771,6 +6810,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6912,6 +6952,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6941,11 +6983,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7068,6 +7112,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7172,6 +7217,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7286,6 +7332,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7513,6 +7560,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7575,6 +7623,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7618,6 +7669,7 @@ self: super: {
   "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7733,6 +7785,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7802,6 +7855,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8091,6 +8145,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8139,10 +8194,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8364,6 +8421,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8438,6 +8496,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8545,6 +8604,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8571,6 +8631,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8584,6 +8645,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 83f9a0923dda4..1269e8c9d0190 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1088,6 +1088,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1172,6 +1173,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1309,6 +1311,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1393,6 +1396,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1540,6 +1544,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1631,6 +1636,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1652,6 +1658,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2030,7 +2037,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2136,6 +2142,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2272,6 +2279,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2297,6 +2306,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2626,6 +2636,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2702,6 +2713,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2775,6 +2787,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2955,6 +2968,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3165,6 +3179,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3348,6 +3363,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3961,6 +3980,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4588,6 +4608,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4600,6 +4621,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4624,6 +4646,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4754,6 +4777,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4807,6 +4832,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4879,6 +4905,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5017,6 +5044,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5307,6 +5335,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5340,6 +5369,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5386,6 +5416,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5576,6 +5607,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5653,6 +5685,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6200,6 +6233,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6366,6 +6400,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6511,6 +6546,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6573,6 +6609,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6615,6 +6652,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6661,6 +6699,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6764,6 +6803,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6905,6 +6945,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6934,11 +6976,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7061,6 +7105,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7164,6 +7209,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7278,6 +7324,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7505,6 +7552,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7567,6 +7615,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7610,6 +7661,7 @@ self: super: {
   "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7725,6 +7777,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7794,6 +7847,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8083,6 +8137,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8131,10 +8186,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8356,6 +8413,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8430,6 +8488,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8537,6 +8596,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8563,6 +8623,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8576,6 +8637,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 5760e899c8bf3..dd886829bd08e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1087,6 +1087,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1171,6 +1172,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1308,6 +1310,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1391,6 +1394,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1537,6 +1541,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1628,6 +1633,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1649,6 +1655,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2025,7 +2032,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2130,6 +2136,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2266,6 +2273,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2291,6 +2300,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2620,6 +2630,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2696,6 +2707,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2769,6 +2781,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2949,6 +2962,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3159,6 +3173,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3342,6 +3357,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3955,6 +3974,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4391,6 +4411,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4579,6 +4600,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4591,6 +4613,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4615,6 +4638,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4745,6 +4769,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4798,6 +4824,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4870,6 +4897,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5007,6 +5035,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_3";
@@ -5296,6 +5325,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5329,6 +5359,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5375,6 +5406,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5565,6 +5597,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5642,6 +5675,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6188,6 +6222,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6354,6 +6389,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6499,6 +6535,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6561,6 +6598,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6603,6 +6641,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6649,6 +6688,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6752,6 +6792,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6893,6 +6934,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6922,11 +6965,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7049,6 +7094,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7152,6 +7198,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7265,6 +7312,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7492,6 +7540,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7554,6 +7603,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7597,6 +7649,7 @@ self: super: {
   "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7712,6 +7765,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7781,6 +7835,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8070,6 +8125,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8118,10 +8174,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8343,6 +8401,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8416,6 +8475,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8523,6 +8583,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8549,6 +8610,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8562,6 +8624,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 830a93f2cc0fb..b527ff2ed2dab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1177,6 +1178,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1403,6 +1405,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1550,6 +1553,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1642,6 +1646,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1663,6 +1668,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2047,7 +2053,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2153,6 +2158,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2291,6 +2297,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2316,6 +2324,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2651,6 +2660,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2728,6 +2738,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2802,6 +2813,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2984,6 +2996,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3197,6 +3210,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3380,6 +3394,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4004,6 +4022,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4639,6 +4658,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4651,6 +4671,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4675,6 +4696,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4808,6 +4830,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4861,6 +4885,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4933,6 +4958,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5073,6 +5099,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11";
@@ -5367,6 +5394,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5447,6 +5475,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5640,6 +5669,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_6";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5719,6 +5749,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6274,6 +6305,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6446,6 +6478,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6591,6 +6624,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6653,6 +6687,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6695,6 +6730,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6743,6 +6779,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6846,6 +6883,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6987,6 +7025,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7016,11 +7056,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7250,6 +7292,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7365,6 +7408,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7594,6 +7638,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7656,6 +7701,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7823,6 +7871,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7893,6 +7942,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8184,6 +8234,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8233,10 +8284,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8464,6 +8517,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8541,6 +8595,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8689,6 +8744,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 1e842db7eed23..64e281547fdbe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1086,6 +1086,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1170,6 +1171,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1307,6 +1309,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1390,6 +1393,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1536,6 +1540,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1627,6 +1632,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1648,6 +1654,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2024,7 +2031,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2129,6 +2135,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2265,6 +2272,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2290,6 +2299,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2619,6 +2629,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2695,6 +2706,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2768,6 +2780,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2948,6 +2961,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3158,6 +3172,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3341,6 +3356,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3954,6 +3973,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4390,6 +4410,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4578,6 +4599,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4590,6 +4612,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4614,6 +4637,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4744,6 +4768,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4797,6 +4823,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4869,6 +4896,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5006,6 +5034,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_4";
@@ -5295,6 +5324,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5328,6 +5358,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5374,6 +5405,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5564,6 +5596,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_9";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5641,6 +5674,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6187,6 +6221,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6353,6 +6388,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6498,6 +6534,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6560,6 +6597,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6602,6 +6640,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6647,6 +6686,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6750,6 +6790,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6891,6 +6932,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6920,11 +6963,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7047,6 +7092,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7150,6 +7196,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7263,6 +7310,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7489,6 +7537,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7551,6 +7600,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7594,6 +7646,7 @@ self: super: {
   "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7709,6 +7762,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7778,6 +7832,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8067,6 +8122,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8115,10 +8171,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8340,6 +8398,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8412,6 +8471,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8519,6 +8579,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8545,6 +8606,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8558,6 +8620,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index d2ba426e30018..b75347e108068 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1086,6 +1086,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1170,6 +1171,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1307,6 +1309,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1390,6 +1393,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1536,6 +1540,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1627,6 +1632,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1648,6 +1654,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2024,7 +2031,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2128,6 +2134,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2264,6 +2271,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2289,6 +2298,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2618,6 +2628,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2694,6 +2705,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2767,6 +2779,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2947,6 +2960,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3155,6 +3169,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3338,6 +3353,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3951,6 +3970,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4387,6 +4407,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4575,6 +4596,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4587,6 +4609,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4611,6 +4634,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4739,6 +4763,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4792,6 +4818,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4864,6 +4891,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5001,6 +5029,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_4";
@@ -5290,6 +5319,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5323,6 +5353,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5369,6 +5400,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5559,6 +5591,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5635,6 +5668,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6179,6 +6213,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6345,6 +6380,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6490,6 +6526,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6552,6 +6589,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6592,7 +6630,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6638,6 +6678,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6740,6 +6781,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6880,6 +6922,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6909,11 +6953,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7033,6 +7079,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7135,6 +7182,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7248,6 +7296,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7474,6 +7523,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7536,6 +7586,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7579,6 +7632,7 @@ self: super: {
   "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7694,6 +7748,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7763,6 +7818,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7883,6 +7939,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -8051,6 +8108,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8099,10 +8157,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8207,6 +8267,7 @@ self: super: {
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -8319,6 +8380,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8391,6 +8453,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8498,6 +8561,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8524,6 +8588,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8537,6 +8602,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index d85a7f7081a5e..c231b3071c8cf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1086,6 +1086,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1170,6 +1171,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1307,6 +1309,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1390,6 +1393,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1536,6 +1540,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1627,6 +1632,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1648,6 +1654,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2024,7 +2031,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2128,6 +2134,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2264,6 +2271,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2289,6 +2298,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2618,6 +2628,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2694,6 +2705,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2767,6 +2779,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2946,6 +2959,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3153,6 +3167,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3336,6 +3351,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3949,6 +3968,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4384,6 +4404,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4572,6 +4593,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4584,6 +4606,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4608,6 +4631,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4734,6 +4758,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4786,6 +4812,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4858,6 +4885,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4995,6 +5023,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_4";
@@ -5284,6 +5313,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5317,6 +5347,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5363,6 +5394,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5553,6 +5585,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5629,6 +5662,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6173,6 +6207,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6339,6 +6374,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6484,6 +6520,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6546,6 +6583,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6586,7 +6624,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6632,6 +6672,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6734,6 +6775,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6874,6 +6916,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6903,11 +6947,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7027,6 +7073,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -7129,6 +7176,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7242,6 +7290,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7468,6 +7517,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7530,6 +7580,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7573,6 +7626,7 @@ self: super: {
   "tasty-expected-failure" = dontDistribute super."tasty-expected-failure";
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7688,6 +7742,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7757,6 +7812,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7877,6 +7933,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -8045,6 +8102,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8093,10 +8151,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8201,6 +8261,7 @@ self: super: {
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -8313,6 +8374,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8385,6 +8447,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8492,6 +8555,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8518,6 +8582,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8531,6 +8596,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index c939e3fded7f1..cc3ae037832d1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1177,6 +1178,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1315,6 +1317,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1402,6 +1405,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1549,6 +1553,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1641,6 +1646,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1662,6 +1668,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2046,7 +2053,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2152,6 +2158,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2290,6 +2297,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2315,6 +2324,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2650,6 +2660,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2727,6 +2738,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2801,6 +2813,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2983,6 +2996,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3195,6 +3209,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3378,6 +3393,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4002,6 +4021,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4636,6 +4656,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4648,6 +4669,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4672,6 +4694,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4805,6 +4828,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4858,6 +4883,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4930,6 +4956,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5070,6 +5097,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11";
@@ -5364,6 +5392,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5444,6 +5473,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5637,6 +5667,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_6";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5716,6 +5747,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6271,6 +6303,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6443,6 +6476,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6588,6 +6622,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6650,6 +6685,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6692,6 +6728,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6739,6 +6776,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6842,6 +6880,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6983,6 +7022,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7012,11 +7053,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7246,6 +7289,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7360,6 +7404,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7589,6 +7634,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7651,6 +7697,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7696,6 +7745,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7817,6 +7867,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7887,6 +7938,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8178,6 +8230,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8226,10 +8279,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8457,6 +8512,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8534,6 +8590,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8641,6 +8698,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6";
@@ -8681,6 +8739,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 97948f178488b..48d2c2bda5b5f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1177,6 +1178,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1315,6 +1317,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1402,6 +1405,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1549,6 +1553,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1641,6 +1646,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1662,6 +1668,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2046,7 +2053,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2152,6 +2158,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2290,6 +2297,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2315,6 +2324,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2650,6 +2660,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2727,6 +2738,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2801,6 +2813,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2983,6 +2996,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3195,6 +3209,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3378,6 +3393,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4002,6 +4021,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4636,6 +4656,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4648,6 +4669,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4672,6 +4694,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4805,6 +4828,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4858,6 +4883,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4930,6 +4956,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5070,6 +5097,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11";
@@ -5364,6 +5392,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5444,6 +5473,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5637,6 +5667,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_6";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5716,6 +5747,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6271,6 +6303,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6443,6 +6476,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6588,6 +6622,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6650,6 +6685,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6692,6 +6728,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6739,6 +6776,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6842,6 +6880,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6983,6 +7022,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7012,11 +7053,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7246,6 +7289,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7360,6 +7404,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7588,6 +7633,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7650,6 +7696,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7695,6 +7744,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7816,6 +7866,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7886,6 +7937,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8177,6 +8229,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8225,10 +8278,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8455,6 +8510,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8532,6 +8588,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8639,6 +8696,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6";
@@ -8679,6 +8737,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 6563871a82639..e6cc581f80b21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1177,6 +1178,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1314,6 +1316,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1401,6 +1404,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1548,6 +1552,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1640,6 +1645,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1661,6 +1667,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2045,7 +2052,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2151,6 +2157,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2289,6 +2296,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2314,6 +2323,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2649,6 +2659,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2726,6 +2737,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2800,6 +2812,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2982,6 +2995,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3193,6 +3207,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3376,6 +3391,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -4000,6 +4019,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4632,6 +4652,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4644,6 +4665,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4668,6 +4690,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4799,6 +4822,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4852,6 +4877,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4924,6 +4950,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5064,6 +5091,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11";
@@ -5358,6 +5386,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5438,6 +5467,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5631,6 +5661,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_7";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5709,6 +5740,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6263,6 +6295,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6434,6 +6467,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6579,6 +6613,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6641,6 +6676,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6683,6 +6719,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6730,6 +6767,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6833,6 +6871,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6974,6 +7013,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -7003,11 +7044,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7237,6 +7280,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7351,6 +7395,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7579,6 +7624,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7641,6 +7687,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7685,6 +7734,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7804,6 +7854,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7874,6 +7925,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8165,6 +8217,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8213,10 +8266,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8443,6 +8498,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8519,6 +8575,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8626,6 +8683,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
@@ -8666,6 +8724,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index ccf8b2a63008f..fdc0007038411 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1177,6 +1178,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1314,6 +1316,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1401,6 +1404,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1548,6 +1552,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1640,6 +1645,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1661,6 +1667,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2045,7 +2052,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2151,6 +2157,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2289,6 +2296,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2314,6 +2323,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2649,6 +2659,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2726,6 +2737,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2800,6 +2812,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2982,6 +2995,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3192,6 +3206,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3375,6 +3390,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3997,6 +4016,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4629,6 +4649,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4641,6 +4662,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4665,6 +4687,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4796,6 +4819,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4849,6 +4874,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4921,6 +4947,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5059,6 +5086,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11";
@@ -5352,6 +5380,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5432,6 +5461,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5625,6 +5655,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_7";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5702,6 +5733,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6256,6 +6288,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6427,6 +6460,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6572,6 +6606,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6634,6 +6669,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6676,6 +6712,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6723,6 +6760,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6826,6 +6864,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6967,6 +7006,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6996,11 +7037,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7230,6 +7273,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7344,6 +7388,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7572,6 +7617,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7634,6 +7680,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7678,6 +7727,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7797,6 +7847,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7867,6 +7918,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8157,6 +8209,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8205,10 +8258,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8434,6 +8489,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8510,6 +8566,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8617,6 +8674,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
@@ -8657,6 +8715,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 1fb8a3e6edd43..335ca51351206 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1177,6 +1178,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1314,6 +1316,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1399,6 +1402,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1546,6 +1550,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1638,6 +1643,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1659,6 +1665,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2043,7 +2050,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2149,6 +2155,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2286,6 +2293,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2311,6 +2320,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_4";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2646,6 +2656,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2723,6 +2734,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2797,6 +2809,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2979,6 +2992,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3189,6 +3203,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3372,6 +3387,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3993,6 +4012,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4625,6 +4645,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4637,6 +4658,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4661,6 +4683,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4792,6 +4815,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4845,6 +4870,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4917,6 +4943,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5055,6 +5082,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_0_1";
@@ -5348,6 +5376,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5428,6 +5457,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5621,6 +5651,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_7";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5698,6 +5729,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6252,6 +6284,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6421,6 +6454,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6566,6 +6600,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6628,6 +6663,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6670,6 +6706,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6717,6 +6754,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6820,6 +6858,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6961,6 +7000,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6990,11 +7031,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7224,6 +7267,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7338,6 +7382,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7565,6 +7610,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7627,6 +7673,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7671,6 +7720,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_1";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7790,6 +7840,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7860,6 +7911,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8150,6 +8202,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8198,10 +8251,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8427,6 +8482,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8501,6 +8557,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8608,6 +8665,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
@@ -8648,6 +8706,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 325fdcc77786f..2263664981862 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1092,6 +1092,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1177,6 +1178,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1314,6 +1316,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1399,6 +1402,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1546,6 +1550,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1638,6 +1643,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1659,6 +1665,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2041,7 +2048,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2147,6 +2153,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2284,6 +2291,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2309,6 +2318,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2640,6 +2650,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2717,6 +2728,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2791,6 +2803,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2973,6 +2986,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3183,6 +3197,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3366,6 +3381,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3987,6 +4006,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4619,6 +4639,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4631,6 +4652,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4655,6 +4677,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4786,6 +4809,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4839,6 +4864,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4911,6 +4937,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5049,6 +5076,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_2";
@@ -5342,6 +5370,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5375,6 +5404,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5421,6 +5451,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5613,6 +5644,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_7";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5690,6 +5722,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6244,6 +6277,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6412,6 +6446,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6557,6 +6592,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6619,6 +6655,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6661,6 +6698,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6708,6 +6746,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6811,6 +6850,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6952,6 +6992,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6981,11 +7023,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7215,6 +7259,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7329,6 +7374,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7556,6 +7602,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7618,6 +7665,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7662,6 +7712,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7780,6 +7831,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7850,6 +7902,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8140,6 +8193,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8188,10 +8242,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8417,6 +8473,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8491,6 +8548,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8598,6 +8656,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_6_1";
@@ -8638,6 +8697,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index d4ca2e6fb55e1..20661911f6f0c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1090,6 +1090,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1175,6 +1176,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_4";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1312,6 +1314,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1397,6 +1400,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1544,6 +1548,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1635,6 +1640,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1656,6 +1662,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -2038,7 +2045,6 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
-  "clock" = doDistribute super."clock_0_5_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2144,6 +2150,7 @@ self: super: {
   "concurrent-extra" = doDistribute super."concurrent-extra_0_7_0_9";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = dontDistribute super."concurrent-output";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2281,6 +2288,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2306,6 +2315,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_5";
   "cryptonite" = doDistribute super."cryptonite_0_6";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2637,6 +2647,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2714,6 +2725,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
@@ -2787,6 +2799,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2969,6 +2982,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3179,6 +3193,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3362,6 +3377,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3983,6 +4002,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4615,6 +4635,7 @@ self: super: {
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
   "hvect" = doDistribute super."hvect_0_2_0_0";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hworker" = dontDistribute super."hworker";
   "hworker-ses" = dontDistribute super."hworker-ses";
@@ -4627,6 +4648,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4651,6 +4673,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4782,6 +4805,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4835,6 +4860,7 @@ self: super: {
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "iso8601-time" = dontDistribute super."iso8601-time";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4907,6 +4933,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -5045,6 +5072,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = doDistribute super."language-c-quote_0_11_2_1";
@@ -5338,6 +5366,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = dontDistribute super."luminance";
   "luminance-samples" = dontDistribute super."luminance-samples";
@@ -5371,6 +5400,7 @@ self: super: {
   "mailbox-count" = dontDistribute super."mailbox-count";
   "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
   "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = doDistribute super."mainland-pretty_0_4_1_2";
   "majordomo" = dontDistribute super."majordomo";
   "majority" = dontDistribute super."majority";
   "make-hard-links" = dontDistribute super."make-hard-links";
@@ -5417,6 +5447,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5609,6 +5640,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongoDB" = doDistribute super."mongoDB_2_0_8";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
@@ -5686,6 +5718,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -6239,6 +6272,7 @@ self: super: {
   "pipes-extra" = dontDistribute super."pipes-extra";
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
@@ -6407,6 +6441,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6552,6 +6587,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6614,6 +6650,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6656,6 +6693,7 @@ self: super: {
   "redis-hs" = dontDistribute super."redis-hs";
   "redis-io" = doDistribute super."redis-io_0_5_1";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reducers" = doDistribute super."reducers_3_10_3_2";
@@ -6703,6 +6741,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6806,6 +6845,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6947,6 +6987,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6976,11 +7018,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -7210,6 +7254,7 @@ self: super: {
   "skeletons" = dontDistribute super."skeletons";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7324,6 +7369,7 @@ self: super: {
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7551,6 +7597,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7613,6 +7660,9 @@ self: super: {
   "systemd" = dontDistribute super."systemd";
   "syz" = dontDistribute super."syz";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7657,6 +7707,7 @@ self: super: {
   "tasty-fail-fast" = dontDistribute super."tasty-fail-fast";
   "tasty-golden" = doDistribute super."tasty-golden_2_3_0_2";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-html" = dontDistribute super."tasty-html";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
@@ -7775,6 +7826,7 @@ self: super: {
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
   "th-desugar" = doDistribute super."th-desugar_1_5_4_1";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7845,6 +7897,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -8135,6 +8188,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -8183,10 +8237,12 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-orphans" = dontDistribute super."uuid-orphans";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -8412,6 +8468,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8486,6 +8543,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-basedir" = dontDistribute super."xdg-basedir";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
@@ -8593,6 +8651,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_7";
@@ -8633,6 +8692,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 04242b21f00d3..2a93a5170821a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -264,6 +264,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -332,6 +333,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -1061,6 +1063,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1144,6 +1147,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex" = doDistribute super."alex_3_1_6";
   "alex-meta" = dontDistribute super."alex-meta";
@@ -1280,6 +1284,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1308,6 +1313,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1361,6 +1367,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1501,6 +1508,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1541,6 +1549,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1588,6 +1597,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1608,6 +1618,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1737,6 +1748,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1971,6 +1983,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2071,6 +2084,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2203,6 +2217,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2228,6 +2244,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_6";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2464,6 +2481,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2544,6 +2562,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2619,6 +2638,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2690,6 +2710,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2820,6 +2841,7 @@ self: super: {
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
   "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2867,6 +2889,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3070,6 +3093,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3248,6 +3272,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3845,6 +3873,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4167,6 +4196,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4266,6 +4296,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4311,6 +4342,7 @@ self: super: {
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
@@ -4318,6 +4350,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4435,6 +4468,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4445,6 +4479,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4468,6 +4503,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4594,6 +4630,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4640,6 +4678,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4708,6 +4747,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4853,6 +4893,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5131,6 +5172,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1";
   "luminance-samples" = doDistribute super."luminance-samples_0_9";
@@ -5208,6 +5250,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5390,6 +5433,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5412,6 +5456,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5465,6 +5510,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5984,7 +6030,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
@@ -6084,6 +6132,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -6142,6 +6191,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6282,6 +6332,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6343,6 +6394,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6382,7 +6434,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6421,6 +6475,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6516,6 +6571,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6653,6 +6709,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6682,11 +6740,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -6802,6 +6862,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6902,6 +6963,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -7003,12 +7065,14 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7227,6 +7291,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7286,6 +7351,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7325,6 +7393,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7435,6 +7504,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7501,6 +7571,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7773,6 +7844,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7819,9 +7891,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7922,6 +7996,7 @@ self: super: {
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -8020,6 +8095,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8090,6 +8166,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -8191,6 +8268,7 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8216,6 +8294,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8228,6 +8307,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8246,6 +8326,7 @@ self: super: {
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 2b56b592c0c41..c5bc923e67676 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -264,6 +264,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -332,6 +333,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -1061,6 +1063,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1143,6 +1146,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1278,6 +1282,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1306,6 +1311,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1359,6 +1365,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1499,6 +1506,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1539,6 +1547,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1586,6 +1595,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1606,6 +1616,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1735,6 +1746,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1969,6 +1981,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -2069,6 +2082,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2201,6 +2215,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2226,6 +2242,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_6";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2462,6 +2479,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2542,6 +2560,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2617,6 +2636,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2687,6 +2707,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
@@ -2816,6 +2837,7 @@ self: super: {
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
   "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2862,6 +2884,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3064,6 +3087,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3242,6 +3266,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3839,6 +3867,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4160,6 +4189,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4259,6 +4289,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4304,6 +4335,7 @@ self: super: {
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
@@ -4311,6 +4343,7 @@ self: super: {
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4428,6 +4461,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4438,6 +4472,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4461,6 +4496,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4583,6 +4619,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
@@ -4628,6 +4666,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4696,6 +4735,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4841,6 +4881,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5116,6 +5157,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1";
   "luminance-samples" = doDistribute super."luminance-samples_0_9";
@@ -5193,6 +5235,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5375,6 +5418,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5397,6 +5441,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5450,6 +5495,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5967,7 +6013,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
@@ -6067,6 +6115,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -6125,6 +6174,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6265,6 +6315,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6326,6 +6377,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6365,7 +6417,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6404,6 +6458,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6499,6 +6554,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6636,6 +6692,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6665,11 +6723,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -6785,6 +6845,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6885,6 +6946,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6986,12 +7048,14 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7210,6 +7274,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7269,6 +7334,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7308,6 +7376,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7418,6 +7487,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7484,6 +7554,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7599,6 +7670,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7755,6 +7827,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7801,9 +7874,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7904,6 +7979,7 @@ self: super: {
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -8001,6 +8077,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8071,6 +8148,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -8172,6 +8250,7 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8197,6 +8276,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8209,6 +8289,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8227,6 +8308,7 @@ self: super: {
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 518d60405fadd..b3bce20007a4c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -264,6 +264,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -332,6 +333,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -1057,6 +1059,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1139,6 +1142,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1274,6 +1278,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1302,6 +1307,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1355,6 +1361,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1495,6 +1502,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1535,6 +1543,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1582,6 +1591,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1602,6 +1612,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1730,6 +1741,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1961,6 +1973,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1994,6 +2007,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2060,6 +2074,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2191,6 +2206,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2216,6 +2233,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptol" = doDistribute super."cryptol_2_2_6";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
@@ -2451,6 +2469,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2531,6 +2550,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2606,6 +2626,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2676,6 +2697,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2804,6 +2826,7 @@ self: super: {
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
   "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2848,6 +2871,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -3048,6 +3072,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3225,6 +3250,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3817,6 +3846,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4136,6 +4166,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4235,6 +4266,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4273,16 +4305,21 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4400,6 +4437,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4410,6 +4448,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4433,6 +4472,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4553,6 +4593,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2_2";
@@ -4596,6 +4638,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4664,6 +4707,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4809,6 +4853,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5084,6 +5129,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -5104,6 +5150,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -5160,6 +5207,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5340,6 +5388,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5362,6 +5411,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5414,6 +5464,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5931,7 +5982,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
@@ -6031,6 +6084,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -6086,6 +6140,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6226,6 +6281,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6287,6 +6343,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6325,7 +6382,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6364,6 +6423,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6456,6 +6516,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6593,6 +6654,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6622,11 +6685,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrypt" = dontDistribute super."scrypt";
@@ -6741,6 +6806,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6837,6 +6903,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6938,12 +7005,14 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -7160,6 +7229,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7219,6 +7289,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7258,6 +7331,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7367,6 +7441,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7433,6 +7508,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7548,6 +7624,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7704,6 +7781,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7750,9 +7828,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7853,6 +7933,7 @@ self: super: {
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7948,6 +8029,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8018,6 +8100,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -8119,6 +8202,7 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
   "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
@@ -8132,6 +8216,7 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
@@ -8143,6 +8228,7 @@ self: super: {
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8155,6 +8241,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8173,6 +8260,7 @@ self: super: {
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index dcee088ade74c..b51729bf2818f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_4";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -262,6 +263,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -328,6 +330,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -1045,6 +1048,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1082,6 +1086,7 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
@@ -1125,6 +1130,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1260,6 +1266,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1288,6 +1295,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1340,6 +1348,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1478,6 +1487,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1514,6 +1524,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1560,6 +1571,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1580,6 +1592,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1705,6 +1718,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1730,6 +1744,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1931,6 +1946,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1945,6 +1961,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1963,6 +1980,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2029,6 +2047,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2156,6 +2175,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2181,6 +2202,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2412,6 +2434,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2490,6 +2513,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2518,6 +2542,7 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2562,6 +2587,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2630,6 +2656,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2756,6 +2783,7 @@ self: super: {
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
   "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2798,6 +2826,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -2996,6 +3025,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3168,6 +3198,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3755,6 +3789,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4044,6 +4079,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4073,6 +4109,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4172,6 +4209,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4210,16 +4248,21 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4334,6 +4377,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4344,6 +4388,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4367,6 +4412,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4486,6 +4532,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_3";
@@ -4529,6 +4577,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4597,6 +4646,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4740,6 +4790,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5013,6 +5064,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -5033,6 +5085,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -5051,6 +5104,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5088,6 +5142,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5263,6 +5318,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5285,6 +5341,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5337,6 +5394,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5676,6 +5734,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5846,7 +5905,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5944,6 +6005,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_5_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5998,6 +6060,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6135,6 +6198,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6195,6 +6259,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6232,7 +6297,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6270,6 +6337,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6362,6 +6430,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6496,6 +6565,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6525,11 +6596,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6643,6 +6716,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6737,6 +6811,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6837,12 +6912,14 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6922,6 +6999,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -7055,6 +7133,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7114,6 +7193,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7152,6 +7234,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7257,6 +7340,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7320,6 +7404,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7407,6 +7492,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7434,6 +7520,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7587,6 +7674,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7633,9 +7721,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7733,8 +7823,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7829,6 +7921,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7899,6 +7992,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -8000,8 +8094,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -8012,16 +8108,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8034,6 +8133,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8052,6 +8152,7 @@ self: super: {
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
   "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 884b11b28b61e..76a7d5bbc9ca2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -262,6 +263,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -328,6 +330,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -1044,6 +1047,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1081,6 +1085,7 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
@@ -1124,6 +1129,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1258,6 +1264,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1286,6 +1293,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1338,6 +1346,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1377,6 +1386,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1473,6 +1485,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1509,6 +1522,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1555,6 +1569,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1575,6 +1590,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1698,6 +1714,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1723,6 +1740,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1923,6 +1941,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1937,6 +1956,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1955,6 +1975,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2021,6 +2042,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2148,6 +2170,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2173,6 +2197,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2403,6 +2428,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2481,6 +2507,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2509,6 +2536,7 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2553,6 +2581,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2621,6 +2650,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2747,6 +2777,7 @@ self: super: {
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
   "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2789,6 +2820,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -2987,6 +3019,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3159,6 +3192,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3746,6 +3783,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4035,6 +4073,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4064,6 +4103,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4163,6 +4203,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4201,16 +4242,21 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4325,6 +4371,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4335,6 +4382,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4358,6 +4406,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4476,6 +4525,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_3";
@@ -4519,6 +4570,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4587,6 +4639,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4730,6 +4783,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -5003,6 +5057,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -5023,6 +5078,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -5041,6 +5097,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5078,6 +5135,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5251,6 +5309,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5273,6 +5332,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5325,6 +5385,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5664,6 +5725,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5834,7 +5896,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5932,6 +5996,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_8";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5986,6 +6051,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6123,6 +6189,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6183,6 +6250,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6219,7 +6287,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6257,6 +6327,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6349,6 +6420,7 @@ self: super: {
   "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6483,6 +6555,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6512,11 +6586,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6629,6 +6705,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6723,6 +6800,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6823,12 +6901,14 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6908,6 +6988,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -7041,6 +7122,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7100,6 +7182,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7137,6 +7222,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7242,6 +7328,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7305,6 +7392,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7392,6 +7480,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7419,6 +7508,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7572,6 +7662,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7618,9 +7709,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7717,8 +7810,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7813,6 +7908,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7883,6 +7979,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7984,8 +8081,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7996,16 +8095,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -8018,6 +8120,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8034,7 +8137,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
new file mode 100644
index 0000000000000..2cbd8c771e508
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -0,0 +1,8004 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.10 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseNewick" = dontDistribute super."BiobaseNewick";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart" = doDistribute super."Chart_1_5_4";
+  "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForestStructures" = dontDistribute super."ForestStructures";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LATS" = dontDistribute super."LATS";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "NumberTheory" = dontDistribute super."NumberTheory";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "QuickPlot" = dontDistribute super."QuickPlot";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-lucid" = dontDistribute super."Spock-lucid";
+  "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "airship" = doDistribute super."airship_0_4_3_0";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_1_3_7";
+  "amazonka-apigateway" = doDistribute super."amazonka-apigateway_1_3_7";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_1_3_7";
+  "amazonka-certificatemanager" = dontDistribute super."amazonka-certificatemanager";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_1_3_7";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_1_3_7";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_1_3_7";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_1_3_7";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_1_3_7";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_1_3_7";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_1_3_7";
+  "amazonka-cloudwatch-events" = dontDistribute super."amazonka-cloudwatch-events";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_1_3_7";
+  "amazonka-codecommit" = doDistribute super."amazonka-codecommit_1_3_7";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_1_3_7";
+  "amazonka-codepipeline" = doDistribute super."amazonka-codepipeline_1_3_7";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_1_3_7";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_1_3_7";
+  "amazonka-config" = doDistribute super."amazonka-config_1_3_7";
+  "amazonka-core" = doDistribute super."amazonka-core_1_3_7";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_1_3_7";
+  "amazonka-devicefarm" = doDistribute super."amazonka-devicefarm_1_3_7";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_1_3_7";
+  "amazonka-dms" = dontDistribute super."amazonka-dms";
+  "amazonka-ds" = doDistribute super."amazonka-ds_1_3_7";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_1_3_7";
+  "amazonka-dynamodb-streams" = doDistribute super."amazonka-dynamodb-streams_1_3_7";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_1_3_7";
+  "amazonka-ecr" = dontDistribute super."amazonka-ecr";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_1_3_7";
+  "amazonka-efs" = doDistribute super."amazonka-efs_1_3_7";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_1_3_7";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_1_3_7";
+  "amazonka-elasticsearch" = doDistribute super."amazonka-elasticsearch_1_3_7";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_1_3_7";
+  "amazonka-elb" = doDistribute super."amazonka-elb_1_3_7";
+  "amazonka-emr" = doDistribute super."amazonka-emr_1_3_7";
+  "amazonka-gamelift" = dontDistribute super."amazonka-gamelift";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_1_3_7";
+  "amazonka-iam" = doDistribute super."amazonka-iam_1_3_7";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_1_3_7";
+  "amazonka-inspector" = doDistribute super."amazonka-inspector_1_3_7";
+  "amazonka-iot" = doDistribute super."amazonka-iot_1_3_7";
+  "amazonka-iot-dataplane" = doDistribute super."amazonka-iot-dataplane_1_3_7";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_1_3_7";
+  "amazonka-kinesis-firehose" = doDistribute super."amazonka-kinesis-firehose_1_3_7";
+  "amazonka-kms" = doDistribute super."amazonka-kms_1_3_7";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_1_3_7";
+  "amazonka-marketplace-analytics" = doDistribute super."amazonka-marketplace-analytics_1_3_7";
+  "amazonka-marketplace-metering" = dontDistribute super."amazonka-marketplace-metering";
+  "amazonka-ml" = doDistribute super."amazonka-ml_1_3_7";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_1_3_7";
+  "amazonka-rds" = doDistribute super."amazonka-rds_1_3_7";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_1_3_7";
+  "amazonka-route53" = doDistribute super."amazonka-route53_1_3_7";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_1_3_7";
+  "amazonka-s3" = doDistribute super."amazonka-s3_1_3_7";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_1_3_7";
+  "amazonka-ses" = doDistribute super."amazonka-ses_1_3_7";
+  "amazonka-sns" = doDistribute super."amazonka-sns_1_3_7";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_1_3_7";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_1_3_7";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_1_3_7";
+  "amazonka-sts" = doDistribute super."amazonka-sts_1_3_7";
+  "amazonka-support" = doDistribute super."amazonka-support_1_3_7";
+  "amazonka-swf" = doDistribute super."amazonka-swf_1_3_7";
+  "amazonka-test" = doDistribute super."amazonka-test_1_3_7";
+  "amazonka-waf" = doDistribute super."amazonka-waf_1_3_7";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_1_3_7";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-http-client" = dontDistribute super."apiary-http-client";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arena" = dontDistribute super."arena";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesome-prelude" = dontDistribute super."awesome-prelude";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "bench" = dontDistribute super."bench";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "bond-haskell" = dontDistribute super."bond-haskell";
+  "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bower-json" = doDistribute super."bower-json_0_7_0_0";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camfort" = dontDistribute super."camfort";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_3";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
+  "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chorale" = dontDistribute super."chorale";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commander" = dontDistribute super."commander";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-manager" = dontDistribute super."config-manager";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraint-classes" = dontDistribute super."constraint-classes";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplex-hs" = dontDistribute super."cplex-hs";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cpphs" = doDistribute super."cpphs_1_19_3";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron" = doDistribute super."cron_0_3_2";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
+  "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
+  "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "danibot" = dontDistribute super."danibot";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-extra" = dontDistribute super."data-default-extra";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dbus-th-introspection" = dontDistribute super."dbus-th-introspection";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delay" = dontDistribute super."delay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = doDistribute super."dotenv_0_1_0_9";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "dotnet-timespan" = dontDistribute super."dotnet-timespan";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_2";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow" = doDistribute super."flow_1_0_5";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fn" = doDistribute super."fn_0_2_0_2";
+  "fn-extra" = doDistribute super."fn-extra_0_2_0_1";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_6";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcons-tools" = dontDistribute super."funcons-tools";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop-lens" = dontDistribute super."generics-sop-lens";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "giphy-api" = dontDistribute super."giphy-api";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridfs" = dontDistribute super."gridfs";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-converters" = dontDistribute super."groundhog-converters";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "handwriting" = dontDistribute super."handwriting";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint" = doDistribute super."hint_0_4_3";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hoppy-generator" = dontDistribute super."hoppy-generator";
+  "hoppy-runtime" = dontDistribute super."hoppy-runtime";
+  "hoppy-std" = dontDistribute super."hoppy-std";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc" = doDistribute super."hprotoc_2_1_12";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec-wai" = doDistribute super."hspec-wai_0_6_5";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-session" = dontDistribute super."http-client-session";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ig" = doDistribute super."ig_0_6_1";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imap" = dontDistribute super."imap";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-logging" = dontDistribute super."implicit-logging";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inquire" = dontDistribute super."inquire";
+  "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-dcc" = dontDistribute super."irc-dcc";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iridium" = dontDistribute super."iridium";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javaclass" = dontDistribute super."javaclass";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jump" = dontDistribute super."jump";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "jwt" = doDistribute super."jwt_0_6_0";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katip" = dontDistribute super."katip";
+  "katip-elasticsearch" = dontDistribute super."katip-elasticsearch";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lfst" = dontDistribute super."lfst";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logict-state" = dontDistribute super."logict-state";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "lol-apps" = dontDistribute super."lol-apps";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midair" = dontDistribute super."midair";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-connect" = dontDistribute super."monad-connect";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "mrm" = dontDistribute super."mrm";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonempty-alternative" = dontDistribute super."nonempty-alternative";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oanda-rest-api" = dontDistribute super."oanda-rest-api";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "operational-extra" = dontDistribute super."operational-extra";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-conduit" = dontDistribute super."osm-conduit";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partage" = dontDistribute super."partage";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "prometheus" = dontDistribute super."prometheus";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
+  "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "psql-helpers" = dontDistribute super."psql-helpers";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bridge" = dontDistribute super."purescript-bridge";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactivity" = dontDistribute super."reactivity";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-orphans" = dontDistribute super."reflex-orphans";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-json" = dontDistribute super."remote-json";
+  "remote-json-client" = dontDistribute super."remote-json-client";
+  "remote-json-server" = dontDistribute super."remote-json-server";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "reqcatcher" = dontDistribute super."reqcatcher";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "riak" = doDistribute super."riak_0_9_1_1";
+  "riak-protobuf" = doDistribute super."riak-protobuf_0_20_0_0";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rlist" = dontDistribute super."rlist";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss-conduit" = dontDistribute super."rss-conduit";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensei" = dontDistribute super."sensei";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-elm" = dontDistribute super."servant-elm";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-foreign" = dontDistribute super."servant-foreign";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-haxl-client" = dontDistribute super."servant-haxl-client";
+  "servant-js" = dontDistribute super."servant-js";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "sleep" = dontDistribute super."sleep";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
+  "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_7_0";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_2";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_2";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "symengine-hs" = dontDistribute super."symengine-hs";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-timers" = dontDistribute super."tagged-timers";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "task-distribution" = dontDistribute super."task-distribution";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_5_1";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-cache" = dontDistribute super."time-cache";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-out" = dontDistribute super."time-out";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tinylog" = doDistribute super."tinylog_0_12_1";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-alternative" = dontDistribute super."total-alternative";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twentyseven" = dontDistribute super."twentyseven";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = doDistribute super."twitter-conduit_0_1_2";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union" = dontDistribute super."union";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_4";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-plus" = dontDistribute super."vinyl-plus";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
+  "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "with-location" = doDistribute super."with-location_0_0_0";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-tabular" = dontDistribute super."xlsx-tabular";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zim-parser" = doDistribute super."zim-parser_0_1_0_0";
+  "zip" = dontDistribute super."zip";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
new file mode 100644
index 0000000000000..f76cfb80c2a57
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -0,0 +1,7968 @@
+{ pkgs }:
+
+with import ./lib.nix { inherit pkgs; };
+
+self: super: {
+
+  # core libraries provided by the compiler
+  Cabal = null;
+  array = null;
+  base = null;
+  bin-package-db = null;
+  binary = null;
+  bytestring = null;
+  containers = null;
+  deepseq = null;
+  directory = null;
+  filepath = null;
+  ghc-prim = null;
+  hoopl = null;
+  hpc = null;
+  integer-gmp = null;
+  pretty = null;
+  process = null;
+  rts = null;
+  template-haskell = null;
+  time = null;
+  transformers = null;
+  unix = null;
+
+  # lts-5.11 packages
+  "3d-graphics-examples" = dontDistribute super."3d-graphics-examples";
+  "3dmodels" = dontDistribute super."3dmodels";
+  "4Blocks" = dontDistribute super."4Blocks";
+  "AAI" = dontDistribute super."AAI";
+  "ABList" = dontDistribute super."ABList";
+  "AC-Angle" = dontDistribute super."AC-Angle";
+  "AC-Boolean" = dontDistribute super."AC-Boolean";
+  "AC-BuildPlatform" = dontDistribute super."AC-BuildPlatform";
+  "AC-Colour" = dontDistribute super."AC-Colour";
+  "AC-EasyRaster-GTK" = dontDistribute super."AC-EasyRaster-GTK";
+  "AC-HalfInteger" = dontDistribute super."AC-HalfInteger";
+  "AC-MiniTest" = dontDistribute super."AC-MiniTest";
+  "AC-PPM" = dontDistribute super."AC-PPM";
+  "AC-Random" = dontDistribute super."AC-Random";
+  "AC-Terminal" = dontDistribute super."AC-Terminal";
+  "AC-VanillaArray" = dontDistribute super."AC-VanillaArray";
+  "AC-Vector-Fancy" = dontDistribute super."AC-Vector-Fancy";
+  "ACME" = dontDistribute super."ACME";
+  "ADPfusion" = dontDistribute super."ADPfusion";
+  "AERN-Basics" = dontDistribute super."AERN-Basics";
+  "AERN-Net" = dontDistribute super."AERN-Net";
+  "AERN-Real" = dontDistribute super."AERN-Real";
+  "AERN-Real-Double" = dontDistribute super."AERN-Real-Double";
+  "AERN-Real-Interval" = dontDistribute super."AERN-Real-Interval";
+  "AERN-RnToRm" = dontDistribute super."AERN-RnToRm";
+  "AERN-RnToRm-Plot" = dontDistribute super."AERN-RnToRm-Plot";
+  "AES" = dontDistribute super."AES";
+  "AGI" = dontDistribute super."AGI";
+  "ALUT" = dontDistribute super."ALUT";
+  "AMI" = dontDistribute super."AMI";
+  "ANum" = dontDistribute super."ANum";
+  "ASN1" = dontDistribute super."ASN1";
+  "AVar" = dontDistribute super."AVar";
+  "AWin32Console" = dontDistribute super."AWin32Console";
+  "AbortT-monadstf" = dontDistribute super."AbortT-monadstf";
+  "AbortT-mtl" = dontDistribute super."AbortT-mtl";
+  "AbortT-transformers" = dontDistribute super."AbortT-transformers";
+  "ActionKid" = dontDistribute super."ActionKid";
+  "Adaptive" = dontDistribute super."Adaptive";
+  "Adaptive-Blaisorblade" = dontDistribute super."Adaptive-Blaisorblade";
+  "Advgame" = dontDistribute super."Advgame";
+  "AesonBson" = dontDistribute super."AesonBson";
+  "Agata" = dontDistribute super."Agata";
+  "Agda-executable" = dontDistribute super."Agda-executable";
+  "AhoCorasick" = dontDistribute super."AhoCorasick";
+  "AlgorithmW" = dontDistribute super."AlgorithmW";
+  "AlignmentAlgorithms" = dontDistribute super."AlignmentAlgorithms";
+  "Allure" = dontDistribute super."Allure";
+  "AndroidViewHierarchyImporter" = dontDistribute super."AndroidViewHierarchyImporter";
+  "Animas" = dontDistribute super."Animas";
+  "Annotations" = dontDistribute super."Annotations";
+  "Ansi2Html" = dontDistribute super."Ansi2Html";
+  "ApplePush" = dontDistribute super."ApplePush";
+  "AppleScript" = dontDistribute super."AppleScript";
+  "ApproxFun-hs" = dontDistribute super."ApproxFun-hs";
+  "ArrayRef" = dontDistribute super."ArrayRef";
+  "ArrowVHDL" = dontDistribute super."ArrowVHDL";
+  "AspectAG" = dontDistribute super."AspectAG";
+  "AttoBencode" = dontDistribute super."AttoBencode";
+  "AttoJson" = dontDistribute super."AttoJson";
+  "Attrac" = dontDistribute super."Attrac";
+  "Aurochs" = dontDistribute super."Aurochs";
+  "AutoForms" = dontDistribute super."AutoForms";
+  "AvlTree" = dontDistribute super."AvlTree";
+  "BASIC" = dontDistribute super."BASIC";
+  "BCMtools" = dontDistribute super."BCMtools";
+  "BNFC" = dontDistribute super."BNFC";
+  "BNFC-meta" = dontDistribute super."BNFC-meta";
+  "Baggins" = dontDistribute super."Baggins";
+  "Bang" = dontDistribute super."Bang";
+  "Barracuda" = dontDistribute super."Barracuda";
+  "Befunge93" = dontDistribute super."Befunge93";
+  "BenchmarkHistory" = dontDistribute super."BenchmarkHistory";
+  "BerkeleyDB" = dontDistribute super."BerkeleyDB";
+  "BerkeleyDBXML" = dontDistribute super."BerkeleyDBXML";
+  "BerlekampAlgorithm" = dontDistribute super."BerlekampAlgorithm";
+  "BigPixel" = dontDistribute super."BigPixel";
+  "Binpack" = dontDistribute super."Binpack";
+  "Biobase" = dontDistribute super."Biobase";
+  "BiobaseBlast" = dontDistribute super."BiobaseBlast";
+  "BiobaseDotP" = dontDistribute super."BiobaseDotP";
+  "BiobaseFR3D" = dontDistribute super."BiobaseFR3D";
+  "BiobaseFasta" = dontDistribute super."BiobaseFasta";
+  "BiobaseInfernal" = dontDistribute super."BiobaseInfernal";
+  "BiobaseMAF" = dontDistribute super."BiobaseMAF";
+  "BiobaseNewick" = dontDistribute super."BiobaseNewick";
+  "BiobaseTrainingData" = dontDistribute super."BiobaseTrainingData";
+  "BiobaseTurner" = dontDistribute super."BiobaseTurner";
+  "BiobaseTypes" = dontDistribute super."BiobaseTypes";
+  "BiobaseVienna" = dontDistribute super."BiobaseVienna";
+  "BiobaseXNA" = dontDistribute super."BiobaseXNA";
+  "BirdPP" = dontDistribute super."BirdPP";
+  "BitSyntax" = dontDistribute super."BitSyntax";
+  "Bitly" = dontDistribute super."Bitly";
+  "Blobs" = dontDistribute super."Blobs";
+  "BluePrintCSS" = dontDistribute super."BluePrintCSS";
+  "Blueprint" = dontDistribute super."Blueprint";
+  "Bookshelf" = dontDistribute super."Bookshelf";
+  "Bravo" = dontDistribute super."Bravo";
+  "BufferedSocket" = dontDistribute super."BufferedSocket";
+  "Buster" = dontDistribute super."Buster";
+  "CBOR" = dontDistribute super."CBOR";
+  "CC-delcont" = dontDistribute super."CC-delcont";
+  "CC-delcont-alt" = dontDistribute super."CC-delcont-alt";
+  "CC-delcont-cxe" = dontDistribute super."CC-delcont-cxe";
+  "CC-delcont-exc" = dontDistribute super."CC-delcont-exc";
+  "CC-delcont-ref" = dontDistribute super."CC-delcont-ref";
+  "CC-delcont-ref-tf" = dontDistribute super."CC-delcont-ref-tf";
+  "CCA" = dontDistribute super."CCA";
+  "CHXHtml" = dontDistribute super."CHXHtml";
+  "CLASE" = dontDistribute super."CLASE";
+  "CLI" = dontDistribute super."CLI";
+  "CMCompare" = dontDistribute super."CMCompare";
+  "CMQ" = dontDistribute super."CMQ";
+  "COrdering" = dontDistribute super."COrdering";
+  "CPBrainfuck" = dontDistribute super."CPBrainfuck";
+  "CPL" = dontDistribute super."CPL";
+  "CSPM-CoreLanguage" = dontDistribute super."CSPM-CoreLanguage";
+  "CSPM-FiringRules" = dontDistribute super."CSPM-FiringRules";
+  "CSPM-Frontend" = dontDistribute super."CSPM-Frontend";
+  "CSPM-Interpreter" = dontDistribute super."CSPM-Interpreter";
+  "CSPM-ToProlog" = dontDistribute super."CSPM-ToProlog";
+  "CSPM-cspm" = dontDistribute super."CSPM-cspm";
+  "CTRex" = dontDistribute super."CTRex";
+  "CV" = dontDistribute super."CV";
+  "CabalSearch" = dontDistribute super."CabalSearch";
+  "Capabilities" = dontDistribute super."Capabilities";
+  "Cardinality" = dontDistribute super."Cardinality";
+  "CarneadesDSL" = dontDistribute super."CarneadesDSL";
+  "CarneadesIntoDung" = dontDistribute super."CarneadesIntoDung";
+  "Cartesian" = dontDistribute super."Cartesian";
+  "Cascade" = dontDistribute super."Cascade";
+  "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart" = doDistribute super."Chart_1_5_4";
+  "Chart-cairo" = doDistribute super."Chart-cairo_1_5_4";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "Chart-gtk" = dontDistribute super."Chart-gtk";
+  "Chart-simple" = dontDistribute super."Chart-simple";
+  "CheatSheet" = dontDistribute super."CheatSheet";
+  "Checked" = dontDistribute super."Checked";
+  "Chitra" = dontDistribute super."Chitra";
+  "ChristmasTree" = dontDistribute super."ChristmasTree";
+  "CirruParser" = dontDistribute super."CirruParser";
+  "ClassLaws" = dontDistribute super."ClassLaws";
+  "ClassyPrelude" = dontDistribute super."ClassyPrelude";
+  "Clean" = dontDistribute super."Clean";
+  "Clipboard" = dontDistribute super."Clipboard";
+  "Coadjute" = dontDistribute super."Coadjute";
+  "Codec-Compression-LZF" = dontDistribute super."Codec-Compression-LZF";
+  "Codec-Image-DevIL" = dontDistribute super."Codec-Image-DevIL";
+  "Combinatorrent" = dontDistribute super."Combinatorrent";
+  "Command" = dontDistribute super."Command";
+  "Commando" = dontDistribute super."Commando";
+  "ComonadSheet" = dontDistribute super."ComonadSheet";
+  "ConcurrentUtils" = dontDistribute super."ConcurrentUtils";
+  "Concurrential" = dontDistribute super."Concurrential";
+  "Condor" = dontDistribute super."Condor";
+  "ConfigFileTH" = dontDistribute super."ConfigFileTH";
+  "Configger" = dontDistribute super."Configger";
+  "Configurable" = dontDistribute super."Configurable";
+  "ConsStream" = dontDistribute super."ConsStream";
+  "Conscript" = dontDistribute super."Conscript";
+  "ConstraintKinds" = dontDistribute super."ConstraintKinds";
+  "Consumer" = dontDistribute super."Consumer";
+  "ContArrow" = dontDistribute super."ContArrow";
+  "ContextAlgebra" = dontDistribute super."ContextAlgebra";
+  "Contract" = dontDistribute super."Contract";
+  "Control-Engine" = dontDistribute super."Control-Engine";
+  "Control-Monad-MultiPass" = dontDistribute super."Control-Monad-MultiPass";
+  "Control-Monad-ST2" = dontDistribute super."Control-Monad-ST2";
+  "CoreDump" = dontDistribute super."CoreDump";
+  "CoreErlang" = dontDistribute super."CoreErlang";
+  "CoreFoundation" = dontDistribute super."CoreFoundation";
+  "Coroutine" = dontDistribute super."Coroutine";
+  "CouchDB" = dontDistribute super."CouchDB";
+  "Craft3e" = dontDistribute super."Craft3e";
+  "Crypto" = dontDistribute super."Crypto";
+  "CurryDB" = dontDistribute super."CurryDB";
+  "DAG-Tournament" = dontDistribute super."DAG-Tournament";
+  "DBlimited" = dontDistribute super."DBlimited";
+  "DBus" = dontDistribute super."DBus";
+  "DCFL" = dontDistribute super."DCFL";
+  "DMuCheck" = dontDistribute super."DMuCheck";
+  "DOM" = dontDistribute super."DOM";
+  "DP" = dontDistribute super."DP";
+  "DPM" = dontDistribute super."DPM";
+  "DSA" = dontDistribute super."DSA";
+  "DSH" = dontDistribute super."DSH";
+  "DSTM" = dontDistribute super."DSTM";
+  "DTC" = dontDistribute super."DTC";
+  "Dangerous" = dontDistribute super."Dangerous";
+  "Dao" = dontDistribute super."Dao";
+  "DarcsHelpers" = dontDistribute super."DarcsHelpers";
+  "Data-Hash-Consistent" = dontDistribute super."Data-Hash-Consistent";
+  "Data-Rope" = dontDistribute super."Data-Rope";
+  "DataTreeView" = dontDistribute super."DataTreeView";
+  "Deadpan-DDP" = dontDistribute super."Deadpan-DDP";
+  "DebugTraceHelpers" = dontDistribute super."DebugTraceHelpers";
+  "DecisionTree" = dontDistribute super."DecisionTree";
+  "DeepArrow" = dontDistribute super."DeepArrow";
+  "DefendTheKing" = dontDistribute super."DefendTheKing";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "DifferenceLogic" = dontDistribute super."DifferenceLogic";
+  "DifferentialEvolution" = dontDistribute super."DifferentialEvolution";
+  "Digit" = dontDistribute super."Digit";
+  "DigitalOcean" = dontDistribute super."DigitalOcean";
+  "DimensionalHash" = dontDistribute super."DimensionalHash";
+  "DirectSound" = dontDistribute super."DirectSound";
+  "DisTract" = dontDistribute super."DisTract";
+  "DiscussionSupportSystem" = dontDistribute super."DiscussionSupportSystem";
+  "Dish" = dontDistribute super."Dish";
+  "Dist" = dontDistribute super."Dist";
+  "DistanceTransform" = dontDistribute super."DistanceTransform";
+  "DistanceUnits" = dontDistribute super."DistanceUnits";
+  "DnaProteinAlignment" = dontDistribute super."DnaProteinAlignment";
+  "DocTest" = dontDistribute super."DocTest";
+  "Docs" = dontDistribute super."Docs";
+  "DrHylo" = dontDistribute super."DrHylo";
+  "DrIFT" = dontDistribute super."DrIFT";
+  "DrIFT-cabalized" = dontDistribute super."DrIFT-cabalized";
+  "Dung" = dontDistribute super."Dung";
+  "Dust" = dontDistribute super."Dust";
+  "Dust-crypto" = dontDistribute super."Dust-crypto";
+  "Dust-tools" = dontDistribute super."Dust-tools";
+  "Dust-tools-pcap" = dontDistribute super."Dust-tools-pcap";
+  "DynamicTimeWarp" = dontDistribute super."DynamicTimeWarp";
+  "DysFRP" = dontDistribute super."DysFRP";
+  "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
+  "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
+  "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
+  "EdisonAPI" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "EditTimeReport" = dontDistribute super."EditTimeReport";
+  "EitherT" = dontDistribute super."EitherT";
+  "Elm" = dontDistribute super."Elm";
+  "Emping" = dontDistribute super."Emping";
+  "Encode" = dontDistribute super."Encode";
+  "EnumContainers" = dontDistribute super."EnumContainers";
+  "EnumMap" = dontDistribute super."EnumMap";
+  "Eq" = dontDistribute super."Eq";
+  "EqualitySolver" = dontDistribute super."EqualitySolver";
+  "EsounD" = dontDistribute super."EsounD";
+  "EstProgress" = dontDistribute super."EstProgress";
+  "EtaMOO" = dontDistribute super."EtaMOO";
+  "Etage" = dontDistribute super."Etage";
+  "Etage-Graph" = dontDistribute super."Etage-Graph";
+  "Eternal10Seconds" = dontDistribute super."Eternal10Seconds";
+  "Etherbunny" = dontDistribute super."Etherbunny";
+  "EuroIT" = dontDistribute super."EuroIT";
+  "Euterpea" = dontDistribute super."Euterpea";
+  "EventSocket" = dontDistribute super."EventSocket";
+  "Extra" = dontDistribute super."Extra";
+  "FComp" = dontDistribute super."FComp";
+  "FM-SBLEX" = dontDistribute super."FM-SBLEX";
+  "FModExRaw" = dontDistribute super."FModExRaw";
+  "FPretty" = dontDistribute super."FPretty";
+  "FTGL" = dontDistribute super."FTGL";
+  "FTGL-bytestring" = dontDistribute super."FTGL-bytestring";
+  "FTPLine" = dontDistribute super."FTPLine";
+  "Facts" = dontDistribute super."Facts";
+  "FailureT" = dontDistribute super."FailureT";
+  "FastxPipe" = dontDistribute super."FastxPipe";
+  "FermatsLastMargin" = dontDistribute super."FermatsLastMargin";
+  "FerryCore" = dontDistribute super."FerryCore";
+  "Feval" = dontDistribute super."Feval";
+  "FieldTrip" = dontDistribute super."FieldTrip";
+  "FileManip" = dontDistribute super."FileManip";
+  "FileManipCompat" = dontDistribute super."FileManipCompat";
+  "FilePather" = dontDistribute super."FilePather";
+  "FileSystem" = dontDistribute super."FileSystem";
+  "Finance-Quote-Yahoo" = dontDistribute super."Finance-Quote-Yahoo";
+  "Finance-Treasury" = dontDistribute super."Finance-Treasury";
+  "FiniteMap" = dontDistribute super."FiniteMap";
+  "FirstOrderTheory" = dontDistribute super."FirstOrderTheory";
+  "FixedPoint-simple" = dontDistribute super."FixedPoint-simple";
+  "Flippi" = dontDistribute super."Flippi";
+  "Focus" = dontDistribute super."Focus";
+  "Folly" = dontDistribute super."Folly";
+  "ForSyDe" = dontDistribute super."ForSyDe";
+  "ForestStructures" = dontDistribute super."ForestStructures";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frank" = dontDistribute super."Frank";
+  "FreeTypeGL" = dontDistribute super."FreeTypeGL";
+  "FunGEn" = dontDistribute super."FunGEn";
+  "Fungi" = dontDistribute super."Fungi";
+  "GA" = dontDistribute super."GA";
+  "GGg" = dontDistribute super."GGg";
+  "GHood" = dontDistribute super."GHood";
+  "GLFW" = dontDistribute super."GLFW";
+  "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
+  "GLFW-task" = dontDistribute super."GLFW-task";
+  "GLHUI" = dontDistribute super."GLHUI";
+  "GLM" = dontDistribute super."GLM";
+  "GLMatrix" = dontDistribute super."GLMatrix";
+  "GLUtil" = dontDistribute super."GLUtil";
+  "GPX" = dontDistribute super."GPX";
+  "GPipe-Collada" = dontDistribute super."GPipe-Collada";
+  "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
+  "GTALib" = dontDistribute super."GTALib";
+  "Gamgine" = dontDistribute super."Gamgine";
+  "Ganymede" = dontDistribute super."Ganymede";
+  "GaussQuadIntegration" = dontDistribute super."GaussQuadIntegration";
+  "GeBoP" = dontDistribute super."GeBoP";
+  "GenI" = dontDistribute super."GenI";
+  "GenSmsPdu" = dontDistribute super."GenSmsPdu";
+  "GeneralTicTacToe" = dontDistribute super."GeneralTicTacToe";
+  "GenussFold" = dontDistribute super."GenussFold";
+  "GeoIp" = dontDistribute super."GeoIp";
+  "GeocoderOpenCage" = dontDistribute super."GeocoderOpenCage";
+  "Geodetic" = dontDistribute super."Geodetic";
+  "GeomPredicates" = dontDistribute super."GeomPredicates";
+  "GeomPredicates-SSE" = dontDistribute super."GeomPredicates-SSE";
+  "GiST" = dontDistribute super."GiST";
+  "Gifcurry" = dontDistribute super."Gifcurry";
+  "GiveYouAHead" = dontDistribute super."GiveYouAHead";
+  "GlomeTrace" = dontDistribute super."GlomeTrace";
+  "GlomeVec" = dontDistribute super."GlomeVec";
+  "GlomeView" = dontDistribute super."GlomeView";
+  "GoogleChart" = dontDistribute super."GoogleChart";
+  "GoogleDirections" = dontDistribute super."GoogleDirections";
+  "GoogleSB" = dontDistribute super."GoogleSB";
+  "GoogleSuggest" = dontDistribute super."GoogleSuggest";
+  "GoogleTranslate" = dontDistribute super."GoogleTranslate";
+  "GotoT-transformers" = dontDistribute super."GotoT-transformers";
+  "GrammarProducts" = dontDistribute super."GrammarProducts";
+  "Graph500" = dontDistribute super."Graph500";
+  "GraphHammer" = dontDistribute super."GraphHammer";
+  "GraphHammer-examples" = dontDistribute super."GraphHammer-examples";
+  "Graphalyze" = dontDistribute super."Graphalyze";
+  "Grempa" = dontDistribute super."Grempa";
+  "GroteTrap" = dontDistribute super."GroteTrap";
+  "Grow" = dontDistribute super."Grow";
+  "GrowlNotify" = dontDistribute super."GrowlNotify";
+  "Gtk2hsGenerics" = dontDistribute super."Gtk2hsGenerics";
+  "GtkGLTV" = dontDistribute super."GtkGLTV";
+  "GtkTV" = dontDistribute super."GtkTV";
+  "GuiHaskell" = dontDistribute super."GuiHaskell";
+  "GuiTV" = dontDistribute super."GuiTV";
+  "HARM" = dontDistribute super."HARM";
+  "HAppS-Data" = dontDistribute super."HAppS-Data";
+  "HAppS-IxSet" = dontDistribute super."HAppS-IxSet";
+  "HAppS-Server" = dontDistribute super."HAppS-Server";
+  "HAppS-State" = dontDistribute super."HAppS-State";
+  "HAppS-Util" = dontDistribute super."HAppS-Util";
+  "HAppSHelpers" = dontDistribute super."HAppSHelpers";
+  "HCL" = dontDistribute super."HCL";
+  "HCard" = dontDistribute super."HCard";
+  "HDBC-mysql" = dontDistribute super."HDBC-mysql";
+  "HDBC-odbc" = dontDistribute super."HDBC-odbc";
+  "HDBC-postgresql-hstore" = dontDistribute super."HDBC-postgresql-hstore";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "HDRUtils" = dontDistribute super."HDRUtils";
+  "HERA" = dontDistribute super."HERA";
+  "HFrequencyQueue" = dontDistribute super."HFrequencyQueue";
+  "HFuse" = dontDistribute super."HFuse";
+  "HGL" = dontDistribute super."HGL";
+  "HGamer3D" = dontDistribute super."HGamer3D";
+  "HGamer3D-API" = dontDistribute super."HGamer3D-API";
+  "HGamer3D-Audio" = dontDistribute super."HGamer3D-Audio";
+  "HGamer3D-Bullet-Binding" = dontDistribute super."HGamer3D-Bullet-Binding";
+  "HGamer3D-CAudio-Binding" = dontDistribute super."HGamer3D-CAudio-Binding";
+  "HGamer3D-CEGUI-Binding" = dontDistribute super."HGamer3D-CEGUI-Binding";
+  "HGamer3D-Common" = dontDistribute super."HGamer3D-Common";
+  "HGamer3D-Data" = dontDistribute super."HGamer3D-Data";
+  "HGamer3D-Enet-Binding" = dontDistribute super."HGamer3D-Enet-Binding";
+  "HGamer3D-GUI" = dontDistribute super."HGamer3D-GUI";
+  "HGamer3D-Graphics3D" = dontDistribute super."HGamer3D-Graphics3D";
+  "HGamer3D-InputSystem" = dontDistribute super."HGamer3D-InputSystem";
+  "HGamer3D-Network" = dontDistribute super."HGamer3D-Network";
+  "HGamer3D-OIS-Binding" = dontDistribute super."HGamer3D-OIS-Binding";
+  "HGamer3D-Ogre-Binding" = dontDistribute super."HGamer3D-Ogre-Binding";
+  "HGamer3D-SDL2-Binding" = dontDistribute super."HGamer3D-SDL2-Binding";
+  "HGamer3D-SFML-Binding" = dontDistribute super."HGamer3D-SFML-Binding";
+  "HGamer3D-WinEvent" = dontDistribute super."HGamer3D-WinEvent";
+  "HGamer3D-Wire" = dontDistribute super."HGamer3D-Wire";
+  "HGraphStorage" = dontDistribute super."HGraphStorage";
+  "HHDL" = dontDistribute super."HHDL";
+  "HJScript" = dontDistribute super."HJScript";
+  "HJVM" = dontDistribute super."HJVM";
+  "HJavaScript" = dontDistribute super."HJavaScript";
+  "HLearn-algebra" = dontDistribute super."HLearn-algebra";
+  "HLearn-approximation" = dontDistribute super."HLearn-approximation";
+  "HLearn-classification" = dontDistribute super."HLearn-classification";
+  "HLearn-datastructures" = dontDistribute super."HLearn-datastructures";
+  "HLearn-distributions" = dontDistribute super."HLearn-distributions";
+  "HListPP" = dontDistribute super."HListPP";
+  "HLogger" = dontDistribute super."HLogger";
+  "HMM" = dontDistribute super."HMM";
+  "HMap" = dontDistribute super."HMap";
+  "HNM" = dontDistribute super."HNM";
+  "HODE" = dontDistribute super."HODE";
+  "HOpenCV" = dontDistribute super."HOpenCV";
+  "HPath" = dontDistribute super."HPath";
+  "HPi" = dontDistribute super."HPi";
+  "HPlot" = dontDistribute super."HPlot";
+  "HPong" = dontDistribute super."HPong";
+  "HROOT" = dontDistribute super."HROOT";
+  "HROOT-core" = dontDistribute super."HROOT-core";
+  "HROOT-graf" = dontDistribute super."HROOT-graf";
+  "HROOT-hist" = dontDistribute super."HROOT-hist";
+  "HROOT-io" = dontDistribute super."HROOT-io";
+  "HROOT-math" = dontDistribute super."HROOT-math";
+  "HRay" = dontDistribute super."HRay";
+  "HSFFIG" = dontDistribute super."HSFFIG";
+  "HSGEP" = dontDistribute super."HSGEP";
+  "HSH" = dontDistribute super."HSH";
+  "HSHHelpers" = dontDistribute super."HSHHelpers";
+  "HSlippyMap" = dontDistribute super."HSlippyMap";
+  "HSmarty" = dontDistribute super."HSmarty";
+  "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
+  "HSvm" = dontDistribute super."HSvm";
+  "HTTP-Simple" = dontDistribute super."HTTP-Simple";
+  "HTab" = dontDistribute super."HTab";
+  "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit-Diff" = dontDistribute super."HUnit-Diff";
+  "HUnit-Plus" = dontDistribute super."HUnit-Plus";
+  "HUnit-approx" = dontDistribute super."HUnit-approx";
+  "HXMPP" = dontDistribute super."HXMPP";
+  "HXQ" = dontDistribute super."HXQ";
+  "HaLeX" = dontDistribute super."HaLeX";
+  "HaMinitel" = dontDistribute super."HaMinitel";
+  "HaPy" = dontDistribute super."HaPy";
+  "HaTeX-meta" = dontDistribute super."HaTeX-meta";
+  "HaTeX-qq" = dontDistribute super."HaTeX-qq";
+  "HaVSA" = dontDistribute super."HaVSA";
+  "Hach" = dontDistribute super."Hach";
+  "HackMail" = dontDistribute super."HackMail";
+  "Haggressive" = dontDistribute super."Haggressive";
+  "HandlerSocketClient" = dontDistribute super."HandlerSocketClient";
+  "Hangman" = dontDistribute super."Hangman";
+  "HarmTrace" = dontDistribute super."HarmTrace";
+  "HarmTrace-Base" = dontDistribute super."HarmTrace-Base";
+  "HasGP" = dontDistribute super."HasGP";
+  "Haschoo" = dontDistribute super."Haschoo";
+  "Hashell" = dontDistribute super."Hashell";
+  "HaskRel" = dontDistribute super."HaskRel";
+  "HaskellForMaths" = dontDistribute super."HaskellForMaths";
+  "HaskellLM" = dontDistribute super."HaskellLM";
+  "HaskellNN" = dontDistribute super."HaskellNN";
+  "HaskellTorrent" = dontDistribute super."HaskellTorrent";
+  "HaskellTutorials" = dontDistribute super."HaskellTutorials";
+  "Haskelloids" = dontDistribute super."Haskelloids";
+  "Hate" = dontDistribute super."Hate";
+  "Hawk" = dontDistribute super."Hawk";
+  "Hayoo" = dontDistribute super."Hayoo";
+  "Hclip" = dontDistribute super."Hclip";
+  "Hedi" = dontDistribute super."Hedi";
+  "HerbiePlugin" = dontDistribute super."HerbiePlugin";
+  "Hermes" = dontDistribute super."Hermes";
+  "Hieroglyph" = dontDistribute super."Hieroglyph";
+  "HiggsSet" = dontDistribute super."HiggsSet";
+  "Hipmunk" = dontDistribute super."Hipmunk";
+  "HipmunkPlayground" = dontDistribute super."HipmunkPlayground";
+  "Hish" = dontDistribute super."Hish";
+  "Histogram" = dontDistribute super."Histogram";
+  "Hmpf" = dontDistribute super."Hmpf";
+  "Hoed" = dontDistribute super."Hoed";
+  "HoleyMonoid" = dontDistribute super."HoleyMonoid";
+  "Holumbus-Distribution" = dontDistribute super."Holumbus-Distribution";
+  "Holumbus-MapReduce" = dontDistribute super."Holumbus-MapReduce";
+  "Holumbus-Searchengine" = dontDistribute super."Holumbus-Searchengine";
+  "Holumbus-Storage" = dontDistribute super."Holumbus-Storage";
+  "Homology" = dontDistribute super."Homology";
+  "HongoDB" = dontDistribute super."HongoDB";
+  "HostAndPort" = dontDistribute super."HostAndPort";
+  "Hricket" = dontDistribute super."Hricket";
+  "Hs2lib" = dontDistribute super."Hs2lib";
+  "HsASA" = dontDistribute super."HsASA";
+  "HsHaruPDF" = dontDistribute super."HsHaruPDF";
+  "HsHyperEstraier" = dontDistribute super."HsHyperEstraier";
+  "HsJudy" = dontDistribute super."HsJudy";
+  "HsOpenSSL-x509-system" = dontDistribute super."HsOpenSSL-x509-system";
+  "HsParrot" = dontDistribute super."HsParrot";
+  "HsPerl5" = dontDistribute super."HsPerl5";
+  "HsSVN" = dontDistribute super."HsSVN";
+  "HsTools" = dontDistribute super."HsTools";
+  "Hsed" = dontDistribute super."Hsed";
+  "Hsmtlib" = dontDistribute super."Hsmtlib";
+  "HueAPI" = dontDistribute super."HueAPI";
+  "HulkImport" = dontDistribute super."HulkImport";
+  "Hungarian-Munkres" = dontDistribute super."Hungarian-Munkres";
+  "IDynamic" = dontDistribute super."IDynamic";
+  "IFS" = dontDistribute super."IFS";
+  "INblobs" = dontDistribute super."INblobs";
+  "IOR" = dontDistribute super."IOR";
+  "IORefCAS" = dontDistribute super."IORefCAS";
+  "IOSpec" = dontDistribute super."IOSpec";
+  "IcoGrid" = dontDistribute super."IcoGrid";
+  "Imlib" = dontDistribute super."Imlib";
+  "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
+  "IndentParser" = dontDistribute super."IndentParser";
+  "IndexedList" = dontDistribute super."IndexedList";
+  "InfixApplicative" = dontDistribute super."InfixApplicative";
+  "Interpolation" = dontDistribute super."Interpolation";
+  "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "Irc" = dontDistribute super."Irc";
+  "IrrHaskell" = dontDistribute super."IrrHaskell";
+  "IsNull" = dontDistribute super."IsNull";
+  "JSON-Combinator" = dontDistribute super."JSON-Combinator";
+  "JSON-Combinator-Examples" = dontDistribute super."JSON-Combinator-Examples";
+  "JSONb" = dontDistribute super."JSONb";
+  "JYU-Utils" = dontDistribute super."JYU-Utils";
+  "JackMiniMix" = dontDistribute super."JackMiniMix";
+  "Javasf" = dontDistribute super."Javasf";
+  "Javav" = dontDistribute super."Javav";
+  "JsContracts" = dontDistribute super."JsContracts";
+  "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
+  "JunkDB" = dontDistribute super."JunkDB";
+  "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
+  "JunkDB-driver-hashtables" = dontDistribute super."JunkDB-driver-hashtables";
+  "JustParse" = dontDistribute super."JustParse";
+  "KMP" = dontDistribute super."KMP";
+  "KSP" = dontDistribute super."KSP";
+  "Kalman" = dontDistribute super."Kalman";
+  "KdTree" = dontDistribute super."KdTree";
+  "Ketchup" = dontDistribute super."Ketchup";
+  "KiCS" = dontDistribute super."KiCS";
+  "KiCS-debugger" = dontDistribute super."KiCS-debugger";
+  "KiCS-prophecy" = dontDistribute super."KiCS-prophecy";
+  "Kleislify" = dontDistribute super."Kleislify";
+  "Konf" = dontDistribute super."Konf";
+  "Kriens" = dontDistribute super."Kriens";
+  "KyotoCabinet" = dontDistribute super."KyotoCabinet";
+  "L-seed" = dontDistribute super."L-seed";
+  "LATS" = dontDistribute super."LATS";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "LambdaHack" = dontDistribute super."LambdaHack";
+  "LambdaINet" = dontDistribute super."LambdaINet";
+  "LambdaNet" = dontDistribute super."LambdaNet";
+  "LambdaPrettyQuote" = dontDistribute super."LambdaPrettyQuote";
+  "LambdaShell" = dontDistribute super."LambdaShell";
+  "Lambdajudge" = dontDistribute super."Lambdajudge";
+  "Lambdaya" = dontDistribute super."Lambdaya";
+  "LargeCardinalHierarchy" = dontDistribute super."LargeCardinalHierarchy";
+  "Lastik" = dontDistribute super."Lastik";
+  "Lattices" = dontDistribute super."Lattices";
+  "Lazy-Pbkdf2" = dontDistribute super."Lazy-Pbkdf2";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "Limit" = dontDistribute super."Limit";
+  "LinearSplit" = dontDistribute super."LinearSplit";
+  "LinguisticsTypes" = dontDistribute super."LinguisticsTypes";
+  "LinkChecker" = dontDistribute super."LinkChecker";
+  "ListTree" = dontDistribute super."ListTree";
+  "ListWriter" = dontDistribute super."ListWriter";
+  "ListZipper" = dontDistribute super."ListZipper";
+  "Logic" = dontDistribute super."Logic";
+  "LogicGrowsOnTrees" = dontDistribute super."LogicGrowsOnTrees";
+  "LogicGrowsOnTrees-MPI" = dontDistribute super."LogicGrowsOnTrees-MPI";
+  "LogicGrowsOnTrees-network" = dontDistribute super."LogicGrowsOnTrees-network";
+  "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
+  "LslPlus" = dontDistribute super."LslPlus";
+  "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
+  "MHask" = dontDistribute super."MHask";
+  "MSQueue" = dontDistribute super."MSQueue";
+  "MTGBuilder" = dontDistribute super."MTGBuilder";
+  "MagicHaskeller" = dontDistribute super."MagicHaskeller";
+  "MailchimpSimple" = dontDistribute super."MailchimpSimple";
+  "MaybeT" = dontDistribute super."MaybeT";
+  "MaybeT-monads-tf" = dontDistribute super."MaybeT-monads-tf";
+  "MaybeT-transformers" = dontDistribute super."MaybeT-transformers";
+  "MazesOfMonad" = dontDistribute super."MazesOfMonad";
+  "MeanShift" = dontDistribute super."MeanShift";
+  "Measure" = dontDistribute super."Measure";
+  "MetaHDBC" = dontDistribute super."MetaHDBC";
+  "MetaObject" = dontDistribute super."MetaObject";
+  "Metrics" = dontDistribute super."Metrics";
+  "Mhailist" = dontDistribute super."Mhailist";
+  "Michelangelo" = dontDistribute super."Michelangelo";
+  "MicrosoftTranslator" = dontDistribute super."MicrosoftTranslator";
+  "MiniAgda" = dontDistribute super."MiniAgda";
+  "MissingK" = dontDistribute super."MissingK";
+  "MissingM" = dontDistribute super."MissingM";
+  "MissingPy" = dontDistribute super."MissingPy";
+  "Modulo" = dontDistribute super."Modulo";
+  "Moe" = dontDistribute super."Moe";
+  "MoeDict" = dontDistribute super."MoeDict";
+  "MonadCatchIO-mtl" = dontDistribute super."MonadCatchIO-mtl";
+  "MonadCatchIO-mtl-foreign" = dontDistribute super."MonadCatchIO-mtl-foreign";
+  "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
+  "MonadCompose" = dontDistribute super."MonadCompose";
+  "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
+  "MonadStack" = dontDistribute super."MonadStack";
+  "Monadius" = dontDistribute super."Monadius";
+  "Monaris" = dontDistribute super."Monaris";
+  "Monatron" = dontDistribute super."Monatron";
+  "Monatron-IO" = dontDistribute super."Monatron-IO";
+  "Monocle" = dontDistribute super."Monocle";
+  "MorseCode" = dontDistribute super."MorseCode";
+  "MuCheck" = dontDistribute super."MuCheck";
+  "MuCheck-HUnit" = dontDistribute super."MuCheck-HUnit";
+  "MuCheck-Hspec" = dontDistribute super."MuCheck-Hspec";
+  "MuCheck-QuickCheck" = dontDistribute super."MuCheck-QuickCheck";
+  "MuCheck-SmallCheck" = dontDistribute super."MuCheck-SmallCheck";
+  "Munkres" = dontDistribute super."Munkres";
+  "Munkres-simple" = dontDistribute super."Munkres-simple";
+  "MusicBrainz-libdiscid" = dontDistribute super."MusicBrainz-libdiscid";
+  "MyPrimes" = dontDistribute super."MyPrimes";
+  "NGrams" = dontDistribute super."NGrams";
+  "NTRU" = dontDistribute super."NTRU";
+  "NXT" = dontDistribute super."NXT";
+  "NXTDSL" = dontDistribute super."NXTDSL";
+  "NanoProlog" = dontDistribute super."NanoProlog";
+  "NaturalLanguageAlphabets" = dontDistribute super."NaturalLanguageAlphabets";
+  "NaturalSort" = dontDistribute super."NaturalSort";
+  "NearContextAlgebra" = dontDistribute super."NearContextAlgebra";
+  "Neks" = dontDistribute super."Neks";
+  "NestedFunctor" = dontDistribute super."NestedFunctor";
+  "NestedSampling" = dontDistribute super."NestedSampling";
+  "NetSNMP" = dontDistribute super."NetSNMP";
+  "NewBinary" = dontDistribute super."NewBinary";
+  "Ninjas" = dontDistribute super."Ninjas";
+  "NoSlow" = dontDistribute super."NoSlow";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "Noise" = dontDistribute super."Noise";
+  "Nomyx" = dontDistribute super."Nomyx";
+  "Nomyx-Core" = dontDistribute super."Nomyx-Core";
+  "Nomyx-Language" = dontDistribute super."Nomyx-Language";
+  "Nomyx-Rules" = dontDistribute super."Nomyx-Rules";
+  "Nomyx-Web" = dontDistribute super."Nomyx-Web";
+  "NonEmpty" = dontDistribute super."NonEmpty";
+  "NonEmptyList" = dontDistribute super."NonEmptyList";
+  "NumLazyByteString" = dontDistribute super."NumLazyByteString";
+  "NumberSieves" = dontDistribute super."NumberSieves";
+  "NumberTheory" = dontDistribute super."NumberTheory";
+  "Numbers" = dontDistribute super."Numbers";
+  "Nussinov78" = dontDistribute super."Nussinov78";
+  "Nutri" = dontDistribute super."Nutri";
+  "OGL" = dontDistribute super."OGL";
+  "OSM" = dontDistribute super."OSM";
+  "OTP" = dontDistribute super."OTP";
+  "Object" = dontDistribute super."Object";
+  "ObjectIO" = dontDistribute super."ObjectIO";
+  "Obsidian" = dontDistribute super."Obsidian";
+  "OddWord" = dontDistribute super."OddWord";
+  "Omega" = dontDistribute super."Omega";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "OpenAFP" = dontDistribute super."OpenAFP";
+  "OpenAFP-Utils" = dontDistribute super."OpenAFP-Utils";
+  "OpenAL" = dontDistribute super."OpenAL";
+  "OpenCL" = dontDistribute super."OpenCL";
+  "OpenCLRaw" = dontDistribute super."OpenCLRaw";
+  "OpenCLWrappers" = dontDistribute super."OpenCLWrappers";
+  "OpenGLCheck" = dontDistribute super."OpenGLCheck";
+  "OpenGLRaw21" = dontDistribute super."OpenGLRaw21";
+  "OpenSCAD" = dontDistribute super."OpenSCAD";
+  "OpenVG" = dontDistribute super."OpenVG";
+  "OpenVGRaw" = dontDistribute super."OpenVGRaw";
+  "Operads" = dontDistribute super."Operads";
+  "OptDir" = dontDistribute super."OptDir";
+  "OrPatterns" = dontDistribute super."OrPatterns";
+  "OrchestrateDB" = dontDistribute super."OrchestrateDB";
+  "OrderedBits" = dontDistribute super."OrderedBits";
+  "Ordinals" = dontDistribute super."Ordinals";
+  "PArrows" = dontDistribute super."PArrows";
+  "PBKDF2" = dontDistribute super."PBKDF2";
+  "PCLT" = dontDistribute super."PCLT";
+  "PCLT-DB" = dontDistribute super."PCLT-DB";
+  "PDBtools" = dontDistribute super."PDBtools";
+  "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
+  "PageIO" = dontDistribute super."PageIO";
+  "Paillier" = dontDistribute super."Paillier";
+  "PandocAgda" = dontDistribute super."PandocAgda";
+  "Paraiso" = dontDistribute super."Paraiso";
+  "Parry" = dontDistribute super."Parry";
+  "ParsecTools" = dontDistribute super."ParsecTools";
+  "ParserFunction" = dontDistribute super."ParserFunction";
+  "PartialTypeSignatures" = dontDistribute super."PartialTypeSignatures";
+  "PasswordGenerator" = dontDistribute super."PasswordGenerator";
+  "PastePipe" = dontDistribute super."PastePipe";
+  "Pathfinder" = dontDistribute super."Pathfinder";
+  "Peano" = dontDistribute super."Peano";
+  "PeanoWitnesses" = dontDistribute super."PeanoWitnesses";
+  "PerfectHash" = dontDistribute super."PerfectHash";
+  "PermuteEffects" = dontDistribute super."PermuteEffects";
+  "Phsu" = dontDistribute super."Phsu";
+  "Pipe" = dontDistribute super."Pipe";
+  "Piso" = dontDistribute super."Piso";
+  "PlayHangmanGame" = dontDistribute super."PlayHangmanGame";
+  "PlayingCards" = dontDistribute super."PlayingCards";
+  "Plot-ho-matic" = dontDistribute super."Plot-ho-matic";
+  "PlslTools" = dontDistribute super."PlslTools";
+  "Plural" = dontDistribute super."Plural";
+  "Pollutocracy" = dontDistribute super."Pollutocracy";
+  "PortFusion" = dontDistribute super."PortFusion";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "PrimitiveArray-Pretty" = dontDistribute super."PrimitiveArray-Pretty";
+  "Printf-TH" = dontDistribute super."Printf-TH";
+  "PriorityChansConverger" = dontDistribute super."PriorityChansConverger";
+  "ProbabilityMonads" = dontDistribute super."ProbabilityMonads";
+  "PropLogic" = dontDistribute super."PropLogic";
+  "Proper" = dontDistribute super."Proper";
+  "ProxN" = dontDistribute super."ProxN";
+  "Pugs" = dontDistribute super."Pugs";
+  "Pup-Events" = dontDistribute super."Pup-Events";
+  "Pup-Events-Client" = dontDistribute super."Pup-Events-Client";
+  "Pup-Events-Demo" = dontDistribute super."Pup-Events-Demo";
+  "Pup-Events-PQueue" = dontDistribute super."Pup-Events-PQueue";
+  "Pup-Events-Server" = dontDistribute super."Pup-Events-Server";
+  "QIO" = dontDistribute super."QIO";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickCheck-safe" = dontDistribute super."QuickCheck-safe";
+  "QuickPlot" = dontDistribute super."QuickPlot";
+  "Quickson" = dontDistribute super."Quickson";
+  "R-pandoc" = dontDistribute super."R-pandoc";
+  "RANSAC" = dontDistribute super."RANSAC";
+  "RBTree" = dontDistribute super."RBTree";
+  "RESTng" = dontDistribute super."RESTng";
+  "RFC1751" = dontDistribute super."RFC1751";
+  "RJson" = dontDistribute super."RJson";
+  "RMP" = dontDistribute super."RMP";
+  "RNAFold" = dontDistribute super."RNAFold";
+  "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
+  "RNAdesign" = dontDistribute super."RNAdesign";
+  "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "RNAwolf" = dontDistribute super."RNAwolf";
+  "Raincat" = dontDistribute super."Raincat";
+  "Random123" = dontDistribute super."Random123";
+  "RandomDotOrg" = dontDistribute super."RandomDotOrg";
+  "Randometer" = dontDistribute super."Randometer";
+  "Range" = dontDistribute super."Range";
+  "Ranged-sets" = dontDistribute super."Ranged-sets";
+  "Ranka" = dontDistribute super."Ranka";
+  "Rasenschach" = dontDistribute super."Rasenschach";
+  "Redmine" = dontDistribute super."Redmine";
+  "Ref" = dontDistribute super."Ref";
+  "Referees" = dontDistribute super."Referees";
+  "RepLib" = dontDistribute super."RepLib";
+  "ReplicateEffects" = dontDistribute super."ReplicateEffects";
+  "ReviewBoard" = dontDistribute super."ReviewBoard";
+  "RichConditional" = dontDistribute super."RichConditional";
+  "RollingDirectory" = dontDistribute super."RollingDirectory";
+  "RoyalMonad" = dontDistribute super."RoyalMonad";
+  "RxHaskell" = dontDistribute super."RxHaskell";
+  "SBench" = dontDistribute super."SBench";
+  "SConfig" = dontDistribute super."SConfig";
+  "SDL" = dontDistribute super."SDL";
+  "SDL-gfx" = dontDistribute super."SDL-gfx";
+  "SDL-image" = dontDistribute super."SDL-image";
+  "SDL-mixer" = dontDistribute super."SDL-mixer";
+  "SDL-mpeg" = dontDistribute super."SDL-mpeg";
+  "SDL-ttf" = dontDistribute super."SDL-ttf";
+  "SDL2-ttf" = dontDistribute super."SDL2-ttf";
+  "SFML" = dontDistribute super."SFML";
+  "SFML-control" = dontDistribute super."SFML-control";
+  "SFont" = dontDistribute super."SFont";
+  "SG" = dontDistribute super."SG";
+  "SGdemo" = dontDistribute super."SGdemo";
+  "SHA2" = dontDistribute super."SHA2";
+  "SMTPClient" = dontDistribute super."SMTPClient";
+  "SNet" = dontDistribute super."SNet";
+  "SQLDeps" = dontDistribute super."SQLDeps";
+  "STL" = dontDistribute super."STL";
+  "SVG2Q" = dontDistribute super."SVG2Q";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "SVGPath" = dontDistribute super."SVGPath";
+  "SWMMoutGetMB" = dontDistribute super."SWMMoutGetMB";
+  "SableCC2Hs" = dontDistribute super."SableCC2Hs";
+  "Safe" = dontDistribute super."Safe";
+  "Salsa" = dontDistribute super."Salsa";
+  "Saturnin" = dontDistribute super."Saturnin";
+  "SciFlow" = dontDistribute super."SciFlow";
+  "ScratchFs" = dontDistribute super."ScratchFs";
+  "Scurry" = dontDistribute super."Scurry";
+  "Semantique" = dontDistribute super."Semantique";
+  "Semigroup" = dontDistribute super."Semigroup";
+  "SeqAlign" = dontDistribute super."SeqAlign";
+  "SessionLogger" = dontDistribute super."SessionLogger";
+  "ShellCheck" = dontDistribute super."ShellCheck";
+  "Shellac" = dontDistribute super."Shellac";
+  "Shellac-compatline" = dontDistribute super."Shellac-compatline";
+  "Shellac-editline" = dontDistribute super."Shellac-editline";
+  "Shellac-haskeline" = dontDistribute super."Shellac-haskeline";
+  "Shellac-readline" = dontDistribute super."Shellac-readline";
+  "ShowF" = dontDistribute super."ShowF";
+  "Shrub" = dontDistribute super."Shrub";
+  "Shu-thing" = dontDistribute super."Shu-thing";
+  "SimpleAES" = dontDistribute super."SimpleAES";
+  "SimpleEA" = dontDistribute super."SimpleEA";
+  "SimpleGL" = dontDistribute super."SimpleGL";
+  "SimpleH" = dontDistribute super."SimpleH";
+  "SimpleLog" = dontDistribute super."SimpleLog";
+  "SimpleServer" = dontDistribute super."SimpleServer";
+  "SizeCompare" = dontDistribute super."SizeCompare";
+  "Slides" = dontDistribute super."Slides";
+  "Smooth" = dontDistribute super."Smooth";
+  "SmtLib" = dontDistribute super."SmtLib";
+  "Snusmumrik" = dontDistribute super."Snusmumrik";
+  "SoOSiM" = dontDistribute super."SoOSiM";
+  "SoccerFun" = dontDistribute super."SoccerFun";
+  "SoccerFunGL" = dontDistribute super."SoccerFunGL";
+  "Sonnex" = dontDistribute super."Sonnex";
+  "SourceGraph" = dontDistribute super."SourceGraph";
+  "Southpaw" = dontDistribute super."Southpaw";
+  "SpaceInvaders" = dontDistribute super."SpaceInvaders";
+  "SpacePrivateers" = dontDistribute super."SpacePrivateers";
+  "SpinCounter" = dontDistribute super."SpinCounter";
+  "Spock-auth" = dontDistribute super."Spock-auth";
+  "Spock-lucid" = dontDistribute super."Spock-lucid";
+  "Spock-worker" = doDistribute super."Spock-worker_0_2_1_3";
+  "SpreadsheetML" = dontDistribute super."SpreadsheetML";
+  "Sprig" = dontDistribute super."Sprig";
+  "Stasis" = dontDistribute super."Stasis";
+  "StateVar-transformer" = dontDistribute super."StateVar-transformer";
+  "StatisticalMethods" = dontDistribute super."StatisticalMethods";
+  "Stomp" = dontDistribute super."Stomp";
+  "Strafunski-ATermLib" = dontDistribute super."Strafunski-ATermLib";
+  "Strafunski-Sdf2Haskell" = dontDistribute super."Strafunski-Sdf2Haskell";
+  "StrappedTemplates" = dontDistribute super."StrappedTemplates";
+  "StrategyLib" = dontDistribute super."StrategyLib";
+  "Stream" = dontDistribute super."Stream";
+  "StrictBench" = dontDistribute super."StrictBench";
+  "SuffixStructures" = dontDistribute super."SuffixStructures";
+  "SybWidget" = dontDistribute super."SybWidget";
+  "SyntaxMacros" = dontDistribute super."SyntaxMacros";
+  "Sysmon" = dontDistribute super."Sysmon";
+  "TBC" = dontDistribute super."TBC";
+  "TBit" = dontDistribute super."TBit";
+  "THEff" = dontDistribute super."THEff";
+  "TTTAS" = dontDistribute super."TTTAS";
+  "TV" = dontDistribute super."TV";
+  "TYB" = dontDistribute super."TYB";
+  "TableAlgebra" = dontDistribute super."TableAlgebra";
+  "Tables" = dontDistribute super."Tables";
+  "Tablify" = dontDistribute super."Tablify";
+  "Tainted" = dontDistribute super."Tainted";
+  "Takusen" = dontDistribute super."Takusen";
+  "Tape" = dontDistribute super."Tape";
+  "TeaHS" = dontDistribute super."TeaHS";
+  "Tensor" = dontDistribute super."Tensor";
+  "TernaryTrees" = dontDistribute super."TernaryTrees";
+  "TestExplode" = dontDistribute super."TestExplode";
+  "Theora" = dontDistribute super."Theora";
+  "Thingie" = dontDistribute super."Thingie";
+  "ThreadObjects" = dontDistribute super."ThreadObjects";
+  "Thrift" = dontDistribute super."Thrift";
+  "Tic-Tac-Toe" = dontDistribute super."Tic-Tac-Toe";
+  "TicTacToe" = dontDistribute super."TicTacToe";
+  "TigerHash" = dontDistribute super."TigerHash";
+  "TimePiece" = dontDistribute super."TimePiece";
+  "TinyLaunchbury" = dontDistribute super."TinyLaunchbury";
+  "TinyURL" = dontDistribute super."TinyURL";
+  "Titim" = dontDistribute super."Titim";
+  "Top" = dontDistribute super."Top";
+  "Tournament" = dontDistribute super."Tournament";
+  "TraceUtils" = dontDistribute super."TraceUtils";
+  "TransformersStepByStep" = dontDistribute super."TransformersStepByStep";
+  "Transhare" = dontDistribute super."Transhare";
+  "TreeCounter" = dontDistribute super."TreeCounter";
+  "TreeStructures" = dontDistribute super."TreeStructures";
+  "TreeT" = dontDistribute super."TreeT";
+  "Treiber" = dontDistribute super."Treiber";
+  "TrendGraph" = dontDistribute super."TrendGraph";
+  "TrieMap" = dontDistribute super."TrieMap";
+  "Twofish" = dontDistribute super."Twofish";
+  "TypeClass" = dontDistribute super."TypeClass";
+  "TypeCompose" = dontDistribute super."TypeCompose";
+  "TypeIlluminator" = dontDistribute super."TypeIlluminator";
+  "TypeNat" = dontDistribute super."TypeNat";
+  "TypingTester" = dontDistribute super."TypingTester";
+  "UISF" = dontDistribute super."UISF";
+  "UMM" = dontDistribute super."UMM";
+  "URLT" = dontDistribute super."URLT";
+  "URLb" = dontDistribute super."URLb";
+  "UTFTConverter" = dontDistribute super."UTFTConverter";
+  "Unique" = dontDistribute super."Unique";
+  "Unixutils-shadow" = dontDistribute super."Unixutils-shadow";
+  "Updater" = dontDistribute super."Updater";
+  "UrlDisp" = dontDistribute super."UrlDisp";
+  "Useful" = dontDistribute super."Useful";
+  "UtilityTM" = dontDistribute super."UtilityTM";
+  "VKHS" = dontDistribute super."VKHS";
+  "Validation" = dontDistribute super."Validation";
+  "Vec" = dontDistribute super."Vec";
+  "Vec-Boolean" = dontDistribute super."Vec-Boolean";
+  "Vec-OpenGLRaw" = dontDistribute super."Vec-OpenGLRaw";
+  "Vec-Transform" = dontDistribute super."Vec-Transform";
+  "VecN" = dontDistribute super."VecN";
+  "Verba" = dontDistribute super."Verba";
+  "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "Vulkan" = dontDistribute super."Vulkan";
+  "WAVE" = dontDistribute super."WAVE";
+  "WL500gPControl" = dontDistribute super."WL500gPControl";
+  "WL500gPLib" = dontDistribute super."WL500gPLib";
+  "WMSigner" = dontDistribute super."WMSigner";
+  "WURFL" = dontDistribute super."WURFL";
+  "WXDiffCtrl" = dontDistribute super."WXDiffCtrl";
+  "WashNGo" = dontDistribute super."WashNGo";
+  "WaveFront" = dontDistribute super."WaveFront";
+  "Weather" = dontDistribute super."Weather";
+  "WebBits" = dontDistribute super."WebBits";
+  "WebBits-Html" = dontDistribute super."WebBits-Html";
+  "WebBits-multiplate" = dontDistribute super."WebBits-multiplate";
+  "WebCont" = dontDistribute super."WebCont";
+  "WeberLogic" = dontDistribute super."WeberLogic";
+  "Webrexp" = dontDistribute super."Webrexp";
+  "Wheb" = dontDistribute super."Wheb";
+  "WikimediaParser" = dontDistribute super."WikimediaParser";
+  "Win32-dhcp-server" = dontDistribute super."Win32-dhcp-server";
+  "Win32-errors" = dontDistribute super."Win32-errors";
+  "Win32-junction-point" = dontDistribute super."Win32-junction-point";
+  "Win32-security" = dontDistribute super."Win32-security";
+  "Win32-services" = dontDistribute super."Win32-services";
+  "Win32-services-wrapper" = dontDistribute super."Win32-services-wrapper";
+  "Wired" = dontDistribute super."Wired";
+  "WordAlignment" = dontDistribute super."WordAlignment";
+  "WordNet" = dontDistribute super."WordNet";
+  "WordNet-ghc74" = dontDistribute super."WordNet-ghc74";
+  "Wordlint" = dontDistribute super."Wordlint";
+  "WxGeneric" = dontDistribute super."WxGeneric";
+  "X11-extras" = dontDistribute super."X11-extras";
+  "X11-rm" = dontDistribute super."X11-rm";
+  "X11-xdamage" = dontDistribute super."X11-xdamage";
+  "X11-xfixes" = dontDistribute super."X11-xfixes";
+  "X11-xft" = dontDistribute super."X11-xft";
+  "X11-xshape" = dontDistribute super."X11-xshape";
+  "XAttr" = dontDistribute super."XAttr";
+  "XInput" = dontDistribute super."XInput";
+  "XMMS" = dontDistribute super."XMMS";
+  "XMPP" = dontDistribute super."XMPP";
+  "XSaiga" = dontDistribute super."XSaiga";
+  "Xec" = dontDistribute super."Xec";
+  "XmlHtmlWriter" = dontDistribute super."XmlHtmlWriter";
+  "Xorshift128Plus" = dontDistribute super."Xorshift128Plus";
+  "YACPong" = dontDistribute super."YACPong";
+  "YFrob" = dontDistribute super."YFrob";
+  "Yablog" = dontDistribute super."Yablog";
+  "YamlReference" = dontDistribute super."YamlReference";
+  "Yampa-core" = dontDistribute super."Yampa-core";
+  "Yocto" = dontDistribute super."Yocto";
+  "Yogurt" = dontDistribute super."Yogurt";
+  "Yogurt-Standalone" = dontDistribute super."Yogurt-Standalone";
+  "ZEBEDDE" = dontDistribute super."ZEBEDDE";
+  "ZFS" = dontDistribute super."ZFS";
+  "ZMachine" = dontDistribute super."ZMachine";
+  "ZipFold" = dontDistribute super."ZipFold";
+  "ZipperAG" = dontDistribute super."ZipperAG";
+  "Zora" = dontDistribute super."Zora";
+  "Zwaluw" = dontDistribute super."Zwaluw";
+  "a50" = dontDistribute super."a50";
+  "abacate" = dontDistribute super."abacate";
+  "abc-puzzle" = dontDistribute super."abc-puzzle";
+  "abcBridge" = dontDistribute super."abcBridge";
+  "abcnotation" = dontDistribute super."abcnotation";
+  "abeson" = dontDistribute super."abeson";
+  "abstract-deque-tests" = dontDistribute super."abstract-deque-tests";
+  "abstract-par-accelerate" = dontDistribute super."abstract-par-accelerate";
+  "abt" = dontDistribute super."abt";
+  "ac-machine" = dontDistribute super."ac-machine";
+  "ac-machine-conduit" = dontDistribute super."ac-machine-conduit";
+  "accelerate-arithmetic" = dontDistribute super."accelerate-arithmetic";
+  "accelerate-cublas" = dontDistribute super."accelerate-cublas";
+  "accelerate-cuda" = dontDistribute super."accelerate-cuda";
+  "accelerate-cufft" = dontDistribute super."accelerate-cufft";
+  "accelerate-examples" = dontDistribute super."accelerate-examples";
+  "accelerate-fft" = dontDistribute super."accelerate-fft";
+  "accelerate-fftw" = dontDistribute super."accelerate-fftw";
+  "accelerate-fourier" = dontDistribute super."accelerate-fourier";
+  "accelerate-fourier-benchmark" = dontDistribute super."accelerate-fourier-benchmark";
+  "accelerate-io" = dontDistribute super."accelerate-io";
+  "accelerate-random" = dontDistribute super."accelerate-random";
+  "accelerate-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "acid-state-dist" = dontDistribute super."acid-state-dist";
+  "acid-state-tls" = dontDistribute super."acid-state-tls";
+  "acl2" = dontDistribute super."acl2";
+  "acme-all-monad" = dontDistribute super."acme-all-monad";
+  "acme-box" = dontDistribute super."acme-box";
+  "acme-cadre" = dontDistribute super."acme-cadre";
+  "acme-cofunctor" = dontDistribute super."acme-cofunctor";
+  "acme-colosson" = dontDistribute super."acme-colosson";
+  "acme-comonad" = dontDistribute super."acme-comonad";
+  "acme-cutegirl" = dontDistribute super."acme-cutegirl";
+  "acme-dont" = dontDistribute super."acme-dont";
+  "acme-flipping-tables" = dontDistribute super."acme-flipping-tables";
+  "acme-grawlix" = dontDistribute super."acme-grawlix";
+  "acme-hq9plus" = dontDistribute super."acme-hq9plus";
+  "acme-http" = dontDistribute super."acme-http";
+  "acme-inator" = dontDistribute super."acme-inator";
+  "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
+  "acme-lolcat" = dontDistribute super."acme-lolcat";
+  "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
+  "acme-memorandom" = dontDistribute super."acme-memorandom";
+  "acme-microwave" = dontDistribute super."acme-microwave";
+  "acme-miscorder" = dontDistribute super."acme-miscorder";
+  "acme-missiles" = dontDistribute super."acme-missiles";
+  "acme-now" = dontDistribute super."acme-now";
+  "acme-numbersystem" = dontDistribute super."acme-numbersystem";
+  "acme-omitted" = dontDistribute super."acme-omitted";
+  "acme-one" = dontDistribute super."acme-one";
+  "acme-operators" = dontDistribute super."acme-operators";
+  "acme-php" = dontDistribute super."acme-php";
+  "acme-pointful-numbers" = dontDistribute super."acme-pointful-numbers";
+  "acme-realworld" = dontDistribute super."acme-realworld";
+  "acme-safe" = dontDistribute super."acme-safe";
+  "acme-schoenfinkel" = dontDistribute super."acme-schoenfinkel";
+  "acme-strfry" = dontDistribute super."acme-strfry";
+  "acme-stringly-typed" = dontDistribute super."acme-stringly-typed";
+  "acme-strtok" = dontDistribute super."acme-strtok";
+  "acme-timemachine" = dontDistribute super."acme-timemachine";
+  "acme-year" = dontDistribute super."acme-year";
+  "acme-zero" = dontDistribute super."acme-zero";
+  "activehs" = dontDistribute super."activehs";
+  "activehs-base" = dontDistribute super."activehs-base";
+  "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
+  "actor" = dontDistribute super."actor";
+  "adaptive-containers" = dontDistribute super."adaptive-containers";
+  "adaptive-tuple" = dontDistribute super."adaptive-tuple";
+  "adb" = dontDistribute super."adb";
+  "adblock2privoxy" = dontDistribute super."adblock2privoxy";
+  "addLicenseInfo" = dontDistribute super."addLicenseInfo";
+  "adhoc-network" = dontDistribute super."adhoc-network";
+  "adict" = dontDistribute super."adict";
+  "adler32" = dontDistribute super."adler32";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
+  "aeson-applicative" = dontDistribute super."aeson-applicative";
+  "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "aeson-schema" = dontDistribute super."aeson-schema";
+  "aeson-serialize" = dontDistribute super."aeson-serialize";
+  "aeson-smart" = dontDistribute super."aeson-smart";
+  "aeson-streams" = dontDistribute super."aeson-streams";
+  "aeson-t" = dontDistribute super."aeson-t";
+  "aeson-toolkit" = dontDistribute super."aeson-toolkit";
+  "aeson-value-parser" = dontDistribute super."aeson-value-parser";
+  "aeson-yak" = dontDistribute super."aeson-yak";
+  "affine-invariant-ensemble-mcmc" = dontDistribute super."affine-invariant-ensemble-mcmc";
+  "afis" = dontDistribute super."afis";
+  "afv" = dontDistribute super."afv";
+  "ag-pictgen" = dontDistribute super."ag-pictgen";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "agum" = dontDistribute super."agum";
+  "aig" = dontDistribute super."aig";
+  "air" = dontDistribute super."air";
+  "air-extra" = dontDistribute super."air-extra";
+  "air-spec" = dontDistribute super."air-spec";
+  "air-th" = dontDistribute super."air-th";
+  "airbrake" = dontDistribute super."airbrake";
+  "airship" = doDistribute super."airship_0_4_3_0";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "aivika-experiment" = dontDistribute super."aivika-experiment";
+  "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
+  "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
+  "aivika-experiment-diagrams" = dontDistribute super."aivika-experiment-diagrams";
+  "aivika-transformers" = dontDistribute super."aivika-transformers";
+  "ajhc" = dontDistribute super."ajhc";
+  "al" = dontDistribute super."al";
+  "alea" = dontDistribute super."alea";
+  "alex-meta" = dontDistribute super."alex-meta";
+  "alfred" = dontDistribute super."alfred";
+  "alga" = dontDistribute super."alga";
+  "algebra" = dontDistribute super."algebra";
+  "algebra-dag" = dontDistribute super."algebra-dag";
+  "algebra-sql" = dontDistribute super."algebra-sql";
+  "algebraic" = dontDistribute super."algebraic";
+  "algebraic-classes" = dontDistribute super."algebraic-classes";
+  "align" = dontDistribute super."align";
+  "align-text" = dontDistribute super."align-text";
+  "aligned-foreignptr" = dontDistribute super."aligned-foreignptr";
+  "allocated-processor" = dontDistribute super."allocated-processor";
+  "alloy" = dontDistribute super."alloy";
+  "alloy-proxy-fd" = dontDistribute super."alloy-proxy-fd";
+  "almost-fix" = dontDistribute super."almost-fix";
+  "alms" = dontDistribute super."alms";
+  "alpha" = dontDistribute super."alpha";
+  "alpino-tools" = dontDistribute super."alpino-tools";
+  "alsa" = dontDistribute super."alsa";
+  "alsa-core" = dontDistribute super."alsa-core";
+  "alsa-gui" = dontDistribute super."alsa-gui";
+  "alsa-midi" = dontDistribute super."alsa-midi";
+  "alsa-mixer" = dontDistribute super."alsa-mixer";
+  "alsa-pcm" = dontDistribute super."alsa-pcm";
+  "alsa-pcm-tests" = dontDistribute super."alsa-pcm-tests";
+  "alsa-seq" = dontDistribute super."alsa-seq";
+  "alsa-seq-tests" = dontDistribute super."alsa-seq-tests";
+  "altcomposition" = dontDistribute super."altcomposition";
+  "alternative-io" = dontDistribute super."alternative-io";
+  "altfloat" = dontDistribute super."altfloat";
+  "alure" = dontDistribute super."alure";
+  "amazon-emailer" = dontDistribute super."amazon-emailer";
+  "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
+  "amazon-products" = dontDistribute super."amazon-products";
+  "amazonka" = doDistribute super."amazonka_1_3_7";
+  "amazonka-apigateway" = doDistribute super."amazonka-apigateway_1_3_7";
+  "amazonka-autoscaling" = doDistribute super."amazonka-autoscaling_1_3_7";
+  "amazonka-certificatemanager" = dontDistribute super."amazonka-certificatemanager";
+  "amazonka-cloudformation" = doDistribute super."amazonka-cloudformation_1_3_7";
+  "amazonka-cloudfront" = doDistribute super."amazonka-cloudfront_1_3_7";
+  "amazonka-cloudhsm" = doDistribute super."amazonka-cloudhsm_1_3_7";
+  "amazonka-cloudsearch" = doDistribute super."amazonka-cloudsearch_1_3_7";
+  "amazonka-cloudsearch-domains" = doDistribute super."amazonka-cloudsearch-domains_1_3_7";
+  "amazonka-cloudtrail" = doDistribute super."amazonka-cloudtrail_1_3_7";
+  "amazonka-cloudwatch" = doDistribute super."amazonka-cloudwatch_1_3_7";
+  "amazonka-cloudwatch-events" = dontDistribute super."amazonka-cloudwatch-events";
+  "amazonka-cloudwatch-logs" = doDistribute super."amazonka-cloudwatch-logs_1_3_7";
+  "amazonka-codecommit" = doDistribute super."amazonka-codecommit_1_3_7";
+  "amazonka-codedeploy" = doDistribute super."amazonka-codedeploy_1_3_7";
+  "amazonka-codepipeline" = doDistribute super."amazonka-codepipeline_1_3_7";
+  "amazonka-cognito-identity" = doDistribute super."amazonka-cognito-identity_1_3_7";
+  "amazonka-cognito-sync" = doDistribute super."amazonka-cognito-sync_1_3_7";
+  "amazonka-config" = doDistribute super."amazonka-config_1_3_7";
+  "amazonka-core" = doDistribute super."amazonka-core_1_3_7";
+  "amazonka-datapipeline" = doDistribute super."amazonka-datapipeline_1_3_7";
+  "amazonka-devicefarm" = doDistribute super."amazonka-devicefarm_1_3_7";
+  "amazonka-directconnect" = doDistribute super."amazonka-directconnect_1_3_7";
+  "amazonka-dms" = dontDistribute super."amazonka-dms";
+  "amazonka-ds" = doDistribute super."amazonka-ds_1_3_7";
+  "amazonka-dynamodb" = doDistribute super."amazonka-dynamodb_1_3_7";
+  "amazonka-dynamodb-streams" = doDistribute super."amazonka-dynamodb-streams_1_3_7";
+  "amazonka-ec2" = doDistribute super."amazonka-ec2_1_3_7";
+  "amazonka-ecr" = dontDistribute super."amazonka-ecr";
+  "amazonka-ecs" = doDistribute super."amazonka-ecs_1_3_7";
+  "amazonka-efs" = doDistribute super."amazonka-efs_1_3_7";
+  "amazonka-elasticache" = doDistribute super."amazonka-elasticache_1_3_7";
+  "amazonka-elasticbeanstalk" = doDistribute super."amazonka-elasticbeanstalk_1_3_7";
+  "amazonka-elasticsearch" = doDistribute super."amazonka-elasticsearch_1_3_7";
+  "amazonka-elastictranscoder" = doDistribute super."amazonka-elastictranscoder_1_3_7";
+  "amazonka-elb" = doDistribute super."amazonka-elb_1_3_7";
+  "amazonka-emr" = doDistribute super."amazonka-emr_1_3_7";
+  "amazonka-gamelift" = dontDistribute super."amazonka-gamelift";
+  "amazonka-glacier" = doDistribute super."amazonka-glacier_1_3_7";
+  "amazonka-iam" = doDistribute super."amazonka-iam_1_3_7";
+  "amazonka-importexport" = doDistribute super."amazonka-importexport_1_3_7";
+  "amazonka-inspector" = doDistribute super."amazonka-inspector_1_3_7";
+  "amazonka-iot" = doDistribute super."amazonka-iot_1_3_7";
+  "amazonka-iot-dataplane" = doDistribute super."amazonka-iot-dataplane_1_3_7";
+  "amazonka-kinesis" = doDistribute super."amazonka-kinesis_1_3_7";
+  "amazonka-kinesis-firehose" = doDistribute super."amazonka-kinesis-firehose_1_3_7";
+  "amazonka-kms" = doDistribute super."amazonka-kms_1_3_7";
+  "amazonka-lambda" = doDistribute super."amazonka-lambda_1_3_7";
+  "amazonka-marketplace-analytics" = doDistribute super."amazonka-marketplace-analytics_1_3_7";
+  "amazonka-marketplace-metering" = dontDistribute super."amazonka-marketplace-metering";
+  "amazonka-ml" = doDistribute super."amazonka-ml_1_3_7";
+  "amazonka-opsworks" = doDistribute super."amazonka-opsworks_1_3_7";
+  "amazonka-rds" = doDistribute super."amazonka-rds_1_3_7";
+  "amazonka-redshift" = doDistribute super."amazonka-redshift_1_3_7";
+  "amazonka-route53" = doDistribute super."amazonka-route53_1_3_7";
+  "amazonka-route53-domains" = doDistribute super."amazonka-route53-domains_1_3_7";
+  "amazonka-s3" = doDistribute super."amazonka-s3_1_3_7";
+  "amazonka-sdb" = doDistribute super."amazonka-sdb_1_3_7";
+  "amazonka-ses" = doDistribute super."amazonka-ses_1_3_7";
+  "amazonka-sns" = doDistribute super."amazonka-sns_1_3_7";
+  "amazonka-sqs" = doDistribute super."amazonka-sqs_1_3_7";
+  "amazonka-ssm" = doDistribute super."amazonka-ssm_1_3_7";
+  "amazonka-storagegateway" = doDistribute super."amazonka-storagegateway_1_3_7";
+  "amazonka-sts" = doDistribute super."amazonka-sts_1_3_7";
+  "amazonka-support" = doDistribute super."amazonka-support_1_3_7";
+  "amazonka-swf" = doDistribute super."amazonka-swf_1_3_7";
+  "amazonka-test" = doDistribute super."amazonka-test_1_3_7";
+  "amazonka-waf" = doDistribute super."amazonka-waf_1_3_7";
+  "amazonka-workspaces" = doDistribute super."amazonka-workspaces_1_3_7";
+  "ampersand" = dontDistribute super."ampersand";
+  "amqp-conduit" = dontDistribute super."amqp-conduit";
+  "amrun" = dontDistribute super."amrun";
+  "analyze-client" = dontDistribute super."analyze-client";
+  "anansi" = dontDistribute super."anansi";
+  "anansi-hscolour" = dontDistribute super."anansi-hscolour";
+  "anansi-pandoc" = dontDistribute super."anansi-pandoc";
+  "anatomy" = dontDistribute super."anatomy";
+  "android" = dontDistribute super."android";
+  "android-lint-summary" = dontDistribute super."android-lint-summary";
+  "animalcase" = dontDistribute super."animalcase";
+  "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
+  "ansi-pretty" = dontDistribute super."ansi-pretty";
+  "ansigraph" = dontDistribute super."ansigraph";
+  "antagonist" = dontDistribute super."antagonist";
+  "antfarm" = dontDistribute super."antfarm";
+  "anticiv" = dontDistribute super."anticiv";
+  "antigate" = dontDistribute super."antigate";
+  "antimirov" = dontDistribute super."antimirov";
+  "antiquoter" = dontDistribute super."antiquoter";
+  "antisplice" = dontDistribute super."antisplice";
+  "antlrc" = dontDistribute super."antlrc";
+  "anydbm" = dontDistribute super."anydbm";
+  "aosd" = dontDistribute super."aosd";
+  "ap-reflect" = dontDistribute super."ap-reflect";
+  "apache-md5" = dontDistribute super."apache-md5";
+  "apelsin" = dontDistribute super."apelsin";
+  "api-builder" = dontDistribute super."api-builder";
+  "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
+  "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
+  "apiary-helics" = dontDistribute super."apiary-helics";
+  "apiary-http-client" = dontDistribute super."apiary-http-client";
+  "apiary-purescript" = dontDistribute super."apiary-purescript";
+  "apis" = dontDistribute super."apis";
+  "apotiki" = dontDistribute super."apotiki";
+  "app-lens" = dontDistribute super."app-lens";
+  "appc" = dontDistribute super."appc";
+  "applicative-extras" = dontDistribute super."applicative-extras";
+  "applicative-fail" = dontDistribute super."applicative-fail";
+  "applicative-numbers" = dontDistribute super."applicative-numbers";
+  "applicative-parsec" = dontDistribute super."applicative-parsec";
+  "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "apportionment" = dontDistribute super."apportionment";
+  "approx-rand-test" = dontDistribute super."approx-rand-test";
+  "approximate-equality" = dontDistribute super."approximate-equality";
+  "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
+  "arb-fft" = dontDistribute super."arb-fft";
+  "arbb-vm" = dontDistribute super."arbb-vm";
+  "archive" = dontDistribute super."archive";
+  "archiver" = dontDistribute super."archiver";
+  "archlinux" = dontDistribute super."archlinux";
+  "archlinux-web" = dontDistribute super."archlinux-web";
+  "archnews" = dontDistribute super."archnews";
+  "arena" = dontDistribute super."arena";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
+  "argon2" = dontDistribute super."argon2";
+  "argparser" = dontDistribute super."argparser";
+  "arguedit" = dontDistribute super."arguedit";
+  "ariadne" = dontDistribute super."ariadne";
+  "arion" = dontDistribute super."arion";
+  "arith-encode" = dontDistribute super."arith-encode";
+  "arithmatic" = dontDistribute super."arithmatic";
+  "arithmetic" = dontDistribute super."arithmetic";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "armada" = dontDistribute super."armada";
+  "arpa" = dontDistribute super."arpa";
+  "array-forth" = dontDistribute super."array-forth";
+  "array-memoize" = dontDistribute super."array-memoize";
+  "array-primops" = dontDistribute super."array-primops";
+  "array-utils" = dontDistribute super."array-utils";
+  "arrow-improve" = dontDistribute super."arrow-improve";
+  "arrowapply-utils" = dontDistribute super."arrowapply-utils";
+  "arrowp" = dontDistribute super."arrowp";
+  "arrows" = dontDistribute super."arrows";
+  "artery" = dontDistribute super."artery";
+  "arx" = dontDistribute super."arx";
+  "arxiv" = dontDistribute super."arxiv";
+  "ascetic" = dontDistribute super."ascetic";
+  "ascii" = dontDistribute super."ascii";
+  "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "asic" = dontDistribute super."asic";
+  "asil" = dontDistribute super."asil";
+  "asn1-data" = dontDistribute super."asn1-data";
+  "asn1dump" = dontDistribute super."asn1dump";
+  "assembler" = dontDistribute super."assembler";
+  "assert" = dontDistribute super."assert";
+  "assert-failure" = dontDistribute super."assert-failure";
+  "assertions" = dontDistribute super."assertions";
+  "assimp" = dontDistribute super."assimp";
+  "astar" = dontDistribute super."astar";
+  "astrds" = dontDistribute super."astrds";
+  "astview" = dontDistribute super."astview";
+  "astview-utils" = dontDistribute super."astview-utils";
+  "async-extras" = dontDistribute super."async-extras";
+  "async-manager" = dontDistribute super."async-manager";
+  "async-pool" = dontDistribute super."async-pool";
+  "asynchronous-exceptions" = dontDistribute super."asynchronous-exceptions";
+  "aterm" = dontDistribute super."aterm";
+  "aterm-utils" = dontDistribute super."aterm-utils";
+  "atl" = dontDistribute super."atl";
+  "atlassian-connect-core" = dontDistribute super."atlassian-connect-core";
+  "atlassian-connect-descriptor" = dontDistribute super."atlassian-connect-descriptor";
+  "atmos" = dontDistribute super."atmos";
+  "atmos-dimensional" = dontDistribute super."atmos-dimensional";
+  "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
+  "atom" = dontDistribute super."atom";
+  "atom-basic" = dontDistribute super."atom-basic";
+  "atom-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "atomo" = dontDistribute super."atomo";
+  "atp-haskell" = dontDistribute super."atp-haskell";
+  "atrans" = dontDistribute super."atrans";
+  "attempt" = dontDistribute super."attempt";
+  "atto-lisp" = dontDistribute super."atto-lisp";
+  "attoparsec-arff" = dontDistribute super."attoparsec-arff";
+  "attoparsec-binary" = dontDistribute super."attoparsec-binary";
+  "attoparsec-conduit" = dontDistribute super."attoparsec-conduit";
+  "attoparsec-csv" = dontDistribute super."attoparsec-csv";
+  "attoparsec-iteratee" = dontDistribute super."attoparsec-iteratee";
+  "attoparsec-parsec" = dontDistribute super."attoparsec-parsec";
+  "attoparsec-text" = dontDistribute super."attoparsec-text";
+  "attoparsec-text-enumerator" = dontDistribute super."attoparsec-text-enumerator";
+  "attosplit" = dontDistribute super."attosplit";
+  "atuin" = dontDistribute super."atuin";
+  "audacity" = dontDistribute super."audacity";
+  "audiovisual" = dontDistribute super."audiovisual";
+  "augeas" = dontDistribute super."augeas";
+  "augur" = dontDistribute super."augur";
+  "aur" = dontDistribute super."aur";
+  "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
+  "authenticate-ldap" = dontDistribute super."authenticate-ldap";
+  "authinfo-hs" = dontDistribute super."authinfo-hs";
+  "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "autonix-deps" = dontDistribute super."autonix-deps";
+  "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
+  "autoproc" = dontDistribute super."autoproc";
+  "avahi" = dontDistribute super."avahi";
+  "avatar-generator" = dontDistribute super."avatar-generator";
+  "average" = dontDistribute super."average";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesome-prelude" = dontDistribute super."awesome-prelude";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "aws-cloudfront-signer" = dontDistribute super."aws-cloudfront-signer";
+  "aws-configuration-tools" = dontDistribute super."aws-configuration-tools";
+  "aws-dynamodb-conduit" = dontDistribute super."aws-dynamodb-conduit";
+  "aws-dynamodb-streams" = dontDistribute super."aws-dynamodb-streams";
+  "aws-ec2" = dontDistribute super."aws-ec2";
+  "aws-elastic-transcoder" = dontDistribute super."aws-elastic-transcoder";
+  "aws-general" = dontDistribute super."aws-general";
+  "aws-kinesis" = dontDistribute super."aws-kinesis";
+  "aws-kinesis-client" = dontDistribute super."aws-kinesis-client";
+  "aws-kinesis-reshard" = dontDistribute super."aws-kinesis-reshard";
+  "aws-lambda" = dontDistribute super."aws-lambda";
+  "aws-performance-tests" = dontDistribute super."aws-performance-tests";
+  "aws-route53" = dontDistribute super."aws-route53";
+  "aws-sdk" = dontDistribute super."aws-sdk";
+  "aws-sdk-text-converter" = dontDistribute super."aws-sdk-text-converter";
+  "aws-sdk-xml-unordered" = dontDistribute super."aws-sdk-xml-unordered";
+  "aws-sign4" = dontDistribute super."aws-sign4";
+  "aws-sns" = dontDistribute super."aws-sns";
+  "azure-acs" = dontDistribute super."azure-acs";
+  "azure-service-api" = dontDistribute super."azure-service-api";
+  "azure-servicebus" = dontDistribute super."azure-servicebus";
+  "azurify" = dontDistribute super."azurify";
+  "b-tree" = dontDistribute super."b-tree";
+  "babylon" = dontDistribute super."babylon";
+  "backdropper" = dontDistribute super."backdropper";
+  "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
+  "backward-state" = dontDistribute super."backward-state";
+  "bacteria" = dontDistribute super."bacteria";
+  "bag" = dontDistribute super."bag";
+  "bamboo" = dontDistribute super."bamboo";
+  "bamboo-launcher" = dontDistribute super."bamboo-launcher";
+  "bamboo-plugin-highlight" = dontDistribute super."bamboo-plugin-highlight";
+  "bamboo-plugin-photo" = dontDistribute super."bamboo-plugin-photo";
+  "bamboo-theme-blueprint" = dontDistribute super."bamboo-theme-blueprint";
+  "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
+  "bamse" = dontDistribute super."bamse";
+  "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
+  "banwords" = dontDistribute super."banwords";
+  "barchart" = dontDistribute super."barchart";
+  "barcodes-code128" = dontDistribute super."barcodes-code128";
+  "barecheck" = dontDistribute super."barecheck";
+  "barley" = dontDistribute super."barley";
+  "barrie" = dontDistribute super."barrie";
+  "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "base32-bytestring" = dontDistribute super."base32-bytestring";
+  "base58-bytestring" = dontDistribute super."base58-bytestring";
+  "base58address" = dontDistribute super."base58address";
+  "base64-conduit" = dontDistribute super."base64-conduit";
+  "base91" = dontDistribute super."base91";
+  "basex-client" = dontDistribute super."basex-client";
+  "bash" = dontDistribute super."bash";
+  "basic-lens" = dontDistribute super."basic-lens";
+  "basic-sop" = dontDistribute super."basic-sop";
+  "baskell" = dontDistribute super."baskell";
+  "battlenet" = dontDistribute super."battlenet";
+  "battlenet-yesod" = dontDistribute super."battlenet-yesod";
+  "battleships" = dontDistribute super."battleships";
+  "bayes-stack" = dontDistribute super."bayes-stack";
+  "bbdb" = dontDistribute super."bbdb";
+  "bbi" = dontDistribute super."bbi";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "bench" = dontDistribute super."bench";
+  "benchmark-function" = dontDistribute super."benchmark-function";
+  "bencoding" = dontDistribute super."bencoding";
+  "berkeleydb" = dontDistribute super."berkeleydb";
+  "berp" = dontDistribute super."berp";
+  "bert" = dontDistribute super."bert";
+  "besout" = dontDistribute super."besout";
+  "bet" = dontDistribute super."bet";
+  "betacode" = dontDistribute super."betacode";
+  "between" = dontDistribute super."between";
+  "bf-cata" = dontDistribute super."bf-cata";
+  "bff" = dontDistribute super."bff";
+  "bff-mono" = dontDistribute super."bff-mono";
+  "bgmax" = dontDistribute super."bgmax";
+  "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bighugethesaurus" = dontDistribute super."bighugethesaurus";
+  "billboard-parser" = dontDistribute super."billboard-parser";
+  "billeksah-forms" = dontDistribute super."billeksah-forms";
+  "billeksah-main" = dontDistribute super."billeksah-main";
+  "billeksah-main-static" = dontDistribute super."billeksah-main-static";
+  "billeksah-pane" = dontDistribute super."billeksah-pane";
+  "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "binary-communicator" = dontDistribute super."binary-communicator";
+  "binary-derive" = dontDistribute super."binary-derive";
+  "binary-enum" = dontDistribute super."binary-enum";
+  "binary-file" = dontDistribute super."binary-file";
+  "binary-generic" = dontDistribute super."binary-generic";
+  "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
+  "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-protocol" = dontDistribute super."binary-protocol";
+  "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "binary-state" = dontDistribute super."binary-state";
+  "binary-store" = dontDistribute super."binary-store";
+  "binary-streams" = dontDistribute super."binary-streams";
+  "binary-strict" = dontDistribute super."binary-strict";
+  "binarydefer" = dontDistribute super."binarydefer";
+  "bind-marshal" = dontDistribute super."bind-marshal";
+  "binding-core" = dontDistribute super."binding-core";
+  "binding-gtk" = dontDistribute super."binding-gtk";
+  "binding-wx" = dontDistribute super."binding-wx";
+  "bindings" = dontDistribute super."bindings";
+  "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-K8055" = dontDistribute super."bindings-K8055";
+  "bindings-apr" = dontDistribute super."bindings-apr";
+  "bindings-apr-util" = dontDistribute super."bindings-apr-util";
+  "bindings-audiofile" = dontDistribute super."bindings-audiofile";
+  "bindings-bfd" = dontDistribute super."bindings-bfd";
+  "bindings-cctools" = dontDistribute super."bindings-cctools";
+  "bindings-codec2" = dontDistribute super."bindings-codec2";
+  "bindings-common" = dontDistribute super."bindings-common";
+  "bindings-dc1394" = dontDistribute super."bindings-dc1394";
+  "bindings-directfb" = dontDistribute super."bindings-directfb";
+  "bindings-eskit" = dontDistribute super."bindings-eskit";
+  "bindings-fann" = dontDistribute super."bindings-fann";
+  "bindings-fluidsynth" = dontDistribute super."bindings-fluidsynth";
+  "bindings-friso" = dontDistribute super."bindings-friso";
+  "bindings-glib" = dontDistribute super."bindings-glib";
+  "bindings-gobject" = dontDistribute super."bindings-gobject";
+  "bindings-gpgme" = dontDistribute super."bindings-gpgme";
+  "bindings-gsl" = dontDistribute super."bindings-gsl";
+  "bindings-gts" = dontDistribute super."bindings-gts";
+  "bindings-hamlib" = dontDistribute super."bindings-hamlib";
+  "bindings-hdf5" = dontDistribute super."bindings-hdf5";
+  "bindings-levmar" = dontDistribute super."bindings-levmar";
+  "bindings-libcddb" = dontDistribute super."bindings-libcddb";
+  "bindings-libffi" = dontDistribute super."bindings-libffi";
+  "bindings-libftdi" = dontDistribute super."bindings-libftdi";
+  "bindings-librrd" = dontDistribute super."bindings-librrd";
+  "bindings-libstemmer" = dontDistribute super."bindings-libstemmer";
+  "bindings-libusb" = dontDistribute super."bindings-libusb";
+  "bindings-libv4l2" = dontDistribute super."bindings-libv4l2";
+  "bindings-linux-videodev2" = dontDistribute super."bindings-linux-videodev2";
+  "bindings-lxc" = dontDistribute super."bindings-lxc";
+  "bindings-mmap" = dontDistribute super."bindings-mmap";
+  "bindings-mpdecimal" = dontDistribute super."bindings-mpdecimal";
+  "bindings-nettle" = dontDistribute super."bindings-nettle";
+  "bindings-parport" = dontDistribute super."bindings-parport";
+  "bindings-portaudio" = dontDistribute super."bindings-portaudio";
+  "bindings-potrace" = dontDistribute super."bindings-potrace";
+  "bindings-ppdev" = dontDistribute super."bindings-ppdev";
+  "bindings-saga-cmd" = dontDistribute super."bindings-saga-cmd";
+  "bindings-sane" = dontDistribute super."bindings-sane";
+  "bindings-sc3" = dontDistribute super."bindings-sc3";
+  "bindings-sipc" = dontDistribute super."bindings-sipc";
+  "bindings-sophia" = dontDistribute super."bindings-sophia";
+  "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
+  "bindings-svm" = dontDistribute super."bindings-svm";
+  "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
+  "bindings-yices" = dontDistribute super."bindings-yices";
+  "bindynamic" = dontDistribute super."bindynamic";
+  "binembed" = dontDistribute super."binembed";
+  "binembed-example" = dontDistribute super."binembed-example";
+  "bini" = dontDistribute super."bini";
+  "bio" = dontDistribute super."bio";
+  "biohazard" = dontDistribute super."biohazard";
+  "bioinformatics-toolkit" = dontDistribute super."bioinformatics-toolkit";
+  "biosff" = dontDistribute super."biosff";
+  "biostockholm" = dontDistribute super."biostockholm";
+  "bird" = dontDistribute super."bird";
+  "bit-array" = dontDistribute super."bit-array";
+  "bit-vector" = dontDistribute super."bit-vector";
+  "bitarray" = dontDistribute super."bitarray";
+  "bitcoin-rpc" = dontDistribute super."bitcoin-rpc";
+  "bitly-cli" = dontDistribute super."bitly-cli";
+  "bitmap" = dontDistribute super."bitmap";
+  "bitmap-opengl" = dontDistribute super."bitmap-opengl";
+  "bitmaps" = dontDistribute super."bitmaps";
+  "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
+  "bits-conduit" = dontDistribute super."bits-conduit";
+  "bits-extras" = dontDistribute super."bits-extras";
+  "bitset" = dontDistribute super."bitset";
+  "bitspeak" = dontDistribute super."bitspeak";
+  "bitstream" = dontDistribute super."bitstream";
+  "bitstring" = dontDistribute super."bitstring";
+  "bittorrent" = dontDistribute super."bittorrent";
+  "bitvec" = dontDistribute super."bitvec";
+  "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
+  "bk-tree" = dontDistribute super."bk-tree";
+  "bkr" = dontDistribute super."bkr";
+  "bktrees" = dontDistribute super."bktrees";
+  "bla" = dontDistribute super."bla";
+  "black-jewel" = dontDistribute super."black-jewel";
+  "blacktip" = dontDistribute super."blacktip";
+  "blakesum" = dontDistribute super."blakesum";
+  "blakesum-demo" = dontDistribute super."blakesum-demo";
+  "blas" = dontDistribute super."blas";
+  "blas-hs" = dontDistribute super."blas-hs";
+  "blatex" = dontDistribute super."blatex";
+  "blaze" = dontDistribute super."blaze";
+  "blaze-builder-conduit" = dontDistribute super."blaze-builder-conduit";
+  "blaze-from-html" = dontDistribute super."blaze-from-html";
+  "blaze-html-contrib" = dontDistribute super."blaze-html-contrib";
+  "blaze-html-hexpat" = dontDistribute super."blaze-html-hexpat";
+  "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
+  "blaze-json" = dontDistribute super."blaze-json";
+  "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-textual-native" = dontDistribute super."blaze-textual-native";
+  "blazeMarker" = dontDistribute super."blazeMarker";
+  "blink1" = dontDistribute super."blink1";
+  "blip" = dontDistribute super."blip";
+  "bliplib" = dontDistribute super."bliplib";
+  "blocking-transactions" = dontDistribute super."blocking-transactions";
+  "blogination" = dontDistribute super."blogination";
+  "bloodhound" = dontDistribute super."bloodhound";
+  "bloodhound-amazonka-auth" = dontDistribute super."bloodhound-amazonka-auth";
+  "bloxorz" = dontDistribute super."bloxorz";
+  "blubber" = dontDistribute super."blubber";
+  "blubber-server" = dontDistribute super."blubber-server";
+  "bluetile" = dontDistribute super."bluetile";
+  "bluetileutils" = dontDistribute super."bluetileutils";
+  "blunt" = dontDistribute super."blunt";
+  "board-games" = dontDistribute super."board-games";
+  "bogre-banana" = dontDistribute super."bogre-banana";
+  "bond" = dontDistribute super."bond";
+  "bond-haskell" = dontDistribute super."bond-haskell";
+  "bond-haskell-compiler" = dontDistribute super."bond-haskell-compiler";
+  "boolean-list" = dontDistribute super."boolean-list";
+  "boolean-normal-forms" = dontDistribute super."boolean-normal-forms";
+  "boolexpr" = dontDistribute super."boolexpr";
+  "bools" = dontDistribute super."bools";
+  "boolsimplifier" = dontDistribute super."boolsimplifier";
+  "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
+  "boomslang" = dontDistribute super."boomslang";
+  "borel" = dontDistribute super."borel";
+  "bot" = dontDistribute super."bot";
+  "botpp" = dontDistribute super."botpp";
+  "bound-gen" = dontDistribute super."bound-gen";
+  "bounded-tchan" = dontDistribute super."bounded-tchan";
+  "boundingboxes" = dontDistribute super."boundingboxes";
+  "bower-json" = doDistribute super."bower-json_0_7_0_0";
+  "bowntz" = dontDistribute super."bowntz";
+  "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
+  "brainfuck" = dontDistribute super."brainfuck";
+  "brainfuck-monad" = dontDistribute super."brainfuck-monad";
+  "brainfuck-tut" = dontDistribute super."brainfuck-tut";
+  "break" = dontDistribute super."break";
+  "breakout" = dontDistribute super."breakout";
+  "breve" = dontDistribute super."breve";
+  "brians-brain" = dontDistribute super."brians-brain";
+  "brillig" = dontDistribute super."brillig";
+  "broccoli" = dontDistribute super."broccoli";
+  "broker-haskell" = dontDistribute super."broker-haskell";
+  "bsd-sysctl" = dontDistribute super."bsd-sysctl";
+  "bson-generic" = dontDistribute super."bson-generic";
+  "bson-generics" = dontDistribute super."bson-generics";
+  "bson-mapping" = dontDistribute super."bson-mapping";
+  "bspack" = dontDistribute super."bspack";
+  "bsparse" = dontDistribute super."bsparse";
+  "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
+  "buffer-pipe" = dontDistribute super."buffer-pipe";
+  "buffon" = dontDistribute super."buffon";
+  "bugzilla" = dontDistribute super."bugzilla";
+  "buildable" = dontDistribute super."buildable";
+  "buildbox" = dontDistribute super."buildbox";
+  "buildbox-tools" = dontDistribute super."buildbox-tools";
+  "buildwrapper" = dontDistribute super."buildwrapper";
+  "bullet" = dontDistribute super."bullet";
+  "burst-detection" = dontDistribute super."burst-detection";
+  "bus-pirate" = dontDistribute super."bus-pirate";
+  "buster" = dontDistribute super."buster";
+  "buster-gtk" = dontDistribute super."buster-gtk";
+  "buster-network" = dontDistribute super."buster-network";
+  "butterflies" = dontDistribute super."butterflies";
+  "bv" = dontDistribute super."bv";
+  "byline" = dontDistribute super."byline";
+  "bytable" = dontDistribute super."bytable";
+  "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
+  "bytestring-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-nums" = dontDistribute super."bytestring-nums";
+  "bytestring-plain" = dontDistribute super."bytestring-plain";
+  "bytestring-rematch" = dontDistribute super."bytestring-rematch";
+  "bytestring-short" = dontDistribute super."bytestring-short";
+  "bytestring-show" = dontDistribute super."bytestring-show";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "c-dsl" = dontDistribute super."c-dsl";
+  "c-io" = dontDistribute super."c-io";
+  "c-storable-deriving" = dontDistribute super."c-storable-deriving";
+  "c0check" = dontDistribute super."c0check";
+  "c0parser" = dontDistribute super."c0parser";
+  "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
+  "c2hsc" = dontDistribute super."c2hsc";
+  "cab" = dontDistribute super."cab";
+  "cabal-audit" = dontDistribute super."cabal-audit";
+  "cabal-bounds" = dontDistribute super."cabal-bounds";
+  "cabal-cargs" = dontDistribute super."cabal-cargs";
+  "cabal-constraints" = dontDistribute super."cabal-constraints";
+  "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "cabal-dev" = dontDistribute super."cabal-dev";
+  "cabal-dir" = dontDistribute super."cabal-dir";
+  "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
+  "cabal-ghci" = dontDistribute super."cabal-ghci";
+  "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
+  "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
+  "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
+  "cabal-install-ghc74" = dontDistribute super."cabal-install-ghc74";
+  "cabal-lenses" = dontDistribute super."cabal-lenses";
+  "cabal-macosx" = dontDistribute super."cabal-macosx";
+  "cabal-meta" = dontDistribute super."cabal-meta";
+  "cabal-mon" = dontDistribute super."cabal-mon";
+  "cabal-nirvana" = dontDistribute super."cabal-nirvana";
+  "cabal-progdeps" = dontDistribute super."cabal-progdeps";
+  "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-scripts" = dontDistribute super."cabal-scripts";
+  "cabal-setup" = dontDistribute super."cabal-setup";
+  "cabal-sign" = dontDistribute super."cabal-sign";
+  "cabal-test" = dontDistribute super."cabal-test";
+  "cabal-test-bin" = dontDistribute super."cabal-test-bin";
+  "cabal-test-compat" = dontDistribute super."cabal-test-compat";
+  "cabal-test-quickcheck" = dontDistribute super."cabal-test-quickcheck";
+  "cabal-uninstall" = dontDistribute super."cabal-uninstall";
+  "cabal-upload" = dontDistribute super."cabal-upload";
+  "cabal2arch" = dontDistribute super."cabal2arch";
+  "cabal2doap" = dontDistribute super."cabal2doap";
+  "cabal2ebuild" = dontDistribute super."cabal2ebuild";
+  "cabal2ghci" = dontDistribute super."cabal2ghci";
+  "cabal2nix" = dontDistribute super."cabal2nix";
+  "cabal2spec" = dontDistribute super."cabal2spec";
+  "cabalQuery" = dontDistribute super."cabalQuery";
+  "cabalg" = dontDistribute super."cabalg";
+  "cabalgraph" = dontDistribute super."cabalgraph";
+  "cabalmdvrpm" = dontDistribute super."cabalmdvrpm";
+  "cabalrpmdeps" = dontDistribute super."cabalrpmdeps";
+  "cabalvchk" = dontDistribute super."cabalvchk";
+  "cabin" = dontDistribute super."cabin";
+  "cabocha" = dontDistribute super."cabocha";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "cairo-appbase" = dontDistribute super."cairo-appbase";
+  "cake" = dontDistribute super."cake";
+  "cake3" = dontDistribute super."cake3";
+  "cakyrespa" = dontDistribute super."cakyrespa";
+  "cal3d" = dontDistribute super."cal3d";
+  "cal3d-examples" = dontDistribute super."cal3d-examples";
+  "cal3d-opengl" = dontDistribute super."cal3d-opengl";
+  "calc" = dontDistribute super."calc";
+  "caldims" = dontDistribute super."caldims";
+  "caledon" = dontDistribute super."caledon";
+  "call" = dontDistribute super."call";
+  "call-haskell-from-anything" = dontDistribute super."call-haskell-from-anything";
+  "camfort" = dontDistribute super."camfort";
+  "camh" = dontDistribute super."camh";
+  "campfire" = dontDistribute super."campfire";
+  "canonical-filepath" = dontDistribute super."canonical-filepath";
+  "canteven-config" = dontDistribute super."canteven-config";
+  "canteven-listen-http" = dontDistribute super."canteven-listen-http";
+  "canteven-log" = dontDistribute super."canteven-log";
+  "canteven-template" = dontDistribute super."canteven-template";
+  "cantor" = dontDistribute super."cantor";
+  "cao" = dontDistribute super."cao";
+  "cap" = dontDistribute super."cap";
+  "capped-list" = dontDistribute super."capped-list";
+  "capri" = dontDistribute super."capri";
+  "car-pool" = dontDistribute super."car-pool";
+  "caramia" = dontDistribute super."caramia";
+  "carboncopy" = dontDistribute super."carboncopy";
+  "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "casa-abbreviations-and-acronyms" = dontDistribute super."casa-abbreviations-and-acronyms";
+  "casadi-bindings" = dontDistribute super."casadi-bindings";
+  "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
+  "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
+  "casadi-bindings-internal" = dontDistribute super."casadi-bindings-internal";
+  "casadi-bindings-ipopt-interface" = dontDistribute super."casadi-bindings-ipopt-interface";
+  "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
+  "cascading" = dontDistribute super."cascading";
+  "case-conversion" = dontDistribute super."case-conversion";
+  "cash" = dontDistribute super."cash";
+  "casing" = dontDistribute super."casing";
+  "casr-logbook" = dontDistribute super."casr-logbook";
+  "cassandra-cql" = dontDistribute super."cassandra-cql";
+  "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava-conduit" = dontDistribute super."cassava-conduit";
+  "cassava-streams" = dontDistribute super."cassava-streams";
+  "cassette" = dontDistribute super."cassette";
+  "cassy" = dontDistribute super."cassy";
+  "castle" = dontDistribute super."castle";
+  "casui" = dontDistribute super."casui";
+  "catamorphism" = dontDistribute super."catamorphism";
+  "catch-fd" = dontDistribute super."catch-fd";
+  "categorical-algebra" = dontDistribute super."categorical-algebra";
+  "categories" = dontDistribute super."categories";
+  "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
+  "cayley-dickson" = dontDistribute super."cayley-dickson";
+  "cblrepo" = dontDistribute super."cblrepo";
+  "cci" = dontDistribute super."cci";
+  "ccnx" = dontDistribute super."ccnx";
+  "cctools-workqueue" = dontDistribute super."cctools-workqueue";
+  "cedict" = dontDistribute super."cedict";
+  "cef" = dontDistribute super."cef";
+  "ceilometer-common" = dontDistribute super."ceilometer-common";
+  "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
+  "cerberus" = dontDistribute super."cerberus";
+  "cereal-derive" = dontDistribute super."cereal-derive";
+  "cereal-enumerator" = dontDistribute super."cereal-enumerator";
+  "cereal-ieee754" = dontDistribute super."cereal-ieee754";
+  "cereal-plus" = dontDistribute super."cereal-plus";
+  "cereal-text" = dontDistribute super."cereal-text";
+  "certificate" = dontDistribute super."certificate";
+  "cf" = dontDistribute super."cf";
+  "cfipu" = dontDistribute super."cfipu";
+  "cflp" = dontDistribute super."cflp";
+  "cfopu" = dontDistribute super."cfopu";
+  "cg" = dontDistribute super."cg";
+  "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_3";
+  "cgi-undecidable" = dontDistribute super."cgi-undecidable";
+  "cgi-utils" = dontDistribute super."cgi-utils";
+  "cgrep" = dontDistribute super."cgrep";
+  "chain-codes" = dontDistribute super."chain-codes";
+  "chalk" = dontDistribute super."chalk";
+  "chalkboard" = dontDistribute super."chalkboard";
+  "chalkboard-viewer" = dontDistribute super."chalkboard-viewer";
+  "chalmers-lava2000" = dontDistribute super."chalmers-lava2000";
+  "chan-split" = dontDistribute super."chan-split";
+  "change-monger" = dontDistribute super."change-monger";
+  "charade" = dontDistribute super."charade";
+  "charsetdetect" = dontDistribute super."charsetdetect";
+  "chart-histogram" = dontDistribute super."chart-histogram";
+  "chaselev-deque" = dontDistribute super."chaselev-deque";
+  "chatter" = dontDistribute super."chatter";
+  "chatty" = dontDistribute super."chatty";
+  "chatty-text" = dontDistribute super."chatty-text";
+  "chatty-utils" = dontDistribute super."chatty-utils";
+  "cheapskate-highlight" = dontDistribute super."cheapskate-highlight";
+  "cheapskate-lucid" = dontDistribute super."cheapskate-lucid";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
+  "check-pvp" = dontDistribute super."check-pvp";
+  "checked" = dontDistribute super."checked";
+  "chell-hunit" = dontDistribute super."chell-hunit";
+  "chesshs" = dontDistribute super."chesshs";
+  "chevalier-common" = dontDistribute super."chevalier-common";
+  "chorale" = dontDistribute super."chorale";
+  "chp" = dontDistribute super."chp";
+  "chp-mtl" = dontDistribute super."chp-mtl";
+  "chp-plus" = dontDistribute super."chp-plus";
+  "chp-spec" = dontDistribute super."chp-spec";
+  "chp-transformers" = dontDistribute super."chp-transformers";
+  "chronograph" = dontDistribute super."chronograph";
+  "chu2" = dontDistribute super."chu2";
+  "chuchu" = dontDistribute super."chuchu";
+  "chunks" = dontDistribute super."chunks";
+  "chunky" = dontDistribute super."chunky";
+  "church-list" = dontDistribute super."church-list";
+  "cil" = dontDistribute super."cil";
+  "cinvoke" = dontDistribute super."cinvoke";
+  "cio" = dontDistribute super."cio";
+  "cipher-rc5" = dontDistribute super."cipher-rc5";
+  "ciphersaber2" = dontDistribute super."ciphersaber2";
+  "circ" = dontDistribute super."circ";
+  "cirru-parser" = dontDistribute super."cirru-parser";
+  "citation-resolve" = dontDistribute super."citation-resolve";
+  "citeproc-hs" = dontDistribute super."citeproc-hs";
+  "citeproc-hs-pandoc-filter" = dontDistribute super."citeproc-hs-pandoc-filter";
+  "cityhash" = dontDistribute super."cityhash";
+  "cjk" = dontDistribute super."cjk";
+  "clac" = dontDistribute super."clac";
+  "clafer" = dontDistribute super."clafer";
+  "claferIG" = dontDistribute super."claferIG";
+  "claferwiki" = dontDistribute super."claferwiki";
+  "clang-pure" = dontDistribute super."clang-pure";
+  "clanki" = dontDistribute super."clanki";
+  "clarifai" = dontDistribute super."clarifai";
+  "clash" = dontDistribute super."clash";
+  "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "classify" = dontDistribute super."classify";
+  "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
+  "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
+  "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
+  "clckwrks-theme-clckwrks" = dontDistribute super."clckwrks-theme-clckwrks";
+  "clckwrks-theme-geo-bootstrap" = dontDistribute super."clckwrks-theme-geo-bootstrap";
+  "cld2" = dontDistribute super."cld2";
+  "clean-home" = dontDistribute super."clean-home";
+  "clean-unions" = dontDistribute super."clean-unions";
+  "cless" = dontDistribute super."cless";
+  "clevercss" = dontDistribute super."clevercss";
+  "cli" = dontDistribute super."cli";
+  "click-clack" = dontDistribute super."click-clack";
+  "clifford" = dontDistribute super."clifford";
+  "clippard" = dontDistribute super."clippard";
+  "clipper" = dontDistribute super."clipper";
+  "clippings" = dontDistribute super."clippings";
+  "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
+  "clocked" = dontDistribute super."clocked";
+  "clogparse" = dontDistribute super."clogparse";
+  "clone-all" = dontDistribute super."clone-all";
+  "closure" = dontDistribute super."closure";
+  "cloud-haskell" = dontDistribute super."cloud-haskell";
+  "cloudfront-signer" = dontDistribute super."cloudfront-signer";
+  "cloudyfs" = dontDistribute super."cloudyfs";
+  "cltw" = dontDistribute super."cltw";
+  "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "cluss" = dontDistribute super."cluss";
+  "clustertools" = dontDistribute super."clustertools";
+  "clutterhs" = dontDistribute super."clutterhs";
+  "cmaes" = dontDistribute super."cmaes";
+  "cmath" = dontDistribute super."cmath";
+  "cmathml3" = dontDistribute super."cmathml3";
+  "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "cmu" = dontDistribute super."cmu";
+  "cnc-spec-compiler" = dontDistribute super."cnc-spec-compiler";
+  "cndict" = dontDistribute super."cndict";
+  "codec" = dontDistribute super."codec";
+  "codec-libevent" = dontDistribute super."codec-libevent";
+  "codec-mbox" = dontDistribute super."codec-mbox";
+  "codecov-haskell" = dontDistribute super."codecov-haskell";
+  "codemonitor" = dontDistribute super."codemonitor";
+  "codepad" = dontDistribute super."codepad";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "coinbase-exchange" = dontDistribute super."coinbase-exchange";
+  "colada" = dontDistribute super."colada";
+  "colchis" = dontDistribute super."colchis";
+  "collada-output" = dontDistribute super."collada-output";
+  "collada-types" = dontDistribute super."collada-types";
+  "collapse-util" = dontDistribute super."collapse-util";
+  "collection-json" = dontDistribute super."collection-json";
+  "collections" = dontDistribute super."collections";
+  "collections-api" = dontDistribute super."collections-api";
+  "collections-base-instances" = dontDistribute super."collections-base-instances";
+  "colock" = dontDistribute super."colock";
+  "colorize-haskell" = dontDistribute super."colorize-haskell";
+  "colors" = dontDistribute super."colors";
+  "coltrane" = dontDistribute super."coltrane";
+  "com" = dontDistribute super."com";
+  "combinat" = dontDistribute super."combinat";
+  "combinat-diagrams" = dontDistribute super."combinat-diagrams";
+  "combinator-interactive" = dontDistribute super."combinator-interactive";
+  "combinatorial-problems" = dontDistribute super."combinatorial-problems";
+  "combinatorics" = dontDistribute super."combinatorics";
+  "combobuffer" = dontDistribute super."combobuffer";
+  "comfort-graph" = dontDistribute super."comfort-graph";
+  "command" = dontDistribute super."command";
+  "command-qq" = dontDistribute super."command-qq";
+  "commander" = dontDistribute super."commander";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "comonad-extras" = dontDistribute super."comonad-extras";
+  "comonad-random" = dontDistribute super."comonad-random";
+  "compact-map" = dontDistribute super."compact-map";
+  "compact-socket" = dontDistribute super."compact-socket";
+  "compact-string" = dontDistribute super."compact-string";
+  "compact-string-fix" = dontDistribute super."compact-string-fix";
+  "compare-type" = dontDistribute super."compare-type";
+  "compdata-automata" = dontDistribute super."compdata-automata";
+  "compdata-dags" = dontDistribute super."compdata-dags";
+  "compdata-param" = dontDistribute super."compdata-param";
+  "compensated" = dontDistribute super."compensated";
+  "competition" = dontDistribute super."competition";
+  "compilation" = dontDistribute super."compilation";
+  "complex-generic" = dontDistribute super."complex-generic";
+  "complex-integrate" = dontDistribute super."complex-integrate";
+  "complexity" = dontDistribute super."complexity";
+  "compose-ltr" = dontDistribute super."compose-ltr";
+  "compose-trans" = dontDistribute super."compose-trans";
+  "compression" = dontDistribute super."compression";
+  "compstrat" = dontDistribute super."compstrat";
+  "comptrans" = dontDistribute super."comptrans";
+  "computational-algebra" = dontDistribute super."computational-algebra";
+  "computations" = dontDistribute super."computations";
+  "conceit" = dontDistribute super."conceit";
+  "concorde" = dontDistribute super."concorde";
+  "concraft" = dontDistribute super."concraft";
+  "concraft-hr" = dontDistribute super."concraft-hr";
+  "concraft-pl" = dontDistribute super."concraft-pl";
+  "concrete-relaxng-parser" = dontDistribute super."concrete-relaxng-parser";
+  "concrete-typerep" = dontDistribute super."concrete-typerep";
+  "concurrent-barrier" = dontDistribute super."concurrent-barrier";
+  "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
+  "concurrent-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
+  "concurrent-sa" = dontDistribute super."concurrent-sa";
+  "concurrent-split" = dontDistribute super."concurrent-split";
+  "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-utilities" = dontDistribute super."concurrent-utilities";
+  "concurrentoutput" = dontDistribute super."concurrentoutput";
+  "cond" = dontDistribute super."cond";
+  "condor" = dontDistribute super."condor";
+  "condorcet" = dontDistribute super."condorcet";
+  "conductive-base" = dontDistribute super."conductive-base";
+  "conductive-clock" = dontDistribute super."conductive-clock";
+  "conductive-hsc3" = dontDistribute super."conductive-hsc3";
+  "conductive-song" = dontDistribute super."conductive-song";
+  "conduit-audio" = dontDistribute super."conduit-audio";
+  "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
+  "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
+  "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-network-stream" = dontDistribute super."conduit-network-stream";
+  "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
+  "conf" = dontDistribute super."conf";
+  "config-manager" = dontDistribute super."config-manager";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "confsolve" = dontDistribute super."confsolve";
+  "congruence-relation" = dontDistribute super."congruence-relation";
+  "conjugateGradient" = dontDistribute super."conjugateGradient";
+  "conjure" = dontDistribute super."conjure";
+  "conlogger" = dontDistribute super."conlogger";
+  "connection-pool" = dontDistribute super."connection-pool";
+  "consistent" = dontDistribute super."consistent";
+  "console-program" = dontDistribute super."console-program";
+  "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
+  "constrained-categories" = dontDistribute super."constrained-categories";
+  "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraint-classes" = dontDistribute super."constraint-classes";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "container-classes" = dontDistribute super."container-classes";
+  "containers-benchmark" = dontDistribute super."containers-benchmark";
+  "containers-deepseq" = dontDistribute super."containers-deepseq";
+  "context-free-grammar" = dontDistribute super."context-free-grammar";
+  "context-stack" = dontDistribute super."context-stack";
+  "continue" = dontDistribute super."continue";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "continuum" = dontDistribute super."continuum";
+  "continuum-client" = dontDistribute super."continuum-client";
+  "control-event" = dontDistribute super."control-event";
+  "control-monad-attempt" = dontDistribute super."control-monad-attempt";
+  "control-monad-exception" = dontDistribute super."control-monad-exception";
+  "control-monad-exception-monadsfd" = dontDistribute super."control-monad-exception-monadsfd";
+  "control-monad-exception-monadstf" = dontDistribute super."control-monad-exception-monadstf";
+  "control-monad-exception-mtl" = dontDistribute super."control-monad-exception-mtl";
+  "control-monad-failure" = dontDistribute super."control-monad-failure";
+  "control-monad-failure-mtl" = dontDistribute super."control-monad-failure-mtl";
+  "control-monad-omega" = dontDistribute super."control-monad-omega";
+  "control-monad-queue" = dontDistribute super."control-monad-queue";
+  "control-timeout" = dontDistribute super."control-timeout";
+  "contstuff" = dontDistribute super."contstuff";
+  "contstuff-monads-tf" = dontDistribute super."contstuff-monads-tf";
+  "contstuff-transformers" = dontDistribute super."contstuff-transformers";
+  "converge" = dontDistribute super."converge";
+  "conversion" = dontDistribute super."conversion";
+  "conversion-bytestring" = dontDistribute super."conversion-bytestring";
+  "conversion-case-insensitive" = dontDistribute super."conversion-case-insensitive";
+  "conversion-text" = dontDistribute super."conversion-text";
+  "convert" = dontDistribute super."convert";
+  "convertible-ascii" = dontDistribute super."convertible-ascii";
+  "convertible-text" = dontDistribute super."convertible-text";
+  "cookbook" = dontDistribute super."cookbook";
+  "coordinate" = dontDistribute super."coordinate";
+  "copilot" = dontDistribute super."copilot";
+  "copilot-c99" = dontDistribute super."copilot-c99";
+  "copilot-cbmc" = dontDistribute super."copilot-cbmc";
+  "copilot-core" = dontDistribute super."copilot-core";
+  "copilot-language" = dontDistribute super."copilot-language";
+  "copilot-libraries" = dontDistribute super."copilot-libraries";
+  "copilot-sbv" = dontDistribute super."copilot-sbv";
+  "copilot-theorem" = dontDistribute super."copilot-theorem";
+  "copr" = dontDistribute super."copr";
+  "core" = dontDistribute super."core";
+  "core-haskell" = dontDistribute super."core-haskell";
+  "corebot-bliki" = dontDistribute super."corebot-bliki";
+  "coroutine-enumerator" = dontDistribute super."coroutine-enumerator";
+  "coroutine-iteratee" = dontDistribute super."coroutine-iteratee";
+  "coroutine-object" = dontDistribute super."coroutine-object";
+  "couch-hs" = dontDistribute super."couch-hs";
+  "couch-simple" = dontDistribute super."couch-simple";
+  "couchdb-conduit" = dontDistribute super."couchdb-conduit";
+  "couchdb-enumerator" = dontDistribute super."couchdb-enumerator";
+  "count" = dontDistribute super."count";
+  "countable" = dontDistribute super."countable";
+  "counter" = dontDistribute super."counter";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "cplex-hs" = dontDistribute super."cplex-hs";
+  "cplusplus-th" = dontDistribute super."cplusplus-th";
+  "cpphs" = doDistribute super."cpphs_1_19_3";
+  "cprng-aes-effect" = dontDistribute super."cprng-aes-effect";
+  "cpsa" = dontDistribute super."cpsa";
+  "cpuid" = dontDistribute super."cpuid";
+  "cpuperf" = dontDistribute super."cpuperf";
+  "cpython" = dontDistribute super."cpython";
+  "cqrs" = dontDistribute super."cqrs";
+  "cqrs-core" = dontDistribute super."cqrs-core";
+  "cqrs-example" = dontDistribute super."cqrs-example";
+  "cqrs-memory" = dontDistribute super."cqrs-memory";
+  "cqrs-postgresql" = dontDistribute super."cqrs-postgresql";
+  "cqrs-sqlite3" = dontDistribute super."cqrs-sqlite3";
+  "cqrs-test" = dontDistribute super."cqrs-test";
+  "cqrs-testkit" = dontDistribute super."cqrs-testkit";
+  "cqrs-types" = dontDistribute super."cqrs-types";
+  "cr" = dontDistribute super."cr";
+  "crack" = dontDistribute super."crack";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
+  "crc16" = dontDistribute super."crc16";
+  "crc16-table" = dontDistribute super."crc16-table";
+  "creatur" = dontDistribute super."creatur";
+  "crf-chain1" = dontDistribute super."crf-chain1";
+  "crf-chain1-constrained" = dontDistribute super."crf-chain1-constrained";
+  "crf-chain2-generic" = dontDistribute super."crf-chain2-generic";
+  "crf-chain2-tiers" = dontDistribute super."crf-chain2-tiers";
+  "critbit" = dontDistribute super."critbit";
+  "criterion-plus" = dontDistribute super."criterion-plus";
+  "criterion-to-html" = dontDistribute super."criterion-to-html";
+  "crockford" = dontDistribute super."crockford";
+  "crocodile" = dontDistribute super."crocodile";
+  "cron" = doDistribute super."cron_0_3_2";
+  "cron-compat" = dontDistribute super."cron-compat";
+  "cruncher-types" = dontDistribute super."cruncher-types";
+  "crunghc" = dontDistribute super."crunghc";
+  "crypto-cipher-benchmarks" = dontDistribute super."crypto-cipher-benchmarks";
+  "crypto-classical" = dontDistribute super."crypto-classical";
+  "crypto-conduit" = dontDistribute super."crypto-conduit";
+  "crypto-enigma" = dontDistribute super."crypto-enigma";
+  "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
+  "crypto-random-effect" = dontDistribute super."crypto-random-effect";
+  "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
+  "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
+  "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
+  "cryptsy-api" = dontDistribute super."cryptsy-api";
+  "crystalfontz" = dontDistribute super."crystalfontz";
+  "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
+  "csound-catalog" = dontDistribute super."csound-catalog";
+  "csound-expression" = dontDistribute super."csound-expression";
+  "csound-expression-dynamic" = dontDistribute super."csound-expression-dynamic";
+  "csound-expression-opcodes" = dontDistribute super."csound-expression-opcodes";
+  "csound-expression-typed" = dontDistribute super."csound-expression-typed";
+  "csound-sampler" = dontDistribute super."csound-sampler";
+  "csp" = dontDistribute super."csp";
+  "cspmchecker" = dontDistribute super."cspmchecker";
+  "css" = dontDistribute super."css";
+  "csv-enumerator" = dontDistribute super."csv-enumerator";
+  "csv-nptools" = dontDistribute super."csv-nptools";
+  "csv-to-qif" = dontDistribute super."csv-to-qif";
+  "ctemplate" = dontDistribute super."ctemplate";
+  "ctkl" = dontDistribute super."ctkl";
+  "ctpl" = dontDistribute super."ctpl";
+  "cube" = dontDistribute super."cube";
+  "cubical" = dontDistribute super."cubical";
+  "cubicbezier" = dontDistribute super."cubicbezier";
+  "cublas" = dontDistribute super."cublas";
+  "cuboid" = dontDistribute super."cuboid";
+  "cuda" = dontDistribute super."cuda";
+  "cudd" = dontDistribute super."cudd";
+  "cufft" = dontDistribute super."cufft";
+  "curl-aeson" = dontDistribute super."curl-aeson";
+  "curlhs" = dontDistribute super."curlhs";
+  "currency" = dontDistribute super."currency";
+  "current-locale" = dontDistribute super."current-locale";
+  "curry-base" = dontDistribute super."curry-base";
+  "curry-frontend" = dontDistribute super."curry-frontend";
+  "cursedcsv" = dontDistribute super."cursedcsv";
+  "curve25519" = dontDistribute super."curve25519";
+  "curves" = dontDistribute super."curves";
+  "custom-prelude" = dontDistribute super."custom-prelude";
+  "cv-combinators" = dontDistribute super."cv-combinators";
+  "cyclotomic" = dontDistribute super."cyclotomic";
+  "cypher" = dontDistribute super."cypher";
+  "d-bus" = dontDistribute super."d-bus";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "danibot" = dontDistribute super."danibot";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs-benchmark" = dontDistribute super."darcs-benchmark";
+  "darcs-beta" = dontDistribute super."darcs-beta";
+  "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
+  "darcs-cabalized" = dontDistribute super."darcs-cabalized";
+  "darcs-fastconvert" = dontDistribute super."darcs-fastconvert";
+  "darcs-graph" = dontDistribute super."darcs-graph";
+  "darcs-monitor" = dontDistribute super."darcs-monitor";
+  "darcs-scripts" = dontDistribute super."darcs-scripts";
+  "darcs2dot" = dontDistribute super."darcs2dot";
+  "darcsden" = dontDistribute super."darcsden";
+  "darcswatch" = dontDistribute super."darcswatch";
+  "darkplaces-demo" = dontDistribute super."darkplaces-demo";
+  "darkplaces-rcon" = dontDistribute super."darkplaces-rcon";
+  "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
+  "darkplaces-text" = dontDistribute super."darkplaces-text";
+  "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor-monadLib" = dontDistribute super."data-accessor-monadLib";
+  "data-accessor-monads-fd" = dontDistribute super."data-accessor-monads-fd";
+  "data-accessor-monads-tf" = dontDistribute super."data-accessor-monads-tf";
+  "data-accessor-template" = dontDistribute super."data-accessor-template";
+  "data-accessor-transformers" = dontDistribute super."data-accessor-transformers";
+  "data-aviary" = dontDistribute super."data-aviary";
+  "data-base" = dontDistribute super."data-base";
+  "data-bword" = dontDistribute super."data-bword";
+  "data-carousel" = dontDistribute super."data-carousel";
+  "data-category" = dontDistribute super."data-category";
+  "data-cell" = dontDistribute super."data-cell";
+  "data-checked" = dontDistribute super."data-checked";
+  "data-clist" = dontDistribute super."data-clist";
+  "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
+  "data-construction" = dontDistribute super."data-construction";
+  "data-cycle" = dontDistribute super."data-cycle";
+  "data-default-extra" = dontDistribute super."data-default-extra";
+  "data-default-generics" = dontDistribute super."data-default-generics";
+  "data-default-instances-bytestring" = dontDistribute super."data-default-instances-bytestring";
+  "data-default-instances-case-insensitive" = dontDistribute super."data-default-instances-case-insensitive";
+  "data-default-instances-new-base" = dontDistribute super."data-default-instances-new-base";
+  "data-default-instances-text" = dontDistribute super."data-default-instances-text";
+  "data-default-instances-unordered-containers" = dontDistribute super."data-default-instances-unordered-containers";
+  "data-default-instances-vector" = dontDistribute super."data-default-instances-vector";
+  "data-dispersal" = dontDistribute super."data-dispersal";
+  "data-dword" = dontDistribute super."data-dword";
+  "data-easy" = dontDistribute super."data-easy";
+  "data-embed" = dontDistribute super."data-embed";
+  "data-endian" = dontDistribute super."data-endian";
+  "data-extend-generic" = dontDistribute super."data-extend-generic";
+  "data-extra" = dontDistribute super."data-extra";
+  "data-filepath" = dontDistribute super."data-filepath";
+  "data-fin" = dontDistribute super."data-fin";
+  "data-fin-simple" = dontDistribute super."data-fin-simple";
+  "data-fix" = dontDistribute super."data-fix";
+  "data-fix-cse" = dontDistribute super."data-fix-cse";
+  "data-flags" = dontDistribute super."data-flags";
+  "data-flagset" = dontDistribute super."data-flagset";
+  "data-fresh" = dontDistribute super."data-fresh";
+  "data-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "data-json-token" = dontDistribute super."data-json-token";
+  "data-kiln" = dontDistribute super."data-kiln";
+  "data-layer" = dontDistribute super."data-layer";
+  "data-layout" = dontDistribute super."data-layout";
+  "data-lens" = dontDistribute super."data-lens";
+  "data-lens-fd" = dontDistribute super."data-lens-fd";
+  "data-lens-ixset" = dontDistribute super."data-lens-ixset";
+  "data-lens-template" = dontDistribute super."data-lens-template";
+  "data-list-sequences" = dontDistribute super."data-list-sequences";
+  "data-map-multikey" = dontDistribute super."data-map-multikey";
+  "data-named" = dontDistribute super."data-named";
+  "data-nat" = dontDistribute super."data-nat";
+  "data-object" = dontDistribute super."data-object";
+  "data-object-json" = dontDistribute super."data-object-json";
+  "data-object-yaml" = dontDistribute super."data-object-yaml";
+  "data-or" = dontDistribute super."data-or";
+  "data-partition" = dontDistribute super."data-partition";
+  "data-pprint" = dontDistribute super."data-pprint";
+  "data-quotientref" = dontDistribute super."data-quotientref";
+  "data-r-tree" = dontDistribute super."data-r-tree";
+  "data-ref" = dontDistribute super."data-ref";
+  "data-reify-cse" = dontDistribute super."data-reify-cse";
+  "data-repr" = dontDistribute super."data-repr";
+  "data-result" = dontDistribute super."data-result";
+  "data-rev" = dontDistribute super."data-rev";
+  "data-rope" = dontDistribute super."data-rope";
+  "data-rtuple" = dontDistribute super."data-rtuple";
+  "data-size" = dontDistribute super."data-size";
+  "data-spacepart" = dontDistribute super."data-spacepart";
+  "data-store" = dontDistribute super."data-store";
+  "data-stringmap" = dontDistribute super."data-stringmap";
+  "data-structure-inferrer" = dontDistribute super."data-structure-inferrer";
+  "data-tensor" = dontDistribute super."data-tensor";
+  "data-textual" = dontDistribute super."data-textual";
+  "data-timeout" = dontDistribute super."data-timeout";
+  "data-transform" = dontDistribute super."data-transform";
+  "data-treify" = dontDistribute super."data-treify";
+  "data-type" = dontDistribute super."data-type";
+  "data-util" = dontDistribute super."data-util";
+  "data-variant" = dontDistribute super."data-variant";
+  "database-migrate" = dontDistribute super."database-migrate";
+  "database-study" = dontDistribute super."database-study";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "date-cache" = dontDistribute super."date-cache";
+  "dates" = dontDistribute super."dates";
+  "datetime" = dontDistribute super."datetime";
+  "datetime-sb" = dontDistribute super."datetime-sb";
+  "dawdle" = dontDistribute super."dawdle";
+  "dawg" = dontDistribute super."dawg";
+  "dbcleaner" = dontDistribute super."dbcleaner";
+  "dbf" = dontDistribute super."dbf";
+  "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "dbus-th-introspection" = dontDistribute super."dbus-th-introspection";
+  "dclabel" = dontDistribute super."dclabel";
+  "dclabel-eci11" = dontDistribute super."dclabel-eci11";
+  "ddc-base" = dontDistribute super."ddc-base";
+  "ddc-build" = dontDistribute super."ddc-build";
+  "ddc-code" = dontDistribute super."ddc-code";
+  "ddc-core" = dontDistribute super."ddc-core";
+  "ddc-core-eval" = dontDistribute super."ddc-core-eval";
+  "ddc-core-flow" = dontDistribute super."ddc-core-flow";
+  "ddc-core-llvm" = dontDistribute super."ddc-core-llvm";
+  "ddc-core-salt" = dontDistribute super."ddc-core-salt";
+  "ddc-core-simpl" = dontDistribute super."ddc-core-simpl";
+  "ddc-core-tetra" = dontDistribute super."ddc-core-tetra";
+  "ddc-driver" = dontDistribute super."ddc-driver";
+  "ddc-interface" = dontDistribute super."ddc-interface";
+  "ddc-source-tetra" = dontDistribute super."ddc-source-tetra";
+  "ddc-tools" = dontDistribute super."ddc-tools";
+  "ddc-war" = dontDistribute super."ddc-war";
+  "ddci-core" = dontDistribute super."ddci-core";
+  "dead-code-detection" = dontDistribute super."dead-code-detection";
+  "dead-simple-json" = dontDistribute super."dead-simple-json";
+  "debian-binary" = dontDistribute super."debian-binary";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "decode-utf8" = dontDistribute super."decode-utf8";
+  "decoder-conduit" = dontDistribute super."decoder-conduit";
+  "dedukti" = dontDistribute super."dedukti";
+  "deepcontrol" = dontDistribute super."deepcontrol";
+  "deeplearning-hs" = dontDistribute super."deeplearning-hs";
+  "deepseq-bounded" = dontDistribute super."deepseq-bounded";
+  "deepseq-magic" = dontDistribute super."deepseq-magic";
+  "deepseq-th" = dontDistribute super."deepseq-th";
+  "deepzoom" = dontDistribute super."deepzoom";
+  "defargs" = dontDistribute super."defargs";
+  "definitive-base" = dontDistribute super."definitive-base";
+  "definitive-filesystem" = dontDistribute super."definitive-filesystem";
+  "definitive-graphics" = dontDistribute super."definitive-graphics";
+  "definitive-parser" = dontDistribute super."definitive-parser";
+  "definitive-reactive" = dontDistribute super."definitive-reactive";
+  "definitive-sound" = dontDistribute super."definitive-sound";
+  "deiko-config" = dontDistribute super."deiko-config";
+  "deka" = dontDistribute super."deka";
+  "deka-tests" = dontDistribute super."deka-tests";
+  "delaunay" = dontDistribute super."delaunay";
+  "delay" = dontDistribute super."delay";
+  "delicious" = dontDistribute super."delicious";
+  "delimited-text" = dontDistribute super."delimited-text";
+  "delimiter-separated" = dontDistribute super."delimiter-separated";
+  "delta" = dontDistribute super."delta";
+  "delta-h" = dontDistribute super."delta-h";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "dependent-state" = dontDistribute super."dependent-state";
+  "depends" = dontDistribute super."depends";
+  "dephd" = dontDistribute super."dephd";
+  "dequeue" = dontDistribute super."dequeue";
+  "derangement" = dontDistribute super."derangement";
+  "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive-IG" = dontDistribute super."derive-IG";
+  "derive-enumerable" = dontDistribute super."derive-enumerable";
+  "derive-gadt" = dontDistribute super."derive-gadt";
+  "derive-monoid" = dontDistribute super."derive-monoid";
+  "derive-topdown" = dontDistribute super."derive-topdown";
+  "derive-trie" = dontDistribute super."derive-trie";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "derp" = dontDistribute super."derp";
+  "derp-lib" = dontDistribute super."derp-lib";
+  "descrilo" = dontDistribute super."descrilo";
+  "despair" = dontDistribute super."despair";
+  "deterministic-game-engine" = dontDistribute super."deterministic-game-engine";
+  "detrospector" = dontDistribute super."detrospector";
+  "deunicode" = dontDistribute super."deunicode";
+  "devil" = dontDistribute super."devil";
+  "dewdrop" = dontDistribute super."dewdrop";
+  "dfrac" = dontDistribute super."dfrac";
+  "dfsbuild" = dontDistribute super."dfsbuild";
+  "dgim" = dontDistribute super."dgim";
+  "dgs" = dontDistribute super."dgs";
+  "dia-base" = dontDistribute super."dia-base";
+  "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
+  "diagrams-pdf" = dontDistribute super."diagrams-pdf";
+  "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
+  "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "dictparser" = dontDistribute super."dictparser";
+  "diet" = dontDistribute super."diet";
+  "diff-gestalt" = dontDistribute super."diff-gestalt";
+  "diff-parse" = dontDistribute super."diff-parse";
+  "diffarray" = dontDistribute super."diffarray";
+  "diffcabal" = dontDistribute super."diffcabal";
+  "diffdump" = dontDistribute super."diffdump";
+  "digamma" = dontDistribute super."digamma";
+  "digest-pure" = dontDistribute super."digest-pure";
+  "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
+  "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
+  "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
+  "digestive-functors-scotty" = dontDistribute super."digestive-functors-scotty";
+  "digestive-functors-snap" = dontDistribute super."digestive-functors-snap";
+  "digit" = dontDistribute super."digit";
+  "digitalocean-kzs" = dontDistribute super."digitalocean-kzs";
+  "dimensional-codata" = dontDistribute super."dimensional-codata";
+  "dimensional-tf" = dontDistribute super."dimensional-tf";
+  "dingo-core" = dontDistribute super."dingo-core";
+  "dingo-example" = dontDistribute super."dingo-example";
+  "dingo-widgets" = dontDistribute super."dingo-widgets";
+  "diophantine" = dontDistribute super."diophantine";
+  "diplomacy" = dontDistribute super."diplomacy";
+  "diplomacy-server" = dontDistribute super."diplomacy-server";
+  "direct-binary-files" = dontDistribute super."direct-binary-files";
+  "direct-daemonize" = dontDistribute super."direct-daemonize";
+  "direct-fastcgi" = dontDistribute super."direct-fastcgi";
+  "direct-http" = dontDistribute super."direct-http";
+  "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
+  "direct-plugins" = dontDistribute super."direct-plugins";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "directory-listing-webpage-parser" = dontDistribute super."directory-listing-webpage-parser";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "discrete-space-map" = dontDistribute super."discrete-space-map";
+  "discrimination" = dontDistribute super."discrimination";
+  "disjoint-set" = dontDistribute super."disjoint-set";
+  "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
+  "dist-upload" = dontDistribute super."dist-upload";
+  "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
+  "distributed-process-monad-control" = dontDistribute super."distributed-process-monad-control";
+  "distributed-process-p2p" = dontDistribute super."distributed-process-p2p";
+  "distributed-process-platform" = dontDistribute super."distributed-process-platform";
+  "distributed-process-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
+  "djembe" = dontDistribute super."djembe";
+  "djinn" = dontDistribute super."djinn";
+  "djinn-th" = dontDistribute super."djinn-th";
+  "dnscache" = dontDistribute super."dnscache";
+  "dnsrbl" = dontDistribute super."dnsrbl";
+  "dnssd" = dontDistribute super."dnssd";
+  "doc-review" = dontDistribute super."doc-review";
+  "doccheck" = dontDistribute super."doccheck";
+  "docidx" = dontDistribute super."docidx";
+  "docker" = dontDistribute super."docker";
+  "dockercook" = dontDistribute super."dockercook";
+  "doctest-discover" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "dom-lt" = dontDistribute super."dom-lt";
+  "dom-parser" = dontDistribute super."dom-parser";
+  "dom-selector" = dontDistribute super."dom-selector";
+  "domain-auth" = dontDistribute super."domain-auth";
+  "dominion" = dontDistribute super."dominion";
+  "domplate" = dontDistribute super."domplate";
+  "dot2graphml" = dontDistribute super."dot2graphml";
+  "dotenv" = doDistribute super."dotenv_0_1_0_9";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "dotnet-timespan" = dontDistribute super."dotnet-timespan";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "download-curl" = dontDistribute super."download-curl";
+  "download-media-content" = dontDistribute super."download-media-content";
+  "dozenal" = dontDistribute super."dozenal";
+  "dozens" = dontDistribute super."dozens";
+  "dph-base" = dontDistribute super."dph-base";
+  "dph-examples" = dontDistribute super."dph-examples";
+  "dph-lifted-base" = dontDistribute super."dph-lifted-base";
+  "dph-lifted-copy" = dontDistribute super."dph-lifted-copy";
+  "dph-lifted-vseg" = dontDistribute super."dph-lifted-vseg";
+  "dph-par" = dontDistribute super."dph-par";
+  "dph-prim-interface" = dontDistribute super."dph-prim-interface";
+  "dph-prim-par" = dontDistribute super."dph-prim-par";
+  "dph-prim-seq" = dontDistribute super."dph-prim-seq";
+  "dph-seq" = dontDistribute super."dph-seq";
+  "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "dropbox-sdk" = dontDistribute super."dropbox-sdk";
+  "dropsolve" = dontDistribute super."dropsolve";
+  "ds-kanren" = dontDistribute super."ds-kanren";
+  "dsh-sql" = dontDistribute super."dsh-sql";
+  "dsmc" = dontDistribute super."dsmc";
+  "dsmc-tools" = dontDistribute super."dsmc-tools";
+  "dson" = dontDistribute super."dson";
+  "dson-parsec" = dontDistribute super."dson-parsec";
+  "dsp" = dontDistribute super."dsp";
+  "dstring" = dontDistribute super."dstring";
+  "dtab" = dontDistribute super."dtab";
+  "dtd" = dontDistribute super."dtd";
+  "dtd-text" = dontDistribute super."dtd-text";
+  "dtd-types" = dontDistribute super."dtd-types";
+  "dtrace" = dontDistribute super."dtrace";
+  "dtw" = dontDistribute super."dtw";
+  "dump" = dontDistribute super."dump";
+  "duplo" = dontDistribute super."duplo";
+  "dvda" = dontDistribute super."dvda";
+  "dvdread" = dontDistribute super."dvdread";
+  "dvi-processing" = dontDistribute super."dvi-processing";
+  "dvorak" = dontDistribute super."dvorak";
+  "dwarf" = dontDistribute super."dwarf";
+  "dwarf-el" = dontDistribute super."dwarf-el";
+  "dwarfadt" = dontDistribute super."dwarfadt";
+  "dx9base" = dontDistribute super."dx9base";
+  "dx9d3d" = dontDistribute super."dx9d3d";
+  "dx9d3dx" = dontDistribute super."dx9d3dx";
+  "dynamic-cabal" = dontDistribute super."dynamic-cabal";
+  "dynamic-graph" = dontDistribute super."dynamic-graph";
+  "dynamic-linker-template" = dontDistribute super."dynamic-linker-template";
+  "dynamic-loader" = dontDistribute super."dynamic-loader";
+  "dynamic-mvector" = dontDistribute super."dynamic-mvector";
+  "dynamic-object" = dontDistribute super."dynamic-object";
+  "dynamic-plot" = dontDistribute super."dynamic-plot";
+  "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynobud" = dontDistribute super."dynobud";
+  "dywapitchtrack" = dontDistribute super."dywapitchtrack";
+  "dzen-utils" = dontDistribute super."dzen-utils";
+  "eager-sockets" = dontDistribute super."eager-sockets";
+  "easy-api" = dontDistribute super."easy-api";
+  "easy-bitcoin" = dontDistribute super."easy-bitcoin";
+  "easyjson" = dontDistribute super."easyjson";
+  "easyplot" = dontDistribute super."easyplot";
+  "easyrender" = dontDistribute super."easyrender";
+  "ebeats" = dontDistribute super."ebeats";
+  "ebnf-bff" = dontDistribute super."ebnf-bff";
+  "ec2-signature" = dontDistribute super."ec2-signature";
+  "ecdsa" = dontDistribute super."ecdsa";
+  "ecma262" = dontDistribute super."ecma262";
+  "ecu" = dontDistribute super."ecu";
+  "ed25519" = dontDistribute super."ed25519";
+  "ed25519-donna" = dontDistribute super."ed25519-donna";
+  "eddie" = dontDistribute super."eddie";
+  "edenmodules" = dontDistribute super."edenmodules";
+  "edenskel" = dontDistribute super."edenskel";
+  "edentv" = dontDistribute super."edentv";
+  "edge" = dontDistribute super."edge";
+  "edis" = dontDistribute super."edis";
+  "edit-lenses" = dontDistribute super."edit-lenses";
+  "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
+  "editable" = dontDistribute super."editable";
+  "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
+  "effect-monad" = dontDistribute super."effect-monad";
+  "effective-aspects" = dontDistribute super."effective-aspects";
+  "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
+  "effects" = dontDistribute super."effects";
+  "effects-parser" = dontDistribute super."effects-parser";
+  "effin" = dontDistribute super."effin";
+  "egison" = dontDistribute super."egison";
+  "egison-quote" = dontDistribute super."egison-quote";
+  "egison-tutorial" = dontDistribute super."egison-tutorial";
+  "ehaskell" = dontDistribute super."ehaskell";
+  "ehs" = dontDistribute super."ehs";
+  "eibd-client-simple" = dontDistribute super."eibd-client-simple";
+  "eigen" = dontDistribute super."eigen";
+  "eithers" = dontDistribute super."eithers";
+  "ekg-bosun" = dontDistribute super."ekg-bosun";
+  "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-log" = dontDistribute super."ekg-log";
+  "ekg-push" = dontDistribute super."ekg-push";
+  "ekg-rrd" = dontDistribute super."ekg-rrd";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "electrum-mnemonic" = dontDistribute super."electrum-mnemonic";
+  "elerea" = dontDistribute super."elerea";
+  "elerea-examples" = dontDistribute super."elerea-examples";
+  "elerea-sdl" = dontDistribute super."elerea-sdl";
+  "elevator" = dontDistribute super."elevator";
+  "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "elm-init" = dontDistribute super."elm-init";
+  "elm-make" = dontDistribute super."elm-make";
+  "elm-package" = dontDistribute super."elm-package";
+  "elm-reactor" = dontDistribute super."elm-reactor";
+  "elm-repl" = dontDistribute super."elm-repl";
+  "elm-server" = dontDistribute super."elm-server";
+  "elm-yesod" = dontDistribute super."elm-yesod";
+  "elo" = dontDistribute super."elo";
+  "elocrypt" = dontDistribute super."elocrypt";
+  "emacs-keys" = dontDistribute super."emacs-keys";
+  "email" = dontDistribute super."email";
+  "email-header" = dontDistribute super."email-header";
+  "email-postmark" = dontDistribute super."email-postmark";
+  "email-validator" = dontDistribute super."email-validator";
+  "embeddock" = dontDistribute super."embeddock";
+  "embeddock-example" = dontDistribute super."embeddock-example";
+  "embroidery" = dontDistribute super."embroidery";
+  "emgm" = dontDistribute super."emgm";
+  "empty" = dontDistribute super."empty";
+  "encoding" = dontDistribute super."encoding";
+  "endo" = dontDistribute super."endo";
+  "engine-io-growler" = dontDistribute super."engine-io-growler";
+  "engine-io-snap" = dontDistribute super."engine-io-snap";
+  "engineering-units" = dontDistribute super."engineering-units";
+  "enumerable" = dontDistribute super."enumerable";
+  "enumerate" = dontDistribute super."enumerate";
+  "enumeration" = dontDistribute super."enumeration";
+  "enumerator-fd" = dontDistribute super."enumerator-fd";
+  "enumerator-tf" = dontDistribute super."enumerator-tf";
+  "enumfun" = dontDistribute super."enumfun";
+  "enummapmap" = dontDistribute super."enummapmap";
+  "enummapset" = dontDistribute super."enummapset";
+  "enummapset-th" = dontDistribute super."enummapset-th";
+  "enumset" = dontDistribute super."enumset";
+  "env-parser" = dontDistribute super."env-parser";
+  "envparse" = dontDistribute super."envparse";
+  "epanet-haskell" = dontDistribute super."epanet-haskell";
+  "epass" = dontDistribute super."epass";
+  "epic" = dontDistribute super."epic";
+  "epoll" = dontDistribute super."epoll";
+  "eprocess" = dontDistribute super."eprocess";
+  "epub" = dontDistribute super."epub";
+  "epub-metadata" = dontDistribute super."epub-metadata";
+  "epub-tools" = dontDistribute super."epub-tools";
+  "epubname" = dontDistribute super."epubname";
+  "equal-files" = dontDistribute super."equal-files";
+  "equational-reasoning" = dontDistribute super."equational-reasoning";
+  "erd" = dontDistribute super."erd";
+  "erf-native" = dontDistribute super."erf-native";
+  "erlang" = dontDistribute super."erlang";
+  "eros" = dontDistribute super."eros";
+  "eros-client" = dontDistribute super."eros-client";
+  "eros-http" = dontDistribute super."eros-http";
+  "errno" = dontDistribute super."errno";
+  "error-analyze" = dontDistribute super."error-analyze";
+  "error-continuations" = dontDistribute super."error-continuations";
+  "error-list" = dontDistribute super."error-list";
+  "error-loc" = dontDistribute super."error-loc";
+  "error-location" = dontDistribute super."error-location";
+  "error-message" = dontDistribute super."error-message";
+  "error-util" = dontDistribute super."error-util";
+  "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "ersatz" = dontDistribute super."ersatz";
+  "ersatz-toysat" = dontDistribute super."ersatz-toysat";
+  "ert" = dontDistribute super."ert";
+  "esotericbot" = dontDistribute super."esotericbot";
+  "ess" = dontDistribute super."ess";
+  "estimator" = dontDistribute super."estimator";
+  "estimators" = dontDistribute super."estimators";
+  "estreps" = dontDistribute super."estreps";
+  "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
+  "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
+  "ethereum-rlp" = dontDistribute super."ethereum-rlp";
+  "ety" = dontDistribute super."ety";
+  "euler" = dontDistribute super."euler";
+  "euphoria" = dontDistribute super."euphoria";
+  "eurofxref" = dontDistribute super."eurofxref";
+  "event-driven" = dontDistribute super."event-driven";
+  "event-handlers" = dontDistribute super."event-handlers";
+  "event-list" = dontDistribute super."event-list";
+  "event-monad" = dontDistribute super."event-monad";
+  "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_2";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exception-hierarchy" = dontDistribute super."exception-hierarchy";
+  "exception-mailer" = dontDistribute super."exception-mailer";
+  "exception-monads-fd" = dontDistribute super."exception-monads-fd";
+  "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exherbo-cabal" = dontDistribute super."exherbo-cabal";
+  "exif" = dontDistribute super."exif";
+  "exinst" = dontDistribute super."exinst";
+  "exinst-aeson" = dontDistribute super."exinst-aeson";
+  "exinst-bytes" = dontDistribute super."exinst-bytes";
+  "exinst-deepseq" = dontDistribute super."exinst-deepseq";
+  "exinst-hashable" = dontDistribute super."exinst-hashable";
+  "existential" = dontDistribute super."existential";
+  "exists" = dontDistribute super."exists";
+  "exit-codes" = dontDistribute super."exit-codes";
+  "exp-extended" = dontDistribute super."exp-extended";
+  "exp-pairs" = dontDistribute super."exp-pairs";
+  "expand" = dontDistribute super."expand";
+  "expat-enumerator" = dontDistribute super."expat-enumerator";
+  "expiring-mvar" = dontDistribute super."expiring-mvar";
+  "explain" = dontDistribute super."explain";
+  "explicit-determinant" = dontDistribute super."explicit-determinant";
+  "explicit-iomodes" = dontDistribute super."explicit-iomodes";
+  "explicit-iomodes-bytestring" = dontDistribute super."explicit-iomodes-bytestring";
+  "explicit-iomodes-text" = dontDistribute super."explicit-iomodes-text";
+  "explicit-sharing" = dontDistribute super."explicit-sharing";
+  "explore" = dontDistribute super."explore";
+  "exposed-containers" = dontDistribute super."exposed-containers";
+  "expression-parser" = dontDistribute super."expression-parser";
+  "extcore" = dontDistribute super."extcore";
+  "extemp" = dontDistribute super."extemp";
+  "extended-categories" = dontDistribute super."extended-categories";
+  "extended-reals" = dontDistribute super."extended-reals";
+  "extensible" = dontDistribute super."extensible";
+  "extensible-data" = dontDistribute super."extensible-data";
+  "external-sort" = dontDistribute super."external-sort";
+  "extractelf" = dontDistribute super."extractelf";
+  "ez-couch" = dontDistribute super."ez-couch";
+  "faceted" = dontDistribute super."faceted";
+  "factory" = dontDistribute super."factory";
+  "factual-api" = dontDistribute super."factual-api";
+  "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "fair-predicates" = dontDistribute super."fair-predicates";
+  "fake-type" = dontDistribute super."fake-type";
+  "faker" = dontDistribute super."faker";
+  "falling-turnip" = dontDistribute super."falling-turnip";
+  "fallingblocks" = dontDistribute super."fallingblocks";
+  "family-tree" = dontDistribute super."family-tree";
+  "fast-digits" = dontDistribute super."fast-digits";
+  "fast-math" = dontDistribute super."fast-math";
+  "fast-tags" = dontDistribute super."fast-tags";
+  "fast-tagsoup" = dontDistribute super."fast-tagsoup";
+  "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fastbayes" = dontDistribute super."fastbayes";
+  "fastcgi" = dontDistribute super."fastcgi";
+  "fastedit" = dontDistribute super."fastedit";
+  "fastirc" = dontDistribute super."fastirc";
+  "fault-tree" = dontDistribute super."fault-tree";
+  "fay-geoposition" = dontDistribute super."fay-geoposition";
+  "fay-hsx" = dontDistribute super."fay-hsx";
+  "fay-ref" = dontDistribute super."fay-ref";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
+  "fdo-trash" = dontDistribute super."fdo-trash";
+  "fec" = dontDistribute super."fec";
+  "fedora-packages" = dontDistribute super."fedora-packages";
+  "feed-cli" = dontDistribute super."feed-cli";
+  "feed-collect" = dontDistribute super."feed-collect";
+  "feed-crawl" = dontDistribute super."feed-crawl";
+  "feed-translator" = dontDistribute super."feed-translator";
+  "feed2lj" = dontDistribute super."feed2lj";
+  "feed2twitter" = dontDistribute super."feed2twitter";
+  "feldspar-compiler" = dontDistribute super."feldspar-compiler";
+  "feldspar-language" = dontDistribute super."feldspar-language";
+  "feldspar-signal" = dontDistribute super."feldspar-signal";
+  "fen2s" = dontDistribute super."fen2s";
+  "fences" = dontDistribute super."fences";
+  "fenfire" = dontDistribute super."fenfire";
+  "fez-conf" = dontDistribute super."fez-conf";
+  "ffeed" = dontDistribute super."ffeed";
+  "fficxx" = dontDistribute super."fficxx";
+  "fficxx-runtime" = dontDistribute super."fficxx-runtime";
+  "ffmpeg-light" = dontDistribute super."ffmpeg-light";
+  "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fftwRaw" = dontDistribute super."fftwRaw";
+  "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
+  "fgl-visualize" = dontDistribute super."fgl-visualize";
+  "fibon" = dontDistribute super."fibon";
+  "fibonacci" = dontDistribute super."fibonacci";
+  "fields" = dontDistribute super."fields";
+  "fields-json" = dontDistribute super."fields-json";
+  "fieldwise" = dontDistribute super."fieldwise";
+  "fig" = dontDistribute super."fig";
+  "file-collection" = dontDistribute super."file-collection";
+  "file-command-qq" = dontDistribute super."file-command-qq";
+  "filediff" = dontDistribute super."filediff";
+  "filepath-io-access" = dontDistribute super."filepath-io-access";
+  "filepather" = dontDistribute super."filepather";
+  "filestore" = dontDistribute super."filestore";
+  "filesystem-conduit" = dontDistribute super."filesystem-conduit";
+  "filesystem-enumerator" = dontDistribute super."filesystem-enumerator";
+  "filesystem-trees" = dontDistribute super."filesystem-trees";
+  "filtrable" = dontDistribute super."filtrable";
+  "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
+  "find-conduit" = dontDistribute super."find-conduit";
+  "fingertree-tf" = dontDistribute super."fingertree-tf";
+  "finite-field" = dontDistribute super."finite-field";
+  "finite-typelits" = dontDistribute super."finite-typelits";
+  "first-and-last" = dontDistribute super."first-and-last";
+  "first-class-patterns" = dontDistribute super."first-class-patterns";
+  "firstify" = dontDistribute super."firstify";
+  "fishfood" = dontDistribute super."fishfood";
+  "fit" = dontDistribute super."fit";
+  "fitsio" = dontDistribute super."fitsio";
+  "fix-imports" = dontDistribute super."fix-imports";
+  "fix-parser-simple" = dontDistribute super."fix-parser-simple";
+  "fix-symbols-gitit" = dontDistribute super."fix-symbols-gitit";
+  "fixed-length" = dontDistribute super."fixed-length";
+  "fixed-point" = dontDistribute super."fixed-point";
+  "fixed-point-vector" = dontDistribute super."fixed-point-vector";
+  "fixed-point-vector-space" = dontDistribute super."fixed-point-vector-space";
+  "fixed-precision" = dontDistribute super."fixed-precision";
+  "fixed-storable-array" = dontDistribute super."fixed-storable-array";
+  "fixed-vector-binary" = dontDistribute super."fixed-vector-binary";
+  "fixed-vector-cereal" = dontDistribute super."fixed-vector-cereal";
+  "fixedprec" = dontDistribute super."fixedprec";
+  "fixedwidth-hs" = dontDistribute super."fixedwidth-hs";
+  "fixfile" = dontDistribute super."fixfile";
+  "fixhs" = dontDistribute super."fixhs";
+  "fixplate" = dontDistribute super."fixplate";
+  "fixpoint" = dontDistribute super."fixpoint";
+  "fixtime" = dontDistribute super."fixtime";
+  "fizz-buzz" = dontDistribute super."fizz-buzz";
+  "flaccuraterip" = dontDistribute super."flaccuraterip";
+  "flamethrower" = dontDistribute super."flamethrower";
+  "flamingra" = dontDistribute super."flamingra";
+  "flat-maybe" = dontDistribute super."flat-maybe";
+  "flat-mcmc" = dontDistribute super."flat-mcmc";
+  "flat-tex" = dontDistribute super."flat-tex";
+  "flexible-time" = dontDistribute super."flexible-time";
+  "flexible-unlit" = dontDistribute super."flexible-unlit";
+  "flexiwrap" = dontDistribute super."flexiwrap";
+  "flexiwrap-smallcheck" = dontDistribute super."flexiwrap-smallcheck";
+  "flickr" = dontDistribute super."flickr";
+  "flippers" = dontDistribute super."flippers";
+  "flite" = dontDistribute super."flite";
+  "flo" = dontDistribute super."flo";
+  "float-binstring" = dontDistribute super."float-binstring";
+  "floating-bits" = dontDistribute super."floating-bits";
+  "floatshow" = dontDistribute super."floatshow";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "flowdock-api" = dontDistribute super."flowdock-api";
+  "flowdock-rest" = dontDistribute super."flowdock-rest";
+  "flower" = dontDistribute super."flower";
+  "flowlocks-framework" = dontDistribute super."flowlocks-framework";
+  "flowsim" = dontDistribute super."flowsim";
+  "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
+  "fltkhs-fluid-demos" = dontDistribute super."fltkhs-fluid-demos";
+  "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
+  "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
+  "fluent-logger" = dontDistribute super."fluent-logger";
+  "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
+  "fluidsynth" = dontDistribute super."fluidsynth";
+  "fmark" = dontDistribute super."fmark";
+  "fn" = doDistribute super."fn_0_2_0_2";
+  "fn-extra" = doDistribute super."fn-extra_0_2_0_1";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_6";
+  "foldl-incremental" = dontDistribute super."foldl-incremental";
+  "foldl-transduce" = dontDistribute super."foldl-transduce";
+  "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
+  "folds" = dontDistribute super."folds";
+  "folds-common" = dontDistribute super."folds-common";
+  "follower" = dontDistribute super."follower";
+  "foma" = dontDistribute super."foma";
+  "font-opengl-basic4x6" = dontDistribute super."font-opengl-basic4x6";
+  "foo" = dontDistribute super."foo";
+  "for-free" = dontDistribute super."for-free";
+  "forbidden-fruit" = dontDistribute super."forbidden-fruit";
+  "fordo" = dontDistribute super."fordo";
+  "foreign-storable-asymmetric" = dontDistribute super."foreign-storable-asymmetric";
+  "foreign-var" = dontDistribute super."foreign-var";
+  "forger" = dontDistribute super."forger";
+  "forkable-monad" = dontDistribute super."forkable-monad";
+  "formal" = dontDistribute super."formal";
+  "format" = dontDistribute super."format";
+  "format-status" = dontDistribute super."format-status";
+  "formattable" = dontDistribute super."formattable";
+  "forml" = dontDistribute super."forml";
+  "formlets" = dontDistribute super."formlets";
+  "formlets-hsp" = dontDistribute super."formlets-hsp";
+  "formura" = dontDistribute super."formura";
+  "forth-hll" = dontDistribute super."forth-hll";
+  "foscam-directory" = dontDistribute super."foscam-directory";
+  "foscam-filename" = dontDistribute super."foscam-filename";
+  "foscam-sort" = dontDistribute super."foscam-sort";
+  "fountain" = dontDistribute super."fountain";
+  "fpco-api" = dontDistribute super."fpco-api";
+  "fpipe" = dontDistribute super."fpipe";
+  "fpnla" = dontDistribute super."fpnla";
+  "fpnla-examples" = dontDistribute super."fpnla-examples";
+  "fptest" = dontDistribute super."fptest";
+  "fquery" = dontDistribute super."fquery";
+  "fractal" = dontDistribute super."fractal";
+  "fractals" = dontDistribute super."fractals";
+  "fraction" = dontDistribute super."fraction";
+  "frag" = dontDistribute super."frag";
+  "frame" = dontDistribute super."frame";
+  "frame-markdown" = dontDistribute super."frame-markdown";
+  "franchise" = dontDistribute super."franchise";
+  "free-concurrent" = dontDistribute super."free-concurrent";
+  "free-functors" = dontDistribute super."free-functors";
+  "free-game" = dontDistribute super."free-game";
+  "free-http" = dontDistribute super."free-http";
+  "free-operational" = dontDistribute super."free-operational";
+  "free-theorems" = dontDistribute super."free-theorems";
+  "free-theorems-counterexamples" = dontDistribute super."free-theorems-counterexamples";
+  "free-theorems-seq" = dontDistribute super."free-theorems-seq";
+  "free-theorems-seq-webui" = dontDistribute super."free-theorems-seq-webui";
+  "free-theorems-webui" = dontDistribute super."free-theorems-webui";
+  "free-vl" = dontDistribute super."free-vl";
+  "freekick2" = dontDistribute super."freekick2";
+  "freer" = dontDistribute super."freer";
+  "freesect" = dontDistribute super."freesect";
+  "freesound" = dontDistribute super."freesound";
+  "freetype-simple" = dontDistribute super."freetype-simple";
+  "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
+  "fresh" = dontDistribute super."fresh";
+  "friday" = dontDistribute super."friday";
+  "friday-devil" = dontDistribute super."friday-devil";
+  "friday-juicypixels" = dontDistribute super."friday-juicypixels";
+  "friday-scale-dct" = dontDistribute super."friday-scale-dct";
+  "friendly-time" = dontDistribute super."friendly-time";
+  "frown" = dontDistribute super."frown";
+  "frp-arduino" = dontDistribute super."frp-arduino";
+  "frpnow" = dontDistribute super."frpnow";
+  "frpnow-gloss" = dontDistribute super."frpnow-gloss";
+  "frpnow-gtk" = dontDistribute super."frpnow-gtk";
+  "frquotes" = dontDistribute super."frquotes";
+  "fs-events" = dontDistribute super."fs-events";
+  "fsharp" = dontDistribute super."fsharp";
+  "fsmActions" = dontDistribute super."fsmActions";
+  "fst" = dontDistribute super."fst";
+  "fsutils" = dontDistribute super."fsutils";
+  "fswatcher" = dontDistribute super."fswatcher";
+  "ftdi" = dontDistribute super."ftdi";
+  "ftp-conduit" = dontDistribute super."ftp-conduit";
+  "ftphs" = dontDistribute super."ftphs";
+  "ftree" = dontDistribute super."ftree";
+  "ftshell" = dontDistribute super."ftshell";
+  "fugue" = dontDistribute super."fugue";
+  "full-sessions" = dontDistribute super."full-sessions";
+  "full-text-search" = dontDistribute super."full-text-search";
+  "fullstop" = dontDistribute super."fullstop";
+  "funbot" = dontDistribute super."funbot";
+  "funbot-client" = dontDistribute super."funbot-client";
+  "funbot-ext-events" = dontDistribute super."funbot-ext-events";
+  "funbot-git-hook" = dontDistribute super."funbot-git-hook";
+  "funcons-tools" = dontDistribute super."funcons-tools";
+  "function-combine" = dontDistribute super."function-combine";
+  "function-instances-algebra" = dontDistribute super."function-instances-algebra";
+  "functional-arrow" = dontDistribute super."functional-arrow";
+  "functional-kmp" = dontDistribute super."functional-kmp";
+  "functor-apply" = dontDistribute super."functor-apply";
+  "functor-combo" = dontDistribute super."functor-combo";
+  "functor-infix" = dontDistribute super."functor-infix";
+  "functor-monadic" = dontDistribute super."functor-monadic";
+  "functor-utils" = dontDistribute super."functor-utils";
+  "functorm" = dontDistribute super."functorm";
+  "functors" = dontDistribute super."functors";
+  "funion" = dontDistribute super."funion";
+  "funpat" = dontDistribute super."funpat";
+  "funsat" = dontDistribute super."funsat";
+  "fusion" = dontDistribute super."fusion";
+  "futun" = dontDistribute super."futun";
+  "future" = dontDistribute super."future";
+  "future-resource" = dontDistribute super."future-resource";
+  "fuzzy" = dontDistribute super."fuzzy";
+  "fuzzy-timings" = dontDistribute super."fuzzy-timings";
+  "fuzzytime" = dontDistribute super."fuzzytime";
+  "fwgl" = dontDistribute super."fwgl";
+  "fwgl-glfw" = dontDistribute super."fwgl-glfw";
+  "fwgl-javascript" = dontDistribute super."fwgl-javascript";
+  "g-npm" = dontDistribute super."g-npm";
+  "gact" = dontDistribute super."gact";
+  "game-of-life" = dontDistribute super."game-of-life";
+  "game-probability" = dontDistribute super."game-probability";
+  "game-tree" = dontDistribute super."game-tree";
+  "gameclock" = dontDistribute super."gameclock";
+  "gamma" = dontDistribute super."gamma";
+  "gang-of-threads" = dontDistribute super."gang-of-threads";
+  "garepinoh" = dontDistribute super."garepinoh";
+  "garsia-wachs" = dontDistribute super."garsia-wachs";
+  "gbu" = dontDistribute super."gbu";
+  "gc" = dontDistribute super."gc";
+  "gc-monitoring-wai" = dontDistribute super."gc-monitoring-wai";
+  "gconf" = dontDistribute super."gconf";
+  "gdiff" = dontDistribute super."gdiff";
+  "gdiff-ig" = dontDistribute super."gdiff-ig";
+  "gdiff-th" = dontDistribute super."gdiff-th";
+  "gdo" = dontDistribute super."gdo";
+  "gearbox" = dontDistribute super."gearbox";
+  "geek" = dontDistribute super."geek";
+  "geek-server" = dontDistribute super."geek-server";
+  "gelatin" = dontDistribute super."gelatin";
+  "gemstone" = dontDistribute super."gemstone";
+  "gencheck" = dontDistribute super."gencheck";
+  "gender" = dontDistribute super."gender";
+  "genders" = dontDistribute super."genders";
+  "general-prelude" = dontDistribute super."general-prelude";
+  "generator" = dontDistribute super."generator";
+  "generators" = dontDistribute super."generators";
+  "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop-lens" = dontDistribute super."generics-sop-lens";
+  "genericserialize" = dontDistribute super."genericserialize";
+  "genetics" = dontDistribute super."genetics";
+  "geni-gui" = dontDistribute super."geni-gui";
+  "geni-util" = dontDistribute super."geni-util";
+  "geniconvert" = dontDistribute super."geniconvert";
+  "genifunctors" = dontDistribute super."genifunctors";
+  "geniplate" = dontDistribute super."geniplate";
+  "geniserver" = dontDistribute super."geniserver";
+  "genprog" = dontDistribute super."genprog";
+  "gentlemark" = dontDistribute super."gentlemark";
+  "geo-resolver" = dontDistribute super."geo-resolver";
+  "geo-uk" = dontDistribute super."geo-uk";
+  "geocalc" = dontDistribute super."geocalc";
+  "geocode-google" = dontDistribute super."geocode-google";
+  "geodetic" = dontDistribute super."geodetic";
+  "geodetics" = dontDistribute super."geodetics";
+  "geohash" = dontDistribute super."geohash";
+  "geoip2" = dontDistribute super."geoip2";
+  "geojson" = dontDistribute super."geojson";
+  "geom2d" = dontDistribute super."geom2d";
+  "getemx" = dontDistribute super."getemx";
+  "getflag" = dontDistribute super."getflag";
+  "getopt-simple" = dontDistribute super."getopt-simple";
+  "gf" = dontDistribute super."gf";
+  "ggtsTC" = dontDistribute super."ggtsTC";
+  "ghc-core" = dontDistribute super."ghc-core";
+  "ghc-core-html" = dontDistribute super."ghc-core-html";
+  "ghc-datasize" = dontDistribute super."ghc-datasize";
+  "ghc-dump-tree" = dontDistribute super."ghc-dump-tree";
+  "ghc-dup" = dontDistribute super."ghc-dup";
+  "ghc-events-analyze" = dontDistribute super."ghc-events-analyze";
+  "ghc-events-parallel" = dontDistribute super."ghc-events-parallel";
+  "ghc-gc-tune" = dontDistribute super."ghc-gc-tune";
+  "ghc-generic-instances" = dontDistribute super."ghc-generic-instances";
+  "ghc-imported-from" = dontDistribute super."ghc-imported-from";
+  "ghc-make" = dontDistribute super."ghc-make";
+  "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-options" = dontDistribute super."ghc-options";
+  "ghc-parmake" = dontDistribute super."ghc-parmake";
+  "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
+  "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
+  "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
+  "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-simple" = dontDistribute super."ghc-simple";
+  "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
+  "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-vis" = dontDistribute super."ghc-vis";
+  "ghci-diagrams" = dontDistribute super."ghci-diagrams";
+  "ghci-haskeline" = dontDistribute super."ghci-haskeline";
+  "ghci-lib" = dontDistribute super."ghci-lib";
+  "ghci-ng" = dontDistribute super."ghci-ng";
+  "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-poppler" = dontDistribute super."gi-poppler";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gi-webkit2webextension" = dontDistribute super."gi-webkit2webextension";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "giphy-api" = dontDistribute super."giphy-api";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "git-checklist" = dontDistribute super."git-checklist";
+  "git-date" = dontDistribute super."git-date";
+  "git-embed" = dontDistribute super."git-embed";
+  "git-freq" = dontDistribute super."git-freq";
+  "git-gpush" = dontDistribute super."git-gpush";
+  "git-jump" = dontDistribute super."git-jump";
+  "git-monitor" = dontDistribute super."git-monitor";
+  "git-object" = dontDistribute super."git-object";
+  "git-repair" = dontDistribute super."git-repair";
+  "git-sanity" = dontDistribute super."git-sanity";
+  "git-vogue" = dontDistribute super."git-vogue";
+  "gitHUD" = dontDistribute super."gitHUD";
+  "gitcache" = dontDistribute super."gitcache";
+  "gitdo" = dontDistribute super."gitdo";
+  "github-backup" = dontDistribute super."github-backup";
+  "github-post-receive" = dontDistribute super."github-post-receive";
+  "github-utils" = dontDistribute super."github-utils";
+  "gitignore" = dontDistribute super."gitignore";
+  "gitit" = dontDistribute super."gitit";
+  "gitlib-cmdline" = dontDistribute super."gitlib-cmdline";
+  "gitlib-cross" = dontDistribute super."gitlib-cross";
+  "gitlib-s3" = dontDistribute super."gitlib-s3";
+  "gitlib-sample" = dontDistribute super."gitlib-sample";
+  "gitlib-utils" = dontDistribute super."gitlib-utils";
+  "gitter" = dontDistribute super."gitter";
+  "gl-capture" = dontDistribute super."gl-capture";
+  "glade" = dontDistribute super."glade";
+  "gladexml-accessor" = dontDistribute super."gladexml-accessor";
+  "glambda" = dontDistribute super."glambda";
+  "glapp" = dontDistribute super."glapp";
+  "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
+  "glider-nlp" = dontDistribute super."glider-nlp";
+  "glintcollider" = dontDistribute super."glintcollider";
+  "gll" = dontDistribute super."gll";
+  "global" = dontDistribute super."global";
+  "global-config" = dontDistribute super."global-config";
+  "global-lock" = dontDistribute super."global-lock";
+  "global-variables" = dontDistribute super."global-variables";
+  "glome-hs" = dontDistribute super."glome-hs";
+  "gloss" = dontDistribute super."gloss";
+  "gloss-accelerate" = dontDistribute super."gloss-accelerate";
+  "gloss-algorithms" = dontDistribute super."gloss-algorithms";
+  "gloss-banana" = dontDistribute super."gloss-banana";
+  "gloss-devil" = dontDistribute super."gloss-devil";
+  "gloss-examples" = dontDistribute super."gloss-examples";
+  "gloss-game" = dontDistribute super."gloss-game";
+  "gloss-juicy" = dontDistribute super."gloss-juicy";
+  "gloss-raster" = dontDistribute super."gloss-raster";
+  "gloss-raster-accelerate" = dontDistribute super."gloss-raster-accelerate";
+  "gloss-rendering" = dontDistribute super."gloss-rendering";
+  "gloss-sodium" = dontDistribute super."gloss-sodium";
+  "glpk-hs" = dontDistribute super."glpk-hs";
+  "glue" = dontDistribute super."glue";
+  "glue-common" = dontDistribute super."glue-common";
+  "glue-core" = dontDistribute super."glue-core";
+  "glue-ekg" = dontDistribute super."glue-ekg";
+  "glue-example" = dontDistribute super."glue-example";
+  "gluturtle" = dontDistribute super."gluturtle";
+  "gmap" = dontDistribute super."gmap";
+  "gmndl" = dontDistribute super."gmndl";
+  "gnome-desktop" = dontDistribute super."gnome-desktop";
+  "gnome-keyring" = dontDistribute super."gnome-keyring";
+  "gnomevfs" = dontDistribute super."gnomevfs";
+  "gnss-converters" = dontDistribute super."gnss-converters";
+  "gnuplot" = dontDistribute super."gnuplot";
+  "goa" = dontDistribute super."goa";
+  "goal-core" = dontDistribute super."goal-core";
+  "goal-geometry" = dontDistribute super."goal-geometry";
+  "goal-probability" = dontDistribute super."goal-probability";
+  "goal-simulation" = dontDistribute super."goal-simulation";
+  "goatee" = dontDistribute super."goatee";
+  "goatee-gtk" = dontDistribute super."goatee-gtk";
+  "gofer-prelude" = dontDistribute super."gofer-prelude";
+  "gogol" = dontDistribute super."gogol";
+  "gogol-adexchange-buyer" = dontDistribute super."gogol-adexchange-buyer";
+  "gogol-adexchange-seller" = dontDistribute super."gogol-adexchange-seller";
+  "gogol-admin-datatransfer" = dontDistribute super."gogol-admin-datatransfer";
+  "gogol-admin-directory" = dontDistribute super."gogol-admin-directory";
+  "gogol-admin-emailmigration" = dontDistribute super."gogol-admin-emailmigration";
+  "gogol-admin-reports" = dontDistribute super."gogol-admin-reports";
+  "gogol-adsense" = dontDistribute super."gogol-adsense";
+  "gogol-adsense-host" = dontDistribute super."gogol-adsense-host";
+  "gogol-affiliates" = dontDistribute super."gogol-affiliates";
+  "gogol-analytics" = dontDistribute super."gogol-analytics";
+  "gogol-android-enterprise" = dontDistribute super."gogol-android-enterprise";
+  "gogol-android-publisher" = dontDistribute super."gogol-android-publisher";
+  "gogol-appengine" = dontDistribute super."gogol-appengine";
+  "gogol-apps-activity" = dontDistribute super."gogol-apps-activity";
+  "gogol-apps-calendar" = dontDistribute super."gogol-apps-calendar";
+  "gogol-apps-licensing" = dontDistribute super."gogol-apps-licensing";
+  "gogol-apps-reseller" = dontDistribute super."gogol-apps-reseller";
+  "gogol-apps-tasks" = dontDistribute super."gogol-apps-tasks";
+  "gogol-appstate" = dontDistribute super."gogol-appstate";
+  "gogol-autoscaler" = dontDistribute super."gogol-autoscaler";
+  "gogol-bigquery" = dontDistribute super."gogol-bigquery";
+  "gogol-billing" = dontDistribute super."gogol-billing";
+  "gogol-blogger" = dontDistribute super."gogol-blogger";
+  "gogol-books" = dontDistribute super."gogol-books";
+  "gogol-civicinfo" = dontDistribute super."gogol-civicinfo";
+  "gogol-classroom" = dontDistribute super."gogol-classroom";
+  "gogol-cloudtrace" = dontDistribute super."gogol-cloudtrace";
+  "gogol-compute" = dontDistribute super."gogol-compute";
+  "gogol-container" = dontDistribute super."gogol-container";
+  "gogol-core" = dontDistribute super."gogol-core";
+  "gogol-customsearch" = dontDistribute super."gogol-customsearch";
+  "gogol-dataflow" = dontDistribute super."gogol-dataflow";
+  "gogol-datastore" = dontDistribute super."gogol-datastore";
+  "gogol-debugger" = dontDistribute super."gogol-debugger";
+  "gogol-deploymentmanager" = dontDistribute super."gogol-deploymentmanager";
+  "gogol-dfareporting" = dontDistribute super."gogol-dfareporting";
+  "gogol-discovery" = dontDistribute super."gogol-discovery";
+  "gogol-dns" = dontDistribute super."gogol-dns";
+  "gogol-doubleclick-bids" = dontDistribute super."gogol-doubleclick-bids";
+  "gogol-doubleclick-search" = dontDistribute super."gogol-doubleclick-search";
+  "gogol-drive" = dontDistribute super."gogol-drive";
+  "gogol-fitness" = dontDistribute super."gogol-fitness";
+  "gogol-fonts" = dontDistribute super."gogol-fonts";
+  "gogol-freebasesearch" = dontDistribute super."gogol-freebasesearch";
+  "gogol-fusiontables" = dontDistribute super."gogol-fusiontables";
+  "gogol-games" = dontDistribute super."gogol-games";
+  "gogol-games-configuration" = dontDistribute super."gogol-games-configuration";
+  "gogol-games-management" = dontDistribute super."gogol-games-management";
+  "gogol-genomics" = dontDistribute super."gogol-genomics";
+  "gogol-gmail" = dontDistribute super."gogol-gmail";
+  "gogol-groups-migration" = dontDistribute super."gogol-groups-migration";
+  "gogol-groups-settings" = dontDistribute super."gogol-groups-settings";
+  "gogol-identity-toolkit" = dontDistribute super."gogol-identity-toolkit";
+  "gogol-latencytest" = dontDistribute super."gogol-latencytest";
+  "gogol-logging" = dontDistribute super."gogol-logging";
+  "gogol-maps-coordinate" = dontDistribute super."gogol-maps-coordinate";
+  "gogol-maps-engine" = dontDistribute super."gogol-maps-engine";
+  "gogol-mirror" = dontDistribute super."gogol-mirror";
+  "gogol-monitoring" = dontDistribute super."gogol-monitoring";
+  "gogol-oauth2" = dontDistribute super."gogol-oauth2";
+  "gogol-pagespeed" = dontDistribute super."gogol-pagespeed";
+  "gogol-partners" = dontDistribute super."gogol-partners";
+  "gogol-play-moviespartner" = dontDistribute super."gogol-play-moviespartner";
+  "gogol-plus" = dontDistribute super."gogol-plus";
+  "gogol-plus-domains" = dontDistribute super."gogol-plus-domains";
+  "gogol-prediction" = dontDistribute super."gogol-prediction";
+  "gogol-proximitybeacon" = dontDistribute super."gogol-proximitybeacon";
+  "gogol-pubsub" = dontDistribute super."gogol-pubsub";
+  "gogol-qpxexpress" = dontDistribute super."gogol-qpxexpress";
+  "gogol-replicapool" = dontDistribute super."gogol-replicapool";
+  "gogol-replicapool-updater" = dontDistribute super."gogol-replicapool-updater";
+  "gogol-resourcemanager" = dontDistribute super."gogol-resourcemanager";
+  "gogol-resourceviews" = dontDistribute super."gogol-resourceviews";
+  "gogol-shopping-content" = dontDistribute super."gogol-shopping-content";
+  "gogol-siteverification" = dontDistribute super."gogol-siteverification";
+  "gogol-spectrum" = dontDistribute super."gogol-spectrum";
+  "gogol-sqladmin" = dontDistribute super."gogol-sqladmin";
+  "gogol-storage" = dontDistribute super."gogol-storage";
+  "gogol-storage-transfer" = dontDistribute super."gogol-storage-transfer";
+  "gogol-tagmanager" = dontDistribute super."gogol-tagmanager";
+  "gogol-taskqueue" = dontDistribute super."gogol-taskqueue";
+  "gogol-translate" = dontDistribute super."gogol-translate";
+  "gogol-urlshortener" = dontDistribute super."gogol-urlshortener";
+  "gogol-useraccounts" = dontDistribute super."gogol-useraccounts";
+  "gogol-webmaster-tools" = dontDistribute super."gogol-webmaster-tools";
+  "gogol-youtube" = dontDistribute super."gogol-youtube";
+  "gogol-youtube-analytics" = dontDistribute super."gogol-youtube-analytics";
+  "gogol-youtube-reporting" = dontDistribute super."gogol-youtube-reporting";
+  "gooey" = dontDistribute super."gooey";
+  "google-dictionary" = dontDistribute super."google-dictionary";
+  "google-drive" = dontDistribute super."google-drive";
+  "google-html5-slide" = dontDistribute super."google-html5-slide";
+  "google-mail-filters" = dontDistribute super."google-mail-filters";
+  "google-oauth2" = dontDistribute super."google-oauth2";
+  "google-search" = dontDistribute super."google-search";
+  "googleplus" = dontDistribute super."googleplus";
+  "googlepolyline" = dontDistribute super."googlepolyline";
+  "gopherbot" = dontDistribute super."gopherbot";
+  "gore-and-ash" = dontDistribute super."gore-and-ash";
+  "gore-and-ash-actor" = dontDistribute super."gore-and-ash-actor";
+  "gore-and-ash-async" = dontDistribute super."gore-and-ash-async";
+  "gore-and-ash-demo" = dontDistribute super."gore-and-ash-demo";
+  "gore-and-ash-glfw" = dontDistribute super."gore-and-ash-glfw";
+  "gore-and-ash-logging" = dontDistribute super."gore-and-ash-logging";
+  "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
+  "gore-and-ash-sdl" = dontDistribute super."gore-and-ash-sdl";
+  "gore-and-ash-sync" = dontDistribute super."gore-and-ash-sync";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "gps" = dontDistribute super."gps";
+  "gps2htmlReport" = dontDistribute super."gps2htmlReport";
+  "gpx-conduit" = dontDistribute super."gpx-conduit";
+  "graceful" = dontDistribute super."graceful";
+  "grammar-combinators" = dontDistribute super."grammar-combinators";
+  "grapefruit-examples" = dontDistribute super."grapefruit-examples";
+  "grapefruit-frp" = dontDistribute super."grapefruit-frp";
+  "grapefruit-records" = dontDistribute super."grapefruit-records";
+  "grapefruit-ui" = dontDistribute super."grapefruit-ui";
+  "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
+  "graph-generators" = dontDistribute super."graph-generators";
+  "graph-matchings" = dontDistribute super."graph-matchings";
+  "graph-rewriting" = dontDistribute super."graph-rewriting";
+  "graph-rewriting-cl" = dontDistribute super."graph-rewriting-cl";
+  "graph-rewriting-gl" = dontDistribute super."graph-rewriting-gl";
+  "graph-rewriting-lambdascope" = dontDistribute super."graph-rewriting-lambdascope";
+  "graph-rewriting-layout" = dontDistribute super."graph-rewriting-layout";
+  "graph-rewriting-ski" = dontDistribute super."graph-rewriting-ski";
+  "graph-rewriting-strategies" = dontDistribute super."graph-rewriting-strategies";
+  "graph-rewriting-trs" = dontDistribute super."graph-rewriting-trs";
+  "graph-rewriting-ww" = dontDistribute super."graph-rewriting-ww";
+  "graph-serialize" = dontDistribute super."graph-serialize";
+  "graph-utils" = dontDistribute super."graph-utils";
+  "graph-visit" = dontDistribute super."graph-visit";
+  "graphbuilder" = dontDistribute super."graphbuilder";
+  "graphene" = dontDistribute super."graphene";
+  "graphics-drawingcombinators" = dontDistribute super."graphics-drawingcombinators";
+  "graphics-formats-collada" = dontDistribute super."graphics-formats-collada";
+  "graphicsFormats" = dontDistribute super."graphicsFormats";
+  "graphicstools" = dontDistribute super."graphicstools";
+  "graphmod" = dontDistribute super."graphmod";
+  "graphql" = dontDistribute super."graphql";
+  "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
+  "gray-code" = dontDistribute super."gray-code";
+  "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
+  "greencard" = dontDistribute super."greencard";
+  "greencard-lib" = dontDistribute super."greencard-lib";
+  "greg-client" = dontDistribute super."greg-client";
+  "gremlin-haskell" = dontDistribute super."gremlin-haskell";
+  "greplicate" = dontDistribute super."greplicate";
+  "grid" = dontDistribute super."grid";
+  "gridfs" = dontDistribute super."gridfs";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-converters" = dontDistribute super."groundhog-converters";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "gruff" = dontDistribute super."gruff";
+  "gruff-examples" = dontDistribute super."gruff-examples";
+  "gsc-weighting" = dontDistribute super."gsc-weighting";
+  "gsl-random" = dontDistribute super."gsl-random";
+  "gsl-random-fu" = dontDistribute super."gsl-random-fu";
+  "gsmenu" = dontDistribute super."gsmenu";
+  "gstreamer" = dontDistribute super."gstreamer";
+  "gt-tools" = dontDistribute super."gt-tools";
+  "gtfs" = dontDistribute super."gtfs";
+  "gtk-helpers" = dontDistribute super."gtk-helpers";
+  "gtk-jsinput" = dontDistribute super."gtk-jsinput";
+  "gtk-largeTreeStore" = dontDistribute super."gtk-largeTreeStore";
+  "gtk-mac-integration" = dontDistribute super."gtk-mac-integration";
+  "gtk-serialized-event" = dontDistribute super."gtk-serialized-event";
+  "gtk-simple-list-view" = dontDistribute super."gtk-simple-list-view";
+  "gtk-toggle-button-list" = dontDistribute super."gtk-toggle-button-list";
+  "gtk-toy" = dontDistribute super."gtk-toy";
+  "gtk-traymanager" = dontDistribute super."gtk-traymanager";
+  "gtk2hs-cast-glade" = dontDistribute super."gtk2hs-cast-glade";
+  "gtk2hs-cast-glib" = dontDistribute super."gtk2hs-cast-glib";
+  "gtk2hs-cast-gnomevfs" = dontDistribute super."gtk2hs-cast-gnomevfs";
+  "gtk2hs-cast-gtk" = dontDistribute super."gtk2hs-cast-gtk";
+  "gtk2hs-cast-gtkglext" = dontDistribute super."gtk2hs-cast-gtkglext";
+  "gtk2hs-cast-gtksourceview2" = dontDistribute super."gtk2hs-cast-gtksourceview2";
+  "gtk2hs-cast-th" = dontDistribute super."gtk2hs-cast-th";
+  "gtk2hs-hello" = dontDistribute super."gtk2hs-hello";
+  "gtk2hs-rpn" = dontDistribute super."gtk2hs-rpn";
+  "gtk3-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "gulcii" = dontDistribute super."gulcii";
+  "gutenberg-fibonaccis" = dontDistribute super."gutenberg-fibonaccis";
+  "gyah-bin" = dontDistribute super."gyah-bin";
+  "h-booru" = dontDistribute super."h-booru";
+  "h-gpgme" = dontDistribute super."h-gpgme";
+  "h2048" = dontDistribute super."h2048";
+  "hArduino" = dontDistribute super."hArduino";
+  "hBDD" = dontDistribute super."hBDD";
+  "hBDD-CMUBDD" = dontDistribute super."hBDD-CMUBDD";
+  "hBDD-CUDD" = dontDistribute super."hBDD-CUDD";
+  "hCsound" = dontDistribute super."hCsound";
+  "hDFA" = dontDistribute super."hDFA";
+  "hF2" = dontDistribute super."hF2";
+  "hGelf" = dontDistribute super."hGelf";
+  "hLLVM" = dontDistribute super."hLLVM";
+  "hMollom" = dontDistribute super."hMollom";
+  "hPDB-examples" = dontDistribute super."hPDB-examples";
+  "hPushover" = dontDistribute super."hPushover";
+  "hR" = dontDistribute super."hR";
+  "hRESP" = dontDistribute super."hRESP";
+  "hS3" = dontDistribute super."hS3";
+  "hScraper" = dontDistribute super."hScraper";
+  "hSimpleDB" = dontDistribute super."hSimpleDB";
+  "hTalos" = dontDistribute super."hTalos";
+  "hTensor" = dontDistribute super."hTensor";
+  "hVOIDP" = dontDistribute super."hVOIDP";
+  "hXmixer" = dontDistribute super."hXmixer";
+  "haar" = dontDistribute super."haar";
+  "hacanon-light" = dontDistribute super."hacanon-light";
+  "hack" = dontDistribute super."hack";
+  "hack-contrib" = dontDistribute super."hack-contrib";
+  "hack-contrib-press" = dontDistribute super."hack-contrib-press";
+  "hack-frontend-happstack" = dontDistribute super."hack-frontend-happstack";
+  "hack-frontend-monadcgi" = dontDistribute super."hack-frontend-monadcgi";
+  "hack-handler-cgi" = dontDistribute super."hack-handler-cgi";
+  "hack-handler-epoll" = dontDistribute super."hack-handler-epoll";
+  "hack-handler-evhttp" = dontDistribute super."hack-handler-evhttp";
+  "hack-handler-fastcgi" = dontDistribute super."hack-handler-fastcgi";
+  "hack-handler-happstack" = dontDistribute super."hack-handler-happstack";
+  "hack-handler-hyena" = dontDistribute super."hack-handler-hyena";
+  "hack-handler-kibro" = dontDistribute super."hack-handler-kibro";
+  "hack-handler-simpleserver" = dontDistribute super."hack-handler-simpleserver";
+  "hack-middleware-cleanpath" = dontDistribute super."hack-middleware-cleanpath";
+  "hack-middleware-clientsession" = dontDistribute super."hack-middleware-clientsession";
+  "hack-middleware-gzip" = dontDistribute super."hack-middleware-gzip";
+  "hack-middleware-jsonp" = dontDistribute super."hack-middleware-jsonp";
+  "hack2" = dontDistribute super."hack2";
+  "hack2-contrib" = dontDistribute super."hack2-contrib";
+  "hack2-contrib-extra" = dontDistribute super."hack2-contrib-extra";
+  "hack2-handler-happstack-server" = dontDistribute super."hack2-handler-happstack-server";
+  "hack2-handler-mongrel2-http" = dontDistribute super."hack2-handler-mongrel2-http";
+  "hack2-handler-snap-server" = dontDistribute super."hack2-handler-snap-server";
+  "hack2-handler-warp" = dontDistribute super."hack2-handler-warp";
+  "hack2-interface-wai" = dontDistribute super."hack2-interface-wai";
+  "hackage-diff" = dontDistribute super."hackage-diff";
+  "hackage-plot" = dontDistribute super."hackage-plot";
+  "hackage-proxy" = dontDistribute super."hackage-proxy";
+  "hackage-repo-tool" = dontDistribute super."hackage-repo-tool";
+  "hackage-security" = dontDistribute super."hackage-security";
+  "hackage-security-HTTP" = dontDistribute super."hackage-security-HTTP";
+  "hackage-server" = dontDistribute super."hackage-server";
+  "hackage-sparks" = dontDistribute super."hackage-sparks";
+  "hackage2hwn" = dontDistribute super."hackage2hwn";
+  "hackage2twitter" = dontDistribute super."hackage2twitter";
+  "hackager" = dontDistribute super."hackager";
+  "hackernews" = dontDistribute super."hackernews";
+  "hackertyper" = dontDistribute super."hackertyper";
+  "hackport" = dontDistribute super."hackport";
+  "hactor" = dontDistribute super."hactor";
+  "hactors" = dontDistribute super."hactors";
+  "haddock" = dontDistribute super."haddock";
+  "haddock-leksah" = dontDistribute super."haddock-leksah";
+  "hadoop-formats" = dontDistribute super."hadoop-formats";
+  "hadoop-rpc" = dontDistribute super."hadoop-rpc";
+  "hadoop-tools" = dontDistribute super."hadoop-tools";
+  "haeredes" = dontDistribute super."haeredes";
+  "haggis" = dontDistribute super."haggis";
+  "haha" = dontDistribute super."haha";
+  "hahp" = dontDistribute super."hahp";
+  "haiji" = dontDistribute super."haiji";
+  "hailgun" = dontDistribute super."hailgun";
+  "hailgun-send" = dontDistribute super."hailgun-send";
+  "hails" = dontDistribute super."hails";
+  "hails-bin" = dontDistribute super."hails-bin";
+  "hairy" = dontDistribute super."hairy";
+  "hakaru" = dontDistribute super."hakaru";
+  "hake" = dontDistribute super."hake";
+  "hakismet" = dontDistribute super."hakismet";
+  "hako" = dontDistribute super."hako";
+  "hakyll-R" = dontDistribute super."hakyll-R";
+  "hakyll-agda" = dontDistribute super."hakyll-agda";
+  "hakyll-blaze-templates" = dontDistribute super."hakyll-blaze-templates";
+  "hakyll-contrib" = dontDistribute super."hakyll-contrib";
+  "hakyll-contrib-hyphenation" = dontDistribute super."hakyll-contrib-hyphenation";
+  "hakyll-contrib-links" = dontDistribute super."hakyll-contrib-links";
+  "hakyll-convert" = dontDistribute super."hakyll-convert";
+  "hakyll-elm" = dontDistribute super."hakyll-elm";
+  "hakyll-filestore" = dontDistribute super."hakyll-filestore";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "halberd" = dontDistribute super."halberd";
+  "halfs" = dontDistribute super."halfs";
+  "halipeto" = dontDistribute super."halipeto";
+  "halive" = dontDistribute super."halive";
+  "halma" = dontDistribute super."halma";
+  "haltavista" = dontDistribute super."haltavista";
+  "hamid" = dontDistribute super."hamid";
+  "hampp" = dontDistribute super."hampp";
+  "hamtmap" = dontDistribute super."hamtmap";
+  "hamusic" = dontDistribute super."hamusic";
+  "handa-gdata" = dontDistribute super."handa-gdata";
+  "handa-geodata" = dontDistribute super."handa-geodata";
+  "handa-opengl" = dontDistribute super."handa-opengl";
+  "handle-like" = dontDistribute super."handle-like";
+  "handsy" = dontDistribute super."handsy";
+  "handwriting" = dontDistribute super."handwriting";
+  "hangman" = dontDistribute super."hangman";
+  "hannahci" = dontDistribute super."hannahci";
+  "hans" = dontDistribute super."hans";
+  "hans-pcap" = dontDistribute super."hans-pcap";
+  "hans-pfq" = dontDistribute super."hans-pfq";
+  "haphviz" = dontDistribute super."haphviz";
+  "happindicator" = dontDistribute super."happindicator";
+  "happindicator3" = dontDistribute super."happindicator3";
+  "happraise" = dontDistribute super."happraise";
+  "happs-hsp" = dontDistribute super."happs-hsp";
+  "happs-hsp-template" = dontDistribute super."happs-hsp-template";
+  "happs-tutorial" = dontDistribute super."happs-tutorial";
+  "happstack" = dontDistribute super."happstack";
+  "happstack-auth" = dontDistribute super."happstack-auth";
+  "happstack-contrib" = dontDistribute super."happstack-contrib";
+  "happstack-data" = dontDistribute super."happstack-data";
+  "happstack-dlg" = dontDistribute super."happstack-dlg";
+  "happstack-facebook" = dontDistribute super."happstack-facebook";
+  "happstack-fastcgi" = dontDistribute super."happstack-fastcgi";
+  "happstack-fay" = dontDistribute super."happstack-fay";
+  "happstack-fay-ajax" = dontDistribute super."happstack-fay-ajax";
+  "happstack-foundation" = dontDistribute super."happstack-foundation";
+  "happstack-hamlet" = dontDistribute super."happstack-hamlet";
+  "happstack-heist" = dontDistribute super."happstack-heist";
+  "happstack-helpers" = dontDistribute super."happstack-helpers";
+  "happstack-hstringtemplate" = dontDistribute super."happstack-hstringtemplate";
+  "happstack-ixset" = dontDistribute super."happstack-ixset";
+  "happstack-lite" = dontDistribute super."happstack-lite";
+  "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
+  "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
+  "happstack-state" = dontDistribute super."happstack-state";
+  "happstack-static-routing" = dontDistribute super."happstack-static-routing";
+  "happstack-util" = dontDistribute super."happstack-util";
+  "happstack-yui" = dontDistribute super."happstack-yui";
+  "happy-meta" = dontDistribute super."happy-meta";
+  "happybara" = dontDistribute super."happybara";
+  "happybara-webkit" = dontDistribute super."happybara-webkit";
+  "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "har" = dontDistribute super."har";
+  "harchive" = dontDistribute super."harchive";
+  "hardware-edsl" = dontDistribute super."hardware-edsl";
+  "hark" = dontDistribute super."hark";
+  "harmony" = dontDistribute super."harmony";
+  "haroonga" = dontDistribute super."haroonga";
+  "haroonga-httpd" = dontDistribute super."haroonga-httpd";
+  "harpy" = dontDistribute super."harpy";
+  "has" = dontDistribute super."has";
+  "has-th" = dontDistribute super."has-th";
+  "hascal" = dontDistribute super."hascal";
+  "hascat" = dontDistribute super."hascat";
+  "hascat-lib" = dontDistribute super."hascat-lib";
+  "hascat-setup" = dontDistribute super."hascat-setup";
+  "hascat-system" = dontDistribute super."hascat-system";
+  "hash" = dontDistribute super."hash";
+  "hashable-generics" = dontDistribute super."hashable-generics";
+  "hashabler" = dontDistribute super."hashabler";
+  "hashed-storage" = dontDistribute super."hashed-storage";
+  "hashids" = dontDistribute super."hashids";
+  "hashring" = dontDistribute super."hashring";
+  "hashtables-plus" = dontDistribute super."hashtables-plus";
+  "hasim" = dontDistribute super."hasim";
+  "hask" = dontDistribute super."hask";
+  "hask-home" = dontDistribute super."hask-home";
+  "haskades" = dontDistribute super."haskades";
+  "haskakafka" = dontDistribute super."haskakafka";
+  "haskanoid" = dontDistribute super."haskanoid";
+  "haskarrow" = dontDistribute super."haskarrow";
+  "haskbot-core" = dontDistribute super."haskbot-core";
+  "haskdeep" = dontDistribute super."haskdeep";
+  "haskdogs" = dontDistribute super."haskdogs";
+  "haskeem" = dontDistribute super."haskeem";
+  "haskeline" = doDistribute super."haskeline_0_7_2_2";
+  "haskeline-class" = dontDistribute super."haskeline-class";
+  "haskell-aliyun" = dontDistribute super."haskell-aliyun";
+  "haskell-awk" = dontDistribute super."haskell-awk";
+  "haskell-bcrypt" = dontDistribute super."haskell-bcrypt";
+  "haskell-brainfuck" = dontDistribute super."haskell-brainfuck";
+  "haskell-cnc" = dontDistribute super."haskell-cnc";
+  "haskell-coffee" = dontDistribute super."haskell-coffee";
+  "haskell-compression" = dontDistribute super."haskell-compression";
+  "haskell-course-preludes" = dontDistribute super."haskell-course-preludes";
+  "haskell-docs" = dontDistribute super."haskell-docs";
+  "haskell-exp-parser" = dontDistribute super."haskell-exp-parser";
+  "haskell-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-kubernetes" = dontDistribute super."haskell-kubernetes";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "haskell-plot" = dontDistribute super."haskell-plot";
+  "haskell-qrencode" = dontDistribute super."haskell-qrencode";
+  "haskell-read-editor" = dontDistribute super."haskell-read-editor";
+  "haskell-reflect" = dontDistribute super."haskell-reflect";
+  "haskell-rules" = dontDistribute super."haskell-rules";
+  "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
+  "haskell-token-utils" = dontDistribute super."haskell-token-utils";
+  "haskell-tor" = dontDistribute super."haskell-tor";
+  "haskell-type-exts" = dontDistribute super."haskell-type-exts";
+  "haskell-typescript" = dontDistribute super."haskell-typescript";
+  "haskell-tyrant" = dontDistribute super."haskell-tyrant";
+  "haskell-updater" = dontDistribute super."haskell-updater";
+  "haskell-xmpp" = dontDistribute super."haskell-xmpp";
+  "haskell2010" = dontDistribute super."haskell2010";
+  "haskell98" = dontDistribute super."haskell98";
+  "haskell98libraries" = dontDistribute super."haskell98libraries";
+  "haskelldb" = dontDistribute super."haskelldb";
+  "haskelldb-connect-hdbc" = dontDistribute super."haskelldb-connect-hdbc";
+  "haskelldb-connect-hdbc-catchio-mtl" = dontDistribute super."haskelldb-connect-hdbc-catchio-mtl";
+  "haskelldb-connect-hdbc-catchio-tf" = dontDistribute super."haskelldb-connect-hdbc-catchio-tf";
+  "haskelldb-connect-hdbc-catchio-transformers" = dontDistribute super."haskelldb-connect-hdbc-catchio-transformers";
+  "haskelldb-connect-hdbc-lifted" = dontDistribute super."haskelldb-connect-hdbc-lifted";
+  "haskelldb-dynamic" = dontDistribute super."haskelldb-dynamic";
+  "haskelldb-flat" = dontDistribute super."haskelldb-flat";
+  "haskelldb-hdbc" = dontDistribute super."haskelldb-hdbc";
+  "haskelldb-hdbc-mysql" = dontDistribute super."haskelldb-hdbc-mysql";
+  "haskelldb-hdbc-odbc" = dontDistribute super."haskelldb-hdbc-odbc";
+  "haskelldb-hdbc-postgresql" = dontDistribute super."haskelldb-hdbc-postgresql";
+  "haskelldb-hdbc-sqlite3" = dontDistribute super."haskelldb-hdbc-sqlite3";
+  "haskelldb-hsql" = dontDistribute super."haskelldb-hsql";
+  "haskelldb-hsql-mysql" = dontDistribute super."haskelldb-hsql-mysql";
+  "haskelldb-hsql-odbc" = dontDistribute super."haskelldb-hsql-odbc";
+  "haskelldb-hsql-oracle" = dontDistribute super."haskelldb-hsql-oracle";
+  "haskelldb-hsql-postgresql" = dontDistribute super."haskelldb-hsql-postgresql";
+  "haskelldb-hsql-sqlite" = dontDistribute super."haskelldb-hsql-sqlite";
+  "haskelldb-hsql-sqlite3" = dontDistribute super."haskelldb-hsql-sqlite3";
+  "haskelldb-th" = dontDistribute super."haskelldb-th";
+  "haskelldb-wx" = dontDistribute super."haskelldb-wx";
+  "haskellscrabble" = dontDistribute super."haskellscrabble";
+  "haskellscript" = dontDistribute super."haskellscript";
+  "haskelm" = dontDistribute super."haskelm";
+  "haskgame" = dontDistribute super."haskgame";
+  "haskheap" = dontDistribute super."haskheap";
+  "haskhol-core" = dontDistribute super."haskhol-core";
+  "haskmon" = dontDistribute super."haskmon";
+  "haskoin" = dontDistribute super."haskoin";
+  "haskoin-core" = dontDistribute super."haskoin-core";
+  "haskoin-crypto" = dontDistribute super."haskoin-crypto";
+  "haskoin-node" = dontDistribute super."haskoin-node";
+  "haskoin-protocol" = dontDistribute super."haskoin-protocol";
+  "haskoin-script" = dontDistribute super."haskoin-script";
+  "haskoin-util" = dontDistribute super."haskoin-util";
+  "haskoin-wallet" = dontDistribute super."haskoin-wallet";
+  "haskoon" = dontDistribute super."haskoon";
+  "haskoon-httpspec" = dontDistribute super."haskoon-httpspec";
+  "haskoon-salvia" = dontDistribute super."haskoon-salvia";
+  "haskore" = dontDistribute super."haskore";
+  "haskore-realtime" = dontDistribute super."haskore-realtime";
+  "haskore-supercollider" = dontDistribute super."haskore-supercollider";
+  "haskore-synthesizer" = dontDistribute super."haskore-synthesizer";
+  "haskore-vintage" = dontDistribute super."haskore-vintage";
+  "hasktags" = dontDistribute super."hasktags";
+  "haslo" = dontDistribute super."haslo";
+  "hasloGUI" = dontDistribute super."hasloGUI";
+  "hasparql-client" = dontDistribute super."hasparql-client";
+  "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
+  "hasql-pool" = dontDistribute super."hasql-pool";
+  "hasql-postgres" = dontDistribute super."hasql-postgres";
+  "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
+  "hasql-th" = dontDistribute super."hasql-th";
+  "hasql-transaction" = dontDistribute super."hasql-transaction";
+  "hastache-aeson" = dontDistribute super."hastache-aeson";
+  "haste" = dontDistribute super."haste";
+  "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
+  "haste-markup" = dontDistribute super."haste-markup";
+  "haste-perch" = dontDistribute super."haste-perch";
+  "hastily" = dontDistribute super."hastily";
+  "hat" = dontDistribute super."hat";
+  "hatex-guide" = dontDistribute super."hatex-guide";
+  "hath" = dontDistribute super."hath";
+  "hatt" = dontDistribute super."hatt";
+  "haverer" = dontDistribute super."haverer";
+  "hawitter" = dontDistribute super."hawitter";
+  "haxl-amazonka" = dontDistribute super."haxl-amazonka";
+  "haxl-facebook" = dontDistribute super."haxl-facebook";
+  "haxparse" = dontDistribute super."haxparse";
+  "haxr-th" = dontDistribute super."haxr-th";
+  "haxy" = dontDistribute super."haxy";
+  "hayland" = dontDistribute super."hayland";
+  "hayoo-cli" = dontDistribute super."hayoo-cli";
+  "hback" = dontDistribute super."hback";
+  "hbayes" = dontDistribute super."hbayes";
+  "hbb" = dontDistribute super."hbb";
+  "hbcd" = dontDistribute super."hbcd";
+  "hbeat" = dontDistribute super."hbeat";
+  "hblas" = dontDistribute super."hblas";
+  "hblock" = dontDistribute super."hblock";
+  "hbro" = dontDistribute super."hbro";
+  "hbro-contrib" = dontDistribute super."hbro-contrib";
+  "hburg" = dontDistribute super."hburg";
+  "hcc" = dontDistribute super."hcc";
+  "hcg-minus" = dontDistribute super."hcg-minus";
+  "hcg-minus-cairo" = dontDistribute super."hcg-minus-cairo";
+  "hcheat" = dontDistribute super."hcheat";
+  "hchesslib" = dontDistribute super."hchesslib";
+  "hcltest" = dontDistribute super."hcltest";
+  "hcoap" = dontDistribute super."hcoap";
+  "hcron" = dontDistribute super."hcron";
+  "hcube" = dontDistribute super."hcube";
+  "hcwiid" = dontDistribute super."hcwiid";
+  "hdaemonize-buildfix" = dontDistribute super."hdaemonize-buildfix";
+  "hdbc-aeson" = dontDistribute super."hdbc-aeson";
+  "hdbc-postgresql-hstore" = dontDistribute super."hdbc-postgresql-hstore";
+  "hdbc-tuple" = dontDistribute super."hdbc-tuple";
+  "hdbi" = dontDistribute super."hdbi";
+  "hdbi-conduit" = dontDistribute super."hdbi-conduit";
+  "hdbi-postgresql" = dontDistribute super."hdbi-postgresql";
+  "hdbi-sqlite" = dontDistribute super."hdbi-sqlite";
+  "hdbi-tests" = dontDistribute super."hdbi-tests";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "hedis-config" = dontDistribute super."hedis-config";
+  "hedis-monadic" = dontDistribute super."hedis-monadic";
+  "hedis-pile" = dontDistribute super."hedis-pile";
+  "hedis-simple" = dontDistribute super."hedis-simple";
+  "hedis-tags" = dontDistribute super."hedis-tags";
+  "hedn" = dontDistribute super."hedn";
+  "hein" = dontDistribute super."hein";
+  "heist-aeson" = dontDistribute super."heist-aeson";
+  "heist-async" = dontDistribute super."heist-async";
+  "helics" = dontDistribute super."helics";
+  "helics-wai" = dontDistribute super."helics-wai";
+  "helisp" = dontDistribute super."helisp";
+  "helium" = dontDistribute super."helium";
+  "helix" = dontDistribute super."helix";
+  "hell" = dontDistribute super."hell";
+  "hellage" = dontDistribute super."hellage";
+  "hellnet" = dontDistribute super."hellnet";
+  "hello" = dontDistribute super."hello";
+  "helm" = dontDistribute super."helm";
+  "help-esb" = dontDistribute super."help-esb";
+  "hemkay" = dontDistribute super."hemkay";
+  "hemkay-core" = dontDistribute super."hemkay-core";
+  "hemokit" = dontDistribute super."hemokit";
+  "hen" = dontDistribute super."hen";
+  "henet" = dontDistribute super."henet";
+  "hepevt" = dontDistribute super."hepevt";
+  "her-lexer" = dontDistribute super."her-lexer";
+  "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
+  "herbalizer" = dontDistribute super."herbalizer";
+  "herf-time" = dontDistribute super."herf-time";
+  "hermit" = dontDistribute super."hermit";
+  "hermit-syb" = dontDistribute super."hermit-syb";
+  "hero-club-five-tenets" = dontDistribute super."hero-club-five-tenets";
+  "heroku" = dontDistribute super."heroku";
+  "heroku-persistent" = dontDistribute super."heroku-persistent";
+  "herringbone" = dontDistribute super."herringbone";
+  "herringbone-embed" = dontDistribute super."herringbone-embed";
+  "herringbone-wai" = dontDistribute super."herringbone-wai";
+  "hesh" = dontDistribute super."hesh";
+  "hesql" = dontDistribute super."hesql";
+  "hetero-map" = dontDistribute super."hetero-map";
+  "hetris" = dontDistribute super."hetris";
+  "heukarya" = dontDistribute super."heukarya";
+  "hevolisa" = dontDistribute super."hevolisa";
+  "hevolisa-dph" = dontDistribute super."hevolisa-dph";
+  "hexdump" = dontDistribute super."hexdump";
+  "hexif" = dontDistribute super."hexif";
+  "hexpat-iteratee" = dontDistribute super."hexpat-iteratee";
+  "hexpat-lens" = dontDistribute super."hexpat-lens";
+  "hexpat-pickle" = dontDistribute super."hexpat-pickle";
+  "hexpat-pickle-generic" = dontDistribute super."hexpat-pickle-generic";
+  "hexpat-tagsoup" = dontDistribute super."hexpat-tagsoup";
+  "hexpr" = dontDistribute super."hexpr";
+  "hexquote" = dontDistribute super."hexquote";
+  "heyefi" = dontDistribute super."heyefi";
+  "hfann" = dontDistribute super."hfann";
+  "hfd" = dontDistribute super."hfd";
+  "hfiar" = dontDistribute super."hfiar";
+  "hfmt" = dontDistribute super."hfmt";
+  "hfoil" = dontDistribute super."hfoil";
+  "hformat" = dontDistribute super."hformat";
+  "hfov" = dontDistribute super."hfov";
+  "hfractal" = dontDistribute super."hfractal";
+  "hfusion" = dontDistribute super."hfusion";
+  "hg-buildpackage" = dontDistribute super."hg-buildpackage";
+  "hgal" = dontDistribute super."hgal";
+  "hgalib" = dontDistribute super."hgalib";
+  "hgdbmi" = dontDistribute super."hgdbmi";
+  "hgearman" = dontDistribute super."hgearman";
+  "hgen" = dontDistribute super."hgen";
+  "hgeometric" = dontDistribute super."hgeometric";
+  "hgeometry" = dontDistribute super."hgeometry";
+  "hgithub" = dontDistribute super."hgithub";
+  "hgl-example" = dontDistribute super."hgl-example";
+  "hgom" = dontDistribute super."hgom";
+  "hgopher" = dontDistribute super."hgopher";
+  "hgrev" = dontDistribute super."hgrev";
+  "hgrib" = dontDistribute super."hgrib";
+  "hharp" = dontDistribute super."hharp";
+  "hi" = dontDistribute super."hi";
+  "hi3status" = dontDistribute super."hi3status";
+  "hiccup" = dontDistribute super."hiccup";
+  "hichi" = dontDistribute super."hichi";
+  "hieraclus" = dontDistribute super."hieraclus";
+  "hierarchical-clustering-diagrams" = dontDistribute super."hierarchical-clustering-diagrams";
+  "hierarchical-exceptions" = dontDistribute super."hierarchical-exceptions";
+  "hierarchy" = dontDistribute super."hierarchy";
+  "hiernotify" = dontDistribute super."hiernotify";
+  "highWaterMark" = dontDistribute super."highWaterMark";
+  "higher-leveldb" = dontDistribute super."higher-leveldb";
+  "higherorder" = dontDistribute super."higherorder";
+  "highlight-versions" = dontDistribute super."highlight-versions";
+  "highlighter" = dontDistribute super."highlighter";
+  "highlighter2" = dontDistribute super."highlighter2";
+  "hills" = dontDistribute super."hills";
+  "himerge" = dontDistribute super."himerge";
+  "himg" = dontDistribute super."himg";
+  "himpy" = dontDistribute super."himpy";
+  "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
+  "hinduce-classifier" = dontDistribute super."hinduce-classifier";
+  "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
+  "hinduce-examples" = dontDistribute super."hinduce-examples";
+  "hinduce-missingh" = dontDistribute super."hinduce-missingh";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint" = doDistribute super."hint_0_4_3";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hip" = dontDistribute super."hip";
+  "hipbot" = dontDistribute super."hipbot";
+  "hipchat-hs" = dontDistribute super."hipchat-hs";
+  "hipe" = dontDistribute super."hipe";
+  "hips" = dontDistribute super."hips";
+  "hircules" = dontDistribute super."hircules";
+  "hirt" = dontDistribute super."hirt";
+  "hissmetrics" = dontDistribute super."hissmetrics";
+  "hist-pl" = dontDistribute super."hist-pl";
+  "hist-pl-dawg" = dontDistribute super."hist-pl-dawg";
+  "hist-pl-fusion" = dontDistribute super."hist-pl-fusion";
+  "hist-pl-lexicon" = dontDistribute super."hist-pl-lexicon";
+  "hist-pl-lmf" = dontDistribute super."hist-pl-lmf";
+  "hist-pl-transliter" = dontDistribute super."hist-pl-transliter";
+  "hist-pl-types" = dontDistribute super."hist-pl-types";
+  "histogram-fill-binary" = dontDistribute super."histogram-fill-binary";
+  "histogram-fill-cereal" = dontDistribute super."histogram-fill-cereal";
+  "historian" = dontDistribute super."historian";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "hjson-query" = dontDistribute super."hjson-query";
+  "hjsonpointer" = dontDistribute super."hjsonpointer";
+  "hjsonschema" = dontDistribute super."hjsonschema";
+  "hkdf" = dontDistribute super."hkdf";
+  "hlatex" = dontDistribute super."hlatex";
+  "hlbfgsb" = dontDistribute super."hlbfgsb";
+  "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
+  "hlogger" = dontDistribute super."hlogger";
+  "hlongurl" = dontDistribute super."hlongurl";
+  "hls" = dontDistribute super."hls";
+  "hlwm" = dontDistribute super."hlwm";
+  "hly" = dontDistribute super."hly";
+  "hmark" = dontDistribute super."hmark";
+  "hmarkup" = dontDistribute super."hmarkup";
+  "hmatrix-banded" = dontDistribute super."hmatrix-banded";
+  "hmatrix-csv" = dontDistribute super."hmatrix-csv";
+  "hmatrix-glpk" = dontDistribute super."hmatrix-glpk";
+  "hmatrix-mmap" = dontDistribute super."hmatrix-mmap";
+  "hmatrix-nipals" = dontDistribute super."hmatrix-nipals";
+  "hmatrix-quadprogpp" = dontDistribute super."hmatrix-quadprogpp";
+  "hmatrix-repa" = dontDistribute super."hmatrix-repa";
+  "hmatrix-special" = dontDistribute super."hmatrix-special";
+  "hmatrix-static" = dontDistribute super."hmatrix-static";
+  "hmatrix-svdlibc" = dontDistribute super."hmatrix-svdlibc";
+  "hmatrix-syntax" = dontDistribute super."hmatrix-syntax";
+  "hmatrix-tests" = dontDistribute super."hmatrix-tests";
+  "hmeap" = dontDistribute super."hmeap";
+  "hmeap-utils" = dontDistribute super."hmeap-utils";
+  "hmemdb" = dontDistribute super."hmemdb";
+  "hmenu" = dontDistribute super."hmenu";
+  "hmidi" = dontDistribute super."hmidi";
+  "hmk" = dontDistribute super."hmk";
+  "hmm" = dontDistribute super."hmm";
+  "hmm-hmatrix" = dontDistribute super."hmm-hmatrix";
+  "hmp3" = dontDistribute super."hmp3";
+  "hmpfr" = dontDistribute super."hmpfr";
+  "hmt" = dontDistribute super."hmt";
+  "hmt-diagrams" = dontDistribute super."hmt-diagrams";
+  "hmumps" = dontDistribute super."hmumps";
+  "hnetcdf" = dontDistribute super."hnetcdf";
+  "hnix" = dontDistribute super."hnix";
+  "hnn" = dontDistribute super."hnn";
+  "hnop" = dontDistribute super."hnop";
+  "ho-rewriting" = dontDistribute super."ho-rewriting";
+  "hoauth" = dontDistribute super."hoauth";
+  "hob" = dontDistribute super."hob";
+  "hobbes" = dontDistribute super."hobbes";
+  "hobbits" = dontDistribute super."hobbits";
+  "hoe" = dontDistribute super."hoe";
+  "hofix-mtl" = dontDistribute super."hofix-mtl";
+  "hog" = dontDistribute super."hog";
+  "hogg" = dontDistribute super."hogg";
+  "hogre" = dontDistribute super."hogre";
+  "hogre-examples" = dontDistribute super."hogre-examples";
+  "hois" = dontDistribute super."hois";
+  "hoist-error" = dontDistribute super."hoist-error";
+  "hold-em" = dontDistribute super."hold-em";
+  "hole" = dontDistribute super."hole";
+  "holey-format" = dontDistribute super."holey-format";
+  "homeomorphic" = dontDistribute super."homeomorphic";
+  "hommage" = dontDistribute super."hommage";
+  "hommage-ds" = dontDistribute super."hommage-ds";
+  "homplexity" = dontDistribute super."homplexity";
+  "honi" = dontDistribute super."honi";
+  "honk" = dontDistribute super."honk";
+  "hoobuddy" = dontDistribute super."hoobuddy";
+  "hood" = dontDistribute super."hood";
+  "hood-off" = dontDistribute super."hood-off";
+  "hood2" = dontDistribute super."hood2";
+  "hoodie" = dontDistribute super."hoodie";
+  "hoodle" = dontDistribute super."hoodle";
+  "hoodle-builder" = dontDistribute super."hoodle-builder";
+  "hoodle-core" = dontDistribute super."hoodle-core";
+  "hoodle-extra" = dontDistribute super."hoodle-extra";
+  "hoodle-parser" = dontDistribute super."hoodle-parser";
+  "hoodle-publish" = dontDistribute super."hoodle-publish";
+  "hoodle-render" = dontDistribute super."hoodle-render";
+  "hoodle-types" = dontDistribute super."hoodle-types";
+  "hoogle-index" = dontDistribute super."hoogle-index";
+  "hooks-dir" = dontDistribute super."hooks-dir";
+  "hoovie" = dontDistribute super."hoovie";
+  "hopencc" = dontDistribute super."hopencc";
+  "hopencl" = dontDistribute super."hopencl";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hoppy-generator" = dontDistribute super."hoppy-generator";
+  "hoppy-runtime" = dontDistribute super."hoppy-runtime";
+  "hoppy-std" = dontDistribute super."hoppy-std";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "hosc-json" = dontDistribute super."hosc-json";
+  "hosc-utils" = dontDistribute super."hosc-utils";
+  "hosts-server" = dontDistribute super."hosts-server";
+  "hothasktags" = dontDistribute super."hothasktags";
+  "hotswap" = dontDistribute super."hotswap";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "hp2any-core" = dontDistribute super."hp2any-core";
+  "hp2any-graph" = dontDistribute super."hp2any-graph";
+  "hp2any-manager" = dontDistribute super."hp2any-manager";
+  "hp2html" = dontDistribute super."hp2html";
+  "hp2pretty" = dontDistribute super."hp2pretty";
+  "hpack" = dontDistribute super."hpack";
+  "hpaco" = dontDistribute super."hpaco";
+  "hpaco-lib" = dontDistribute super."hpaco-lib";
+  "hpage" = dontDistribute super."hpage";
+  "hpapi" = dontDistribute super."hpapi";
+  "hpaste" = dontDistribute super."hpaste";
+  "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "hprotoc" = doDistribute super."hprotoc_2_1_12";
+  "hprotoc-fork" = dontDistribute super."hprotoc-fork";
+  "hps" = dontDistribute super."hps";
+  "hps-cairo" = dontDistribute super."hps-cairo";
+  "hps-kmeans" = dontDistribute super."hps-kmeans";
+  "hpuz" = dontDistribute super."hpuz";
+  "hpygments" = dontDistribute super."hpygments";
+  "hpylos" = dontDistribute super."hpylos";
+  "hpyrg" = dontDistribute super."hpyrg";
+  "hquantlib" = dontDistribute super."hquantlib";
+  "hquery" = dontDistribute super."hquery";
+  "hranker" = dontDistribute super."hranker";
+  "hreader" = dontDistribute super."hreader";
+  "hricket" = dontDistribute super."hricket";
+  "hruby" = dontDistribute super."hruby";
+  "hs-GeoIP" = dontDistribute super."hs-GeoIP";
+  "hs-blake2" = dontDistribute super."hs-blake2";
+  "hs-captcha" = dontDistribute super."hs-captcha";
+  "hs-carbon" = dontDistribute super."hs-carbon";
+  "hs-carbon-examples" = dontDistribute super."hs-carbon-examples";
+  "hs-cdb" = dontDistribute super."hs-cdb";
+  "hs-dotnet" = dontDistribute super."hs-dotnet";
+  "hs-duktape" = dontDistribute super."hs-duktape";
+  "hs-excelx" = dontDistribute super."hs-excelx";
+  "hs-ffmpeg" = dontDistribute super."hs-ffmpeg";
+  "hs-fltk" = dontDistribute super."hs-fltk";
+  "hs-gchart" = dontDistribute super."hs-gchart";
+  "hs-gen-iface" = dontDistribute super."hs-gen-iface";
+  "hs-gizapp" = dontDistribute super."hs-gizapp";
+  "hs-inspector" = dontDistribute super."hs-inspector";
+  "hs-java" = dontDistribute super."hs-java";
+  "hs-json-rpc" = dontDistribute super."hs-json-rpc";
+  "hs-logo" = dontDistribute super."hs-logo";
+  "hs-mesos" = dontDistribute super."hs-mesos";
+  "hs-nombre-generator" = dontDistribute super."hs-nombre-generator";
+  "hs-pgms" = dontDistribute super."hs-pgms";
+  "hs-php-session" = dontDistribute super."hs-php-session";
+  "hs-pkg-config" = dontDistribute super."hs-pkg-config";
+  "hs-pkpass" = dontDistribute super."hs-pkpass";
+  "hs-re" = dontDistribute super."hs-re";
+  "hs-scrape" = dontDistribute super."hs-scrape";
+  "hs-twitter" = dontDistribute super."hs-twitter";
+  "hs-twitterarchiver" = dontDistribute super."hs-twitterarchiver";
+  "hs-vcard" = dontDistribute super."hs-vcard";
+  "hs2048" = dontDistribute super."hs2048";
+  "hs2bf" = dontDistribute super."hs2bf";
+  "hs2dot" = dontDistribute super."hs2dot";
+  "hsConfigure" = dontDistribute super."hsConfigure";
+  "hsSqlite3" = dontDistribute super."hsSqlite3";
+  "hsXenCtrl" = dontDistribute super."hsXenCtrl";
+  "hsay" = dontDistribute super."hsay";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "hsbackup" = dontDistribute super."hsbackup";
+  "hsbencher" = dontDistribute super."hsbencher";
+  "hsbencher-codespeed" = dontDistribute super."hsbencher-codespeed";
+  "hsbencher-fusion" = dontDistribute super."hsbencher-fusion";
+  "hsc2hs" = dontDistribute super."hsc2hs";
+  "hsc3" = dontDistribute super."hsc3";
+  "hsc3-auditor" = dontDistribute super."hsc3-auditor";
+  "hsc3-cairo" = dontDistribute super."hsc3-cairo";
+  "hsc3-data" = dontDistribute super."hsc3-data";
+  "hsc3-db" = dontDistribute super."hsc3-db";
+  "hsc3-dot" = dontDistribute super."hsc3-dot";
+  "hsc3-forth" = dontDistribute super."hsc3-forth";
+  "hsc3-graphs" = dontDistribute super."hsc3-graphs";
+  "hsc3-lang" = dontDistribute super."hsc3-lang";
+  "hsc3-lisp" = dontDistribute super."hsc3-lisp";
+  "hsc3-plot" = dontDistribute super."hsc3-plot";
+  "hsc3-process" = dontDistribute super."hsc3-process";
+  "hsc3-rec" = dontDistribute super."hsc3-rec";
+  "hsc3-rw" = dontDistribute super."hsc3-rw";
+  "hsc3-server" = dontDistribute super."hsc3-server";
+  "hsc3-sf" = dontDistribute super."hsc3-sf";
+  "hsc3-sf-hsndfile" = dontDistribute super."hsc3-sf-hsndfile";
+  "hsc3-unsafe" = dontDistribute super."hsc3-unsafe";
+  "hsc3-utils" = dontDistribute super."hsc3-utils";
+  "hscamwire" = dontDistribute super."hscamwire";
+  "hscassandra" = dontDistribute super."hscassandra";
+  "hscd" = dontDistribute super."hscd";
+  "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "hsdif" = dontDistribute super."hsdif";
+  "hsdip" = dontDistribute super."hsdip";
+  "hsdns" = dontDistribute super."hsdns";
+  "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsemail-ns" = dontDistribute super."hsemail-ns";
+  "hsenv" = dontDistribute super."hsenv";
+  "hserv" = dontDistribute super."hserv";
+  "hset" = dontDistribute super."hset";
+  "hsfacter" = dontDistribute super."hsfacter";
+  "hsfcsh" = dontDistribute super."hsfcsh";
+  "hsfilt" = dontDistribute super."hsfilt";
+  "hsgnutls" = dontDistribute super."hsgnutls";
+  "hsgnutls-yj" = dontDistribute super."hsgnutls-yj";
+  "hsgsom" = dontDistribute super."hsgsom";
+  "hsgtd" = dontDistribute super."hsgtd";
+  "hsharc" = dontDistribute super."hsharc";
+  "hsilop" = dontDistribute super."hsilop";
+  "hsimport" = dontDistribute super."hsimport";
+  "hsini" = dontDistribute super."hsini";
+  "hskeleton" = dontDistribute super."hskeleton";
+  "hslackbuilder" = dontDistribute super."hslackbuilder";
+  "hslibsvm" = dontDistribute super."hslibsvm";
+  "hslinks" = dontDistribute super."hslinks";
+  "hslogger-reader" = dontDistribute super."hslogger-reader";
+  "hslogger-template" = dontDistribute super."hslogger-template";
+  "hslogger4j" = dontDistribute super."hslogger4j";
+  "hslogstash" = dontDistribute super."hslogstash";
+  "hsmagick" = dontDistribute super."hsmagick";
+  "hsmisc" = dontDistribute super."hsmisc";
+  "hsmtpclient" = dontDistribute super."hsmtpclient";
+  "hsndfile-storablevector" = dontDistribute super."hsndfile-storablevector";
+  "hsnock" = dontDistribute super."hsnock";
+  "hsnoise" = dontDistribute super."hsnoise";
+  "hsns" = dontDistribute super."hsns";
+  "hsnsq" = dontDistribute super."hsnsq";
+  "hsntp" = dontDistribute super."hsntp";
+  "hsoptions" = dontDistribute super."hsoptions";
+  "hsp-cgi" = dontDistribute super."hsp-cgi";
+  "hsparklines" = dontDistribute super."hsparklines";
+  "hsparql" = dontDistribute super."hsparql";
+  "hspear" = dontDistribute super."hspear";
+  "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
+  "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
+  "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-experimental" = dontDistribute super."hspec-experimental";
+  "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
+  "hspec-test-framework" = dontDistribute super."hspec-test-framework";
+  "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
+  "hspec-test-sandbox" = dontDistribute super."hspec-test-sandbox";
+  "hspec-wai" = doDistribute super."hspec-wai_0_6_5";
+  "hspec2" = dontDistribute super."hspec2";
+  "hspr-sh" = dontDistribute super."hspr-sh";
+  "hspread" = dontDistribute super."hspread";
+  "hspresent" = dontDistribute super."hspresent";
+  "hsprocess" = dontDistribute super."hsprocess";
+  "hsql" = dontDistribute super."hsql";
+  "hsql-mysql" = dontDistribute super."hsql-mysql";
+  "hsql-odbc" = dontDistribute super."hsql-odbc";
+  "hsql-postgresql" = dontDistribute super."hsql-postgresql";
+  "hsql-sqlite3" = dontDistribute super."hsql-sqlite3";
+  "hsqml" = dontDistribute super."hsqml";
+  "hsqml-datamodel" = dontDistribute super."hsqml-datamodel";
+  "hsqml-datamodel-vinyl" = dontDistribute super."hsqml-datamodel-vinyl";
+  "hsqml-demo-morris" = dontDistribute super."hsqml-demo-morris";
+  "hsqml-demo-notes" = dontDistribute super."hsqml-demo-notes";
+  "hsqml-demo-samples" = dontDistribute super."hsqml-demo-samples";
+  "hsqml-morris" = dontDistribute super."hsqml-morris";
+  "hsreadability" = dontDistribute super."hsreadability";
+  "hsseccomp" = dontDistribute super."hsseccomp";
+  "hsshellscript" = dontDistribute super."hsshellscript";
+  "hssourceinfo" = dontDistribute super."hssourceinfo";
+  "hssqlppp" = dontDistribute super."hssqlppp";
+  "hstats" = dontDistribute super."hstats";
+  "hstest" = dontDistribute super."hstest";
+  "hstidy" = dontDistribute super."hstidy";
+  "hstorchat" = dontDistribute super."hstorchat";
+  "hstradeking" = dontDistribute super."hstradeking";
+  "hstyle" = dontDistribute super."hstyle";
+  "hstzaar" = dontDistribute super."hstzaar";
+  "hsubconvert" = dontDistribute super."hsubconvert";
+  "hsverilog" = dontDistribute super."hsverilog";
+  "hswip" = dontDistribute super."hswip";
+  "hsx" = dontDistribute super."hsx";
+  "hsx-xhtml" = dontDistribute super."hsx-xhtml";
+  "hsyscall" = dontDistribute super."hsyscall";
+  "hszephyr" = dontDistribute super."hszephyr";
+  "htags" = dontDistribute super."htags";
+  "htar" = dontDistribute super."htar";
+  "htiled" = dontDistribute super."htiled";
+  "htime" = dontDistribute super."htime";
+  "html-email-validate" = dontDistribute super."html-email-validate";
+  "html-entities" = dontDistribute super."html-entities";
+  "html-kure" = dontDistribute super."html-kure";
+  "html-minimalist" = dontDistribute super."html-minimalist";
+  "html-rules" = dontDistribute super."html-rules";
+  "html-tokenizer" = dontDistribute super."html-tokenizer";
+  "html-truncate" = dontDistribute super."html-truncate";
+  "html2hamlet" = dontDistribute super."html2hamlet";
+  "html5-entity" = dontDistribute super."html5-entity";
+  "htodo" = dontDistribute super."htodo";
+  "htoml" = dontDistribute super."htoml";
+  "htrace" = dontDistribute super."htrace";
+  "hts" = dontDistribute super."hts";
+  "htsn" = dontDistribute super."htsn";
+  "htsn-common" = dontDistribute super."htsn-common";
+  "htsn-import" = dontDistribute super."htsn-import";
+  "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client-auth" = dontDistribute super."http-client-auth";
+  "http-client-conduit" = dontDistribute super."http-client-conduit";
+  "http-client-lens" = dontDistribute super."http-client-lens";
+  "http-client-multipart" = dontDistribute super."http-client-multipart";
+  "http-client-request-modifiers" = dontDistribute super."http-client-request-modifiers";
+  "http-client-session" = dontDistribute super."http-client-session";
+  "http-client-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kinder" = dontDistribute super."http-kinder";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "http-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
+  "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
+  "httpspec" = dontDistribute super."httpspec";
+  "htune" = dontDistribute super."htune";
+  "htzaar" = dontDistribute super."htzaar";
+  "hub" = dontDistribute super."hub";
+  "hubigraph" = dontDistribute super."hubigraph";
+  "hubris" = dontDistribute super."hubris";
+  "huckleberry" = dontDistribute super."huckleberry";
+  "huffman" = dontDistribute super."huffman";
+  "hugs2yc" = dontDistribute super."hugs2yc";
+  "hulk" = dontDistribute super."hulk";
+  "hums" = dontDistribute super."hums";
+  "hunch" = dontDistribute super."hunch";
+  "hunit-gui" = dontDistribute super."hunit-gui";
+  "hunit-parsec" = dontDistribute super."hunit-parsec";
+  "hunit-rematch" = dontDistribute super."hunit-rematch";
+  "hunp" = dontDistribute super."hunp";
+  "hunt-searchengine" = dontDistribute super."hunt-searchengine";
+  "hunt-server" = dontDistribute super."hunt-server";
+  "hunt-server-cli" = dontDistribute super."hunt-server-cli";
+  "hurdle" = dontDistribute super."hurdle";
+  "husk-scheme" = dontDistribute super."husk-scheme";
+  "husk-scheme-libs" = dontDistribute super."husk-scheme-libs";
+  "husky" = dontDistribute super."husky";
+  "hutton" = dontDistribute super."hutton";
+  "huttons-razor" = dontDistribute super."huttons-razor";
+  "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
+  "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
+  "hws" = dontDistribute super."hws";
+  "hwsl2" = dontDistribute super."hwsl2";
+  "hwsl2-bytevector" = dontDistribute super."hwsl2-bytevector";
+  "hwsl2-reducers" = dontDistribute super."hwsl2-reducers";
+  "hx" = dontDistribute super."hx";
+  "hxmppc" = dontDistribute super."hxmppc";
+  "hxournal" = dontDistribute super."hxournal";
+  "hxt-binary" = dontDistribute super."hxt-binary";
+  "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-extras" = dontDistribute super."hxt-extras";
+  "hxt-filter" = dontDistribute super."hxt-filter";
+  "hxt-xpath" = dontDistribute super."hxt-xpath";
+  "hxt-xslt" = dontDistribute super."hxt-xslt";
+  "hxthelper" = dontDistribute super."hxthelper";
+  "hxweb" = dontDistribute super."hxweb";
+  "hyahtzee" = dontDistribute super."hyahtzee";
+  "hyakko" = dontDistribute super."hyakko";
+  "hybrid" = dontDistribute super."hybrid";
+  "hydra-hs" = dontDistribute super."hydra-hs";
+  "hydra-print" = dontDistribute super."hydra-print";
+  "hydrogen" = dontDistribute super."hydrogen";
+  "hydrogen-cli" = dontDistribute super."hydrogen-cli";
+  "hydrogen-cli-args" = dontDistribute super."hydrogen-cli-args";
+  "hydrogen-data" = dontDistribute super."hydrogen-data";
+  "hydrogen-multimap" = dontDistribute super."hydrogen-multimap";
+  "hydrogen-parsing" = dontDistribute super."hydrogen-parsing";
+  "hydrogen-prelude" = dontDistribute super."hydrogen-prelude";
+  "hydrogen-prelude-parsec" = dontDistribute super."hydrogen-prelude-parsec";
+  "hydrogen-syntax" = dontDistribute super."hydrogen-syntax";
+  "hydrogen-util" = dontDistribute super."hydrogen-util";
+  "hydrogen-version" = dontDistribute super."hydrogen-version";
+  "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
+  "hylolib" = dontDistribute super."hylolib";
+  "hylotab" = dontDistribute super."hylotab";
+  "hyloutils" = dontDistribute super."hyloutils";
+  "hyperdrive" = dontDistribute super."hyperdrive";
+  "hyperfunctions" = dontDistribute super."hyperfunctions";
+  "hyperpublic" = dontDistribute super."hyperpublic";
+  "hyphenate" = dontDistribute super."hyphenate";
+  "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
+  "hzk" = dontDistribute super."hzk";
+  "i18n" = dontDistribute super."i18n";
+  "iCalendar" = dontDistribute super."iCalendar";
+  "iException" = dontDistribute super."iException";
+  "iap-verifier" = dontDistribute super."iap-verifier";
+  "ib-api" = dontDistribute super."ib-api";
+  "iban" = dontDistribute super."iban";
+  "ibus-hs" = dontDistribute super."ibus-hs";
+  "ideas" = dontDistribute super."ideas";
+  "ideas-math" = dontDistribute super."ideas-math";
+  "idempotent" = dontDistribute super."idempotent";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "ieee" = dontDistribute super."ieee";
+  "ieee-utils" = dontDistribute super."ieee-utils";
+  "ieee-utils-tempfix" = dontDistribute super."ieee-utils-tempfix";
+  "ieee754-parser" = dontDistribute super."ieee754-parser";
+  "ifcxt" = dontDistribute super."ifcxt";
+  "iff" = dontDistribute super."iff";
+  "ifscs" = dontDistribute super."ifscs";
+  "ig" = doDistribute super."ig_0_6_1";
+  "ige-mac-integration" = dontDistribute super."ige-mac-integration";
+  "igraph" = dontDistribute super."igraph";
+  "igrf" = dontDistribute super."igrf";
+  "ihaskell-display" = dontDistribute super."ihaskell-display";
+  "ihaskell-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "imap" = dontDistribute super."imap";
+  "imapget" = dontDistribute super."imapget";
+  "imbib" = dontDistribute super."imbib";
+  "imgurder" = dontDistribute super."imgurder";
+  "imm" = dontDistribute super."imm";
+  "imparse" = dontDistribute super."imparse";
+  "imperative-edsl" = dontDistribute super."imperative-edsl";
+  "imperative-edsl-vhdl" = dontDistribute super."imperative-edsl-vhdl";
+  "implicit" = dontDistribute super."implicit";
+  "implicit-logging" = dontDistribute super."implicit-logging";
+  "implicit-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "impossible" = dontDistribute super."impossible";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "indentparser" = dontDistribute super."indentparser";
+  "index-core" = dontDistribute super."index-core";
+  "indexed" = dontDistribute super."indexed";
+  "indexed-do-notation" = dontDistribute super."indexed-do-notation";
+  "indexed-extras" = dontDistribute super."indexed-extras";
+  "indexed-free" = dontDistribute super."indexed-free";
+  "indian-language-font-converter" = dontDistribute super."indian-language-font-converter";
+  "indices" = dontDistribute super."indices";
+  "indieweb-algorithms" = dontDistribute super."indieweb-algorithms";
+  "inf-interval" = dontDistribute super."inf-interval";
+  "infer-upstream" = dontDistribute super."infer-upstream";
+  "infernu" = dontDistribute super."infernu";
+  "infinite-search" = dontDistribute super."infinite-search";
+  "infinity" = dontDistribute super."infinity";
+  "infix" = dontDistribute super."infix";
+  "inflist" = dontDistribute super."inflist";
+  "influxdb" = dontDistribute super."influxdb";
+  "informative" = dontDistribute super."informative";
+  "inilist" = dontDistribute super."inilist";
+  "inject" = dontDistribute super."inject";
+  "inject-function" = dontDistribute super."inject-function";
+  "inline-c-win32" = dontDistribute super."inline-c-win32";
+  "inquire" = dontDistribute super."inquire";
+  "insert-ordered-containers" = dontDistribute super."insert-ordered-containers";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "instant-aeson" = dontDistribute super."instant-aeson";
+  "instant-bytes" = dontDistribute super."instant-bytes";
+  "instant-deepseq" = dontDistribute super."instant-deepseq";
+  "instant-generics" = dontDistribute super."instant-generics";
+  "instant-hashable" = dontDistribute super."instant-hashable";
+  "instant-zipper" = dontDistribute super."instant-zipper";
+  "instinct" = dontDistribute super."instinct";
+  "instrument-chord" = dontDistribute super."instrument-chord";
+  "int-cast" = dontDistribute super."int-cast";
+  "integer-pure" = dontDistribute super."integer-pure";
+  "intel-aes" = dontDistribute super."intel-aes";
+  "interchangeable" = dontDistribute super."interchangeable";
+  "interleavableGen" = dontDistribute super."interleavableGen";
+  "interleavableIO" = dontDistribute super."interleavableIO";
+  "interleave" = dontDistribute super."interleave";
+  "interlude" = dontDistribute super."interlude";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invertible-syntax" = dontDistribute super."invertible-syntax";
+  "io-capture" = dontDistribute super."io-capture";
+  "io-reactive" = dontDistribute super."io-reactive";
+  "io-streams-http" = dontDistribute super."io-streams-http";
+  "io-throttle" = dontDistribute super."io-throttle";
+  "ioctl" = dontDistribute super."ioctl";
+  "ioref-stable" = dontDistribute super."ioref-stable";
+  "iothread" = dontDistribute super."iothread";
+  "iotransaction" = dontDistribute super."iotransaction";
+  "ip-quoter" = dontDistribute super."ip-quoter";
+  "ipatch" = dontDistribute super."ipatch";
+  "ipc" = dontDistribute super."ipc";
+  "ipcvar" = dontDistribute super."ipcvar";
+  "ipopt-hs" = dontDistribute super."ipopt-hs";
+  "ipprint" = dontDistribute super."ipprint";
+  "iptables-helpers" = dontDistribute super."iptables-helpers";
+  "iptadmin" = dontDistribute super."iptadmin";
+  "irc-bytestring" = dontDistribute super."irc-bytestring";
+  "irc-colors" = dontDistribute super."irc-colors";
+  "irc-core" = dontDistribute super."irc-core";
+  "irc-dcc" = dontDistribute super."irc-dcc";
+  "irc-fun-bot" = dontDistribute super."irc-fun-bot";
+  "irc-fun-client" = dontDistribute super."irc-fun-client";
+  "irc-fun-color" = dontDistribute super."irc-fun-color";
+  "irc-fun-messages" = dontDistribute super."irc-fun-messages";
+  "irc-fun-types" = dontDistribute super."irc-fun-types";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "iridium" = dontDistribute super."iridium";
+  "iron-mq" = dontDistribute super."iron-mq";
+  "ironforge" = dontDistribute super."ironforge";
+  "is" = dontDistribute super."is";
+  "isdicom" = dontDistribute super."isdicom";
+  "isevaluated" = dontDistribute super."isevaluated";
+  "isiz" = dontDistribute super."isiz";
+  "ismtp" = dontDistribute super."ismtp";
+  "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
+  "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
+  "itanium-abi" = dontDistribute super."itanium-abi";
+  "iter-stats" = dontDistribute super."iter-stats";
+  "iterIO" = dontDistribute super."iterIO";
+  "iteratee" = dontDistribute super."iteratee";
+  "iteratee-compress" = dontDistribute super."iteratee-compress";
+  "iteratee-mtl" = dontDistribute super."iteratee-mtl";
+  "iteratee-parsec" = dontDistribute super."iteratee-parsec";
+  "iteratee-stm" = dontDistribute super."iteratee-stm";
+  "iterio-server" = dontDistribute super."iterio-server";
+  "ivar-simple" = dontDistribute super."ivar-simple";
+  "ivor" = dontDistribute super."ivor";
+  "ivory" = dontDistribute super."ivory";
+  "ivory-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-examples" = dontDistribute super."ivory-examples";
+  "ivory-hw" = dontDistribute super."ivory-hw";
+  "ivory-opts" = dontDistribute super."ivory-opts";
+  "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-stdlib" = dontDistribute super."ivory-stdlib";
+  "ivy-web" = dontDistribute super."ivy-web";
+  "ixdopp" = dontDistribute super."ixdopp";
+  "ixmonad" = dontDistribute super."ixmonad";
+  "iyql" = dontDistribute super."iyql";
+  "j2hs" = dontDistribute super."j2hs";
+  "ja-base-extra" = dontDistribute super."ja-base-extra";
+  "jack" = dontDistribute super."jack";
+  "jack-bindings" = dontDistribute super."jack-bindings";
+  "jackminimix" = dontDistribute super."jackminimix";
+  "jacobi-roots" = dontDistribute super."jacobi-roots";
+  "jail" = dontDistribute super."jail";
+  "jailbreak-cabal" = dontDistribute super."jailbreak-cabal";
+  "jalaali" = dontDistribute super."jalaali";
+  "jalla" = dontDistribute super."jalla";
+  "jammittools" = dontDistribute super."jammittools";
+  "jarfind" = dontDistribute super."jarfind";
+  "java-bridge" = dontDistribute super."java-bridge";
+  "java-bridge-extras" = dontDistribute super."java-bridge-extras";
+  "java-character" = dontDistribute super."java-character";
+  "java-poker" = dontDistribute super."java-poker";
+  "java-reflect" = dontDistribute super."java-reflect";
+  "javaclass" = dontDistribute super."javaclass";
+  "javasf" = dontDistribute super."javasf";
+  "javav" = dontDistribute super."javav";
+  "jcdecaux-vls" = dontDistribute super."jcdecaux-vls";
+  "jdi" = dontDistribute super."jdi";
+  "jespresso" = dontDistribute super."jespresso";
+  "jobqueue" = dontDistribute super."jobqueue";
+  "join" = dontDistribute super."join";
+  "joinlist" = dontDistribute super."joinlist";
+  "jonathanscard" = dontDistribute super."jonathanscard";
+  "jort" = dontDistribute super."jort";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
+  "json-b" = dontDistribute super."json-b";
+  "json-encoder" = dontDistribute super."json-encoder";
+  "json-enumerator" = dontDistribute super."json-enumerator";
+  "json-extra" = dontDistribute super."json-extra";
+  "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
+  "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
+  "json-python" = dontDistribute super."json-python";
+  "json-qq" = dontDistribute super."json-qq";
+  "json-rpc" = dontDistribute super."json-rpc";
+  "json-rpc-client" = dontDistribute super."json-rpc-client";
+  "json-rpc-server" = dontDistribute super."json-rpc-server";
+  "json-sop" = dontDistribute super."json-sop";
+  "json-state" = dontDistribute super."json-state";
+  "json-stream" = dontDistribute super."json-stream";
+  "json-togo" = dontDistribute super."json-togo";
+  "json-tools" = dontDistribute super."json-tools";
+  "json-types" = dontDistribute super."json-types";
+  "json2" = dontDistribute super."json2";
+  "json2-hdbc" = dontDistribute super."json2-hdbc";
+  "json2-types" = dontDistribute super."json2-types";
+  "json2yaml" = dontDistribute super."json2yaml";
+  "jsonresume" = dontDistribute super."jsonresume";
+  "jsonrpc-conduit" = dontDistribute super."jsonrpc-conduit";
+  "jsonschema-gen" = dontDistribute super."jsonschema-gen";
+  "jsonsql" = dontDistribute super."jsonsql";
+  "jsontsv" = dontDistribute super."jsontsv";
+  "jspath" = dontDistribute super."jspath";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jump" = dontDistribute super."jump";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "jwt" = doDistribute super."jwt_0_6_0";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "kansas-lava" = dontDistribute super."kansas-lava";
+  "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
+  "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
+  "kansas-lava-shake" = dontDistribute super."kansas-lava-shake";
+  "karakuri" = dontDistribute super."karakuri";
+  "karver" = dontDistribute super."karver";
+  "katip" = dontDistribute super."katip";
+  "katip-elasticsearch" = dontDistribute super."katip-elasticsearch";
+  "katt" = dontDistribute super."katt";
+  "kazura-queue" = dontDistribute super."kazura-queue";
+  "kbq-gu" = dontDistribute super."kbq-gu";
+  "kd-tree" = dontDistribute super."kd-tree";
+  "kdesrc-build-extra" = dontDistribute super."kdesrc-build-extra";
+  "keera-callbacks" = dontDistribute super."keera-callbacks";
+  "keera-hails-i18n" = dontDistribute super."keera-hails-i18n";
+  "keera-hails-mvc-controller" = dontDistribute super."keera-hails-mvc-controller";
+  "keera-hails-mvc-environment-gtk" = dontDistribute super."keera-hails-mvc-environment-gtk";
+  "keera-hails-mvc-model-lightmodel" = dontDistribute super."keera-hails-mvc-model-lightmodel";
+  "keera-hails-mvc-model-protectedmodel" = dontDistribute super."keera-hails-mvc-model-protectedmodel";
+  "keera-hails-mvc-solutions-config" = dontDistribute super."keera-hails-mvc-solutions-config";
+  "keera-hails-mvc-solutions-gtk" = dontDistribute super."keera-hails-mvc-solutions-gtk";
+  "keera-hails-mvc-view" = dontDistribute super."keera-hails-mvc-view";
+  "keera-hails-mvc-view-gtk" = dontDistribute super."keera-hails-mvc-view-gtk";
+  "keera-hails-reactive-fs" = dontDistribute super."keera-hails-reactive-fs";
+  "keera-hails-reactive-gtk" = dontDistribute super."keera-hails-reactive-gtk";
+  "keera-hails-reactive-network" = dontDistribute super."keera-hails-reactive-network";
+  "keera-hails-reactive-polling" = dontDistribute super."keera-hails-reactive-polling";
+  "keera-hails-reactive-wx" = dontDistribute super."keera-hails-reactive-wx";
+  "keera-hails-reactive-yampa" = dontDistribute super."keera-hails-reactive-yampa";
+  "keera-hails-reactivelenses" = dontDistribute super."keera-hails-reactivelenses";
+  "keera-hails-reactivevalues" = dontDistribute super."keera-hails-reactivevalues";
+  "keera-posture" = dontDistribute super."keera-posture";
+  "keiretsu" = dontDistribute super."keiretsu";
+  "kevin" = dontDistribute super."kevin";
+  "keyed" = dontDistribute super."keyed";
+  "keyring" = dontDistribute super."keyring";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "kibro" = dontDistribute super."kibro";
+  "kicad-data" = dontDistribute super."kicad-data";
+  "kickass-torrents-dump-parser" = dontDistribute super."kickass-torrents-dump-parser";
+  "kickchan" = dontDistribute super."kickchan";
+  "kif-parser" = dontDistribute super."kif-parser";
+  "kinds" = dontDistribute super."kinds";
+  "kit" = dontDistribute super."kit";
+  "kmeans-par" = dontDistribute super."kmeans-par";
+  "kmeans-vector" = dontDistribute super."kmeans-vector";
+  "knots" = dontDistribute super."knots";
+  "koellner-phonetic" = dontDistribute super."koellner-phonetic";
+  "kontrakcja-templates" = dontDistribute super."kontrakcja-templates";
+  "korfu" = dontDistribute super."korfu";
+  "kqueue" = dontDistribute super."kqueue";
+  "krpc" = dontDistribute super."krpc";
+  "ks-test" = dontDistribute super."ks-test";
+  "ktx" = dontDistribute super."ktx";
+  "kure-your-boilerplate" = dontDistribute super."kure-your-boilerplate";
+  "kyotocabinet" = dontDistribute super."kyotocabinet";
+  "l-bfgs-b" = dontDistribute super."l-bfgs-b";
+  "labeled-graph" = dontDistribute super."labeled-graph";
+  "labeled-tree" = dontDistribute super."labeled-tree";
+  "laborantin-hs" = dontDistribute super."laborantin-hs";
+  "labyrinth" = dontDistribute super."labyrinth";
+  "labyrinth-server" = dontDistribute super."labyrinth-server";
+  "lackey" = dontDistribute super."lackey";
+  "lagrangian" = dontDistribute super."lagrangian";
+  "laika" = dontDistribute super."laika";
+  "lambda-ast" = dontDistribute super."lambda-ast";
+  "lambda-bridge" = dontDistribute super."lambda-bridge";
+  "lambda-canvas" = dontDistribute super."lambda-canvas";
+  "lambda-devs" = dontDistribute super."lambda-devs";
+  "lambda-options" = dontDistribute super."lambda-options";
+  "lambda-placeholders" = dontDistribute super."lambda-placeholders";
+  "lambda-toolbox" = dontDistribute super."lambda-toolbox";
+  "lambda2js" = dontDistribute super."lambda2js";
+  "lambdaBase" = dontDistribute super."lambdaBase";
+  "lambdaFeed" = dontDistribute super."lambdaFeed";
+  "lambdaLit" = dontDistribute super."lambdaLit";
+  "lambdabot" = dontDistribute super."lambdabot";
+  "lambdabot-core" = dontDistribute super."lambdabot-core";
+  "lambdabot-haskell-plugins" = dontDistribute super."lambdabot-haskell-plugins";
+  "lambdabot-irc-plugins" = dontDistribute super."lambdabot-irc-plugins";
+  "lambdabot-misc-plugins" = dontDistribute super."lambdabot-misc-plugins";
+  "lambdabot-novelty-plugins" = dontDistribute super."lambdabot-novelty-plugins";
+  "lambdabot-reference-plugins" = dontDistribute super."lambdabot-reference-plugins";
+  "lambdabot-social-plugins" = dontDistribute super."lambdabot-social-plugins";
+  "lambdabot-trusted" = dontDistribute super."lambdabot-trusted";
+  "lambdabot-utils" = dontDistribute super."lambdabot-utils";
+  "lambdacat" = dontDistribute super."lambdacat";
+  "lambdacms-core" = dontDistribute super."lambdacms-core";
+  "lambdacms-media" = dontDistribute super."lambdacms-media";
+  "lambdacube" = dontDistribute super."lambdacube";
+  "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
+  "lambdacube-core" = dontDistribute super."lambdacube-core";
+  "lambdacube-edsl" = dontDistribute super."lambdacube-edsl";
+  "lambdacube-engine" = dontDistribute super."lambdacube-engine";
+  "lambdacube-examples" = dontDistribute super."lambdacube-examples";
+  "lambdacube-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "lambdiff" = dontDistribute super."lambdiff";
+  "lame-tester" = dontDistribute super."lame-tester";
+  "language-asn1" = dontDistribute super."language-asn1";
+  "language-bash" = dontDistribute super."language-bash";
+  "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
+  "language-c-comments" = dontDistribute super."language-c-comments";
+  "language-c-inline" = dontDistribute super."language-c-inline";
+  "language-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
+  "language-eiffel" = dontDistribute super."language-eiffel";
+  "language-fortran" = dontDistribute super."language-fortran";
+  "language-gcl" = dontDistribute super."language-gcl";
+  "language-go" = dontDistribute super."language-go";
+  "language-guess" = dontDistribute super."language-guess";
+  "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-kort" = dontDistribute super."language-kort";
+  "language-lua" = dontDistribute super."language-lua";
+  "language-lua-qq" = dontDistribute super."language-lua-qq";
+  "language-mixal" = dontDistribute super."language-mixal";
+  "language-objc" = dontDistribute super."language-objc";
+  "language-openscad" = dontDistribute super."language-openscad";
+  "language-pig" = dontDistribute super."language-pig";
+  "language-puppet" = dontDistribute super."language-puppet";
+  "language-python" = dontDistribute super."language-python";
+  "language-python-colour" = dontDistribute super."language-python-colour";
+  "language-python-test" = dontDistribute super."language-python-test";
+  "language-qux" = dontDistribute super."language-qux";
+  "language-sh" = dontDistribute super."language-sh";
+  "language-slice" = dontDistribute super."language-slice";
+  "language-spelling" = dontDistribute super."language-spelling";
+  "language-sqlite" = dontDistribute super."language-sqlite";
+  "language-thrift" = doDistribute super."language-thrift_0_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "lat" = dontDistribute super."lat";
+  "latest-npm-version" = dontDistribute super."latest-npm-version";
+  "latex" = dontDistribute super."latex";
+  "launchpad-control" = dontDistribute super."launchpad-control";
+  "lax" = dontDistribute super."lax";
+  "layers" = dontDistribute super."layers";
+  "layers-game" = dontDistribute super."layers-game";
+  "layout" = dontDistribute super."layout";
+  "layout-bootstrap" = dontDistribute super."layout-bootstrap";
+  "lazy-io" = dontDistribute super."lazy-io";
+  "lazyarray" = dontDistribute super."lazyarray";
+  "lazyio" = dontDistribute super."lazyio";
+  "lazysmallcheck" = dontDistribute super."lazysmallcheck";
+  "lazysplines" = dontDistribute super."lazysplines";
+  "lbfgs" = dontDistribute super."lbfgs";
+  "lcs" = dontDistribute super."lcs";
+  "lda" = dontDistribute super."lda";
+  "ldap-client" = dontDistribute super."ldap-client";
+  "ldif" = dontDistribute super."ldif";
+  "leaf" = dontDistribute super."leaf";
+  "leaky" = dontDistribute super."leaky";
+  "leankit-api" = dontDistribute super."leankit-api";
+  "leapseconds-announced" = dontDistribute super."leapseconds-announced";
+  "learn" = dontDistribute super."learn";
+  "learn-physics" = dontDistribute super."learn-physics";
+  "learn-physics-examples" = dontDistribute super."learn-physics-examples";
+  "learning-hmm" = dontDistribute super."learning-hmm";
+  "leetify" = dontDistribute super."leetify";
+  "leksah" = dontDistribute super."leksah";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "lens-prelude" = dontDistribute super."lens-prelude";
+  "lens-properties" = dontDistribute super."lens-properties";
+  "lens-sop" = dontDistribute super."lens-sop";
+  "lens-text-encoding" = dontDistribute super."lens-text-encoding";
+  "lens-time" = dontDistribute super."lens-time";
+  "lens-tutorial" = dontDistribute super."lens-tutorial";
+  "lens-utils" = dontDistribute super."lens-utils";
+  "lenses" = dontDistribute super."lenses";
+  "lensref" = dontDistribute super."lensref";
+  "lenz" = dontDistribute super."lenz";
+  "lenz-template" = dontDistribute super."lenz-template";
+  "level-monad" = dontDistribute super."level-monad";
+  "leveldb-haskell-fork" = dontDistribute super."leveldb-haskell-fork";
+  "levmar" = dontDistribute super."levmar";
+  "levmar-chart" = dontDistribute super."levmar-chart";
+  "lfst" = dontDistribute super."lfst";
+  "lgtk" = dontDistribute super."lgtk";
+  "lha" = dontDistribute super."lha";
+  "lhae" = dontDistribute super."lhae";
+  "lhc" = dontDistribute super."lhc";
+  "lhe" = dontDistribute super."lhe";
+  "lhs2TeX-hl" = dontDistribute super."lhs2TeX-hl";
+  "lhs2html" = dontDistribute super."lhs2html";
+  "lhslatex" = dontDistribute super."lhslatex";
+  "libGenI" = dontDistribute super."libGenI";
+  "libarchive-conduit" = dontDistribute super."libarchive-conduit";
+  "libconfig" = dontDistribute super."libconfig";
+  "libcspm" = dontDistribute super."libcspm";
+  "libexpect" = dontDistribute super."libexpect";
+  "libffi" = dontDistribute super."libffi";
+  "libgraph" = dontDistribute super."libgraph";
+  "libhbb" = dontDistribute super."libhbb";
+  "libjenkins" = dontDistribute super."libjenkins";
+  "liblastfm" = dontDistribute super."liblastfm";
+  "liblinear-enumerator" = dontDistribute super."liblinear-enumerator";
+  "libltdl" = dontDistribute super."libltdl";
+  "libmpd" = dontDistribute super."libmpd";
+  "libnvvm" = dontDistribute super."libnvvm";
+  "liboleg" = dontDistribute super."liboleg";
+  "libpafe" = dontDistribute super."libpafe";
+  "libpq" = dontDistribute super."libpq";
+  "librandomorg" = dontDistribute super."librandomorg";
+  "libravatar" = dontDistribute super."libravatar";
+  "libssh2" = dontDistribute super."libssh2";
+  "libssh2-conduit" = dontDistribute super."libssh2-conduit";
+  "libstackexchange" = dontDistribute super."libstackexchange";
+  "libsystemd-daemon" = dontDistribute super."libsystemd-daemon";
+  "libtagc" = dontDistribute super."libtagc";
+  "libvirt-hs" = dontDistribute super."libvirt-hs";
+  "libvorbis" = dontDistribute super."libvorbis";
+  "libxls" = dontDistribute super."libxls";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-threads" = dontDistribute super."lifted-threads";
+  "lifter" = dontDistribute super."lifter";
+  "ligature" = dontDistribute super."ligature";
+  "ligd" = dontDistribute super."ligd";
+  "lighttpd-conf" = dontDistribute super."lighttpd-conf";
+  "lighttpd-conf-qq" = dontDistribute super."lighttpd-conf-qq";
+  "lilypond" = dontDistribute super."lilypond";
+  "limp" = dontDistribute super."limp";
+  "limp-cbc" = dontDistribute super."limp-cbc";
+  "lin-alg" = dontDistribute super."lin-alg";
+  "linda" = dontDistribute super."linda";
+  "lindenmayer" = dontDistribute super."lindenmayer";
+  "line-break" = dontDistribute super."line-break";
+  "line2pdf" = dontDistribute super."line2pdf";
+  "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
+  "linear-circuit" = dontDistribute super."linear-circuit";
+  "linear-grammar" = dontDistribute super."linear-grammar";
+  "linear-maps" = dontDistribute super."linear-maps";
+  "linear-opengl" = dontDistribute super."linear-opengl";
+  "linear-vect" = dontDistribute super."linear-vect";
+  "linearEqSolver" = dontDistribute super."linearEqSolver";
+  "linearscan" = dontDistribute super."linearscan";
+  "linearscan-hoopl" = dontDistribute super."linearscan-hoopl";
+  "linebreak" = dontDistribute super."linebreak";
+  "linguistic-ordinals" = dontDistribute super."linguistic-ordinals";
+  "link-relations" = dontDistribute super."link-relations";
+  "linkchk" = dontDistribute super."linkchk";
+  "linkcore" = dontDistribute super."linkcore";
+  "linkedhashmap" = dontDistribute super."linkedhashmap";
+  "linklater" = dontDistribute super."linklater";
+  "linode" = dontDistribute super."linode";
+  "linux-blkid" = dontDistribute super."linux-blkid";
+  "linux-cgroup" = dontDistribute super."linux-cgroup";
+  "linux-evdev" = dontDistribute super."linux-evdev";
+  "linux-inotify" = dontDistribute super."linux-inotify";
+  "linux-kmod" = dontDistribute super."linux-kmod";
+  "linux-mount" = dontDistribute super."linux-mount";
+  "linux-perf" = dontDistribute super."linux-perf";
+  "linux-ptrace" = dontDistribute super."linux-ptrace";
+  "linux-xattr" = dontDistribute super."linux-xattr";
+  "linx-gateway" = dontDistribute super."linx-gateway";
+  "lio" = dontDistribute super."lio";
+  "lio-eci11" = dontDistribute super."lio-eci11";
+  "lio-fs" = dontDistribute super."lio-fs";
+  "lio-simple" = dontDistribute super."lio-simple";
+  "lipsum-gen" = dontDistribute super."lipsum-gen";
+  "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
+  "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "lispparser" = dontDistribute super."lispparser";
+  "list-extras" = dontDistribute super."list-extras";
+  "list-grouping" = dontDistribute super."list-grouping";
+  "list-mux" = dontDistribute super."list-mux";
+  "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t-attoparsec" = dontDistribute super."list-t-attoparsec";
+  "list-t-html-parser" = dontDistribute super."list-t-html-parser";
+  "list-t-http-client" = dontDistribute super."list-t-http-client";
+  "list-t-libcurl" = dontDistribute super."list-t-libcurl";
+  "list-t-text" = dontDistribute super."list-t-text";
+  "list-tries" = dontDistribute super."list-tries";
+  "list-zip-def" = dontDistribute super."list-zip-def";
+  "listlike-instances" = dontDistribute super."listlike-instances";
+  "lists" = dontDistribute super."lists";
+  "listsafe" = dontDistribute super."listsafe";
+  "lit" = dontDistribute super."lit";
+  "literals" = dontDistribute super."literals";
+  "live-sequencer" = dontDistribute super."live-sequencer";
+  "ll-picosat" = dontDistribute super."ll-picosat";
+  "llrbtree" = dontDistribute super."llrbtree";
+  "llsd" = dontDistribute super."llsd";
+  "llvm" = dontDistribute super."llvm";
+  "llvm-analysis" = dontDistribute super."llvm-analysis";
+  "llvm-base" = dontDistribute super."llvm-base";
+  "llvm-base-types" = dontDistribute super."llvm-base-types";
+  "llvm-base-util" = dontDistribute super."llvm-base-util";
+  "llvm-data-interop" = dontDistribute super."llvm-data-interop";
+  "llvm-extra" = dontDistribute super."llvm-extra";
+  "llvm-ffi" = dontDistribute super."llvm-ffi";
+  "llvm-general" = dontDistribute super."llvm-general";
+  "llvm-general-pure" = dontDistribute super."llvm-general-pure";
+  "llvm-general-quote" = dontDistribute super."llvm-general-quote";
+  "llvm-ht" = dontDistribute super."llvm-ht";
+  "llvm-pkg-config" = dontDistribute super."llvm-pkg-config";
+  "llvm-pretty" = dontDistribute super."llvm-pretty";
+  "llvm-pretty-bc-parser" = dontDistribute super."llvm-pretty-bc-parser";
+  "llvm-tf" = dontDistribute super."llvm-tf";
+  "llvm-tools" = dontDistribute super."llvm-tools";
+  "lmdb" = dontDistribute super."lmdb";
+  "lmonad" = dontDistribute super."lmonad";
+  "lmonad-yesod" = dontDistribute super."lmonad-yesod";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "located-base" = dontDistribute super."located-base";
+  "locators" = dontDistribute super."locators";
+  "loch" = dontDistribute super."loch";
+  "lock-file" = dontDistribute super."lock-file";
+  "locked-poll" = dontDistribute super."locked-poll";
+  "lockfree-queue" = dontDistribute super."lockfree-queue";
+  "log" = dontDistribute super."log";
+  "log-effect" = dontDistribute super."log-effect";
+  "log2json" = dontDistribute super."log2json";
+  "logfloat" = dontDistribute super."logfloat";
+  "logger" = dontDistribute super."logger";
+  "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade-journald" = dontDistribute super."logging-facade-journald";
+  "logic-TPTP" = dontDistribute super."logic-TPTP";
+  "logic-classes" = dontDistribute super."logic-classes";
+  "logicst" = dontDistribute super."logicst";
+  "logict-state" = dontDistribute super."logict-state";
+  "logplex-parse" = dontDistribute super."logplex-parse";
+  "logsink" = dontDistribute super."logsink";
+  "lojban" = dontDistribute super."lojban";
+  "lojbanParser" = dontDistribute super."lojbanParser";
+  "lojbanXiragan" = dontDistribute super."lojbanXiragan";
+  "lojysamban" = dontDistribute super."lojysamban";
+  "lol" = dontDistribute super."lol";
+  "lol-apps" = dontDistribute super."lol-apps";
+  "loli" = dontDistribute super."loli";
+  "lookup-tables" = dontDistribute super."lookup-tables";
+  "loop-effin" = dontDistribute super."loop-effin";
+  "loop-while" = dontDistribute super."loop-while";
+  "loops" = dontDistribute super."loops";
+  "loopy" = dontDistribute super."loopy";
+  "lord" = dontDistribute super."lord";
+  "lorem" = dontDistribute super."lorem";
+  "loris" = dontDistribute super."loris";
+  "loshadka" = dontDistribute super."loshadka";
+  "lostcities" = dontDistribute super."lostcities";
+  "lowgl" = dontDistribute super."lowgl";
+  "lp-diagrams" = dontDistribute super."lp-diagrams";
+  "lp-diagrams-svg" = dontDistribute super."lp-diagrams-svg";
+  "ls-usb" = dontDistribute super."ls-usb";
+  "lscabal" = dontDistribute super."lscabal";
+  "lss" = dontDistribute super."lss";
+  "lsystem" = dontDistribute super."lsystem";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "lua-bytecode" = dontDistribute super."lua-bytecode";
+  "luachunk" = dontDistribute super."luachunk";
+  "luautils" = dontDistribute super."luautils";
+  "lub" = dontDistribute super."lub";
+  "lucid-foundation" = dontDistribute super."lucid-foundation";
+  "lucienne" = dontDistribute super."lucienne";
+  "luhn" = dontDistribute super."luhn";
+  "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "lushtags" = dontDistribute super."lushtags";
+  "luthor" = dontDistribute super."luthor";
+  "lvish" = dontDistribute super."lvish";
+  "lvmlib" = dontDistribute super."lvmlib";
+  "lvmrun" = dontDistribute super."lvmrun";
+  "lxc" = dontDistribute super."lxc";
+  "lye" = dontDistribute super."lye";
+  "lz4" = dontDistribute super."lz4";
+  "lzma" = dontDistribute super."lzma";
+  "lzma-clib" = dontDistribute super."lzma-clib";
+  "lzma-enumerator" = dontDistribute super."lzma-enumerator";
+  "lzma-streams" = dontDistribute super."lzma-streams";
+  "maam" = dontDistribute super."maam";
+  "mac" = dontDistribute super."mac";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "machines-zlib" = dontDistribute super."machines-zlib";
+  "macho" = dontDistribute super."macho";
+  "maclight" = dontDistribute super."maclight";
+  "macosx-make-standalone" = dontDistribute super."macosx-make-standalone";
+  "mage" = dontDistribute super."mage";
+  "magico" = dontDistribute super."magico";
+  "magma" = dontDistribute super."magma";
+  "mahoro" = dontDistribute super."mahoro";
+  "maid" = dontDistribute super."maid";
+  "mailbox-count" = dontDistribute super."mailbox-count";
+  "mailchimp-subscribe" = dontDistribute super."mailchimp-subscribe";
+  "mailgun" = dontDistribute super."mailgun";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "majordomo" = dontDistribute super."majordomo";
+  "majority" = dontDistribute super."majority";
+  "make-hard-links" = dontDistribute super."make-hard-links";
+  "make-package" = dontDistribute super."make-package";
+  "makedo" = dontDistribute super."makedo";
+  "manatee" = dontDistribute super."manatee";
+  "manatee-all" = dontDistribute super."manatee-all";
+  "manatee-anything" = dontDistribute super."manatee-anything";
+  "manatee-browser" = dontDistribute super."manatee-browser";
+  "manatee-core" = dontDistribute super."manatee-core";
+  "manatee-curl" = dontDistribute super."manatee-curl";
+  "manatee-editor" = dontDistribute super."manatee-editor";
+  "manatee-filemanager" = dontDistribute super."manatee-filemanager";
+  "manatee-imageviewer" = dontDistribute super."manatee-imageviewer";
+  "manatee-ircclient" = dontDistribute super."manatee-ircclient";
+  "manatee-mplayer" = dontDistribute super."manatee-mplayer";
+  "manatee-pdfviewer" = dontDistribute super."manatee-pdfviewer";
+  "manatee-processmanager" = dontDistribute super."manatee-processmanager";
+  "manatee-reader" = dontDistribute super."manatee-reader";
+  "manatee-template" = dontDistribute super."manatee-template";
+  "manatee-terminal" = dontDistribute super."manatee-terminal";
+  "manatee-welcome" = dontDistribute super."manatee-welcome";
+  "mancala" = dontDistribute super."mancala";
+  "mandulia" = dontDistribute super."mandulia";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
+  "marionetta" = dontDistribute super."marionetta";
+  "markdown-kate" = dontDistribute super."markdown-kate";
+  "markdown-pap" = dontDistribute super."markdown-pap";
+  "markdown2svg" = dontDistribute super."markdown2svg";
+  "marked-pretty" = dontDistribute super."marked-pretty";
+  "markov" = dontDistribute super."markov";
+  "markov-chain" = dontDistribute super."markov-chain";
+  "markov-processes" = dontDistribute super."markov-processes";
+  "markup-preview" = dontDistribute super."markup-preview";
+  "marmalade-upload" = dontDistribute super."marmalade-upload";
+  "marquise" = dontDistribute super."marquise";
+  "marxup" = dontDistribute super."marxup";
+  "masakazu-bot" = dontDistribute super."masakazu-bot";
+  "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
+  "matchers" = dontDistribute super."matchers";
+  "mathblog" = dontDistribute super."mathblog";
+  "mathgenealogy" = dontDistribute super."mathgenealogy";
+  "mathista" = dontDistribute super."mathista";
+  "mathlink" = dontDistribute super."mathlink";
+  "matlab" = dontDistribute super."matlab";
+  "matrix-market" = dontDistribute super."matrix-market";
+  "matrix-market-pure" = dontDistribute super."matrix-market-pure";
+  "matsuri" = dontDistribute super."matsuri";
+  "maude" = dontDistribute super."maude";
+  "maxent" = dontDistribute super."maxent";
+  "maxsharing" = dontDistribute super."maxsharing";
+  "maybe-justify" = dontDistribute super."maybe-justify";
+  "maybench" = dontDistribute super."maybench";
+  "mbox-tools" = dontDistribute super."mbox-tools";
+  "mcmaster-gloss-examples" = dontDistribute super."mcmaster-gloss-examples";
+  "mcmc-samplers" = dontDistribute super."mcmc-samplers";
+  "mcmc-synthesis" = dontDistribute super."mcmc-synthesis";
+  "mcpi" = dontDistribute super."mcpi";
+  "mdapi" = dontDistribute super."mdapi";
+  "mdcat" = dontDistribute super."mdcat";
+  "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
+  "mecab" = dontDistribute super."mecab";
+  "mecha" = dontDistribute super."mecha";
+  "mediawiki" = dontDistribute super."mediawiki";
+  "mediawiki2latex" = dontDistribute super."mediawiki2latex";
+  "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
+  "meep" = dontDistribute super."meep";
+  "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
+  "meldable-heap" = dontDistribute super."meldable-heap";
+  "melody" = dontDistribute super."melody";
+  "memcache" = dontDistribute super."memcache";
+  "memcache-conduit" = dontDistribute super."memcache-conduit";
+  "memcache-haskell" = dontDistribute super."memcache-haskell";
+  "memcached" = dontDistribute super."memcached";
+  "memexml" = dontDistribute super."memexml";
+  "memo-ptr" = dontDistribute super."memo-ptr";
+  "memo-sqlite" = dontDistribute super."memo-sqlite";
+  "memscript" = dontDistribute super."memscript";
+  "mersenne-random" = dontDistribute super."mersenne-random";
+  "messente" = dontDistribute super."messente";
+  "meta-misc" = dontDistribute super."meta-misc";
+  "meta-par" = dontDistribute super."meta-par";
+  "meta-par-accelerate" = dontDistribute super."meta-par-accelerate";
+  "metadata" = dontDistribute super."metadata";
+  "metamorphic" = dontDistribute super."metamorphic";
+  "metaplug" = dontDistribute super."metaplug";
+  "metric" = dontDistribute super."metric";
+  "metricsd-client" = dontDistribute super."metricsd-client";
+  "metronome" = dontDistribute super."metronome";
+  "mezzolens" = dontDistribute super."mezzolens";
+  "mfsolve" = dontDistribute super."mfsolve";
+  "mgeneric" = dontDistribute super."mgeneric";
+  "mi" = dontDistribute super."mi";
+  "microbench" = dontDistribute super."microbench";
+  "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microtimer" = dontDistribute super."microtimer";
+  "mida" = dontDistribute super."mida";
+  "midair" = dontDistribute super."midair";
+  "midi" = dontDistribute super."midi";
+  "midi-alsa" = dontDistribute super."midi-alsa";
+  "midi-music-box" = dontDistribute super."midi-music-box";
+  "midi-util" = dontDistribute super."midi-util";
+  "midimory" = dontDistribute super."midimory";
+  "midisurface" = dontDistribute super."midisurface";
+  "mighttpd" = dontDistribute super."mighttpd";
+  "mighttpd2" = dontDistribute super."mighttpd2";
+  "mikmod" = dontDistribute super."mikmod";
+  "miku" = dontDistribute super."miku";
+  "milena" = dontDistribute super."milena";
+  "mime" = dontDistribute super."mime";
+  "mime-directory" = dontDistribute super."mime-directory";
+  "mime-string" = dontDistribute super."mime-string";
+  "mines" = dontDistribute super."mines";
+  "minesweeper" = dontDistribute super."minesweeper";
+  "miniball" = dontDistribute super."miniball";
+  "miniforth" = dontDistribute super."miniforth";
+  "minilens" = dontDistribute super."minilens";
+  "minimal-configuration" = dontDistribute super."minimal-configuration";
+  "minimorph" = dontDistribute super."minimorph";
+  "minimung" = dontDistribute super."minimung";
+  "minions" = dontDistribute super."minions";
+  "minioperational" = dontDistribute super."minioperational";
+  "miniplex" = dontDistribute super."miniplex";
+  "minirotate" = dontDistribute super."minirotate";
+  "minisat" = dontDistribute super."minisat";
+  "ministg" = dontDistribute super."ministg";
+  "miniutter" = dontDistribute super."miniutter";
+  "minst-idx" = dontDistribute super."minst-idx";
+  "mirror-tweet" = dontDistribute super."mirror-tweet";
+  "missing-py2" = dontDistribute super."missing-py2";
+  "mix-arrows" = dontDistribute super."mix-arrows";
+  "mixed-strategies" = dontDistribute super."mixed-strategies";
+  "mkbndl" = dontDistribute super."mkbndl";
+  "mkcabal" = dontDistribute super."mkcabal";
+  "ml-w" = dontDistribute super."ml-w";
+  "mlist" = dontDistribute super."mlist";
+  "mmtl" = dontDistribute super."mmtl";
+  "mmtl-base" = dontDistribute super."mmtl-base";
+  "moan" = dontDistribute super."moan";
+  "modbus-tcp" = dontDistribute super."modbus-tcp";
+  "modelicaparser" = dontDistribute super."modelicaparser";
+  "modsplit" = dontDistribute super."modsplit";
+  "modular-arithmetic" = dontDistribute super."modular-arithmetic";
+  "modular-prelude" = dontDistribute super."modular-prelude";
+  "modular-prelude-classy" = dontDistribute super."modular-prelude-classy";
+  "module-management" = dontDistribute super."module-management";
+  "modulespection" = dontDistribute super."modulespection";
+  "modulo" = dontDistribute super."modulo";
+  "moe" = dontDistribute super."moe";
+  "mohws" = dontDistribute super."mohws";
+  "monad-abort-fd" = dontDistribute super."monad-abort-fd";
+  "monad-atom" = dontDistribute super."monad-atom";
+  "monad-atom-simple" = dontDistribute super."monad-atom-simple";
+  "monad-bool" = dontDistribute super."monad-bool";
+  "monad-classes" = dontDistribute super."monad-classes";
+  "monad-codec" = dontDistribute super."monad-codec";
+  "monad-connect" = dontDistribute super."monad-connect";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "monad-loops-stm" = dontDistribute super."monad-loops-stm";
+  "monad-lrs" = dontDistribute super."monad-lrs";
+  "monad-memo" = dontDistribute super."monad-memo";
+  "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
+  "monad-open" = dontDistribute super."monad-open";
+  "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
+  "monad-param" = dontDistribute super."monad-param";
+  "monad-ran" = dontDistribute super."monad-ran";
+  "monad-resumption" = dontDistribute super."monad-resumption";
+  "monad-state" = dontDistribute super."monad-state";
+  "monad-statevar" = dontDistribute super."monad-statevar";
+  "monad-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-stm";
+  "monad-supply" = dontDistribute super."monad-supply";
+  "monad-task" = dontDistribute super."monad-task";
+  "monad-tx" = dontDistribute super."monad-tx";
+  "monad-unify" = dontDistribute super."monad-unify";
+  "monad-wrap" = dontDistribute super."monad-wrap";
+  "monadIO" = dontDistribute super."monadIO";
+  "monadLib-compose" = dontDistribute super."monadLib-compose";
+  "monadacme" = dontDistribute super."monadacme";
+  "monadbi" = dontDistribute super."monadbi";
+  "monadfibre" = dontDistribute super."monadfibre";
+  "monadiccp" = dontDistribute super."monadiccp";
+  "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
+  "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
+  "monadlist" = dontDistribute super."monadlist";
+  "monadloc-pp" = dontDistribute super."monadloc-pp";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "monoid-transformer" = dontDistribute super."monoid-transformer";
+  "monoidplus" = dontDistribute super."monoidplus";
+  "monoids" = dontDistribute super."monoids";
+  "monomorphic" = dontDistribute super."monomorphic";
+  "montage" = dontDistribute super."montage";
+  "montage-client" = dontDistribute super."montage-client";
+  "monte-carlo" = dontDistribute super."monte-carlo";
+  "moo" = dontDistribute super."moo";
+  "moonshine" = dontDistribute super."moonshine";
+  "morfette" = dontDistribute super."morfette";
+  "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
+  "mosaico-lib" = dontDistribute super."mosaico-lib";
+  "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "mp" = dontDistribute super."mp";
+  "mp3decoder" = dontDistribute super."mp3decoder";
+  "mpdmate" = dontDistribute super."mpdmate";
+  "mpppc" = dontDistribute super."mpppc";
+  "mpretty" = dontDistribute super."mpretty";
+  "mpris" = dontDistribute super."mpris";
+  "mprover" = dontDistribute super."mprover";
+  "mps" = dontDistribute super."mps";
+  "mpvguihs" = dontDistribute super."mpvguihs";
+  "mqtt-hs" = dontDistribute super."mqtt-hs";
+  "mrm" = dontDistribute super."mrm";
+  "ms" = dontDistribute super."ms";
+  "msgpack" = dontDistribute super."msgpack";
+  "msgpack-aeson" = dontDistribute super."msgpack-aeson";
+  "msgpack-idl" = dontDistribute super."msgpack-idl";
+  "msgpack-rpc" = dontDistribute super."msgpack-rpc";
+  "msh" = dontDistribute super."msh";
+  "msu" = dontDistribute super."msu";
+  "mtgoxapi" = dontDistribute super."mtgoxapi";
+  "mtl-c" = dontDistribute super."mtl-c";
+  "mtl-evil-instances" = dontDistribute super."mtl-evil-instances";
+  "mtl-tf" = dontDistribute super."mtl-tf";
+  "mtl-unleashed" = dontDistribute super."mtl-unleashed";
+  "mtlparse" = dontDistribute super."mtlparse";
+  "mtlx" = dontDistribute super."mtlx";
+  "mtp" = dontDistribute super."mtp";
+  "mtree" = dontDistribute super."mtree";
+  "mucipher" = dontDistribute super."mucipher";
+  "mudbath" = dontDistribute super."mudbath";
+  "muesli" = dontDistribute super."muesli";
+  "mueval" = dontDistribute super."mueval";
+  "mulang" = dontDistribute super."mulang";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
+  "multifocal" = dontDistribute super."multifocal";
+  "multihash" = dontDistribute super."multihash";
+  "multipart-names" = dontDistribute super."multipart-names";
+  "multipass" = dontDistribute super."multipass";
+  "multiplate-simplified" = dontDistribute super."multiplate-simplified";
+  "multiplicity" = dontDistribute super."multiplicity";
+  "multirec" = dontDistribute super."multirec";
+  "multirec-alt-deriver" = dontDistribute super."multirec-alt-deriver";
+  "multirec-binary" = dontDistribute super."multirec-binary";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
+  "murmur3" = dontDistribute super."murmur3";
+  "murmurhash3" = dontDistribute super."murmurhash3";
+  "music-articulation" = dontDistribute super."music-articulation";
+  "music-diatonic" = dontDistribute super."music-diatonic";
+  "music-dynamics" = dontDistribute super."music-dynamics";
+  "music-dynamics-literal" = dontDistribute super."music-dynamics-literal";
+  "music-graphics" = dontDistribute super."music-graphics";
+  "music-parts" = dontDistribute super."music-parts";
+  "music-pitch" = dontDistribute super."music-pitch";
+  "music-pitch-literal" = dontDistribute super."music-pitch-literal";
+  "music-preludes" = dontDistribute super."music-preludes";
+  "music-score" = dontDistribute super."music-score";
+  "music-sibelius" = dontDistribute super."music-sibelius";
+  "music-suite" = dontDistribute super."music-suite";
+  "music-util" = dontDistribute super."music-util";
+  "musicbrainz-email" = dontDistribute super."musicbrainz-email";
+  "musicxml" = dontDistribute super."musicxml";
+  "musicxml2" = dontDistribute super."musicxml2";
+  "mustache-haskell" = dontDistribute super."mustache-haskell";
+  "mustache2hs" = dontDistribute super."mustache2hs";
+  "mutable-iter" = dontDistribute super."mutable-iter";
+  "mute-unmute" = dontDistribute super."mute-unmute";
+  "mvc" = dontDistribute super."mvc";
+  "mvc-updates" = dontDistribute super."mvc-updates";
+  "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random-monad" = dontDistribute super."mwc-random-monad";
+  "myTestlll" = dontDistribute super."myTestlll";
+  "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
+  "myo" = dontDistribute super."myo";
+  "mysnapsession" = dontDistribute super."mysnapsession";
+  "mysnapsession-example" = dontDistribute super."mysnapsession-example";
+  "mysql-effect" = dontDistribute super."mysql-effect";
+  "mysql-simple-quasi" = dontDistribute super."mysql-simple-quasi";
+  "mysql-simple-typed" = dontDistribute super."mysql-simple-typed";
+  "mzv" = dontDistribute super."mzv";
+  "n-m" = dontDistribute super."n-m";
+  "nagios-perfdata" = dontDistribute super."nagios-perfdata";
+  "nagios-plugin-ekg" = dontDistribute super."nagios-plugin-ekg";
+  "named-formlet" = dontDistribute super."named-formlet";
+  "named-lock" = dontDistribute super."named-lock";
+  "named-records" = dontDistribute super."named-records";
+  "namelist" = dontDistribute super."namelist";
+  "names" = dontDistribute super."names";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "nano-hmac" = dontDistribute super."nano-hmac";
+  "nano-md5" = dontDistribute super."nano-md5";
+  "nanoAgda" = dontDistribute super."nanoAgda";
+  "nanocurses" = dontDistribute super."nanocurses";
+  "nanomsg" = dontDistribute super."nanomsg";
+  "nanomsg-haskell" = dontDistribute super."nanomsg-haskell";
+  "nanoparsec" = dontDistribute super."nanoparsec";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "naturalcomp" = dontDistribute super."naturalcomp";
+  "naturals" = dontDistribute super."naturals";
+  "naver-translate" = dontDistribute super."naver-translate";
+  "nbt" = dontDistribute super."nbt";
+  "nc-indicators" = dontDistribute super."nc-indicators";
+  "ncurses" = dontDistribute super."ncurses";
+  "neat" = dontDistribute super."neat";
+  "needle" = dontDistribute super."needle";
+  "neet" = dontDistribute super."neet";
+  "nehe-tuts" = dontDistribute super."nehe-tuts";
+  "neil" = dontDistribute super."neil";
+  "neither" = dontDistribute super."neither";
+  "nemesis" = dontDistribute super."nemesis";
+  "nemesis-titan" = dontDistribute super."nemesis-titan";
+  "nerf" = dontDistribute super."nerf";
+  "nero" = dontDistribute super."nero";
+  "nero-wai" = dontDistribute super."nero-wai";
+  "nero-warp" = dontDistribute super."nero-warp";
+  "nested-routes" = dontDistribute super."nested-routes";
+  "nested-sets" = dontDistribute super."nested-sets";
+  "nestedmap" = dontDistribute super."nestedmap";
+  "net-concurrent" = dontDistribute super."net-concurrent";
+  "netclock" = dontDistribute super."netclock";
+  "netcore" = dontDistribute super."netcore";
+  "netlines" = dontDistribute super."netlines";
+  "netlink" = dontDistribute super."netlink";
+  "netlist" = dontDistribute super."netlist";
+  "netlist-to-vhdl" = dontDistribute super."netlist-to-vhdl";
+  "netpbm" = dontDistribute super."netpbm";
+  "netrc" = dontDistribute super."netrc";
+  "netspec" = dontDistribute super."netspec";
+  "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle-frp" = dontDistribute super."nettle-frp";
+  "nettle-netkit" = dontDistribute super."nettle-netkit";
+  "nettle-openflow" = dontDistribute super."nettle-openflow";
+  "netwire" = dontDistribute super."netwire";
+  "netwire-input" = dontDistribute super."netwire-input";
+  "netwire-input-glfw" = dontDistribute super."netwire-input-glfw";
+  "network-address" = dontDistribute super."network-address";
+  "network-api-support" = dontDistribute super."network-api-support";
+  "network-bitcoin" = dontDistribute super."network-bitcoin";
+  "network-builder" = dontDistribute super."network-builder";
+  "network-bytestring" = dontDistribute super."network-bytestring";
+  "network-conduit" = dontDistribute super."network-conduit";
+  "network-connection" = dontDistribute super."network-connection";
+  "network-data" = dontDistribute super."network-data";
+  "network-dbus" = dontDistribute super."network-dbus";
+  "network-dns" = dontDistribute super."network-dns";
+  "network-enumerator" = dontDistribute super."network-enumerator";
+  "network-fancy" = dontDistribute super."network-fancy";
+  "network-interfacerequest" = dontDistribute super."network-interfacerequest";
+  "network-ip" = dontDistribute super."network-ip";
+  "network-metrics" = dontDistribute super."network-metrics";
+  "network-minihttp" = dontDistribute super."network-minihttp";
+  "network-msg" = dontDistribute super."network-msg";
+  "network-netpacket" = dontDistribute super."network-netpacket";
+  "network-pgi" = dontDistribute super."network-pgi";
+  "network-rpca" = dontDistribute super."network-rpca";
+  "network-server" = dontDistribute super."network-server";
+  "network-service" = dontDistribute super."network-service";
+  "network-simple-sockaddr" = dontDistribute super."network-simple-sockaddr";
+  "network-simple-tls" = dontDistribute super."network-simple-tls";
+  "network-socket-options" = dontDistribute super."network-socket-options";
+  "network-stream" = dontDistribute super."network-stream";
+  "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "network-uri-static" = dontDistribute super."network-uri-static";
+  "network-wai-router" = dontDistribute super."network-wai-router";
+  "network-websocket" = dontDistribute super."network-websocket";
+  "networked-game" = dontDistribute super."networked-game";
+  "newports" = dontDistribute super."newports";
+  "newsynth" = dontDistribute super."newsynth";
+  "newt" = dontDistribute super."newt";
+  "newtype-deriving" = dontDistribute super."newtype-deriving";
+  "newtype-th" = dontDistribute super."newtype-th";
+  "newtyper" = dontDistribute super."newtyper";
+  "nextstep-plist" = dontDistribute super."nextstep-plist";
+  "nf" = dontDistribute super."nf";
+  "ngrams-loader" = dontDistribute super."ngrams-loader";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "nist-beacon" = dontDistribute super."nist-beacon";
+  "nitro" = dontDistribute super."nitro";
+  "nix-eval" = dontDistribute super."nix-eval";
+  "nixfromnpm" = dontDistribute super."nixfromnpm";
+  "nixos-types" = dontDistribute super."nixos-types";
+  "nkjp" = dontDistribute super."nkjp";
+  "nlp-scores" = dontDistribute super."nlp-scores";
+  "nlp-scores-scripts" = dontDistribute super."nlp-scores-scripts";
+  "nm" = dontDistribute super."nm";
+  "nme" = dontDistribute super."nme";
+  "nntp" = dontDistribute super."nntp";
+  "no-buffering-workaround" = dontDistribute super."no-buffering-workaround";
+  "no-role-annots" = dontDistribute super."no-role-annots";
+  "nofib-analyse" = dontDistribute super."nofib-analyse";
+  "nofib-analyze" = dontDistribute super."nofib-analyze";
+  "noise" = dontDistribute super."noise";
+  "non-empty" = dontDistribute super."non-empty";
+  "non-negative" = dontDistribute super."non-negative";
+  "nondeterminism" = dontDistribute super."nondeterminism";
+  "nonempty-alternative" = dontDistribute super."nonempty-alternative";
+  "nonfree" = dontDistribute super."nonfree";
+  "nonlinear-optimization" = dontDistribute super."nonlinear-optimization";
+  "nonlinear-optimization-ad" = dontDistribute super."nonlinear-optimization-ad";
+  "noodle" = dontDistribute super."noodle";
+  "normaldistribution" = dontDistribute super."normaldistribution";
+  "not-gloss" = dontDistribute super."not-gloss";
+  "not-gloss-examples" = dontDistribute super."not-gloss-examples";
+  "not-in-base" = dontDistribute super."not-in-base";
+  "notcpp" = dontDistribute super."notcpp";
+  "notmuch-haskell" = dontDistribute super."notmuch-haskell";
+  "notmuch-web" = dontDistribute super."notmuch-web";
+  "notzero" = dontDistribute super."notzero";
+  "np-extras" = dontDistribute super."np-extras";
+  "np-linear" = dontDistribute super."np-linear";
+  "nptools" = dontDistribute super."nptools";
+  "nth-prime" = dontDistribute super."nth-prime";
+  "nthable" = dontDistribute super."nthable";
+  "ntp-control" = dontDistribute super."ntp-control";
+  "null-canvas" = dontDistribute super."null-canvas";
+  "nullary" = dontDistribute super."nullary";
+  "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
+  "numbering" = dontDistribute super."numbering";
+  "numerals" = dontDistribute super."numerals";
+  "numerals-base" = dontDistribute super."numerals-base";
+  "numeric-limits" = dontDistribute super."numeric-limits";
+  "numeric-prelude" = dontDistribute super."numeric-prelude";
+  "numeric-qq" = dontDistribute super."numeric-qq";
+  "numeric-quest" = dontDistribute super."numeric-quest";
+  "numeric-ranges" = dontDistribute super."numeric-ranges";
+  "numeric-tools" = dontDistribute super."numeric-tools";
+  "numericpeano" = dontDistribute super."numericpeano";
+  "nums" = dontDistribute super."nums";
+  "numtype" = dontDistribute super."numtype";
+  "numtype-tf" = dontDistribute super."numtype-tf";
+  "nurbs" = dontDistribute super."nurbs";
+  "nvim-hs" = dontDistribute super."nvim-hs";
+  "nvim-hs-contrib" = dontDistribute super."nvim-hs-contrib";
+  "nyan" = dontDistribute super."nyan";
+  "nylas" = dontDistribute super."nylas";
+  "nymphaea" = dontDistribute super."nymphaea";
+  "oanda-rest-api" = dontDistribute super."oanda-rest-api";
+  "oauthenticated" = dontDistribute super."oauthenticated";
+  "obdd" = dontDistribute super."obdd";
+  "oberon0" = dontDistribute super."oberon0";
+  "obj" = dontDistribute super."obj";
+  "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
+  "oeis" = dontDistribute super."oeis";
+  "off-simple" = dontDistribute super."off-simple";
+  "ohloh-hs" = dontDistribute super."ohloh-hs";
+  "oi" = dontDistribute super."oi";
+  "oidc-client" = dontDistribute super."oidc-client";
+  "ois-input-manager" = dontDistribute super."ois-input-manager";
+  "old-version" = dontDistribute super."old-version";
+  "olwrapper" = dontDistribute super."olwrapper";
+  "omaketex" = dontDistribute super."omaketex";
+  "omega" = dontDistribute super."omega";
+  "omnicodec" = dontDistribute super."omnicodec";
+  "on-a-horse" = dontDistribute super."on-a-horse";
+  "on-demand-ssh-tunnel" = dontDistribute super."on-demand-ssh-tunnel";
+  "one-liner" = dontDistribute super."one-liner";
+  "one-time-password" = dontDistribute super."one-time-password";
+  "oneOfN" = dontDistribute super."oneOfN";
+  "oneormore" = dontDistribute super."oneormore";
+  "only" = dontDistribute super."only";
+  "onu-course" = dontDistribute super."onu-course";
+  "opaleye-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "open-symbology" = dontDistribute super."open-symbology";
+  "open-typerep" = dontDistribute super."open-typerep";
+  "open-union" = dontDistribute super."open-union";
+  "open-witness" = dontDistribute super."open-witness";
+  "opencog-atomspace" = dontDistribute super."opencog-atomspace";
+  "opencv-raw" = dontDistribute super."opencv-raw";
+  "opendatatable" = dontDistribute super."opendatatable";
+  "openexchangerates" = dontDistribute super."openexchangerates";
+  "openflow" = dontDistribute super."openflow";
+  "opengl-dlp-stereo" = dontDistribute super."opengl-dlp-stereo";
+  "opengl-spacenavigator" = dontDistribute super."opengl-spacenavigator";
+  "opengles" = dontDistribute super."opengles";
+  "openid" = dontDistribute super."openid";
+  "openpgp" = dontDistribute super."openpgp";
+  "openpgp-Crypto" = dontDistribute super."openpgp-Crypto";
+  "openpgp-crypto-api" = dontDistribute super."openpgp-crypto-api";
+  "opensoundcontrol-ht" = dontDistribute super."opensoundcontrol-ht";
+  "openssh-github-keys" = dontDistribute super."openssh-github-keys";
+  "openssl-createkey" = dontDistribute super."openssl-createkey";
+  "opentheory" = dontDistribute super."opentheory";
+  "opentheory-bits" = dontDistribute super."opentheory-bits";
+  "opentheory-byte" = dontDistribute super."opentheory-byte";
+  "opentheory-char" = dontDistribute super."opentheory-char";
+  "opentheory-divides" = dontDistribute super."opentheory-divides";
+  "opentheory-fibonacci" = dontDistribute super."opentheory-fibonacci";
+  "opentheory-parser" = dontDistribute super."opentheory-parser";
+  "opentheory-prime" = dontDistribute super."opentheory-prime";
+  "opentheory-primitive" = dontDistribute super."opentheory-primitive";
+  "opentheory-probability" = dontDistribute super."opentheory-probability";
+  "opentheory-stream" = dontDistribute super."opentheory-stream";
+  "opentheory-unicode" = dontDistribute super."opentheory-unicode";
+  "operational-alacarte" = dontDistribute super."operational-alacarte";
+  "operational-extra" = dontDistribute super."operational-extra";
+  "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "opn" = dontDistribute super."opn";
+  "optimal-blocks" = dontDistribute super."optimal-blocks";
+  "optimization" = dontDistribute super."optimization";
+  "optimusprime" = dontDistribute super."optimusprime";
+  "option" = dontDistribute super."option";
+  "optional" = dontDistribute super."optional";
+  "options-time" = dontDistribute super."options-time";
+  "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "orc" = dontDistribute super."orc";
+  "orchestrate" = dontDistribute super."orchestrate";
+  "orchid" = dontDistribute super."orchid";
+  "orchid-demo" = dontDistribute super."orchid-demo";
+  "ord-adhoc" = dontDistribute super."ord-adhoc";
+  "order-maintenance" = dontDistribute super."order-maintenance";
+  "order-statistic-tree" = dontDistribute super."order-statistic-tree";
+  "order-statistics" = dontDistribute super."order-statistics";
+  "ordered" = dontDistribute super."ordered";
+  "orders" = dontDistribute super."orders";
+  "ordrea" = dontDistribute super."ordrea";
+  "organize-imports" = dontDistribute super."organize-imports";
+  "orgmode" = dontDistribute super."orgmode";
+  "orgmode-parse" = dontDistribute super."orgmode-parse";
+  "origami" = dontDistribute super."origami";
+  "os-release" = dontDistribute super."os-release";
+  "osc" = dontDistribute super."osc";
+  "osm-conduit" = dontDistribute super."osm-conduit";
+  "osm-download" = dontDistribute super."osm-download";
+  "oso2pdf" = dontDistribute super."oso2pdf";
+  "osx-ar" = dontDistribute super."osx-ar";
+  "ot" = dontDistribute super."ot";
+  "ottparse-pretty" = dontDistribute super."ottparse-pretty";
+  "overloaded-records" = dontDistribute super."overloaded-records";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "packed-dawg" = dontDistribute super."packed-dawg";
+  "packedstring" = dontDistribute super."packedstring";
+  "packer" = dontDistribute super."packer";
+  "packman" = dontDistribute super."packman";
+  "packunused" = dontDistribute super."packunused";
+  "pacman-memcache" = dontDistribute super."pacman-memcache";
+  "padKONTROL" = dontDistribute super."padKONTROL";
+  "pagarme" = dontDistribute super."pagarme";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
+  "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
+  "pandoc-crossref" = dontDistribute super."pandoc-crossref";
+  "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
+  "pandoc-include" = dontDistribute super."pandoc-include";
+  "pandoc-japanese-filters" = dontDistribute super."pandoc-japanese-filters";
+  "pandoc-lens" = dontDistribute super."pandoc-lens";
+  "pandoc-placetable" = dontDistribute super."pandoc-placetable";
+  "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-unlit" = dontDistribute super."pandoc-unlit";
+  "papillon" = dontDistribute super."papillon";
+  "pappy" = dontDistribute super."pappy";
+  "para" = dontDistribute super."para";
+  "paragon" = dontDistribute super."paragon";
+  "parallel-tasks" = dontDistribute super."parallel-tasks";
+  "parallel-tree-search" = dontDistribute super."parallel-tree-search";
+  "parameterized-data" = dontDistribute super."parameterized-data";
+  "parco" = dontDistribute super."parco";
+  "parco-attoparsec" = dontDistribute super."parco-attoparsec";
+  "parco-parsec" = dontDistribute super."parco-parsec";
+  "parcom-lib" = dontDistribute super."parcom-lib";
+  "parconc-examples" = dontDistribute super."parconc-examples";
+  "parport" = dontDistribute super."parport";
+  "parse-dimacs" = dontDistribute super."parse-dimacs";
+  "parse-help" = dontDistribute super."parse-help";
+  "parsec-extra" = dontDistribute super."parsec-extra";
+  "parsec-numbers" = dontDistribute super."parsec-numbers";
+  "parsec-parsers" = dontDistribute super."parsec-parsers";
+  "parsec-permutation" = dontDistribute super."parsec-permutation";
+  "parsec-tagsoup" = dontDistribute super."parsec-tagsoup";
+  "parsec-trace" = dontDistribute super."parsec-trace";
+  "parsec-utils" = dontDistribute super."parsec-utils";
+  "parsec1" = dontDistribute super."parsec1";
+  "parsec2" = dontDistribute super."parsec2";
+  "parsec3" = dontDistribute super."parsec3";
+  "parsec3-numbers" = dontDistribute super."parsec3-numbers";
+  "parsedate" = dontDistribute super."parsedate";
+  "parsek" = dontDistribute super."parsek";
+  "parsely" = dontDistribute super."parsely";
+  "parser-helper" = dontDistribute super."parser-helper";
+  "parser241" = dontDistribute super."parser241";
+  "parsergen" = dontDistribute super."parsergen";
+  "parsestar" = dontDistribute super."parsestar";
+  "parsimony" = dontDistribute super."parsimony";
+  "partage" = dontDistribute super."partage";
+  "partial" = dontDistribute super."partial";
+  "partial-lens" = dontDistribute super."partial-lens";
+  "partial-uri" = dontDistribute super."partial-uri";
+  "partly" = dontDistribute super."partly";
+  "passage" = dontDistribute super."passage";
+  "passwords" = dontDistribute super."passwords";
+  "pastis" = dontDistribute super."pastis";
+  "pasty" = dontDistribute super."pasty";
+  "patch-combinators" = dontDistribute super."patch-combinators";
+  "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "pathfinding" = dontDistribute super."pathfinding";
+  "pathfindingcore" = dontDistribute super."pathfindingcore";
+  "pathtype" = dontDistribute super."pathtype";
+  "patronscraper" = dontDistribute super."patronscraper";
+  "patterns" = dontDistribute super."patterns";
+  "paymill" = dontDistribute super."paymill";
+  "paypal-adaptive-hoops" = dontDistribute super."paypal-adaptive-hoops";
+  "paypal-api" = dontDistribute super."paypal-api";
+  "pb" = dontDistribute super."pb";
+  "pbc4hs" = dontDistribute super."pbc4hs";
+  "pbkdf" = dontDistribute super."pbkdf";
+  "pcap-conduit" = dontDistribute super."pcap-conduit";
+  "pcap-enumerator" = dontDistribute super."pcap-enumerator";
+  "pcd-loader" = dontDistribute super."pcd-loader";
+  "pcf" = dontDistribute super."pcf";
+  "pcg-random" = dontDistribute super."pcg-random";
+  "pcre-less" = dontDistribute super."pcre-less";
+  "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
+  "pdf2line" = dontDistribute super."pdf2line";
+  "pdfsplit" = dontDistribute super."pdfsplit";
+  "pdynload" = dontDistribute super."pdynload";
+  "peakachu" = dontDistribute super."peakachu";
+  "peano" = dontDistribute super."peano";
+  "peano-inf" = dontDistribute super."peano-inf";
+  "pec" = dontDistribute super."pec";
+  "pecoff" = dontDistribute super."pecoff";
+  "peg" = dontDistribute super."peg";
+  "peggy" = dontDistribute super."peggy";
+  "pell" = dontDistribute super."pell";
+  "penn-treebank" = dontDistribute super."penn-treebank";
+  "penny" = dontDistribute super."penny";
+  "penny-bin" = dontDistribute super."penny-bin";
+  "penny-lib" = dontDistribute super."penny-lib";
+  "peparser" = dontDistribute super."peparser";
+  "perceptron" = dontDistribute super."perceptron";
+  "perdure" = dontDistribute super."perdure";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "persistent-equivalence" = dontDistribute super."persistent-equivalence";
+  "persistent-hssqlppp" = dontDistribute super."persistent-hssqlppp";
+  "persistent-instances-iproute" = dontDistribute super."persistent-instances-iproute";
+  "persistent-iproute" = dontDistribute super."persistent-iproute";
+  "persistent-map" = dontDistribute super."persistent-map";
+  "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "persistent-vector" = dontDistribute super."persistent-vector";
+  "persistent-zookeeper" = dontDistribute super."persistent-zookeeper";
+  "persona" = dontDistribute super."persona";
+  "persona-idp" = dontDistribute super."persona-idp";
+  "pesca" = dontDistribute super."pesca";
+  "peyotls" = dontDistribute super."peyotls";
+  "peyotls-codec" = dontDistribute super."peyotls-codec";
+  "pez" = dontDistribute super."pez";
+  "pg-harness" = dontDistribute super."pg-harness";
+  "pg-harness-client" = dontDistribute super."pg-harness-client";
+  "pg-harness-server" = dontDistribute super."pg-harness-server";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "phone-numbers" = dontDistribute super."phone-numbers";
+  "phone-push" = dontDistribute super."phone-push";
+  "phonetic-code" = dontDistribute super."phonetic-code";
+  "phooey" = dontDistribute super."phooey";
+  "photoname" = dontDistribute super."photoname";
+  "phraskell" = dontDistribute super."phraskell";
+  "phybin" = dontDistribute super."phybin";
+  "pi-calculus" = dontDistribute super."pi-calculus";
+  "pia-forward" = dontDistribute super."pia-forward";
+  "pianola" = dontDistribute super."pianola";
+  "picologic" = dontDistribute super."picologic";
+  "picosat" = dontDistribute super."picosat";
+  "piet" = dontDistribute super."piet";
+  "piki" = dontDistribute super."piki";
+  "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
+  "pipes-cellular" = dontDistribute super."pipes-cellular";
+  "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
+  "pipes-cereal" = dontDistribute super."pipes-cereal";
+  "pipes-cereal-plus" = dontDistribute super."pipes-cereal-plus";
+  "pipes-conduit" = dontDistribute super."pipes-conduit";
+  "pipes-core" = dontDistribute super."pipes-core";
+  "pipes-courier" = dontDistribute super."pipes-courier";
+  "pipes-errors" = dontDistribute super."pipes-errors";
+  "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
+  "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
+  "pipes-network-tls" = dontDistribute super."pipes-network-tls";
+  "pipes-p2p" = dontDistribute super."pipes-p2p";
+  "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
+  "pipes-rt" = dontDistribute super."pipes-rt";
+  "pipes-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-websockets" = dontDistribute super."pipes-websockets";
+  "pipes-zeromq4" = dontDistribute super."pipes-zeromq4";
+  "pipes-zlib" = dontDistribute super."pipes-zlib";
+  "pisigma" = dontDistribute super."pisigma";
+  "pit" = dontDistribute super."pit";
+  "pitchtrack" = dontDistribute super."pitchtrack";
+  "pivotal-tracker" = dontDistribute super."pivotal-tracker";
+  "pkcs1" = dontDistribute super."pkcs1";
+  "pkcs7" = dontDistribute super."pkcs7";
+  "pkggraph" = dontDistribute super."pkggraph";
+  "pktree" = dontDistribute super."pktree";
+  "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
+  "planar-graph" = dontDistribute super."planar-graph";
+  "plat" = dontDistribute super."plat";
+  "playlists" = dontDistribute super."playlists";
+  "plist" = dontDistribute super."plist";
+  "plist-buddy" = dontDistribute super."plist-buddy";
+  "plivo" = dontDistribute super."plivo";
+  "plot-lab" = dontDistribute super."plot-lab";
+  "plotfont" = dontDistribute super."plotfont";
+  "plotserver-api" = dontDistribute super."plotserver-api";
+  "plugins" = dontDistribute super."plugins";
+  "plugins-auto" = dontDistribute super."plugins-auto";
+  "plugins-multistage" = dontDistribute super."plugins-multistage";
+  "plumbers" = dontDistribute super."plumbers";
+  "ply-loader" = dontDistribute super."ply-loader";
+  "png-file" = dontDistribute super."png-file";
+  "pngload" = dontDistribute super."pngload";
+  "pngload-fixed" = dontDistribute super."pngload-fixed";
+  "pnm" = dontDistribute super."pnm";
+  "pocket-dns" = dontDistribute super."pocket-dns";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "pointless-haskell" = dontDistribute super."pointless-haskell";
+  "pointless-lenses" = dontDistribute super."pointless-lenses";
+  "pointless-rewrite" = dontDistribute super."pointless-rewrite";
+  "poker-eval" = dontDistribute super."poker-eval";
+  "pokitdok" = dontDistribute super."pokitdok";
+  "polar" = dontDistribute super."polar";
+  "polar-configfile" = dontDistribute super."polar-configfile";
+  "polar-shader" = dontDistribute super."polar-shader";
+  "polh-lexicon" = dontDistribute super."polh-lexicon";
+  "polimorf" = dontDistribute super."polimorf";
+  "poll" = dontDistribute super."poll";
+  "poly-control" = dontDistribute super."poly-control";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "pong-server" = dontDistribute super."pong-server";
+  "pontarius-mediaserver" = dontDistribute super."pontarius-mediaserver";
+  "pontarius-xmpp" = dontDistribute super."pontarius-xmpp";
+  "pontarius-xpmn" = dontDistribute super."pontarius-xpmn";
+  "pony" = dontDistribute super."pony";
+  "pool" = dontDistribute super."pool";
+  "pool-conduit" = dontDistribute super."pool-conduit";
+  "pooled-io" = dontDistribute super."pooled-io";
+  "pop3-client" = dontDistribute super."pop3-client";
+  "popenhs" = dontDistribute super."popenhs";
+  "poppler" = dontDistribute super."poppler";
+  "populate-setup-exe-cache" = dontDistribute super."populate-setup-exe-cache";
+  "portable-lines" = dontDistribute super."portable-lines";
+  "portaudio" = dontDistribute super."portaudio";
+  "porte" = dontDistribute super."porte";
+  "porter" = dontDistribute super."porter";
+  "ports" = dontDistribute super."ports";
+  "ports-tools" = dontDistribute super."ports-tools";
+  "positive" = dontDistribute super."positive";
+  "posix-acl" = dontDistribute super."posix-acl";
+  "posix-escape" = dontDistribute super."posix-escape";
+  "posix-filelock" = dontDistribute super."posix-filelock";
+  "posix-paths" = dontDistribute super."posix-paths";
+  "posix-pty" = dontDistribute super."posix-pty";
+  "posix-timer" = dontDistribute super."posix-timer";
+  "posix-waitpid" = dontDistribute super."posix-waitpid";
+  "possible" = dontDistribute super."possible";
+  "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "postgresql-config" = dontDistribute super."postgresql-config";
+  "postgresql-connector" = dontDistribute super."postgresql-connector";
+  "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
+  "postgresql-cube" = dontDistribute super."postgresql-cube";
+  "postgresql-error-codes" = dontDistribute super."postgresql-error-codes";
+  "postgresql-query" = dontDistribute super."postgresql-query";
+  "postgresql-simple-migration" = dontDistribute super."postgresql-simple-migration";
+  "postgresql-simple-sop" = dontDistribute super."postgresql-simple-sop";
+  "postgresql-simple-typed" = dontDistribute super."postgresql-simple-typed";
+  "postgresql-typed" = dontDistribute super."postgresql-typed";
+  "postgrest" = dontDistribute super."postgrest";
+  "postie" = dontDistribute super."postie";
+  "postmark" = dontDistribute super."postmark";
+  "postmaster" = dontDistribute super."postmaster";
+  "potato-tool" = dontDistribute super."potato-tool";
+  "potrace" = dontDistribute super."potrace";
+  "potrace-diagrams" = dontDistribute super."potrace-diagrams";
+  "powermate" = dontDistribute super."powermate";
+  "powerpc" = dontDistribute super."powerpc";
+  "ppm" = dontDistribute super."ppm";
+  "pqc" = dontDistribute super."pqc";
+  "pqueue-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "present" = dontDistribute super."present";
+  "press" = dontDistribute super."press";
+  "presto-hdbc" = dontDistribute super."presto-hdbc";
+  "prettify" = dontDistribute super."prettify";
+  "pretty-compact" = dontDistribute super."pretty-compact";
+  "pretty-error" = dontDistribute super."pretty-error";
+  "pretty-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
+  "printxosd" = dontDistribute super."printxosd";
+  "priority-queue" = dontDistribute super."priority-queue";
+  "priority-sync" = dontDistribute super."priority-sync";
+  "privileged-concurrency" = dontDistribute super."privileged-concurrency";
+  "prizm" = dontDistribute super."prizm";
+  "probability" = dontDistribute super."probability";
+  "probable" = dontDistribute super."probable";
+  "proc" = dontDistribute super."proc";
+  "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
+  "process-iterio" = dontDistribute super."process-iterio";
+  "process-leksah" = dontDistribute super."process-leksah";
+  "process-listlike" = dontDistribute super."process-listlike";
+  "process-progress" = dontDistribute super."process-progress";
+  "process-qq" = dontDistribute super."process-qq";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "processing" = dontDistribute super."processing";
+  "processor-creative-kit" = dontDistribute super."processor-creative-kit";
+  "procrastinating-structure" = dontDistribute super."procrastinating-structure";
+  "procrastinating-variable" = dontDistribute super."procrastinating-variable";
+  "procstat" = dontDistribute super."procstat";
+  "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "progress" = dontDistribute super."progress";
+  "progressbar" = dontDistribute super."progressbar";
+  "progression" = dontDistribute super."progression";
+  "progressive" = dontDistribute super."progressive";
+  "proj4-hs-bindings" = dontDistribute super."proj4-hs-bindings";
+  "projection" = dontDistribute super."projection";
+  "prolog" = dontDistribute super."prolog";
+  "prolog-graph" = dontDistribute super."prolog-graph";
+  "prolog-graph-lib" = dontDistribute super."prolog-graph-lib";
+  "prologue" = dontDistribute super."prologue";
+  "prometheus" = dontDistribute super."prometheus";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "propane" = dontDistribute super."propane";
+  "propellor" = dontDistribute super."propellor";
+  "properties" = dontDistribute super."properties";
+  "property-list" = dontDistribute super."property-list";
+  "proplang" = dontDistribute super."proplang";
+  "props" = dontDistribute super."props";
+  "prosper" = dontDistribute super."prosper";
+  "proteaaudio" = dontDistribute super."proteaaudio";
+  "protobuf-native" = dontDistribute super."protobuf-native";
+  "protocol-buffers" = doDistribute super."protocol-buffers_2_1_12";
+  "protocol-buffers-descriptor" = doDistribute super."protocol-buffers-descriptor_2_1_12";
+  "protocol-buffers-descriptor-fork" = dontDistribute super."protocol-buffers-descriptor-fork";
+  "protocol-buffers-fork" = dontDistribute super."protocol-buffers-fork";
+  "proton-haskell" = dontDistribute super."proton-haskell";
+  "prototype" = dontDistribute super."prototype";
+  "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "psql-helpers" = dontDistribute super."psql-helpers";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "publicsuffixlist" = dontDistribute super."publicsuffixlist";
+  "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
+  "pubnub" = dontDistribute super."pubnub";
+  "pubsub" = dontDistribute super."pubsub";
+  "puffytools" = dontDistribute super."puffytools";
+  "pugixml" = dontDistribute super."pugixml";
+  "pugs-DrIFT" = dontDistribute super."pugs-DrIFT";
+  "pugs-HsSyck" = dontDistribute super."pugs-HsSyck";
+  "pugs-compat" = dontDistribute super."pugs-compat";
+  "pugs-hsregex" = dontDistribute super."pugs-hsregex";
+  "pulse-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-fft" = dontDistribute super."pure-fft";
+  "pure-priority-queue" = dontDistribute super."pure-priority-queue";
+  "pure-priority-queue-tests" = dontDistribute super."pure-priority-queue-tests";
+  "pure-zlib" = dontDistribute super."pure-zlib";
+  "purescript" = doDistribute super."purescript_0_7_6_1";
+  "purescript-bridge" = dontDistribute super."purescript-bridge";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "push-notify" = dontDistribute super."push-notify";
+  "push-notify-ccs" = dontDistribute super."push-notify-ccs";
+  "push-notify-general" = dontDistribute super."push-notify-general";
+  "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pushme" = dontDistribute super."pushme";
+  "putlenses" = dontDistribute super."putlenses";
+  "puzzle-draw" = dontDistribute super."puzzle-draw";
+  "puzzle-draw-cmdline" = dontDistribute super."puzzle-draw-cmdline";
+  "pvd" = dontDistribute super."pvd";
+  "pwstore-cli" = dontDistribute super."pwstore-cli";
+  "pxsl-tools" = dontDistribute super."pxsl-tools";
+  "pyffi" = dontDistribute super."pyffi";
+  "pyfi" = dontDistribute super."pyfi";
+  "python-pickle" = dontDistribute super."python-pickle";
+  "qc-oi-testgenerator" = dontDistribute super."qc-oi-testgenerator";
+  "qd" = dontDistribute super."qd";
+  "qd-vec" = dontDistribute super."qd-vec";
+  "qed" = dontDistribute super."qed";
+  "qhull-simple" = dontDistribute super."qhull-simple";
+  "qrcode" = dontDistribute super."qrcode";
+  "qt" = dontDistribute super."qt";
+  "quadratic-irrational" = dontDistribute super."quadratic-irrational";
+  "quantfin" = dontDistribute super."quantfin";
+  "quantities" = dontDistribute super."quantities";
+  "quantum-arrow" = dontDistribute super."quantum-arrow";
+  "qudb" = dontDistribute super."qudb";
+  "quenya-verb" = dontDistribute super."quenya-verb";
+  "querystring-pickle" = dontDistribute super."querystring-pickle";
+  "queue" = dontDistribute super."queue";
+  "queuelike" = dontDistribute super."queuelike";
+  "quick-generator" = dontDistribute super."quick-generator";
+  "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-poly" = dontDistribute super."quickcheck-poly";
+  "quickcheck-properties" = dontDistribute super."quickcheck-properties";
+  "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
+  "quickcheck-property-monad" = dontDistribute super."quickcheck-property-monad";
+  "quickcheck-regex" = dontDistribute super."quickcheck-regex";
+  "quickcheck-relaxng" = dontDistribute super."quickcheck-relaxng";
+  "quickcheck-rematch" = dontDistribute super."quickcheck-rematch";
+  "quickcheck-script" = dontDistribute super."quickcheck-script";
+  "quickcheck-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
+  "quiver-bytestring" = dontDistribute super."quiver-bytestring";
+  "quiver-cell" = dontDistribute super."quiver-cell";
+  "quiver-csv" = dontDistribute super."quiver-csv";
+  "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-http" = dontDistribute super."quiver-http";
+  "quoridor-hs" = dontDistribute super."quoridor-hs";
+  "qux" = dontDistribute super."qux";
+  "rabocsv2qif" = dontDistribute super."rabocsv2qif";
+  "rad" = dontDistribute super."rad";
+  "radian" = dontDistribute super."radian";
+  "radium" = dontDistribute super."radium";
+  "radium-formula-parser" = dontDistribute super."radium-formula-parser";
+  "radix" = dontDistribute super."radix";
+  "rados-haskell" = dontDistribute super."rados-haskell";
+  "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
+  "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "rake" = dontDistribute super."rake";
+  "rakhana" = dontDistribute super."rakhana";
+  "ralist" = dontDistribute super."ralist";
+  "rallod" = dontDistribute super."rallod";
+  "raml" = dontDistribute super."raml";
+  "rand-vars" = dontDistribute super."rand-vars";
+  "randfile" = dontDistribute super."randfile";
+  "random-access-list" = dontDistribute super."random-access-list";
+  "random-derive" = dontDistribute super."random-derive";
+  "random-eff" = dontDistribute super."random-eff";
+  "random-effin" = dontDistribute super."random-effin";
+  "random-extras" = dontDistribute super."random-extras";
+  "random-hypergeometric" = dontDistribute super."random-hypergeometric";
+  "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
+  "random-variates" = dontDistribute super."random-variates";
+  "randomgen" = dontDistribute super."randomgen";
+  "randproc" = dontDistribute super."randproc";
+  "randsolid" = dontDistribute super."randsolid";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "ratio-int" = dontDistribute super."ratio-int";
+  "raven-haskell" = dontDistribute super."raven-haskell";
+  "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
+  "rawstring-qm" = dontDistribute super."rawstring-qm";
+  "razom-text-util" = dontDistribute super."razom-text-util";
+  "rbr" = dontDistribute super."rbr";
+  "rclient" = dontDistribute super."rclient";
+  "rcu" = dontDistribute super."rcu";
+  "rdf4h" = dontDistribute super."rdf4h";
+  "rdioh" = dontDistribute super."rdioh";
+  "rdtsc" = dontDistribute super."rdtsc";
+  "rdtsc-enolan" = dontDistribute super."rdtsc-enolan";
+  "re2" = dontDistribute super."re2";
+  "react-flux" = dontDistribute super."react-flux";
+  "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
+  "reaction-logic" = dontDistribute super."reaction-logic";
+  "reactive" = dontDistribute super."reactive";
+  "reactive-bacon" = dontDistribute super."reactive-bacon";
+  "reactive-balsa" = dontDistribute super."reactive-balsa";
+  "reactive-banana" = dontDistribute super."reactive-banana";
+  "reactive-banana-sdl" = dontDistribute super."reactive-banana-sdl";
+  "reactive-banana-sdl2" = dontDistribute super."reactive-banana-sdl2";
+  "reactive-banana-threepenny" = dontDistribute super."reactive-banana-threepenny";
+  "reactive-banana-wx" = dontDistribute super."reactive-banana-wx";
+  "reactive-fieldtrip" = dontDistribute super."reactive-fieldtrip";
+  "reactive-glut" = dontDistribute super."reactive-glut";
+  "reactive-haskell" = dontDistribute super."reactive-haskell";
+  "reactive-io" = dontDistribute super."reactive-io";
+  "reactive-thread" = dontDistribute super."reactive-thread";
+  "reactivity" = dontDistribute super."reactivity";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "rebase" = dontDistribute super."rebase";
+  "recaptcha" = dontDistribute super."recaptcha";
+  "record" = dontDistribute super."record";
+  "record-aeson" = dontDistribute super."record-aeson";
+  "record-gl" = dontDistribute super."record-gl";
+  "record-preprocessor" = dontDistribute super."record-preprocessor";
+  "record-syntax" = dontDistribute super."record-syntax";
+  "records" = dontDistribute super."records";
+  "records-th" = dontDistribute super."records-th";
+  "recursive-line-count" = dontDistribute super."recursive-line-count";
+  "redHandlers" = dontDistribute super."redHandlers";
+  "reddit" = dontDistribute super."reddit";
+  "redis" = dontDistribute super."redis";
+  "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
+  "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
+  "redis-simple" = dontDistribute super."redis-simple";
+  "redo" = dontDistribute super."redo";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "reenact" = dontDistribute super."reenact";
+  "reexport-crypto-random" = dontDistribute super."reexport-crypto-random";
+  "ref" = dontDistribute super."ref";
+  "ref-mtl" = dontDistribute super."ref-mtl";
+  "ref-tf" = dontDistribute super."ref-tf";
+  "refcount" = dontDistribute super."refcount";
+  "reference" = dontDistribute super."reference";
+  "references" = dontDistribute super."references";
+  "refh" = dontDistribute super."refh";
+  "refined" = dontDistribute super."refined";
+  "reflection-extras" = dontDistribute super."reflection-extras";
+  "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
+  "reflex" = dontDistribute super."reflex";
+  "reflex-animation" = dontDistribute super."reflex-animation";
+  "reflex-dom" = dontDistribute super."reflex-dom";
+  "reflex-dom-contrib" = dontDistribute super."reflex-dom-contrib";
+  "reflex-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-orphans" = dontDistribute super."reflex-orphans";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-deriv" = dontDistribute super."regex-deriv";
+  "regex-dfa" = dontDistribute super."regex-dfa";
+  "regex-easy" = dontDistribute super."regex-easy";
+  "regex-genex" = dontDistribute super."regex-genex";
+  "regex-parsec" = dontDistribute super."regex-parsec";
+  "regex-pderiv" = dontDistribute super."regex-pderiv";
+  "regex-posix-unittest" = dontDistribute super."regex-posix-unittest";
+  "regex-tdfa-pipes" = dontDistribute super."regex-tdfa-pipes";
+  "regex-tdfa-quasiquoter" = dontDistribute super."regex-tdfa-quasiquoter";
+  "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
+  "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
+  "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
+  "regex-xmlschema" = dontDistribute super."regex-xmlschema";
+  "regexchar" = dontDistribute super."regexchar";
+  "regexdot" = dontDistribute super."regexdot";
+  "regexp-tries" = dontDistribute super."regexp-tries";
+  "regexpr" = dontDistribute super."regexpr";
+  "regexpr-symbolic" = dontDistribute super."regexpr-symbolic";
+  "regexqq" = dontDistribute super."regexqq";
+  "regional-pointers" = dontDistribute super."regional-pointers";
+  "regions" = dontDistribute super."regions";
+  "regions-monadsfd" = dontDistribute super."regions-monadsfd";
+  "regions-monadstf" = dontDistribute super."regions-monadstf";
+  "regions-mtl" = dontDistribute super."regions-mtl";
+  "regress" = dontDistribute super."regress";
+  "regular" = dontDistribute super."regular";
+  "regular-extras" = dontDistribute super."regular-extras";
+  "regular-web" = dontDistribute super."regular-web";
+  "regular-xmlpickler" = dontDistribute super."regular-xmlpickler";
+  "reheat" = dontDistribute super."reheat";
+  "rehoo" = dontDistribute super."rehoo";
+  "rei" = dontDistribute super."rei";
+  "reified-records" = dontDistribute super."reified-records";
+  "reify" = dontDistribute super."reify";
+  "relacion" = dontDistribute super."relacion";
+  "relation" = dontDistribute super."relation";
+  "relational-postgresql8" = dontDistribute super."relational-postgresql8";
+  "relational-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-json" = dontDistribute super."remote-json";
+  "remote-json-client" = dontDistribute super."remote-json-client";
+  "remote-json-server" = dontDistribute super."remote-json-server";
+  "remote-monad" = dontDistribute super."remote-monad";
+  "remotion" = dontDistribute super."remotion";
+  "renderable" = dontDistribute super."renderable";
+  "reord" = dontDistribute super."reord";
+  "reorderable" = dontDistribute super."reorderable";
+  "repa-array" = dontDistribute super."repa-array";
+  "repa-bytestring" = dontDistribute super."repa-bytestring";
+  "repa-convert" = dontDistribute super."repa-convert";
+  "repa-eval" = dontDistribute super."repa-eval";
+  "repa-examples" = dontDistribute super."repa-examples";
+  "repa-fftw" = dontDistribute super."repa-fftw";
+  "repa-flow" = dontDistribute super."repa-flow";
+  "repa-linear-algebra" = dontDistribute super."repa-linear-algebra";
+  "repa-plugin" = dontDistribute super."repa-plugin";
+  "repa-scalar" = dontDistribute super."repa-scalar";
+  "repa-series" = dontDistribute super."repa-series";
+  "repa-sndfile" = dontDistribute super."repa-sndfile";
+  "repa-stream" = dontDistribute super."repa-stream";
+  "repa-v4l2" = dontDistribute super."repa-v4l2";
+  "repl" = dontDistribute super."repl";
+  "repl-toolkit" = dontDistribute super."repl-toolkit";
+  "repline" = dontDistribute super."repline";
+  "repo-based-blog" = dontDistribute super."repo-based-blog";
+  "repr" = dontDistribute super."repr";
+  "repr-tree-syb" = dontDistribute super."repr-tree-syb";
+  "representable-functors" = dontDistribute super."representable-functors";
+  "representable-profunctors" = dontDistribute super."representable-profunctors";
+  "representable-tries" = dontDistribute super."representable-tries";
+  "reqcatcher" = dontDistribute super."reqcatcher";
+  "request-monad" = dontDistribute super."request-monad";
+  "reserve" = dontDistribute super."reserve";
+  "resistor-cube" = dontDistribute super."resistor-cube";
+  "resource-effect" = dontDistribute super."resource-effect";
+  "resource-embed" = dontDistribute super."resource-embed";
+  "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
+  "resource-pool-monad" = dontDistribute super."resource-pool-monad";
+  "resource-simple" = dontDistribute super."resource-simple";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
+  "reverse-geocoding" = dontDistribute super."reverse-geocoding";
+  "reversi" = dontDistribute super."reversi";
+  "rewrite" = dontDistribute super."rewrite";
+  "rewriting" = dontDistribute super."rewriting";
+  "rex" = dontDistribute super."rex";
+  "rezoom" = dontDistribute super."rezoom";
+  "rfc3339" = dontDistribute super."rfc3339";
+  "rhythm-game-tutorial" = dontDistribute super."rhythm-game-tutorial";
+  "riak" = doDistribute super."riak_0_9_1_1";
+  "riak-protobuf" = doDistribute super."riak-protobuf_0_20_0_0";
+  "richreports" = dontDistribute super."richreports";
+  "riemann" = dontDistribute super."riemann";
+  "riff" = dontDistribute super."riff";
+  "ring-buffer" = dontDistribute super."ring-buffer";
+  "riot" = dontDistribute super."riot";
+  "ripple" = dontDistribute super."ripple";
+  "ripple-federation" = dontDistribute super."ripple-federation";
+  "risc386" = dontDistribute super."risc386";
+  "rivers" = dontDistribute super."rivers";
+  "rivet" = dontDistribute super."rivet";
+  "rivet-core" = dontDistribute super."rivet-core";
+  "rivet-migration" = dontDistribute super."rivet-migration";
+  "rivet-simple-deploy" = dontDistribute super."rivet-simple-deploy";
+  "rlglue" = dontDistribute super."rlglue";
+  "rlist" = dontDistribute super."rlist";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "robin" = dontDistribute super."robin";
+  "robot" = dontDistribute super."robot";
+  "robots-txt" = dontDistribute super."robots-txt";
+  "rocksdb-haskell" = dontDistribute super."rocksdb-haskell";
+  "roguestar" = dontDistribute super."roguestar";
+  "roguestar-engine" = dontDistribute super."roguestar-engine";
+  "roguestar-gl" = dontDistribute super."roguestar-gl";
+  "roguestar-glut" = dontDistribute super."roguestar-glut";
+  "rollbar" = dontDistribute super."rollbar";
+  "roller" = dontDistribute super."roller";
+  "rolling-queue" = dontDistribute super."rolling-queue";
+  "roman-numerals" = dontDistribute super."roman-numerals";
+  "romkan" = dontDistribute super."romkan";
+  "roots" = dontDistribute super."roots";
+  "rope" = dontDistribute super."rope";
+  "rosa" = dontDistribute super."rosa";
+  "rose-trie" = dontDistribute super."rose-trie";
+  "roshask" = dontDistribute super."roshask";
+  "rosso" = dontDistribute super."rosso";
+  "rot13" = dontDistribute super."rot13";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "rounding" = dontDistribute super."rounding";
+  "roundtrip" = dontDistribute super."roundtrip";
+  "roundtrip-aeson" = dontDistribute super."roundtrip-aeson";
+  "roundtrip-string" = dontDistribute super."roundtrip-string";
+  "roundtrip-xml" = dontDistribute super."roundtrip-xml";
+  "route-generator" = dontDistribute super."route-generator";
+  "route-planning" = dontDistribute super."route-planning";
+  "rowrecord" = dontDistribute super."rowrecord";
+  "rpc" = dontDistribute super."rpc";
+  "rpc-framework" = dontDistribute super."rpc-framework";
+  "rpf" = dontDistribute super."rpf";
+  "rpm" = dontDistribute super."rpm";
+  "rsagl" = dontDistribute super."rsagl";
+  "rsagl-frp" = dontDistribute super."rsagl-frp";
+  "rsagl-math" = dontDistribute super."rsagl-math";
+  "rspp" = dontDistribute super."rspp";
+  "rss" = dontDistribute super."rss";
+  "rss-conduit" = dontDistribute super."rss-conduit";
+  "rss2irc" = dontDistribute super."rss2irc";
+  "rtcm" = dontDistribute super."rtcm";
+  "rtld" = dontDistribute super."rtld";
+  "rtlsdr" = dontDistribute super."rtlsdr";
+  "rtorrent-rpc" = dontDistribute super."rtorrent-rpc";
+  "rtorrent-state" = dontDistribute super."rtorrent-state";
+  "rubberband" = dontDistribute super."rubberband";
+  "ruby-marshal" = dontDistribute super."ruby-marshal";
+  "ruby-qq" = dontDistribute super."ruby-qq";
+  "ruff" = dontDistribute super."ruff";
+  "ruler" = dontDistribute super."ruler";
+  "ruler-core" = dontDistribute super."ruler-core";
+  "rungekutta" = dontDistribute super."rungekutta";
+  "runghc" = dontDistribute super."runghc";
+  "rwlock" = dontDistribute super."rwlock";
+  "rws" = dontDistribute super."rws";
+  "s-cargot" = dontDistribute super."s-cargot";
+  "safe-access" = dontDistribute super."safe-access";
+  "safe-failure" = dontDistribute super."safe-failure";
+  "safe-failure-cme" = dontDistribute super."safe-failure-cme";
+  "safe-freeze" = dontDistribute super."safe-freeze";
+  "safe-globals" = dontDistribute super."safe-globals";
+  "safe-lazy-io" = dontDistribute super."safe-lazy-io";
+  "safe-length" = dontDistribute super."safe-length";
+  "safe-plugins" = dontDistribute super."safe-plugins";
+  "safe-printf" = dontDistribute super."safe-printf";
+  "safeint" = dontDistribute super."safeint";
+  "safer-file-handles" = dontDistribute super."safer-file-handles";
+  "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
+  "safer-file-handles-text" = dontDistribute super."safer-file-handles-text";
+  "saferoute" = dontDistribute super."saferoute";
+  "sai-shape-syb" = dontDistribute super."sai-shape-syb";
+  "saltine" = dontDistribute super."saltine";
+  "saltine-quickcheck" = dontDistribute super."saltine-quickcheck";
+  "salvia" = dontDistribute super."salvia";
+  "salvia-demo" = dontDistribute super."salvia-demo";
+  "salvia-extras" = dontDistribute super."salvia-extras";
+  "salvia-protocol" = dontDistribute super."salvia-protocol";
+  "salvia-sessions" = dontDistribute super."salvia-sessions";
+  "salvia-websocket" = dontDistribute super."salvia-websocket";
+  "sample-frame" = dontDistribute super."sample-frame";
+  "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "sasl" = dontDistribute super."sasl";
+  "sat" = dontDistribute super."sat";
+  "sat-micro-hs" = dontDistribute super."sat-micro-hs";
+  "satchmo" = dontDistribute super."satchmo";
+  "satchmo-backends" = dontDistribute super."satchmo-backends";
+  "satchmo-examples" = dontDistribute super."satchmo-examples";
+  "satchmo-funsat" = dontDistribute super."satchmo-funsat";
+  "satchmo-minisat" = dontDistribute super."satchmo-minisat";
+  "satchmo-toysat" = dontDistribute super."satchmo-toysat";
+  "sbp" = dontDistribute super."sbp";
+  "sbvPlugin" = dontDistribute super."sbvPlugin";
+  "sc3-rdu" = dontDistribute super."sc3-rdu";
+  "scalable-server" = dontDistribute super."scalable-server";
+  "scaleimage" = dontDistribute super."scaleimage";
+  "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
+  "scat" = dontDistribute super."scat";
+  "scc" = dontDistribute super."scc";
+  "scenegraph" = dontDistribute super."scenegraph";
+  "scgi" = dontDistribute super."scgi";
+  "schedevr" = dontDistribute super."schedevr";
+  "schedule-planner" = dontDistribute super."schedule-planner";
+  "schedyield" = dontDistribute super."schedyield";
+  "scholdoc" = dontDistribute super."scholdoc";
+  "scholdoc-citeproc" = dontDistribute super."scholdoc-citeproc";
+  "scholdoc-texmath" = dontDistribute super."scholdoc-texmath";
+  "scholdoc-types" = dontDistribute super."scholdoc-types";
+  "schonfinkeling" = dontDistribute super."schonfinkeling";
+  "sci-ratio" = dontDistribute super."sci-ratio";
+  "science-constants" = dontDistribute super."science-constants";
+  "science-constants-dimensional" = dontDistribute super."science-constants-dimensional";
+  "scion" = dontDistribute super."scion";
+  "scion-browser" = dontDistribute super."scion-browser";
+  "scons2dot" = dontDistribute super."scons2dot";
+  "scope" = dontDistribute super."scope";
+  "scope-cairo" = dontDistribute super."scope-cairo";
+  "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
+  "scotty-binding-play" = dontDistribute super."scotty-binding-play";
+  "scotty-blaze" = dontDistribute super."scotty-blaze";
+  "scotty-cookie" = dontDistribute super."scotty-cookie";
+  "scotty-fay" = dontDistribute super."scotty-fay";
+  "scotty-hastache" = dontDistribute super."scotty-hastache";
+  "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
+  "scotty-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrz" = dontDistribute super."scrz";
+  "scyther-proof" = dontDistribute super."scyther-proof";
+  "sde-solver" = dontDistribute super."sde-solver";
+  "sdf2p1-parser" = dontDistribute super."sdf2p1-parser";
+  "sdl2-cairo" = dontDistribute super."sdl2-cairo";
+  "sdl2-cairo-image" = dontDistribute super."sdl2-cairo-image";
+  "sdl2-compositor" = dontDistribute super."sdl2-compositor";
+  "sdl2-image" = dontDistribute super."sdl2-image";
+  "sdl2-ttf" = dontDistribute super."sdl2-ttf";
+  "sdnv" = dontDistribute super."sdnv";
+  "sdr" = dontDistribute super."sdr";
+  "seacat" = dontDistribute super."seacat";
+  "seal-module" = dontDistribute super."seal-module";
+  "search" = dontDistribute super."search";
+  "sec" = dontDistribute super."sec";
+  "secdh" = dontDistribute super."secdh";
+  "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
+  "secp256k1" = dontDistribute super."secp256k1";
+  "secret-santa" = dontDistribute super."secret-santa";
+  "secret-sharing" = dontDistribute super."secret-sharing";
+  "secrm" = dontDistribute super."secrm";
+  "secure-sockets" = dontDistribute super."secure-sockets";
+  "sednaDBXML" = dontDistribute super."sednaDBXML";
+  "select" = dontDistribute super."select";
+  "selectors" = dontDistribute super."selectors";
+  "selenium" = dontDistribute super."selenium";
+  "selenium-server" = dontDistribute super."selenium-server";
+  "selfrestart" = dontDistribute super."selfrestart";
+  "selinux" = dontDistribute super."selinux";
+  "semaphore-plus" = dontDistribute super."semaphore-plus";
+  "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups-actions" = dontDistribute super."semigroups-actions";
+  "semiring" = dontDistribute super."semiring";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "sensei" = dontDistribute super."sensei";
+  "sensenet" = dontDistribute super."sensenet";
+  "sentry" = dontDistribute super."sentry";
+  "senza" = dontDistribute super."senza";
+  "separated" = dontDistribute super."separated";
+  "seqaid" = dontDistribute super."seqaid";
+  "seqid" = dontDistribute super."seqid";
+  "seqid-streams" = dontDistribute super."seqid-streams";
+  "seqloc-datafiles" = dontDistribute super."seqloc-datafiles";
+  "sequence" = dontDistribute super."sequence";
+  "sequent-core" = dontDistribute super."sequent-core";
+  "sequential-index" = dontDistribute super."sequential-index";
+  "sequor" = dontDistribute super."sequor";
+  "serial" = dontDistribute super."serial";
+  "serial-test-generators" = dontDistribute super."serial-test-generators";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-elm" = dontDistribute super."servant-elm";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-foreign" = dontDistribute super."servant-foreign";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-haxl-client" = dontDistribute super."servant-haxl-client";
+  "servant-js" = dontDistribute super."servant-js";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "set-with" = dontDistribute super."set-with";
+  "setdown" = dontDistribute super."setdown";
+  "setgame" = dontDistribute super."setgame";
+  "setops" = dontDistribute super."setops";
+  "setters" = dontDistribute super."setters";
+  "settings" = dontDistribute super."settings";
+  "sexp" = dontDistribute super."sexp";
+  "sexp-grammar" = dontDistribute super."sexp-grammar";
+  "sexp-show" = dontDistribute super."sexp-show";
+  "sexpr" = dontDistribute super."sexpr";
+  "sext" = dontDistribute super."sext";
+  "sfml-audio" = dontDistribute super."sfml-audio";
+  "sfmt" = dontDistribute super."sfmt";
+  "sgd" = dontDistribute super."sgd";
+  "sgf" = dontDistribute super."sgf";
+  "sgrep" = dontDistribute super."sgrep";
+  "sha-streams" = dontDistribute super."sha-streams";
+  "shadower" = dontDistribute super."shadower";
+  "shadowsocks" = dontDistribute super."shadowsocks";
+  "shady-gen" = dontDistribute super."shady-gen";
+  "shady-graphics" = dontDistribute super."shady-graphics";
+  "shake-cabal-build" = dontDistribute super."shake-cabal-build";
+  "shake-extras" = dontDistribute super."shake-extras";
+  "shake-minify" = dontDistribute super."shake-minify";
+  "shake-pack" = dontDistribute super."shake-pack";
+  "shake-persist" = dontDistribute super."shake-persist";
+  "shaker" = dontDistribute super."shaker";
+  "shakespeare-babel" = dontDistribute super."shakespeare-babel";
+  "shakespeare-css" = dontDistribute super."shakespeare-css";
+  "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
+  "shakespeare-js" = dontDistribute super."shakespeare-js";
+  "shakespeare-text" = dontDistribute super."shakespeare-text";
+  "shana" = dontDistribute super."shana";
+  "shapefile" = dontDistribute super."shapefile";
+  "shapely-data" = dontDistribute super."shapely-data";
+  "sharc-timbre" = dontDistribute super."sharc-timbre";
+  "shared-buffer" = dontDistribute super."shared-buffer";
+  "shared-fields" = dontDistribute super."shared-fields";
+  "shared-memory" = dontDistribute super."shared-memory";
+  "sharedio" = dontDistribute super."sharedio";
+  "she" = dontDistribute super."she";
+  "shelduck" = dontDistribute super."shelduck";
+  "shell-escape" = dontDistribute super."shell-escape";
+  "shell-monad" = dontDistribute super."shell-monad";
+  "shell-pipe" = dontDistribute super."shell-pipe";
+  "shellish" = dontDistribute super."shellish";
+  "shellmate" = dontDistribute super."shellmate";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "shivers-cfg" = dontDistribute super."shivers-cfg";
+  "shoap" = dontDistribute super."shoap";
+  "shortcircuit" = dontDistribute super."shortcircuit";
+  "shorten-strings" = dontDistribute super."shorten-strings";
+  "show" = dontDistribute super."show";
+  "show-type" = dontDistribute super."show-type";
+  "showdown" = dontDistribute super."showdown";
+  "shpider" = dontDistribute super."shpider";
+  "shplit" = dontDistribute super."shplit";
+  "shqq" = dontDistribute super."shqq";
+  "shuffle" = dontDistribute super."shuffle";
+  "sieve" = dontDistribute super."sieve";
+  "sifflet" = dontDistribute super."sifflet";
+  "sifflet-lib" = dontDistribute super."sifflet-lib";
+  "sign" = dontDistribute super."sign";
+  "signals" = dontDistribute super."signals";
+  "signed-multiset" = dontDistribute super."signed-multiset";
+  "simd" = dontDistribute super."simd";
+  "simgi" = dontDistribute super."simgi";
+  "simple-actors" = dontDistribute super."simple-actors";
+  "simple-atom" = dontDistribute super."simple-atom";
+  "simple-bluetooth" = dontDistribute super."simple-bluetooth";
+  "simple-c-value" = dontDistribute super."simple-c-value";
+  "simple-conduit" = dontDistribute super."simple-conduit";
+  "simple-config" = dontDistribute super."simple-config";
+  "simple-css" = dontDistribute super."simple-css";
+  "simple-eval" = dontDistribute super."simple-eval";
+  "simple-firewire" = dontDistribute super."simple-firewire";
+  "simple-form" = dontDistribute super."simple-form";
+  "simple-genetic-algorithm" = dontDistribute super."simple-genetic-algorithm";
+  "simple-genetic-algorithm-mr" = dontDistribute super."simple-genetic-algorithm-mr";
+  "simple-get-opt" = dontDistribute super."simple-get-opt";
+  "simple-index" = dontDistribute super."simple-index";
+  "simple-log" = dontDistribute super."simple-log";
+  "simple-log-syslog" = dontDistribute super."simple-log-syslog";
+  "simple-neural-networks" = dontDistribute super."simple-neural-networks";
+  "simple-nix" = dontDistribute super."simple-nix";
+  "simple-observer" = dontDistribute super."simple-observer";
+  "simple-pascal" = dontDistribute super."simple-pascal";
+  "simple-pipe" = dontDistribute super."simple-pipe";
+  "simple-rope" = dontDistribute super."simple-rope";
+  "simple-server" = dontDistribute super."simple-server";
+  "simple-sessions" = dontDistribute super."simple-sessions";
+  "simple-sql-parser" = dontDistribute super."simple-sql-parser";
+  "simple-stacked-vm" = dontDistribute super."simple-stacked-vm";
+  "simple-tabular" = dontDistribute super."simple-tabular";
+  "simple-vec3" = dontDistribute super."simple-vec3";
+  "simpleargs" = dontDistribute super."simpleargs";
+  "simpleirc" = dontDistribute super."simpleirc";
+  "simpleirc-lens" = dontDistribute super."simpleirc-lens";
+  "simplenote" = dontDistribute super."simplenote";
+  "simpleprelude" = dontDistribute super."simpleprelude";
+  "simplesmtpclient" = dontDistribute super."simplesmtpclient";
+  "simplessh" = dontDistribute super."simplessh";
+  "simplest-sqlite" = dontDistribute super."simplest-sqlite";
+  "simplex" = dontDistribute super."simplex";
+  "simplex-basic" = dontDistribute super."simplex-basic";
+  "simseq" = dontDistribute super."simseq";
+  "simtreelo" = dontDistribute super."simtreelo";
+  "sindre" = dontDistribute super."sindre";
+  "singleton-nats" = dontDistribute super."singleton-nats";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "sized" = dontDistribute super."sized";
+  "sized-types" = dontDistribute super."sized-types";
+  "sized-vector" = dontDistribute super."sized-vector";
+  "sizes" = dontDistribute super."sizes";
+  "sjsp" = dontDistribute super."sjsp";
+  "skeleton" = dontDistribute super."skeleton";
+  "skell" = dontDistribute super."skell";
+  "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
+  "skype4hs" = dontDistribute super."skype4hs";
+  "skypelogexport" = dontDistribute super."skypelogexport";
+  "slack" = dontDistribute super."slack";
+  "slack-api" = dontDistribute super."slack-api";
+  "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "sleep" = dontDistribute super."sleep";
+  "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
+  "slidemews" = dontDistribute super."slidemews";
+  "sloane" = dontDistribute super."sloane";
+  "slot-lambda" = dontDistribute super."slot-lambda";
+  "sloth" = dontDistribute super."sloth";
+  "smallarray" = dontDistribute super."smallarray";
+  "smallcheck-laws" = dontDistribute super."smallcheck-laws";
+  "smallcheck-lens" = dontDistribute super."smallcheck-lens";
+  "smallcheck-series" = dontDistribute super."smallcheck-series";
+  "smallpt-hs" = dontDistribute super."smallpt-hs";
+  "smallstring" = dontDistribute super."smallstring";
+  "smaoin" = dontDistribute super."smaoin";
+  "smartGroup" = dontDistribute super."smartGroup";
+  "smartcheck" = dontDistribute super."smartcheck";
+  "smartconstructor" = dontDistribute super."smartconstructor";
+  "smartword" = dontDistribute super."smartword";
+  "sme" = dontDistribute super."sme";
+  "smt-lib" = dontDistribute super."smt-lib";
+  "smtlib2" = dontDistribute super."smtlib2";
+  "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
+  "smtp2mta" = dontDistribute super."smtp2mta";
+  "smtps-gmail" = dontDistribute super."smtps-gmail";
+  "snake-game" = dontDistribute super."snake-game";
+  "snap-accept" = dontDistribute super."snap-accept";
+  "snap-app" = dontDistribute super."snap-app";
+  "snap-auth-cli" = dontDistribute super."snap-auth-cli";
+  "snap-blaze" = dontDistribute super."snap-blaze";
+  "snap-blaze-clay" = dontDistribute super."snap-blaze-clay";
+  "snap-configuration-utilities" = dontDistribute super."snap-configuration-utilities";
+  "snap-cors" = dontDistribute super."snap-cors";
+  "snap-elm" = dontDistribute super."snap-elm";
+  "snap-error-collector" = dontDistribute super."snap-error-collector";
+  "snap-extras" = dontDistribute super."snap-extras";
+  "snap-language" = dontDistribute super."snap-language";
+  "snap-loader-dynamic" = dontDistribute super."snap-loader-dynamic";
+  "snap-loader-static" = dontDistribute super."snap-loader-static";
+  "snap-predicates" = dontDistribute super."snap-predicates";
+  "snap-testing" = dontDistribute super."snap-testing";
+  "snap-utils" = dontDistribute super."snap-utils";
+  "snap-web-routes" = dontDistribute super."snap-web-routes";
+  "snaplet-acid-state" = dontDistribute super."snaplet-acid-state";
+  "snaplet-actionlog" = dontDistribute super."snaplet-actionlog";
+  "snaplet-amqp" = dontDistribute super."snaplet-amqp";
+  "snaplet-auth-acid" = dontDistribute super."snaplet-auth-acid";
+  "snaplet-coffee" = dontDistribute super."snaplet-coffee";
+  "snaplet-css-min" = dontDistribute super."snaplet-css-min";
+  "snaplet-environments" = dontDistribute super."snaplet-environments";
+  "snaplet-ghcjs" = dontDistribute super."snaplet-ghcjs";
+  "snaplet-hasql" = dontDistribute super."snaplet-hasql";
+  "snaplet-haxl" = dontDistribute super."snaplet-haxl";
+  "snaplet-hdbc" = dontDistribute super."snaplet-hdbc";
+  "snaplet-hslogger" = dontDistribute super."snaplet-hslogger";
+  "snaplet-i18n" = dontDistribute super."snaplet-i18n";
+  "snaplet-influxdb" = dontDistribute super."snaplet-influxdb";
+  "snaplet-lss" = dontDistribute super."snaplet-lss";
+  "snaplet-mandrill" = dontDistribute super."snaplet-mandrill";
+  "snaplet-mongoDB" = dontDistribute super."snaplet-mongoDB";
+  "snaplet-mongodb-minimalistic" = dontDistribute super."snaplet-mongodb-minimalistic";
+  "snaplet-mysql-simple" = dontDistribute super."snaplet-mysql-simple";
+  "snaplet-oauth" = dontDistribute super."snaplet-oauth";
+  "snaplet-persistent" = dontDistribute super."snaplet-persistent";
+  "snaplet-postgresql-simple" = dontDistribute super."snaplet-postgresql-simple";
+  "snaplet-postmark" = dontDistribute super."snaplet-postmark";
+  "snaplet-purescript" = dontDistribute super."snaplet-purescript";
+  "snaplet-recaptcha" = dontDistribute super."snaplet-recaptcha";
+  "snaplet-redis" = dontDistribute super."snaplet-redis";
+  "snaplet-redson" = dontDistribute super."snaplet-redson";
+  "snaplet-rest" = dontDistribute super."snaplet-rest";
+  "snaplet-riak" = dontDistribute super."snaplet-riak";
+  "snaplet-sass" = dontDistribute super."snaplet-sass";
+  "snaplet-sedna" = dontDistribute super."snaplet-sedna";
+  "snaplet-ses-html" = dontDistribute super."snaplet-ses-html";
+  "snaplet-sqlite-simple" = dontDistribute super."snaplet-sqlite-simple";
+  "snaplet-stripe" = dontDistribute super."snaplet-stripe";
+  "snaplet-tasks" = dontDistribute super."snaplet-tasks";
+  "snaplet-typed-sessions" = dontDistribute super."snaplet-typed-sessions";
+  "snaplet-wordpress" = dontDistribute super."snaplet-wordpress";
+  "snappy" = dontDistribute super."snappy";
+  "snappy-conduit" = dontDistribute super."snappy-conduit";
+  "snappy-framing" = dontDistribute super."snappy-framing";
+  "snappy-iteratee" = dontDistribute super."snappy-iteratee";
+  "sndfile-enumerators" = dontDistribute super."sndfile-enumerators";
+  "sneakyterm" = dontDistribute super."sneakyterm";
+  "sneathlane-haste" = dontDistribute super."sneathlane-haste";
+  "snippet-extractor" = dontDistribute super."snippet-extractor";
+  "snm" = dontDistribute super."snm";
+  "snow-white" = dontDistribute super."snow-white";
+  "snowball" = dontDistribute super."snowball";
+  "snowglobe" = dontDistribute super."snowglobe";
+  "sock2stream" = dontDistribute super."sock2stream";
+  "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
+  "socket-activation" = dontDistribute super."socket-activation";
+  "socket-sctp" = dontDistribute super."socket-sctp";
+  "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
+  "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "sorting" = dontDistribute super."sorting";
+  "sorty" = dontDistribute super."sorty";
+  "sound-collage" = dontDistribute super."sound-collage";
+  "sounddelay" = dontDistribute super."sounddelay";
+  "source-code-server" = dontDistribute super."source-code-server";
+  "sousit" = dontDistribute super."sousit";
+  "sox" = dontDistribute super."sox";
+  "soxlib" = dontDistribute super."soxlib";
+  "soyuz" = dontDistribute super."soyuz";
+  "spacefill" = dontDistribute super."spacefill";
+  "spacepart" = dontDistribute super."spacepart";
+  "spaceprobe" = dontDistribute super."spaceprobe";
+  "spanout" = dontDistribute super."spanout";
+  "sparse" = dontDistribute super."sparse";
+  "sparse-lin-alg" = dontDistribute super."sparse-lin-alg";
+  "sparsebit" = dontDistribute super."sparsebit";
+  "sparsecheck" = dontDistribute super."sparsecheck";
+  "sparser" = dontDistribute super."sparser";
+  "spata" = dontDistribute super."spata";
+  "spatial-math" = dontDistribute super."spatial-math";
+  "spawn" = dontDistribute super."spawn";
+  "spe" = dontDistribute super."spe";
+  "special-functors" = dontDistribute super."special-functors";
+  "special-keys" = dontDistribute super."special-keys";
+  "specialize-th" = dontDistribute super."specialize-th";
+  "species" = dontDistribute super."species";
+  "speculation-transformers" = dontDistribute super."speculation-transformers";
+  "spelling-suggest" = dontDistribute super."spelling-suggest";
+  "sphero" = dontDistribute super."sphero";
+  "sphinx-cli" = dontDistribute super."sphinx-cli";
+  "spice" = dontDistribute super."spice";
+  "spike" = dontDistribute super."spike";
+  "spine" = dontDistribute super."spine";
+  "spir-v" = dontDistribute super."spir-v";
+  "splay" = dontDistribute super."splay";
+  "splaytree" = dontDistribute super."splaytree";
+  "spline3" = dontDistribute super."spline3";
+  "splines" = dontDistribute super."splines";
+  "split-channel" = dontDistribute super."split-channel";
+  "split-record" = dontDistribute super."split-record";
+  "split-tchan" = dontDistribute super."split-tchan";
+  "splitter" = dontDistribute super."splitter";
+  "splot" = dontDistribute super."splot";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "spsa" = dontDistribute super."spsa";
+  "spy" = dontDistribute super."spy";
+  "sql-simple" = dontDistribute super."sql-simple";
+  "sql-simple-mysql" = dontDistribute super."sql-simple-mysql";
+  "sql-simple-pool" = dontDistribute super."sql-simple-pool";
+  "sql-simple-postgresql" = dontDistribute super."sql-simple-postgresql";
+  "sql-simple-sqlite" = dontDistribute super."sql-simple-sqlite";
+  "sql-words" = dontDistribute super."sql-words";
+  "sqlite" = dontDistribute super."sqlite";
+  "sqlite-simple-typed" = dontDistribute super."sqlite-simple-typed";
+  "sqlvalue-list" = dontDistribute super."sqlvalue-list";
+  "squeeze" = dontDistribute super."squeeze";
+  "sr-extra" = dontDistribute super."sr-extra";
+  "srcinst" = dontDistribute super."srcinst";
+  "srec" = dontDistribute super."srec";
+  "sscgi" = dontDistribute super."sscgi";
+  "ssh" = dontDistribute super."ssh";
+  "sshd-lint" = dontDistribute super."sshd-lint";
+  "sshtun" = dontDistribute super."sshtun";
+  "sssp" = dontDistribute super."sssp";
+  "sstable" = dontDistribute super."sstable";
+  "ssv" = dontDistribute super."ssv";
+  "stable-heap" = dontDistribute super."stable-heap";
+  "stable-maps" = dontDistribute super."stable-maps";
+  "stable-marriage" = dontDistribute super."stable-marriage";
+  "stable-memo" = dontDistribute super."stable-memo";
+  "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
+  "standalone-haddock" = dontDistribute super."standalone-haddock";
+  "star-to-star" = dontDistribute super."star-to-star";
+  "star-to-star-contra" = dontDistribute super."star-to-star-contra";
+  "starling" = dontDistribute super."starling";
+  "starrover2" = dontDistribute super."starrover2";
+  "stash" = dontDistribute super."stash";
+  "state" = dontDistribute super."state";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statethread" = dontDistribute super."statethread";
+  "statgrab" = dontDistribute super."statgrab";
+  "static-hash" = dontDistribute super."static-hash";
+  "static-resources" = dontDistribute super."static-resources";
+  "staticanalysis" = dontDistribute super."staticanalysis";
+  "statistics-dirichlet" = dontDistribute super."statistics-dirichlet";
+  "statistics-fusion" = dontDistribute super."statistics-fusion";
+  "statistics-hypergeometric-genvar" = dontDistribute super."statistics-hypergeometric-genvar";
+  "stats" = dontDistribute super."stats";
+  "statsd" = dontDistribute super."statsd";
+  "statsd-client" = dontDistribute super."statsd-client";
+  "statsd-datadog" = dontDistribute super."statsd-datadog";
+  "statvfs" = dontDistribute super."statvfs";
+  "stb-image" = dontDistribute super."stb-image";
+  "stb-truetype" = dontDistribute super."stb-truetype";
+  "stdata" = dontDistribute super."stdata";
+  "stdf" = dontDistribute super."stdf";
+  "steambrowser" = dontDistribute super."steambrowser";
+  "steeloverseer" = dontDistribute super."steeloverseer";
+  "stemmer" = dontDistribute super."stemmer";
+  "step-function" = dontDistribute super."step-function";
+  "stepwise" = dontDistribute super."stepwise";
+  "stickyKeysHotKey" = dontDistribute super."stickyKeysHotKey";
+  "stitch" = dontDistribute super."stitch";
+  "stm-channelize" = dontDistribute super."stm-channelize";
+  "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-conduit" = doDistribute super."stm-conduit_2_7_0";
+  "stm-firehose" = dontDistribute super."stm-firehose";
+  "stm-io-hooks" = dontDistribute super."stm-io-hooks";
+  "stm-lifted" = dontDistribute super."stm-lifted";
+  "stm-linkedlist" = dontDistribute super."stm-linkedlist";
+  "stm-orelse-io" = dontDistribute super."stm-orelse-io";
+  "stm-promise" = dontDistribute super."stm-promise";
+  "stm-queue-extras" = dontDistribute super."stm-queue-extras";
+  "stm-sbchan" = dontDistribute super."stm-sbchan";
+  "stm-split" = dontDistribute super."stm-split";
+  "stm-tlist" = dontDistribute super."stm-tlist";
+  "stmcontrol" = dontDistribute super."stmcontrol";
+  "stomp-conduit" = dontDistribute super."stomp-conduit";
+  "stomp-patterns" = dontDistribute super."stomp-patterns";
+  "stomp-queue" = dontDistribute super."stomp-queue";
+  "stompl" = dontDistribute super."stompl";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "storable" = dontDistribute super."storable";
+  "storable-record" = dontDistribute super."storable-record";
+  "storable-static-array" = dontDistribute super."storable-static-array";
+  "storable-tuple" = dontDistribute super."storable-tuple";
+  "storablevector" = dontDistribute super."storablevector";
+  "storablevector-carray" = dontDistribute super."storablevector-carray";
+  "storablevector-streamfusion" = dontDistribute super."storablevector-streamfusion";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "strict-concurrency" = dontDistribute super."strict-concurrency";
+  "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
+  "strict-identity" = dontDistribute super."strict-identity";
+  "strict-io" = dontDistribute super."strict-io";
+  "strictify" = dontDistribute super."strictify";
+  "strictly" = dontDistribute super."strictly";
+  "string" = dontDistribute super."string";
+  "string-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
+  "stringlike" = dontDistribute super."stringlike";
+  "stringprep" = dontDistribute super."stringprep";
+  "strings" = dontDistribute super."strings";
+  "stringtable-atom" = dontDistribute super."stringtable-atom";
+  "strio" = dontDistribute super."strio";
+  "stripe" = dontDistribute super."stripe";
+  "stripe-http-streams" = doDistribute super."stripe-http-streams_2_0_2";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "structured-haskell-mode" = dontDistribute super."structured-haskell-mode";
+  "structured-mongoDB" = dontDistribute super."structured-mongoDB";
+  "structures" = dontDistribute super."structures";
+  "stunclient" = dontDistribute super."stunclient";
+  "stunts" = dontDistribute super."stunts";
+  "stylized" = dontDistribute super."stylized";
+  "sub-state" = dontDistribute super."sub-state";
+  "subhask" = dontDistribute super."subhask";
+  "subleq-toolchain" = dontDistribute super."subleq-toolchain";
+  "subnet" = dontDistribute super."subnet";
+  "subtitleParser" = dontDistribute super."subtitleParser";
+  "subtitles" = dontDistribute super."subtitles";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "sunlight" = dontDistribute super."sunlight";
+  "sunroof-compiler" = dontDistribute super."sunroof-compiler";
+  "sunroof-examples" = dontDistribute super."sunroof-examples";
+  "sunroof-server" = dontDistribute super."sunroof-server";
+  "super-user-spark" = dontDistribute super."super-user-spark";
+  "supercollider-ht" = dontDistribute super."supercollider-ht";
+  "supercollider-midi" = dontDistribute super."supercollider-midi";
+  "superdoc" = dontDistribute super."superdoc";
+  "supero" = dontDistribute super."supero";
+  "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "svg2q" = dontDistribute super."svg2q";
+  "svgcairo" = dontDistribute super."svgcairo";
+  "svgutils" = dontDistribute super."svgutils";
+  "svm" = dontDistribute super."svm";
+  "svm-light-utils" = dontDistribute super."svm-light-utils";
+  "svm-simple" = dontDistribute super."svm-simple";
+  "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
+  "swapper" = dontDistribute super."swapper";
+  "swearjure" = dontDistribute super."swearjure";
+  "swf" = dontDistribute super."swf";
+  "swift-lda" = dontDistribute super."swift-lda";
+  "swish" = dontDistribute super."swish";
+  "sws" = dontDistribute super."sws";
+  "syb-extras" = dontDistribute super."syb-extras";
+  "syb-with-class-instances-text" = dontDistribute super."syb-with-class-instances-text";
+  "sylvia" = dontDistribute super."sylvia";
+  "sym" = dontDistribute super."sym";
+  "sym-plot" = dontDistribute super."sym-plot";
+  "symbol" = dontDistribute super."symbol";
+  "symengine-hs" = dontDistribute super."symengine-hs";
+  "sync" = dontDistribute super."sync";
+  "synchronous-channels" = dontDistribute super."synchronous-channels";
+  "syncthing-hs" = dontDistribute super."syncthing-hs";
+  "synt" = dontDistribute super."synt";
+  "syntactic" = dontDistribute super."syntactic";
+  "syntactical" = dontDistribute super."syntactical";
+  "syntax" = dontDistribute super."syntax";
+  "syntax-attoparsec" = dontDistribute super."syntax-attoparsec";
+  "syntax-example" = dontDistribute super."syntax-example";
+  "syntax-example-json" = dontDistribute super."syntax-example-json";
+  "syntax-pretty" = dontDistribute super."syntax-pretty";
+  "syntax-printer" = dontDistribute super."syntax-printer";
+  "syntax-trees" = dontDistribute super."syntax-trees";
+  "syntax-trees-fork-bairyn" = dontDistribute super."syntax-trees-fork-bairyn";
+  "synthesizer" = dontDistribute super."synthesizer";
+  "synthesizer-alsa" = dontDistribute super."synthesizer-alsa";
+  "synthesizer-core" = dontDistribute super."synthesizer-core";
+  "synthesizer-dimensional" = dontDistribute super."synthesizer-dimensional";
+  "synthesizer-filter" = dontDistribute super."synthesizer-filter";
+  "synthesizer-inference" = dontDistribute super."synthesizer-inference";
+  "synthesizer-llvm" = dontDistribute super."synthesizer-llvm";
+  "synthesizer-midi" = dontDistribute super."synthesizer-midi";
+  "sys-auth-smbclient" = dontDistribute super."sys-auth-smbclient";
+  "sys-process" = dontDistribute super."sys-process";
+  "system-canonicalpath" = dontDistribute super."system-canonicalpath";
+  "system-command" = dontDistribute super."system-command";
+  "system-gpio" = dontDistribute super."system-gpio";
+  "system-inotify" = dontDistribute super."system-inotify";
+  "system-lifted" = dontDistribute super."system-lifted";
+  "system-random-effect" = dontDistribute super."system-random-effect";
+  "system-time-monotonic" = dontDistribute super."system-time-monotonic";
+  "system-util" = dontDistribute super."system-util";
+  "system-uuid" = dontDistribute super."system-uuid";
+  "systemd" = dontDistribute super."systemd";
+  "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "table-tennis" = dontDistribute super."table-tennis";
+  "tableaux" = dontDistribute super."tableaux";
+  "tables" = dontDistribute super."tables";
+  "tablestorage" = dontDistribute super."tablestorage";
+  "tabloid" = dontDistribute super."tabloid";
+  "taffybar" = dontDistribute super."taffybar";
+  "tag-bits" = dontDistribute super."tag-bits";
+  "tag-stream" = dontDistribute super."tag-stream";
+  "tagchup" = dontDistribute super."tagchup";
+  "tagged-exception-core" = dontDistribute super."tagged-exception-core";
+  "tagged-list" = dontDistribute super."tagged-list";
+  "tagged-th" = dontDistribute super."tagged-th";
+  "tagged-timers" = dontDistribute super."tagged-timers";
+  "tagged-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "taglib" = dontDistribute super."taglib";
+  "taglib-api" = dontDistribute super."taglib-api";
+  "tagset-positional" = dontDistribute super."tagset-positional";
+  "tagsoup-ht" = dontDistribute super."tagsoup-ht";
+  "tagsoup-parsec" = dontDistribute super."tagsoup-parsec";
+  "takahashi" = dontDistribute super."takahashi";
+  "takusen-oracle" = dontDistribute super."takusen-oracle";
+  "tamarin-prover" = dontDistribute super."tamarin-prover";
+  "tamarin-prover-term" = dontDistribute super."tamarin-prover-term";
+  "tamarin-prover-theory" = dontDistribute super."tamarin-prover-theory";
+  "tamarin-prover-utils" = dontDistribute super."tamarin-prover-utils";
+  "tamper" = dontDistribute super."tamper";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "task-distribution" = dontDistribute super."task-distribution";
+  "taskpool" = dontDistribute super."taskpool";
+  "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
+  "tasty-integrate" = dontDistribute super."tasty-integrate";
+  "tasty-laws" = dontDistribute super."tasty-laws";
+  "tasty-lens" = dontDistribute super."tasty-lens";
+  "tasty-program" = dontDistribute super."tasty-program";
+  "tateti-tateti" = dontDistribute super."tateti-tateti";
+  "tau" = dontDistribute super."tau";
+  "tbox" = dontDistribute super."tbox";
+  "tcache-AWS" = dontDistribute super."tcache-AWS";
+  "tccli" = dontDistribute super."tccli";
+  "tce-conf" = dontDistribute super."tce-conf";
+  "tconfig" = dontDistribute super."tconfig";
+  "tcp" = dontDistribute super."tcp";
+  "tdd-util" = dontDistribute super."tdd-util";
+  "tdoc" = dontDistribute super."tdoc";
+  "teams" = dontDistribute super."teams";
+  "teeth" = dontDistribute super."teeth";
+  "telegram" = dontDistribute super."telegram";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "teleport" = dontDistribute super."teleport";
+  "template-default" = dontDistribute super."template-default";
+  "template-haskell-util" = dontDistribute super."template-haskell-util";
+  "template-hsml" = dontDistribute super."template-hsml";
+  "template-yj" = dontDistribute super."template-yj";
+  "templatepg" = dontDistribute super."templatepg";
+  "templater" = dontDistribute super."templater";
+  "tempodb" = dontDistribute super."tempodb";
+  "temporal-csound" = dontDistribute super."temporal-csound";
+  "temporal-media" = dontDistribute super."temporal-media";
+  "temporal-music-notation" = dontDistribute super."temporal-music-notation";
+  "temporal-music-notation-demo" = dontDistribute super."temporal-music-notation-demo";
+  "temporal-music-notation-western" = dontDistribute super."temporal-music-notation-western";
+  "temporary-resourcet" = dontDistribute super."temporary-resourcet";
+  "tempus" = dontDistribute super."tempus";
+  "tempus-fugit" = dontDistribute super."tempus-fugit";
+  "tensor" = dontDistribute super."tensor";
+  "term-rewriting" = dontDistribute super."term-rewriting";
+  "termbox-bindings" = dontDistribute super."termbox-bindings";
+  "termination-combinators" = dontDistribute super."termination-combinators";
+  "terminfo" = doDistribute super."terminfo_0_4_0_2";
+  "terminfo-hs" = dontDistribute super."terminfo-hs";
+  "termplot" = dontDistribute super."termplot";
+  "terntup" = dontDistribute super."terntup";
+  "terrahs" = dontDistribute super."terrahs";
+  "tersmu" = dontDistribute super."tersmu";
+  "test-framework-doctest" = dontDistribute super."test-framework-doctest";
+  "test-framework-golden" = dontDistribute super."test-framework-golden";
+  "test-framework-program" = dontDistribute super."test-framework-program";
+  "test-framework-quickcheck" = dontDistribute super."test-framework-quickcheck";
+  "test-framework-sandbox" = dontDistribute super."test-framework-sandbox";
+  "test-framework-skip" = dontDistribute super."test-framework-skip";
+  "test-framework-testing-feat" = dontDistribute super."test-framework-testing-feat";
+  "test-invariant" = dontDistribute super."test-invariant";
+  "test-pkg" = dontDistribute super."test-pkg";
+  "test-sandbox" = dontDistribute super."test-sandbox";
+  "test-sandbox-compose" = dontDistribute super."test-sandbox-compose";
+  "test-sandbox-hunit" = dontDistribute super."test-sandbox-hunit";
+  "test-sandbox-quickcheck" = dontDistribute super."test-sandbox-quickcheck";
+  "test-shouldbe" = dontDistribute super."test-shouldbe";
+  "testPkg" = dontDistribute super."testPkg";
+  "testing-type-modifiers" = dontDistribute super."testing-type-modifiers";
+  "testloop" = dontDistribute super."testloop";
+  "testpack" = dontDistribute super."testpack";
+  "testpattern" = dontDistribute super."testpattern";
+  "testrunner" = dontDistribute super."testrunner";
+  "tetris" = dontDistribute super."tetris";
+  "tex2txt" = dontDistribute super."tex2txt";
+  "texrunner" = dontDistribute super."texrunner";
+  "text-and-plots" = dontDistribute super."text-and-plots";
+  "text-format-simple" = dontDistribute super."text-format-simple";
+  "text-icu-translit" = dontDistribute super."text-icu-translit";
+  "text-json-qq" = dontDistribute super."text-json-qq";
+  "text-latin1" = dontDistribute super."text-latin1";
+  "text-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "text-show-instances" = dontDistribute super."text-show-instances";
+  "text-stream-decode" = dontDistribute super."text-stream-decode";
+  "text-utf7" = dontDistribute super."text-utf7";
+  "text-xml-generic" = dontDistribute super."text-xml-generic";
+  "text-xml-qq" = dontDistribute super."text-xml-qq";
+  "text1" = dontDistribute super."text1";
+  "textPlot" = dontDistribute super."textPlot";
+  "textmatetags" = dontDistribute super."textmatetags";
+  "textocat-api" = dontDistribute super."textocat-api";
+  "texts" = dontDistribute super."texts";
+  "textual" = dontDistribute super."textual";
+  "tfp" = dontDistribute super."tfp";
+  "tfp-th" = dontDistribute super."tfp-th";
+  "tftp" = dontDistribute super."tftp";
+  "tga" = dontDistribute super."tga";
+  "th-alpha" = dontDistribute super."th-alpha";
+  "th-build" = dontDistribute super."th-build";
+  "th-cas" = dontDistribute super."th-cas";
+  "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
+  "th-fold" = dontDistribute super."th-fold";
+  "th-inline-io-action" = dontDistribute super."th-inline-io-action";
+  "th-instance-reification" = dontDistribute super."th-instance-reification";
+  "th-instances" = dontDistribute super."th-instances";
+  "th-kinds" = dontDistribute super."th-kinds";
+  "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "thespian" = dontDistribute super."thespian";
+  "theta-functions" = dontDistribute super."theta-functions";
+  "thih" = dontDistribute super."thih";
+  "thimk" = dontDistribute super."thimk";
+  "thorn" = dontDistribute super."thorn";
+  "thread-local-storage" = dontDistribute super."thread-local-storage";
+  "threadPool" = dontDistribute super."threadPool";
+  "threadmanager" = dontDistribute super."threadmanager";
+  "threads-pool" = dontDistribute super."threads-pool";
+  "threads-supervisor" = dontDistribute super."threads-supervisor";
+  "threadscope" = dontDistribute super."threadscope";
+  "threefish" = dontDistribute super."threefish";
+  "threepenny-gui" = dontDistribute super."threepenny-gui";
+  "thrift" = dontDistribute super."thrift";
+  "thrist" = dontDistribute super."thrist";
+  "throttle" = dontDistribute super."throttle";
+  "thumbnail" = dontDistribute super."thumbnail";
+  "tianbar" = dontDistribute super."tianbar";
+  "tic-tac-toe" = dontDistribute super."tic-tac-toe";
+  "tickle" = dontDistribute super."tickle";
+  "tictactoe3d" = dontDistribute super."tictactoe3d";
+  "tidal" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "tidal-vis" = dontDistribute super."tidal-vis";
+  "tie-knot" = dontDistribute super."tie-knot";
+  "tiempo" = dontDistribute super."tiempo";
+  "tiger" = dontDistribute super."tiger";
+  "tight-apply" = dontDistribute super."tight-apply";
+  "tightrope" = dontDistribute super."tightrope";
+  "tighttp" = dontDistribute super."tighttp";
+  "tilings" = dontDistribute super."tilings";
+  "timberc" = dontDistribute super."timberc";
+  "time-cache" = dontDistribute super."time-cache";
+  "time-extras" = dontDistribute super."time-extras";
+  "time-exts" = dontDistribute super."time-exts";
+  "time-http" = dontDistribute super."time-http";
+  "time-interval" = dontDistribute super."time-interval";
+  "time-io-access" = dontDistribute super."time-io-access";
+  "time-out" = dontDistribute super."time-out";
+  "time-patterns" = dontDistribute super."time-patterns";
+  "time-qq" = dontDistribute super."time-qq";
+  "time-recurrence" = dontDistribute super."time-recurrence";
+  "time-series" = dontDistribute super."time-series";
+  "time-w3c" = dontDistribute super."time-w3c";
+  "timecalc" = dontDistribute super."timecalc";
+  "timeconsole" = dontDistribute super."timeconsole";
+  "timeless" = dontDistribute super."timeless";
+  "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
+  "timelike-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "timeout" = dontDistribute super."timeout";
+  "timeout-control" = dontDistribute super."timeout-control";
+  "timeout-with-results" = dontDistribute super."timeout-with-results";
+  "timeparsers" = dontDistribute super."timeparsers";
+  "timeplot" = dontDistribute super."timeplot";
+  "timers" = dontDistribute super."timers";
+  "timers-updatable" = dontDistribute super."timers-updatable";
+  "timestamp-subprocess-lines" = dontDistribute super."timestamp-subprocess-lines";
+  "timestamper" = dontDistribute super."timestamper";
+  "timezone-olson-th" = dontDistribute super."timezone-olson-th";
+  "timing-convenience" = dontDistribute super."timing-convenience";
+  "tinyMesh" = dontDistribute super."tinyMesh";
+  "tinylog" = doDistribute super."tinylog_0_12_1";
+  "tip-haskell-frontend" = dontDistribute super."tip-haskell-frontend";
+  "tip-lib" = dontDistribute super."tip-lib";
+  "tiphys" = dontDistribute super."tiphys";
+  "titlecase" = dontDistribute super."titlecase";
+  "tkhs" = dontDistribute super."tkhs";
+  "tkyprof" = dontDistribute super."tkyprof";
+  "tld" = dontDistribute super."tld";
+  "tls-extra" = dontDistribute super."tls-extra";
+  "tmpl" = dontDistribute super."tmpl";
+  "tn" = dontDistribute super."tn";
+  "tnet" = dontDistribute super."tnet";
+  "to-haskell" = dontDistribute super."to-haskell";
+  "to-string-class" = dontDistribute super."to-string-class";
+  "to-string-instances" = dontDistribute super."to-string-instances";
+  "todos" = dontDistribute super."todos";
+  "tofromxml" = dontDistribute super."tofromxml";
+  "toilet" = dontDistribute super."toilet";
+  "tokenify" = dontDistribute super."tokenify";
+  "tokenize" = dontDistribute super."tokenize";
+  "toktok" = dontDistribute super."toktok";
+  "tokyocabinet-haskell" = dontDistribute super."tokyocabinet-haskell";
+  "tokyotyrant-haskell" = dontDistribute super."tokyotyrant-haskell";
+  "tomato-rubato-openal" = dontDistribute super."tomato-rubato-openal";
+  "toml" = dontDistribute super."toml";
+  "toolshed" = dontDistribute super."toolshed";
+  "topkata" = dontDistribute super."topkata";
+  "torch" = dontDistribute super."torch";
+  "total" = dontDistribute super."total";
+  "total-alternative" = dontDistribute super."total-alternative";
+  "total-map" = dontDistribute super."total-map";
+  "total-maps" = dontDistribute super."total-maps";
+  "touched" = dontDistribute super."touched";
+  "toysolver" = dontDistribute super."toysolver";
+  "tpdb" = dontDistribute super."tpdb";
+  "trace" = dontDistribute super."trace";
+  "trace-call" = dontDistribute super."trace-call";
+  "trace-function-call" = dontDistribute super."trace-function-call";
+  "traced" = dontDistribute super."traced";
+  "tracer" = dontDistribute super."tracer";
+  "tracker" = dontDistribute super."tracker";
+  "trajectory" = dontDistribute super."trajectory";
+  "transactional-events" = dontDistribute super."transactional-events";
+  "transf" = dontDistribute super."transf";
+  "transformations" = dontDistribute super."transformations";
+  "transformers-abort" = dontDistribute super."transformers-abort";
+  "transformers-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "translatable-intset" = dontDistribute super."translatable-intset";
+  "translate" = dontDistribute super."translate";
+  "travis" = dontDistribute super."travis";
+  "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
+  "trawl" = dontDistribute super."trawl";
+  "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
+  "tree-monad" = dontDistribute super."tree-monad";
+  "treemap-html" = dontDistribute super."treemap-html";
+  "treemap-html-tools" = dontDistribute super."treemap-html-tools";
+  "treersec" = dontDistribute super."treersec";
+  "treeviz" = dontDistribute super."treeviz";
+  "tremulous-query" = dontDistribute super."tremulous-query";
+  "trhsx" = dontDistribute super."trhsx";
+  "triangulation" = dontDistribute super."triangulation";
+  "trimpolya" = dontDistribute super."trimpolya";
+  "tripLL" = dontDistribute super."tripLL";
+  "trivia" = dontDistribute super."trivia";
+  "trivial-constraint" = dontDistribute super."trivial-constraint";
+  "tropical" = dontDistribute super."tropical";
+  "truelevel" = dontDistribute super."truelevel";
+  "trurl" = dontDistribute super."trurl";
+  "truthful" = dontDistribute super."truthful";
+  "tsession" = dontDistribute super."tsession";
+  "tsession-happstack" = dontDistribute super."tsession-happstack";
+  "tskiplist" = dontDistribute super."tskiplist";
+  "tslib" = dontDistribute super."tslib";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "tuple-gen" = dontDistribute super."tuple-gen";
+  "tuple-generic" = dontDistribute super."tuple-generic";
+  "tuple-hlist" = dontDistribute super."tuple-hlist";
+  "tuple-lenses" = dontDistribute super."tuple-lenses";
+  "tuple-morph" = dontDistribute super."tuple-morph";
+  "tupleinstances" = dontDistribute super."tupleinstances";
+  "turing" = dontDistribute super."turing";
+  "turing-music" = dontDistribute super."turing-music";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "tweak" = dontDistribute super."tweak";
+  "twee" = dontDistribute super."twee";
+  "twentefp" = dontDistribute super."twentefp";
+  "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
+  "twentefp-eventloop-trees" = dontDistribute super."twentefp-eventloop-trees";
+  "twentefp-graphs" = dontDistribute super."twentefp-graphs";
+  "twentefp-number" = dontDistribute super."twentefp-number";
+  "twentefp-rosetree" = dontDistribute super."twentefp-rosetree";
+  "twentefp-trees" = dontDistribute super."twentefp-trees";
+  "twentefp-websockets" = dontDistribute super."twentefp-websockets";
+  "twentyseven" = dontDistribute super."twentyseven";
+  "twhs" = dontDistribute super."twhs";
+  "twidge" = dontDistribute super."twidge";
+  "twilight-stm" = dontDistribute super."twilight-stm";
+  "twilio" = dontDistribute super."twilio";
+  "twill" = dontDistribute super."twill";
+  "twiml" = dontDistribute super."twiml";
+  "twine" = dontDistribute super."twine";
+  "twisty" = dontDistribute super."twisty";
+  "twitch" = dontDistribute super."twitch";
+  "twitter" = dontDistribute super."twitter";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "tx" = dontDistribute super."tx";
+  "txt-sushi" = dontDistribute super."txt-sushi";
+  "txt2rtf" = dontDistribute super."txt2rtf";
+  "txtblk" = dontDistribute super."txtblk";
+  "ty" = dontDistribute super."ty";
+  "typalyze" = dontDistribute super."typalyze";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "type-cache" = dontDistribute super."type-cache";
+  "type-cereal" = dontDistribute super."type-cereal";
+  "type-combinators" = dontDistribute super."type-combinators";
+  "type-combinators-quote" = dontDistribute super."type-combinators-quote";
+  "type-digits" = dontDistribute super."type-digits";
+  "type-equality" = dontDistribute super."type-equality";
+  "type-equality-check" = dontDistribute super."type-equality-check";
+  "type-fun" = dontDistribute super."type-fun";
+  "type-functions" = dontDistribute super."type-functions";
+  "type-hint" = dontDistribute super."type-hint";
+  "type-int" = dontDistribute super."type-int";
+  "type-iso" = dontDistribute super."type-iso";
+  "type-level" = dontDistribute super."type-level";
+  "type-level-bst" = dontDistribute super."type-level-bst";
+  "type-level-natural-number" = dontDistribute super."type-level-natural-number";
+  "type-level-natural-number-induction" = dontDistribute super."type-level-natural-number-induction";
+  "type-level-natural-number-operations" = dontDistribute super."type-level-natural-number-operations";
+  "type-level-sets" = dontDistribute super."type-level-sets";
+  "type-level-tf" = dontDistribute super."type-level-tf";
+  "type-natural" = dontDistribute super."type-natural";
+  "type-ord" = dontDistribute super."type-ord";
+  "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
+  "type-prelude" = dontDistribute super."type-prelude";
+  "type-settheory" = dontDistribute super."type-settheory";
+  "type-spine" = dontDistribute super."type-spine";
+  "type-structure" = dontDistribute super."type-structure";
+  "type-sub-th" = dontDistribute super."type-sub-th";
+  "type-unary" = dontDistribute super."type-unary";
+  "typeable-th" = dontDistribute super."typeable-th";
+  "typed-spreadsheet" = dontDistribute super."typed-spreadsheet";
+  "typed-wire" = dontDistribute super."typed-wire";
+  "typed-wire-utils" = dontDistribute super."typed-wire-utils";
+  "typedquery" = dontDistribute super."typedquery";
+  "typehash" = dontDistribute super."typehash";
+  "typelevel" = dontDistribute super."typelevel";
+  "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "uberlast" = dontDistribute super."uberlast";
+  "uconv" = dontDistribute super."uconv";
+  "udbus" = dontDistribute super."udbus";
+  "udbus-model" = dontDistribute super."udbus-model";
+  "udcode" = dontDistribute super."udcode";
+  "udev" = dontDistribute super."udev";
+  "uhc-light" = dontDistribute super."uhc-light";
+  "uhc-util" = dontDistribute super."uhc-util";
+  "uhexdump" = dontDistribute super."uhexdump";
+  "uhttpc" = dontDistribute super."uhttpc";
+  "ui-command" = dontDistribute super."ui-command";
+  "uid" = dontDistribute super."uid";
+  "una" = dontDistribute super."una";
+  "unagi-chan" = dontDistribute super."unagi-chan";
+  "unagi-streams" = dontDistribute super."unagi-streams";
+  "unamb" = dontDistribute super."unamb";
+  "unamb-custom" = dontDistribute super."unamb-custom";
+  "unbound" = dontDistribute super."unbound";
+  "unbounded-delays-units" = dontDistribute super."unbounded-delays-units";
+  "unboxed-containers" = dontDistribute super."unboxed-containers";
+  "unbreak" = dontDistribute super."unbreak";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "ungadtagger" = dontDistribute super."ungadtagger";
+  "uni-events" = dontDistribute super."uni-events";
+  "uni-graphs" = dontDistribute super."uni-graphs";
+  "uni-htk" = dontDistribute super."uni-htk";
+  "uni-posixutil" = dontDistribute super."uni-posixutil";
+  "uni-reactor" = dontDistribute super."uni-reactor";
+  "uni-uDrawGraph" = dontDistribute super."uni-uDrawGraph";
+  "uni-util" = dontDistribute super."uni-util";
+  "unicode" = dontDistribute super."unicode";
+  "unicode-names" = dontDistribute super."unicode-names";
+  "unicode-normalization" = dontDistribute super."unicode-normalization";
+  "unicode-prelude" = dontDistribute super."unicode-prelude";
+  "unicode-properties" = dontDistribute super."unicode-properties";
+  "unicode-show" = dontDistribute super."unicode-show";
+  "unicode-symbols" = dontDistribute super."unicode-symbols";
+  "unicoder" = dontDistribute super."unicoder";
+  "uniform-io" = dontDistribute super."uniform-io";
+  "uniform-pair" = dontDistribute super."uniform-pair";
+  "union" = dontDistribute super."union";
+  "union-find-array" = dontDistribute super."union-find-array";
+  "union-map" = dontDistribute super."union-map";
+  "unique" = dontDistribute super."unique";
+  "unique-logic" = dontDistribute super."unique-logic";
+  "unique-logic-tf" = dontDistribute super."unique-logic-tf";
+  "uniqueid" = dontDistribute super."uniqueid";
+  "unit" = dontDistribute super."unit";
+  "units" = dontDistribute super."units";
+  "units-attoparsec" = dontDistribute super."units-attoparsec";
+  "units-defs" = dontDistribute super."units-defs";
+  "units-parser" = dontDistribute super."units-parser";
+  "unittyped" = dontDistribute super."unittyped";
+  "universal-binary" = dontDistribute super."universal-binary";
+  "universe-th" = dontDistribute super."universe-th";
+  "unix-fcntl" = dontDistribute super."unix-fcntl";
+  "unix-handle" = dontDistribute super."unix-handle";
+  "unix-io-extra" = dontDistribute super."unix-io-extra";
+  "unix-memory" = dontDistribute super."unix-memory";
+  "unix-process-conduit" = dontDistribute super."unix-process-conduit";
+  "unix-pty-light" = dontDistribute super."unix-pty-light";
+  "unlambda" = dontDistribute super."unlambda";
+  "unlit" = dontDistribute super."unlit";
+  "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
+  "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
+  "unordered-graphs" = dontDistribute super."unordered-graphs";
+  "unpack-funcs" = dontDistribute super."unpack-funcs";
+  "unroll-ghc-plugin" = dontDistribute super."unroll-ghc-plugin";
+  "unsafe" = dontDistribute super."unsafe";
+  "unsafe-promises" = dontDistribute super."unsafe-promises";
+  "unsafely" = dontDistribute super."unsafely";
+  "unsafeperformst" = dontDistribute super."unsafeperformst";
+  "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
+  "unusable-pkg" = dontDistribute super."unusable-pkg";
+  "uom-plugin" = dontDistribute super."uom-plugin";
+  "up" = dontDistribute super."up";
+  "up-grade" = dontDistribute super."up-grade";
+  "uploadcare" = dontDistribute super."uploadcare";
+  "upskirt" = dontDistribute super."upskirt";
+  "ureader" = dontDistribute super."ureader";
+  "urembed" = dontDistribute super."urembed";
+  "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "uri-conduit" = dontDistribute super."uri-conduit";
+  "uri-enumerator" = dontDistribute super."uri-enumerator";
+  "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
+  "uri-template" = dontDistribute super."uri-template";
+  "url-generic" = dontDistribute super."url-generic";
+  "urlcheck" = dontDistribute super."urlcheck";
+  "urldecode" = dontDistribute super."urldecode";
+  "urldisp-happstack" = dontDistribute super."urldisp-happstack";
+  "urlencoded" = dontDistribute super."urlencoded";
+  "urn" = dontDistribute super."urn";
+  "urxml" = dontDistribute super."urxml";
+  "usb" = dontDistribute super."usb";
+  "usb-enumerator" = dontDistribute super."usb-enumerator";
+  "usb-hid" = dontDistribute super."usb-hid";
+  "usb-id-database" = dontDistribute super."usb-id-database";
+  "usb-iteratee" = dontDistribute super."usb-iteratee";
+  "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "utc" = dontDistribute super."utc";
+  "utf8-env" = dontDistribute super."utf8-env";
+  "utf8-prelude" = dontDistribute super."utf8-prelude";
+  "uu-cco" = dontDistribute super."uu-cco";
+  "uu-cco-examples" = dontDistribute super."uu-cco-examples";
+  "uu-cco-hut-parsing" = dontDistribute super."uu-cco-hut-parsing";
+  "uu-cco-uu-parsinglib" = dontDistribute super."uu-cco-uu-parsinglib";
+  "uu-options" = dontDistribute super."uu-options";
+  "uu-tc" = dontDistribute super."uu-tc";
+  "uuagc" = dontDistribute super."uuagc";
+  "uuagc-bootstrap" = dontDistribute super."uuagc-bootstrap";
+  "uuagc-cabal" = dontDistribute super."uuagc-cabal";
+  "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
+  "uuagd" = dontDistribute super."uuagd";
+  "uuid-aeson" = dontDistribute super."uuid-aeson";
+  "uuid-le" = dontDistribute super."uuid-le";
+  "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uulib" = dontDistribute super."uulib";
+  "uvector" = dontDistribute super."uvector";
+  "uvector-algorithms" = dontDistribute super."uvector-algorithms";
+  "uxadt" = dontDistribute super."uxadt";
+  "uzbl-with-source" = dontDistribute super."uzbl-with-source";
+  "v4l2" = dontDistribute super."v4l2";
+  "v4l2-examples" = dontDistribute super."v4l2-examples";
+  "vacuum" = dontDistribute super."vacuum";
+  "vacuum-cairo" = dontDistribute super."vacuum-cairo";
+  "vacuum-graphviz" = dontDistribute super."vacuum-graphviz";
+  "vacuum-opengl" = dontDistribute super."vacuum-opengl";
+  "vacuum-ubigraph" = dontDistribute super."vacuum-ubigraph";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validations" = dontDistribute super."validations";
+  "value-supply" = dontDistribute super."value-supply";
+  "vampire" = dontDistribute super."vampire";
+  "var" = dontDistribute super."var";
+  "varan" = dontDistribute super."varan";
+  "variable-precision" = dontDistribute super."variable-precision";
+  "variables" = dontDistribute super."variables";
+  "varying" = dontDistribute super."varying";
+  "vaultaire-common" = dontDistribute super."vaultaire-common";
+  "vcache" = dontDistribute super."vcache";
+  "vcache-trie" = dontDistribute super."vcache-trie";
+  "vcard" = dontDistribute super."vcard";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "vect-floating" = dontDistribute super."vect-floating";
+  "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
+  "vect-opengl" = dontDistribute super."vect-opengl";
+  "vector-binary" = dontDistribute super."vector-binary";
+  "vector-bytestring" = dontDistribute super."vector-bytestring";
+  "vector-clock" = dontDistribute super."vector-clock";
+  "vector-conduit" = dontDistribute super."vector-conduit";
+  "vector-functorlazy" = dontDistribute super."vector-functorlazy";
+  "vector-heterogenous" = dontDistribute super."vector-heterogenous";
+  "vector-instances-collections" = dontDistribute super."vector-instances-collections";
+  "vector-mmap" = dontDistribute super."vector-mmap";
+  "vector-random" = dontDistribute super."vector-random";
+  "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-sized" = dontDistribute super."vector-sized";
+  "vector-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "vector-space-points" = dontDistribute super."vector-space-points";
+  "vector-static" = dontDistribute super."vector-static";
+  "vector-strategies" = dontDistribute super."vector-strategies";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "vhdl" = dontDistribute super."vhdl";
+  "views" = dontDistribute super."views";
+  "vigilance" = dontDistribute super."vigilance";
+  "vimeta" = dontDistribute super."vimeta";
+  "vimus" = dontDistribute super."vimus";
+  "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-plus" = dontDistribute super."vinyl-plus";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "vinyl-vectors" = dontDistribute super."vinyl-vectors";
+  "virthualenv" = dontDistribute super."virthualenv";
+  "visibility" = dontDistribute super."visibility";
+  "vision" = dontDistribute super."vision";
+  "visual-graphrewrite" = dontDistribute super."visual-graphrewrite";
+  "visual-prof" = dontDistribute super."visual-prof";
+  "vivid" = dontDistribute super."vivid";
+  "vk-aws-route53" = dontDistribute super."vk-aws-route53";
+  "vk-posix-pty" = dontDistribute super."vk-posix-pty";
+  "vocabulary-kadma" = dontDistribute super."vocabulary-kadma";
+  "vorbiscomment" = dontDistribute super."vorbiscomment";
+  "vowpal-utils" = dontDistribute super."vowpal-utils";
+  "voyeur" = dontDistribute super."voyeur";
+  "vrpn" = dontDistribute super."vrpn";
+  "vte" = dontDistribute super."vte";
+  "vtegtk3" = dontDistribute super."vtegtk3";
+  "vty-examples" = dontDistribute super."vty-examples";
+  "vty-menu" = dontDistribute super."vty-menu";
+  "vty-ui" = dontDistribute super."vty-ui";
+  "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
+  "wacom-daemon" = dontDistribute super."wacom-daemon";
+  "waddle" = dontDistribute super."waddle";
+  "wai-accept-language" = dontDistribute super."wai-accept-language";
+  "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-devel" = dontDistribute super."wai-devel";
+  "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
+  "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
+  "wai-graceful" = dontDistribute super."wai-graceful";
+  "wai-handler-devel" = dontDistribute super."wai-handler-devel";
+  "wai-handler-fastcgi" = dontDistribute super."wai-handler-fastcgi";
+  "wai-handler-scgi" = dontDistribute super."wai-handler-scgi";
+  "wai-handler-snap" = dontDistribute super."wai-handler-snap";
+  "wai-handler-webkit" = dontDistribute super."wai-handler-webkit";
+  "wai-hastache" = dontDistribute super."wai-hastache";
+  "wai-hmac-auth" = dontDistribute super."wai-hmac-auth";
+  "wai-lens" = dontDistribute super."wai-lens";
+  "wai-lite" = dontDistribute super."wai-lite";
+  "wai-logger-prefork" = dontDistribute super."wai-logger-prefork";
+  "wai-middleware-cache" = dontDistribute super."wai-middleware-cache";
+  "wai-middleware-cache-redis" = dontDistribute super."wai-middleware-cache-redis";
+  "wai-middleware-catch" = dontDistribute super."wai-middleware-catch";
+  "wai-middleware-content-type" = dontDistribute super."wai-middleware-content-type";
+  "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
+  "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
+  "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
+  "wai-middleware-hmac" = dontDistribute super."wai-middleware-hmac";
+  "wai-middleware-hmac-client" = dontDistribute super."wai-middleware-hmac-client";
+  "wai-middleware-preprocessor" = dontDistribute super."wai-middleware-preprocessor";
+  "wai-middleware-route" = dontDistribute super."wai-middleware-route";
+  "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
+  "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-session-alt" = dontDistribute super."wai-session-alt";
+  "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
+  "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
+  "wai-static-cache" = dontDistribute super."wai-static-cache";
+  "wai-static-pages" = dontDistribute super."wai-static-pages";
+  "wai-test" = dontDistribute super."wai-test";
+  "wai-thrift" = dontDistribute super."wai-thrift";
+  "wai-throttler" = dontDistribute super."wai-throttler";
+  "wait-handle" = dontDistribute super."wait-handle";
+  "waitfree" = dontDistribute super."waitfree";
+  "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavesurfer" = dontDistribute super."wavesurfer";
+  "wavy" = dontDistribute super."wavy";
+  "wcwidth" = dontDistribute super."wcwidth";
+  "weather-api" = dontDistribute super."weather-api";
+  "web-browser-in-haskell" = dontDistribute super."web-browser-in-haskell";
+  "web-css" = dontDistribute super."web-css";
+  "web-encodings" = dontDistribute super."web-encodings";
+  "web-mongrel2" = dontDistribute super."web-mongrel2";
+  "web-page" = dontDistribute super."web-page";
+  "web-routes-mtl" = dontDistribute super."web-routes-mtl";
+  "web-routes-quasi" = dontDistribute super."web-routes-quasi";
+  "web-routes-regular" = dontDistribute super."web-routes-regular";
+  "web-routes-transformers" = dontDistribute super."web-routes-transformers";
+  "webapi" = dontDistribute super."webapi";
+  "webapp" = dontDistribute super."webapp";
+  "webcrank" = dontDistribute super."webcrank";
+  "webcrank-dispatch" = dontDistribute super."webcrank-dispatch";
+  "webcrank-wai" = dontDistribute super."webcrank-wai";
+  "webdriver-snoy" = dontDistribute super."webdriver-snoy";
+  "webfinger-client" = dontDistribute super."webfinger-client";
+  "webidl" = dontDistribute super."webidl";
+  "webify" = dontDistribute super."webify";
+  "webkit" = dontDistribute super."webkit";
+  "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
+  "webkitgtk3" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "webwire" = dontDistribute super."webwire";
+  "wedding-announcement" = dontDistribute super."wedding-announcement";
+  "wedged" = dontDistribute super."wedged";
+  "weighted-regexp" = dontDistribute super."weighted-regexp";
+  "weighted-search" = dontDistribute super."weighted-search";
+  "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
+  "wheb-mongo" = dontDistribute super."wheb-mongo";
+  "wheb-redis" = dontDistribute super."wheb-redis";
+  "wheb-strapped" = dontDistribute super."wheb-strapped";
+  "while-lang-parser" = dontDistribute super."while-lang-parser";
+  "whim" = dontDistribute super."whim";
+  "whiskers" = dontDistribute super."whiskers";
+  "whitespace" = dontDistribute super."whitespace";
+  "whois" = dontDistribute super."whois";
+  "why3" = dontDistribute super."why3";
+  "wigner-symbols" = dontDistribute super."wigner-symbols";
+  "wikipedia4epub" = dontDistribute super."wikipedia4epub";
+  "win-hp-path" = dontDistribute super."win-hp-path";
+  "windowslive" = dontDistribute super."windowslive";
+  "winerror" = dontDistribute super."winerror";
+  "winio" = dontDistribute super."winio";
+  "wiring" = dontDistribute super."wiring";
+  "with-location" = doDistribute super."with-location_0_0_0";
+  "witness" = dontDistribute super."witness";
+  "witty" = dontDistribute super."witty";
+  "wkt" = dontDistribute super."wkt";
+  "wl-pprint-ansiterm" = dontDistribute super."wl-pprint-ansiterm";
+  "wlc-hs" = dontDistribute super."wlc-hs";
+  "wobsurv" = dontDistribute super."wobsurv";
+  "woffex" = dontDistribute super."woffex";
+  "wol" = dontDistribute super."wol";
+  "wolf" = dontDistribute super."wolf";
+  "woot" = dontDistribute super."woot";
+  "word24" = dontDistribute super."word24";
+  "wordcloud" = dontDistribute super."wordcloud";
+  "wordexp" = dontDistribute super."wordexp";
+  "words" = dontDistribute super."words";
+  "wordsearch" = dontDistribute super."wordsearch";
+  "wordsetdiff" = dontDistribute super."wordsetdiff";
+  "workflow-osx" = dontDistribute super."workflow-osx";
+  "wp-archivebot" = dontDistribute super."wp-archivebot";
+  "wraparound" = dontDistribute super."wraparound";
+  "wraxml" = dontDistribute super."wraxml";
+  "wreq-sb" = dontDistribute super."wreq-sb";
+  "wright" = dontDistribute super."wright";
+  "wsdl" = dontDistribute super."wsdl";
+  "wsedit" = dontDistribute super."wsedit";
+  "wtk" = dontDistribute super."wtk";
+  "wtk-gtk" = dontDistribute super."wtk-gtk";
+  "wumpus-basic" = dontDistribute super."wumpus-basic";
+  "wumpus-core" = dontDistribute super."wumpus-core";
+  "wumpus-drawing" = dontDistribute super."wumpus-drawing";
+  "wumpus-microprint" = dontDistribute super."wumpus-microprint";
+  "wumpus-tree" = dontDistribute super."wumpus-tree";
+  "wuss" = dontDistribute super."wuss";
+  "wx" = dontDistribute super."wx";
+  "wxAsteroids" = dontDistribute super."wxAsteroids";
+  "wxFruit" = dontDistribute super."wxFruit";
+  "wxc" = dontDistribute super."wxc";
+  "wxcore" = dontDistribute super."wxcore";
+  "wxdirect" = dontDistribute super."wxdirect";
+  "wxhnotepad" = dontDistribute super."wxhnotepad";
+  "wxturtle" = dontDistribute super."wxturtle";
+  "wybor" = dontDistribute super."wybor";
+  "wyvern" = dontDistribute super."wyvern";
+  "x-dsp" = dontDistribute super."x-dsp";
+  "x11-xim" = dontDistribute super."x11-xim";
+  "x11-xinput" = dontDistribute super."x11-xinput";
+  "x509-util" = dontDistribute super."x509-util";
+  "xattr" = dontDistribute super."xattr";
+  "xbattbar" = dontDistribute super."xbattbar";
+  "xcb-types" = dontDistribute super."xcb-types";
+  "xcffib" = dontDistribute super."xcffib";
+  "xchat-plugin" = dontDistribute super."xchat-plugin";
+  "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
+  "xdg-userdirs" = dontDistribute super."xdg-userdirs";
+  "xdot" = dontDistribute super."xdot";
+  "xfconf" = dontDistribute super."xfconf";
+  "xhaskell-library" = dontDistribute super."xhaskell-library";
+  "xhb" = dontDistribute super."xhb";
+  "xhb-atom-cache" = dontDistribute super."xhb-atom-cache";
+  "xhb-ewmh" = dontDistribute super."xhb-ewmh";
+  "xhtml" = doDistribute super."xhtml_3000_2_1";
+  "xhtml-combinators" = dontDistribute super."xhtml-combinators";
+  "xilinx-lava" = dontDistribute super."xilinx-lava";
+  "xine" = dontDistribute super."xine";
+  "xing-api" = dontDistribute super."xing-api";
+  "xinput-conduit" = dontDistribute super."xinput-conduit";
+  "xkbcommon" = dontDistribute super."xkbcommon";
+  "xkcd" = dontDistribute super."xkcd";
+  "xlsx-tabular" = dontDistribute super."xlsx-tabular";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-enumerator" = dontDistribute super."xml-enumerator";
+  "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
+  "xml-extractors" = dontDistribute super."xml-extractors";
+  "xml-helpers" = dontDistribute super."xml-helpers";
+  "xml-html-conduit-lens" = dontDistribute super."xml-html-conduit-lens";
+  "xml-monad" = dontDistribute super."xml-monad";
+  "xml-parsec" = dontDistribute super."xml-parsec";
+  "xml-picklers" = dontDistribute super."xml-picklers";
+  "xml-pipe" = dontDistribute super."xml-pipe";
+  "xml-prettify" = dontDistribute super."xml-prettify";
+  "xml-push" = dontDistribute super."xml-push";
+  "xml-query" = dontDistribute super."xml-query";
+  "xml-query-xml-conduit" = dontDistribute super."xml-query-xml-conduit";
+  "xml-query-xml-types" = dontDistribute super."xml-query-xml-types";
+  "xml2html" = dontDistribute super."xml2html";
+  "xml2json" = dontDistribute super."xml2json";
+  "xml2x" = dontDistribute super."xml2x";
+  "xmltv" = dontDistribute super."xmltv";
+  "xmms2-client" = dontDistribute super."xmms2-client";
+  "xmms2-client-glib" = dontDistribute super."xmms2-client-glib";
+  "xmobar" = dontDistribute super."xmobar";
+  "xmonad-bluetilebranch" = dontDistribute super."xmonad-bluetilebranch";
+  "xmonad-contrib" = dontDistribute super."xmonad-contrib";
+  "xmonad-contrib-bluetilebranch" = dontDistribute super."xmonad-contrib-bluetilebranch";
+  "xmonad-contrib-gpl" = dontDistribute super."xmonad-contrib-gpl";
+  "xmonad-entryhelper" = dontDistribute super."xmonad-entryhelper";
+  "xmonad-eval" = dontDistribute super."xmonad-eval";
+  "xmonad-extras" = dontDistribute super."xmonad-extras";
+  "xmonad-screenshot" = dontDistribute super."xmonad-screenshot";
+  "xmonad-utils" = dontDistribute super."xmonad-utils";
+  "xmonad-wallpaper" = dontDistribute super."xmonad-wallpaper";
+  "xmonad-windownames" = dontDistribute super."xmonad-windownames";
+  "xmpipe" = dontDistribute super."xmpipe";
+  "xorshift" = dontDistribute super."xorshift";
+  "xosd" = dontDistribute super."xosd";
+  "xournal-builder" = dontDistribute super."xournal-builder";
+  "xournal-convert" = dontDistribute super."xournal-convert";
+  "xournal-parser" = dontDistribute super."xournal-parser";
+  "xournal-render" = dontDistribute super."xournal-render";
+  "xournal-types" = dontDistribute super."xournal-types";
+  "xsact" = dontDistribute super."xsact";
+  "xsd" = dontDistribute super."xsd";
+  "xsha1" = dontDistribute super."xsha1";
+  "xslt" = dontDistribute super."xslt";
+  "xtc" = dontDistribute super."xtc";
+  "xtest" = dontDistribute super."xtest";
+  "xturtle" = dontDistribute super."xturtle";
+  "xxhash" = dontDistribute super."xxhash";
+  "y0l0bot" = dontDistribute super."y0l0bot";
+  "yabi" = dontDistribute super."yabi";
+  "yabi-muno" = dontDistribute super."yabi-muno";
+  "yahoo-finance-conduit" = dontDistribute super."yahoo-finance-conduit";
+  "yahoo-web-search" = dontDistribute super."yahoo-web-search";
+  "yajl" = dontDistribute super."yajl";
+  "yajl-enumerator" = dontDistribute super."yajl-enumerator";
+  "yall" = dontDistribute super."yall";
+  "yamemo" = dontDistribute super."yamemo";
+  "yaml-config" = dontDistribute super."yaml-config";
+  "yaml-light-lens" = dontDistribute super."yaml-light-lens";
+  "yaml-rpc" = dontDistribute super."yaml-rpc";
+  "yaml-rpc-scotty" = dontDistribute super."yaml-rpc-scotty";
+  "yaml-rpc-snap" = dontDistribute super."yaml-rpc-snap";
+  "yaml-union" = dontDistribute super."yaml-union";
+  "yaml2owl" = dontDistribute super."yaml2owl";
+  "yamlkeysdiff" = dontDistribute super."yamlkeysdiff";
+  "yampa-canvas" = dontDistribute super."yampa-canvas";
+  "yampa-glfw" = dontDistribute super."yampa-glfw";
+  "yampa-glut" = dontDistribute super."yampa-glut";
+  "yampa2048" = dontDistribute super."yampa2048";
+  "yaop" = dontDistribute super."yaop";
+  "yap" = dontDistribute super."yap";
+  "yarr" = dontDistribute super."yarr";
+  "yarr-image-io" = dontDistribute super."yarr-image-io";
+  "yate" = dontDistribute super."yate";
+  "yavie" = dontDistribute super."yavie";
+  "ycextra" = dontDistribute super."ycextra";
+  "yeganesh" = dontDistribute super."yeganesh";
+  "yeller" = dontDistribute super."yeller";
+  "yeshql" = dontDistribute super."yeshql";
+  "yesod-angular" = dontDistribute super."yesod-angular";
+  "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
+  "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
+  "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
+  "yesod-auth-ldap-mediocre" = dontDistribute super."yesod-auth-ldap-mediocre";
+  "yesod-auth-ldap-native" = dontDistribute super."yesod-auth-ldap-native";
+  "yesod-auth-oauth" = dontDistribute super."yesod-auth-oauth";
+  "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
+  "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
+  "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
+  "yesod-comments" = dontDistribute super."yesod-comments";
+  "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
+  "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-crud" = dontDistribute super."yesod-crud";
+  "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
+  "yesod-csp" = dontDistribute super."yesod-csp";
+  "yesod-datatables" = dontDistribute super."yesod-datatables";
+  "yesod-dsl" = dontDistribute super."yesod-dsl";
+  "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form-json" = dontDistribute super."yesod-form-json";
+  "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
+  "yesod-goodies" = dontDistribute super."yesod-goodies";
+  "yesod-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "yesod-paginate" = dontDistribute super."yesod-paginate";
+  "yesod-pagination" = dontDistribute super."yesod-pagination";
+  "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-platform" = dontDistribute super."yesod-platform";
+  "yesod-pnotify" = dontDistribute super."yesod-pnotify";
+  "yesod-pure" = dontDistribute super."yesod-pure";
+  "yesod-purescript" = dontDistribute super."yesod-purescript";
+  "yesod-raml" = dontDistribute super."yesod-raml";
+  "yesod-raml-bin" = dontDistribute super."yesod-raml-bin";
+  "yesod-raml-docs" = dontDistribute super."yesod-raml-docs";
+  "yesod-raml-mock" = dontDistribute super."yesod-raml-mock";
+  "yesod-recaptcha" = dontDistribute super."yesod-recaptcha";
+  "yesod-routes" = dontDistribute super."yesod-routes";
+  "yesod-routes-flow" = dontDistribute super."yesod-routes-flow";
+  "yesod-routes-typescript" = dontDistribute super."yesod-routes-typescript";
+  "yesod-rst" = dontDistribute super."yesod-rst";
+  "yesod-s3" = dontDistribute super."yesod-s3";
+  "yesod-sass" = dontDistribute super."yesod-sass";
+  "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test-json" = dontDistribute super."yesod-test-json";
+  "yesod-tls" = dontDistribute super."yesod-tls";
+  "yesod-transloadit" = dontDistribute super."yesod-transloadit";
+  "yesod-vend" = dontDistribute super."yesod-vend";
+  "yesod-websockets-extra" = dontDistribute super."yesod-websockets-extra";
+  "yesod-worker" = dontDistribute super."yesod-worker";
+  "yet-another-logger" = dontDistribute super."yet-another-logger";
+  "yhccore" = dontDistribute super."yhccore";
+  "yi-contrib" = dontDistribute super."yi-contrib";
+  "yi-emacs-colours" = dontDistribute super."yi-emacs-colours";
+  "yi-gtk" = dontDistribute super."yi-gtk";
+  "yi-monokai" = dontDistribute super."yi-monokai";
+  "yi-snippet" = dontDistribute super."yi-snippet";
+  "yi-solarized" = dontDistribute super."yi-solarized";
+  "yi-spolsky" = dontDistribute super."yi-spolsky";
+  "yi-vty" = dontDistribute super."yi-vty";
+  "yices" = dontDistribute super."yices";
+  "yices-easy" = dontDistribute super."yices-easy";
+  "yices-painless" = dontDistribute super."yices-painless";
+  "yjftp" = dontDistribute super."yjftp";
+  "yjftp-libs" = dontDistribute super."yjftp-libs";
+  "yjsvg" = dontDistribute super."yjsvg";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
+  "yoko" = dontDistribute super."yoko";
+  "york-lava" = dontDistribute super."york-lava";
+  "youtube" = dontDistribute super."youtube";
+  "yql" = dontDistribute super."yql";
+  "yst" = dontDistribute super."yst";
+  "yuiGrid" = dontDistribute super."yuiGrid";
+  "yuuko" = dontDistribute super."yuuko";
+  "yxdb-utils" = dontDistribute super."yxdb-utils";
+  "z3" = dontDistribute super."z3";
+  "zalgo" = dontDistribute super."zalgo";
+  "zampolit" = dontDistribute super."zampolit";
+  "zasni-gerna" = dontDistribute super."zasni-gerna";
+  "zcache" = dontDistribute super."zcache";
+  "zenc" = dontDistribute super."zenc";
+  "zendesk-api" = dontDistribute super."zendesk-api";
+  "zeno" = dontDistribute super."zeno";
+  "zerobin" = dontDistribute super."zerobin";
+  "zeromq-haskell" = dontDistribute super."zeromq-haskell";
+  "zeromq3-conduit" = dontDistribute super."zeromq3-conduit";
+  "zeromq3-haskell" = dontDistribute super."zeromq3-haskell";
+  "zeroth" = dontDistribute super."zeroth";
+  "zigbee-znet25" = dontDistribute super."zigbee-znet25";
+  "zim-parser" = doDistribute super."zim-parser_0_1_0_0";
+  "zip" = dontDistribute super."zip";
+  "zip-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "zippo" = dontDistribute super."zippo";
+  "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zmcat" = dontDistribute super."zmcat";
+  "zmidi-core" = dontDistribute super."zmidi-core";
+  "zmidi-score" = dontDistribute super."zmidi-score";
+  "zmqat" = dontDistribute super."zmqat";
+  "zoneinfo" = dontDistribute super."zoneinfo";
+  "zoom" = dontDistribute super."zoom";
+  "zoom-cache" = dontDistribute super."zoom-cache";
+  "zoom-cache-pcm" = dontDistribute super."zoom-cache-pcm";
+  "zoom-cache-sndfile" = dontDistribute super."zoom-cache-sndfile";
+  "zoom-refs" = dontDistribute super."zoom-refs";
+  "zot" = dontDistribute super."zot";
+  "zsh-battery" = dontDistribute super."zsh-battery";
+  "ztail" = dontDistribute super."ztail";
+
+}
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index 2f1000c924508..bd84d493760a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -262,6 +263,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -328,6 +330,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -1043,6 +1046,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1080,6 +1084,7 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
@@ -1123,6 +1128,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1257,6 +1263,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1285,6 +1292,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1337,6 +1345,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1376,6 +1385,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1472,6 +1484,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1508,6 +1521,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1554,6 +1568,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1574,6 +1589,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1697,6 +1713,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1722,6 +1739,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1922,6 +1940,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1936,6 +1955,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1954,6 +1974,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2020,6 +2041,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2147,6 +2169,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2172,6 +2196,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2402,6 +2427,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2479,6 +2505,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2507,6 +2534,7 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2551,6 +2579,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2619,6 +2648,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2743,6 +2773,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2785,6 +2816,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
@@ -2982,6 +3014,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3153,6 +3186,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3739,6 +3776,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4028,6 +4066,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4057,6 +4096,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4156,6 +4196,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4194,16 +4235,21 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4317,6 +4363,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4327,6 +4374,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4350,6 +4398,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4468,6 +4517,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4510,6 +4561,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4578,6 +4630,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4721,6 +4774,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4994,6 +5048,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -5014,6 +5069,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -5032,6 +5088,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5069,6 +5126,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5237,6 +5295,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5258,6 +5317,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5310,6 +5370,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5649,6 +5710,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5816,7 +5878,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5913,6 +5977,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5967,6 +6032,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6102,6 +6168,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6162,6 +6229,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6198,7 +6266,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6236,6 +6306,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6327,6 +6398,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6461,6 +6533,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6490,11 +6564,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6607,6 +6683,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6701,6 +6778,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6801,12 +6879,14 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6886,6 +6966,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -7018,6 +7099,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7077,6 +7159,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7114,6 +7199,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7219,6 +7305,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7282,6 +7369,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7369,6 +7457,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7396,6 +7485,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7549,6 +7639,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7595,9 +7686,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7694,8 +7787,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7790,6 +7885,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7860,6 +7956,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7961,8 +8058,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7973,16 +8072,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7995,6 +8097,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -8011,7 +8114,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index f831a7ec7cf16..c7cdcc3de5289 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -261,6 +262,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -326,6 +328,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -938,6 +941,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_8";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1039,6 +1043,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1076,9 +1081,11 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_1_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_3_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1118,6 +1125,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1252,6 +1260,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1279,6 +1288,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1331,6 +1341,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1370,6 +1381,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1466,6 +1480,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1500,6 +1515,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1546,6 +1562,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1566,6 +1583,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1689,6 +1707,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1714,6 +1733,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1912,6 +1932,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1926,6 +1947,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1944,6 +1966,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2010,6 +2033,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2135,6 +2159,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2160,6 +2186,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2389,6 +2416,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2465,6 +2493,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2493,6 +2522,7 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2537,6 +2567,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2604,6 +2635,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2724,6 +2756,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2766,6 +2799,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2961,6 +2995,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3131,6 +3166,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3716,6 +3755,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -4005,6 +4045,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4034,6 +4075,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4133,6 +4175,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4171,16 +4214,21 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-megaparsec" = doDistribute super."hspec-megaparsec_0_1_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4294,6 +4342,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4304,6 +4353,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4327,6 +4377,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4444,6 +4495,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4486,6 +4539,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4554,6 +4608,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4697,6 +4752,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4969,6 +5025,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -4989,6 +5046,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -5007,6 +5065,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5043,6 +5102,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5209,6 +5269,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5230,6 +5291,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5282,6 +5344,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5621,6 +5684,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5787,7 +5851,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5883,6 +5949,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5937,6 +6004,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6071,6 +6139,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6131,6 +6200,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6167,7 +6237,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6203,6 +6275,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6293,6 +6366,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6427,6 +6501,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6456,11 +6532,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6573,6 +6651,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6667,6 +6746,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6765,11 +6845,13 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6849,6 +6931,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -6979,6 +7062,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7038,6 +7122,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7075,6 +7162,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7180,6 +7268,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7243,6 +7332,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7330,6 +7420,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7357,6 +7448,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7510,6 +7602,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7556,9 +7649,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7654,8 +7749,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7747,6 +7844,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7817,6 +7915,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7918,8 +8017,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7930,16 +8031,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7952,6 +8056,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7968,7 +8073,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index fc4d8cb7798b3..269cd7e281022 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -261,6 +262,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -326,6 +328,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -937,6 +940,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_8";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1038,6 +1042,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1075,9 +1080,11 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_1_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1116,6 +1123,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1250,6 +1258,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1277,6 +1286,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1329,6 +1339,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1368,6 +1379,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1464,6 +1478,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1498,6 +1513,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1544,6 +1560,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1564,6 +1581,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1687,6 +1705,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1712,6 +1731,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1910,6 +1930,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1924,6 +1945,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1941,6 +1963,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2007,6 +2030,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2131,6 +2155,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2156,6 +2182,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2385,6 +2412,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2457,6 +2485,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2484,6 +2513,7 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2528,6 +2558,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2594,6 +2625,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2713,6 +2745,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2755,6 +2788,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2949,6 +2983,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3118,6 +3153,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3702,6 +3741,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -3989,6 +4029,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4018,6 +4059,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4117,6 +4159,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4155,15 +4198,20 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4277,6 +4325,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4287,6 +4336,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4310,6 +4360,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4427,6 +4478,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4469,6 +4522,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4537,6 +4591,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4680,6 +4735,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4950,6 +5006,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -4970,6 +5027,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -4988,6 +5046,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5024,6 +5083,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5187,6 +5247,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5206,6 +5267,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5258,6 +5320,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5593,6 +5656,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5758,7 +5822,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5854,6 +5920,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5908,6 +5975,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6042,6 +6110,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6101,6 +6170,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6137,7 +6207,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6173,6 +6245,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6263,6 +6336,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6397,6 +6471,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6426,11 +6502,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6543,6 +6621,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6637,6 +6716,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6735,11 +6815,13 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6819,6 +6901,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -6949,6 +7032,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7008,6 +7092,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7045,6 +7132,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7149,6 +7237,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7212,6 +7301,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7299,6 +7389,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7326,6 +7417,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7478,6 +7570,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7524,9 +7617,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7581,6 +7676,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_4";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7621,8 +7717,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7714,6 +7812,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7784,6 +7883,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7884,8 +7984,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7896,16 +7998,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7918,6 +8023,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7934,7 +8040,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 62c28b5dc613d..32a7dfff632be 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -261,6 +262,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -326,6 +328,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -937,6 +940,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_8";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1038,6 +1042,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1075,9 +1080,11 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_1_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1116,6 +1123,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1250,6 +1258,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1277,6 +1286,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1329,6 +1339,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1368,6 +1379,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1463,6 +1477,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1497,6 +1512,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1543,6 +1559,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1563,6 +1580,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1685,6 +1703,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1710,6 +1729,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1906,6 +1926,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1920,6 +1941,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1937,6 +1959,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -2003,6 +2026,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2127,6 +2151,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2152,6 +2178,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2381,6 +2408,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2453,6 +2481,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2480,6 +2509,7 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2524,6 +2554,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2590,6 +2621,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2709,6 +2741,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2751,6 +2784,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2945,6 +2979,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3114,6 +3149,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3697,6 +3736,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -3984,6 +4024,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4012,6 +4053,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4111,6 +4153,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4149,15 +4192,20 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4271,6 +4319,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4281,6 +4330,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4304,6 +4354,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4421,6 +4472,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4463,6 +4516,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4517,6 +4571,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_1";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4530,6 +4585,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4673,6 +4729,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4748,6 +4805,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_10_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4942,6 +5000,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -4962,6 +5021,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -4980,6 +5040,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5016,6 +5077,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5179,6 +5241,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5198,6 +5261,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5250,6 +5314,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5585,6 +5650,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5750,7 +5816,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5846,6 +5914,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5900,6 +5969,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6034,6 +6104,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6093,6 +6164,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6129,7 +6201,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6165,6 +6239,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6255,6 +6330,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6389,6 +6465,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6418,11 +6496,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6535,6 +6615,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6629,6 +6710,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6727,11 +6809,13 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6811,6 +6895,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -6941,6 +7026,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -7000,6 +7086,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7037,6 +7126,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7141,6 +7231,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7204,6 +7295,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7291,6 +7383,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7318,6 +7411,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7470,6 +7564,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7515,9 +7610,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7572,6 +7669,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_4";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7611,8 +7709,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7703,6 +7803,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7773,6 +7874,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7872,8 +7974,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7884,16 +7988,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7906,6 +8013,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7922,7 +8030,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index ce744723e3b5d..40258206fbd60 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -261,6 +262,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -326,6 +328,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -936,6 +939,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_8";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1037,6 +1041,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1074,9 +1079,11 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_1_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1115,6 +1122,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1249,6 +1257,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1276,6 +1285,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1328,6 +1338,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1366,6 +1377,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1459,6 +1473,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1493,6 +1508,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1539,6 +1555,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1559,6 +1576,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1680,6 +1698,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1704,6 +1723,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1897,6 +1917,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1911,6 +1932,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1928,6 +1950,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -1994,6 +2017,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2011,6 +2035,7 @@ self: super: {
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2117,6 +2142,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2141,6 +2168,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2370,6 +2398,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2442,6 +2471,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2469,6 +2499,7 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2513,6 +2544,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2579,6 +2611,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2698,6 +2731,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2740,6 +2774,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2934,6 +2969,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3100,6 +3136,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3682,6 +3722,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -3890,6 +3931,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3966,6 +4008,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -3994,6 +4037,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4093,6 +4137,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4131,15 +4176,20 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4252,6 +4302,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4262,6 +4313,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4285,6 +4337,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4402,6 +4455,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4444,6 +4499,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4498,6 +4554,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_1";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4511,6 +4568,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4654,6 +4712,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4728,6 +4787,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_10_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4921,6 +4981,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -4941,6 +5002,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -4959,6 +5021,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -4995,6 +5058,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5158,6 +5222,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5177,6 +5242,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5229,6 +5295,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5563,6 +5630,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5726,7 +5794,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5822,6 +5892,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5876,6 +5947,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6010,6 +6082,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6069,6 +6142,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6105,7 +6179,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6141,6 +6217,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6230,6 +6307,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6364,6 +6442,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6393,11 +6473,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6510,6 +6592,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6604,6 +6687,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6702,11 +6786,13 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6786,6 +6872,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -6891,6 +6978,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_2";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6914,6 +7002,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -6973,6 +7062,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -7010,6 +7102,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7114,6 +7207,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7177,6 +7271,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7263,6 +7358,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7290,6 +7386,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7442,6 +7539,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7487,9 +7585,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7544,6 +7644,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_4";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7583,8 +7684,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7674,6 +7777,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7743,6 +7847,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7841,8 +7946,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7853,16 +7960,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7875,6 +7985,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7891,7 +8002,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index 2bda8436a28ca..93309958e178a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -261,6 +262,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -326,6 +328,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -936,6 +939,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_8";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1037,6 +1041,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1074,9 +1079,11 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_1_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1115,6 +1122,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1249,6 +1257,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1276,6 +1285,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1328,6 +1338,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1366,6 +1377,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1459,6 +1473,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1493,6 +1508,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1539,6 +1555,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1559,6 +1576,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1680,6 +1698,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1704,6 +1723,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1894,6 +1914,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1908,6 +1929,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1925,6 +1947,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -1991,6 +2014,7 @@ self: super: {
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
   "concurrent-output" = doDistribute super."concurrent-output_1_7_3";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2007,6 +2031,7 @@ self: super: {
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2113,6 +2138,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2137,6 +2164,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2366,6 +2394,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2438,6 +2467,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2465,6 +2495,7 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2509,6 +2540,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2575,6 +2607,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2694,6 +2727,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2736,6 +2770,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2930,6 +2965,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3096,6 +3132,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3678,6 +3718,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -3885,6 +3926,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3961,6 +4003,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -3989,6 +4032,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4088,6 +4132,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4125,15 +4170,20 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4246,6 +4296,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4256,6 +4307,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4279,6 +4331,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4396,6 +4449,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4438,6 +4493,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4492,6 +4548,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_1";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4505,6 +4562,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4648,6 +4706,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4722,6 +4781,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_10_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4915,6 +4975,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -4935,6 +4996,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -4953,6 +5015,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -4989,6 +5052,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5151,6 +5215,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5170,6 +5235,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5222,6 +5288,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5556,6 +5623,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5716,7 +5784,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5812,6 +5882,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5866,6 +5937,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -6000,6 +6072,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6059,6 +6132,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6095,7 +6169,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6131,6 +6207,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6220,6 +6297,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6354,6 +6432,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6382,11 +6462,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6499,6 +6581,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6593,6 +6676,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6691,11 +6775,13 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6775,6 +6861,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -6878,6 +6965,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_2";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6901,6 +6989,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -6960,6 +7049,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -6997,6 +7089,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7101,6 +7194,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7164,6 +7258,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7250,6 +7345,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7277,6 +7373,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7299,7 +7396,9 @@ self: super: {
   "twisty" = dontDistribute super."twisty";
   "twitch" = dontDistribute super."twitch";
   "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = doDistribute super."twitter-conduit_0_1_2";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = doDistribute super."twitter-types_0_7_2";
   "tx" = dontDistribute super."tx";
   "txt-sushi" = dontDistribute super."txt-sushi";
   "txt2rtf" = dontDistribute super."txt2rtf";
@@ -7426,6 +7525,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7471,9 +7571,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7528,6 +7630,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_4";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7567,8 +7670,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7658,6 +7763,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7727,6 +7833,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7825,8 +7932,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7837,16 +7946,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7859,6 +7971,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7875,7 +7988,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index 0f0b7a65ccf16..c947c1178774f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -261,6 +262,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -326,6 +328,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -936,6 +939,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_8";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1037,6 +1041,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1074,9 +1079,11 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-better-errors" = doDistribute super."aeson-better-errors_0_9_0";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_1_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1115,6 +1122,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1249,6 +1257,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1276,6 +1285,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1328,6 +1338,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1366,6 +1377,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1459,6 +1473,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1493,6 +1508,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1539,6 +1555,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1559,6 +1576,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1680,6 +1698,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1704,6 +1723,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1894,6 +1914,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1908,6 +1929,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1925,6 +1947,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -1990,6 +2013,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2006,6 +2030,7 @@ self: super: {
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2112,6 +2137,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2136,6 +2163,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2365,6 +2393,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2437,6 +2466,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2464,6 +2494,7 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2508,6 +2539,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2574,6 +2606,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2693,6 +2726,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2735,6 +2769,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2869,6 +2904,7 @@ self: super: {
   "fn-extra" = doDistribute super."fn-extra_0_2_0_1";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_6";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -2928,6 +2964,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3094,6 +3131,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3676,6 +3717,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -3883,6 +3925,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3959,6 +4002,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -3987,6 +4031,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4086,6 +4131,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4123,15 +4169,20 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4244,6 +4295,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4254,6 +4306,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4277,6 +4330,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4394,6 +4448,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4436,6 +4492,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4490,6 +4547,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_1";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4503,6 +4561,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4646,6 +4705,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4720,6 +4780,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_10_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4913,6 +4974,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -4933,6 +4995,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -4951,6 +5014,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -4987,6 +5051,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5149,6 +5214,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5168,6 +5234,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5220,6 +5287,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5554,6 +5622,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_9";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5714,7 +5783,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5810,6 +5881,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5864,6 +5936,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -5998,6 +6071,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6057,6 +6131,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6093,7 +6168,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6129,6 +6206,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6218,6 +6296,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6352,6 +6431,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6380,11 +6461,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6497,6 +6580,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6591,6 +6675,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6689,11 +6774,13 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6773,6 +6860,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -6876,6 +6964,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_2";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6899,6 +6988,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -6958,6 +7048,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -6995,6 +7088,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7099,6 +7193,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7162,6 +7257,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7248,6 +7344,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7275,6 +7372,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7297,7 +7395,9 @@ self: super: {
   "twisty" = dontDistribute super."twisty";
   "twitch" = dontDistribute super."twitch";
   "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = doDistribute super."twitter-conduit_0_1_2";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = doDistribute super."twitter-types_0_7_2";
   "tx" = dontDistribute super."tx";
   "txt-sushi" = dontDistribute super."txt-sushi";
   "txt2rtf" = dontDistribute super."txt2rtf";
@@ -7424,6 +7524,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7469,9 +7570,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7525,6 +7628,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_4";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7564,8 +7668,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7654,6 +7760,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7723,6 +7830,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7821,8 +7929,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7833,16 +7943,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7855,6 +7968,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7871,7 +7985,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index 86b1a521d5882..dda42848b6e4f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_5";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_2";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -261,6 +262,7 @@ self: super: {
   "DysFRP-Cairo" = dontDistribute super."DysFRP-Cairo";
   "DysFRP-Craftwerk" = dontDistribute super."DysFRP-Craftwerk";
   "EEConfig" = dontDistribute super."EEConfig";
+  "Earley" = doDistribute super."Earley_0_10_1_0";
   "EdisonAPI" = dontDistribute super."EdisonAPI";
   "EdisonCore" = dontDistribute super."EdisonCore";
   "EditTimeReport" = dontDistribute super."EditTimeReport";
@@ -326,6 +328,7 @@ self: super: {
   "GHood" = dontDistribute super."GHood";
   "GLFW" = dontDistribute super."GLFW";
   "GLFW-OGL" = dontDistribute super."GLFW-OGL";
+  "GLFW-b" = doDistribute super."GLFW-b_1_4_7_3";
   "GLFW-b-demo" = dontDistribute super."GLFW-b-demo";
   "GLFW-task" = dontDistribute super."GLFW-task";
   "GLHUI" = dontDistribute super."GLHUI";
@@ -936,6 +939,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_8";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1037,6 +1041,7 @@ self: super: {
   "acme-http" = dontDistribute super."acme-http";
   "acme-inator" = dontDistribute super."acme-inator";
   "acme-io" = dontDistribute super."acme-io";
+  "acme-left-pad" = dontDistribute super."acme-left-pad";
   "acme-lolcat" = dontDistribute super."acme-lolcat";
   "acme-lookofdisapproval" = dontDistribute super."acme-lookofdisapproval";
   "acme-memorandom" = dontDistribute super."acme-memorandom";
@@ -1074,8 +1079,10 @@ self: super: {
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_9_0_1";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_1_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1114,6 +1121,7 @@ self: super: {
   "aivika-transformers" = dontDistribute super."aivika-transformers";
   "ajhc" = dontDistribute super."ajhc";
   "al" = dontDistribute super."al";
+  "alarmclock" = doDistribute super."alarmclock_0_2_0_8";
   "alea" = dontDistribute super."alea";
   "alex-meta" = dontDistribute super."alex-meta";
   "alfred" = dontDistribute super."alfred";
@@ -1248,6 +1256,7 @@ self: super: {
   "api-builder" = dontDistribute super."api-builder";
   "api-opentheory-unicode" = dontDistribute super."api-opentheory-unicode";
   "api-tools" = dontDistribute super."api-tools";
+  "apiary" = doDistribute super."apiary_1_4_5";
   "apiary-helics" = dontDistribute super."apiary-helics";
   "apiary-http-client" = dontDistribute super."apiary-http-client";
   "apiary-purescript" = dontDistribute super."apiary-purescript";
@@ -1275,6 +1284,7 @@ self: super: {
   "arena" = dontDistribute super."arena";
   "arff" = dontDistribute super."arff";
   "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "argon" = doDistribute super."argon_0_4_0_0";
   "argon2" = dontDistribute super."argon2";
   "argparser" = dontDistribute super."argparser";
   "arguedit" = dontDistribute super."arguedit";
@@ -1327,6 +1337,7 @@ self: super: {
   "atmos" = dontDistribute super."atmos";
   "atmos-dimensional" = dontDistribute super."atmos-dimensional";
   "atmos-dimensional-tf" = dontDistribute super."atmos-dimensional-tf";
+  "atndapi" = dontDistribute super."atndapi";
   "atom" = dontDistribute super."atom";
   "atom-basic" = dontDistribute super."atom-basic";
   "atom-conduit" = dontDistribute super."atom-conduit";
@@ -1365,6 +1376,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_14";
+  "avers-api" = doDistribute super."avers-api_0_0_2";
+  "avers-server" = doDistribute super."avers-server_0_0_2";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesome-prelude" = dontDistribute super."awesome-prelude";
@@ -1458,6 +1472,7 @@ self: super: {
   "bff-mono" = dontDistribute super."bff-mono";
   "bgmax" = dontDistribute super."bgmax";
   "bgzf" = dontDistribute super."bgzf";
+  "bibdb" = dontDistribute super."bibdb";
   "bibtex" = dontDistribute super."bibtex";
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
@@ -1492,6 +1507,7 @@ self: super: {
   "binding-wx" = dontDistribute super."binding-wx";
   "bindings" = dontDistribute super."bindings";
   "bindings-EsounD" = dontDistribute super."bindings-EsounD";
+  "bindings-GLFW" = doDistribute super."bindings-GLFW_3_1_1_4";
   "bindings-K8055" = dontDistribute super."bindings-K8055";
   "bindings-apr" = dontDistribute super."bindings-apr";
   "bindings-apr-util" = dontDistribute super."bindings-apr-util";
@@ -1538,6 +1554,7 @@ self: super: {
   "bindings-sqlite3" = dontDistribute super."bindings-sqlite3";
   "bindings-svm" = dontDistribute super."bindings-svm";
   "bindings-uname" = dontDistribute super."bindings-uname";
+  "bindings-wlc" = dontDistribute super."bindings-wlc";
   "bindings-yices" = dontDistribute super."bindings-yices";
   "bindynamic" = dontDistribute super."bindynamic";
   "binembed" = dontDistribute super."binembed";
@@ -1558,6 +1575,7 @@ self: super: {
   "bitmap-opengl" = dontDistribute super."bitmap-opengl";
   "bitmaps" = dontDistribute super."bitmaps";
   "bits-atomic" = dontDistribute super."bits-atomic";
+  "bits-bytestring" = dontDistribute super."bits-bytestring";
   "bits-conduit" = dontDistribute super."bits-conduit";
   "bits-extras" = dontDistribute super."bits-extras";
   "bitset" = dontDistribute super."bitset";
@@ -1679,6 +1697,7 @@ self: super: {
   "c0check" = dontDistribute super."c0check";
   "c0parser" = dontDistribute super."c0parser";
   "c10k" = dontDistribute super."c10k";
+  "c2hs" = doDistribute super."c2hs_0_27_1";
   "c2hsc" = dontDistribute super."c2hsc";
   "cab" = dontDistribute super."cab";
   "cabal-audit" = dontDistribute super."cabal-audit";
@@ -1703,6 +1722,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_9";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1889,6 +1909,7 @@ self: super: {
   "clipper" = dontDistribute super."clipper";
   "clippings" = dontDistribute super."clippings";
   "clist" = dontDistribute super."clist";
+  "clock" = doDistribute super."clock_0_6_0_1";
   "clocked" = dontDistribute super."clocked";
   "clogparse" = dontDistribute super."clogparse";
   "clone-all" = dontDistribute super."clone-all";
@@ -1903,6 +1924,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_5_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -1920,6 +1942,7 @@ self: super: {
   "codecov-haskell" = dontDistribute super."codecov-haskell";
   "codemonitor" = dontDistribute super."codemonitor";
   "codepad" = dontDistribute super."codepad";
+  "codex" = doDistribute super."codex_0_4_0_8";
   "codo-notation" = dontDistribute super."codo-notation";
   "cofunctor" = dontDistribute super."cofunctor";
   "cognimeta-utils" = dontDistribute super."cognimeta-utils";
@@ -1985,6 +2008,7 @@ self: super: {
   "concurrent-dns-cache" = dontDistribute super."concurrent-dns-cache";
   "concurrent-extra" = dontDistribute super."concurrent-extra";
   "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "concurrent-rpc" = dontDistribute super."concurrent-rpc";
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
@@ -2001,6 +2025,7 @@ self: super: {
   "conduit-audio-lame" = dontDistribute super."conduit-audio-lame";
   "conduit-audio-samplerate" = dontDistribute super."conduit-audio-samplerate";
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_11";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2107,6 +2132,8 @@ self: super: {
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "craze" = dontDistribute super."craze";
+  "crc" = dontDistribute super."crc";
   "crc16" = dontDistribute super."crc16";
   "crc16-table" = dontDistribute super."crc16-table";
   "creatur" = dontDistribute super."creatur";
@@ -2131,6 +2158,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptohash" = doDistribute super."cryptohash_0_11_6";
+  "cryptohash-cryptoapi" = doDistribute super."cryptohash-cryptoapi_0_1_3";
   "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptonite-conduit" = dontDistribute super."cryptonite-conduit";
   "cryptonite-openssl" = dontDistribute super."cryptonite-openssl";
@@ -2360,6 +2388,7 @@ self: super: {
   "dequeue" = dontDistribute super."dequeue";
   "derangement" = dontDistribute super."derangement";
   "derivation-trees" = dontDistribute super."derivation-trees";
+  "derive" = doDistribute super."derive_2_5_23";
   "derive-IG" = dontDistribute super."derive-IG";
   "derive-enumerable" = dontDistribute super."derive-enumerable";
   "derive-gadt" = dontDistribute super."derive-gadt";
@@ -2431,6 +2460,7 @@ self: super: {
   "dirfiles" = dontDistribute super."dirfiles";
   "dirstream" = dontDistribute super."dirstream";
   "disassembler" = dontDistribute super."disassembler";
+  "discogs-haskell" = dontDistribute super."discogs-haskell";
   "discordian-calendar" = dontDistribute super."discordian-calendar";
   "discount" = dontDistribute super."discount";
   "discrete-space-map" = dontDistribute super."discrete-space-map";
@@ -2458,6 +2488,7 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "dixi" = doDistribute super."dixi_0_6_0_5";
   "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -2502,6 +2533,7 @@ self: super: {
   "dph-prim-seq" = dontDistribute super."dph-prim-seq";
   "dph-seq" = dontDistribute super."dph-seq";
   "dpkg" = dontDistribute super."dpkg";
+  "dpor" = dontDistribute super."dpor";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
@@ -2568,6 +2600,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "editpipe" = dontDistribute super."editpipe";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2687,6 +2720,7 @@ self: super: {
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-real" = doDistribute super."exact-real_0_12_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2729,6 +2763,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fadno-braids" = dontDistribute super."fadno-braids";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2843,6 +2878,7 @@ self: super: {
   "float-binstring" = dontDistribute super."float-binstring";
   "floating-bits" = dontDistribute super."floating-bits";
   "floatshow" = dontDistribute super."floatshow";
+  "flow" = doDistribute super."flow_1_0_5";
   "flow2dot" = dontDistribute super."flow2dot";
   "flowdock-api" = dontDistribute super."flowdock-api";
   "flowdock-rest" = dontDistribute super."flowdock-rest";
@@ -2862,6 +2898,7 @@ self: super: {
   "fn-extra" = doDistribute super."fn-extra_0_2_0_1";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_6";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -2921,6 +2958,7 @@ self: super: {
   "freesound" = dontDistribute super."freesound";
   "freetype-simple" = dontDistribute super."freetype-simple";
   "freetype2" = dontDistribute super."freetype2";
+  "fresco-binding" = dontDistribute super."fresco-binding";
   "fresh" = dontDistribute super."fresh";
   "friday" = dontDistribute super."friday";
   "friday-devil" = dontDistribute super."friday-devil";
@@ -3087,6 +3125,10 @@ self: super: {
   "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gst" = dontDistribute super."gi-gst";
+  "gi-gstaudio" = dontDistribute super."gi-gstaudio";
+  "gi-gstbase" = dontDistribute super."gi-gstbase";
+  "gi-gstvideo" = dontDistribute super."gi-gstvideo";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
@@ -3667,6 +3709,7 @@ self: super: {
   "hastache-aeson" = dontDistribute super."hastache-aeson";
   "haste" = dontDistribute super."haste";
   "haste-compiler" = dontDistribute super."haste-compiler";
+  "haste-gapi" = dontDistribute super."haste-gapi";
   "haste-markup" = dontDistribute super."haste-markup";
   "haste-perch" = dontDistribute super."haste-perch";
   "hastily" = dontDistribute super."hastily";
@@ -3870,6 +3913,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_31";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3946,6 +3990,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_17";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -3974,6 +4019,7 @@ self: super: {
   "hpapi" = dontDistribute super."hpapi";
   "hpaste" = dontDistribute super."hpaste";
   "hpasteit" = dontDistribute super."hpasteit";
+  "hpc-coveralls" = doDistribute super."hpc-coveralls_1_0_3";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
   "hpdft" = dontDistribute super."hpdft";
@@ -4073,6 +4119,7 @@ self: super: {
   "hsdip" = dontDistribute super."hsdip";
   "hsdns" = dontDistribute super."hsdns";
   "hsdns-cache" = dontDistribute super."hsdns-cache";
+  "hsebaysdk" = doDistribute super."hsebaysdk_0_3_0_1";
   "hsemail-ns" = dontDistribute super."hsemail-ns";
   "hsenv" = dontDistribute super."hsenv";
   "hserv" = dontDistribute super."hserv";
@@ -4110,15 +4157,20 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_2";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_2";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_2";
   "hspec-expectations-lens" = dontDistribute super."hspec-expectations-lens";
   "hspec-expectations-lifted" = dontDistribute super."hspec-expectations-lifted";
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
+  "hspec-expectations-pretty-diff" = doDistribute super."hspec-expectations-pretty-diff_0_7_2_3";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "hspec-snap" = doDistribute super."hspec-snap_0_4_0_0";
   "hspec-structured-formatter" = dontDistribute super."hspec-structured-formatter";
   "hspec-test-framework" = dontDistribute super."hspec-test-framework";
   "hspec-test-framework-th" = dontDistribute super."hspec-test-framework-th";
@@ -4231,6 +4283,7 @@ self: super: {
   "hutton" = dontDistribute super."hutton";
   "huttons-razor" = dontDistribute super."huttons-razor";
   "huzzy" = dontDistribute super."huzzy";
+  "hw-succinct" = dontDistribute super."hw-succinct";
   "hwall-auth-iitk" = dontDistribute super."hwall-auth-iitk";
   "hws" = dontDistribute super."hws";
   "hwsl2" = dontDistribute super."hwsl2";
@@ -4241,6 +4294,7 @@ self: super: {
   "hxournal" = dontDistribute super."hxournal";
   "hxt-binary" = dontDistribute super."hxt-binary";
   "hxt-cache" = dontDistribute super."hxt-cache";
+  "hxt-css" = doDistribute super."hxt-css_0_1_0_1";
   "hxt-extras" = dontDistribute super."hxt-extras";
   "hxt-filter" = dontDistribute super."hxt-filter";
   "hxt-xpath" = dontDistribute super."hxt-xpath";
@@ -4264,6 +4318,7 @@ self: super: {
   "hydrogen-util" = dontDistribute super."hydrogen-util";
   "hydrogen-version" = dontDistribute super."hydrogen-version";
   "hyena" = dontDistribute super."hyena";
+  "hylogen" = dontDistribute super."hylogen";
   "hylolib" = dontDistribute super."hylolib";
   "hylotab" = dontDistribute super."hylotab";
   "hyloutils" = dontDistribute super."hyloutils";
@@ -4379,6 +4434,8 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "interruptible" = dontDistribute super."interruptible";
+  "interspersed" = dontDistribute super."interspersed";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
@@ -4420,6 +4477,7 @@ self: super: {
   "ismtp" = dontDistribute super."ismtp";
   "iso8583-bitmaps" = dontDistribute super."iso8583-bitmaps";
   "isohunt" = dontDistribute super."isohunt";
+  "ispositive" = dontDistribute super."ispositive";
   "itanium-abi" = dontDistribute super."itanium-abi";
   "iter-stats" = dontDistribute super."iter-stats";
   "iterIO" = dontDistribute super."iterIO";
@@ -4474,6 +4532,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_1";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4486,6 +4545,7 @@ self: super: {
   "json-enumerator" = dontDistribute super."json-enumerator";
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
+  "json-incremental-decoder" = dontDistribute super."json-incremental-decoder";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
   "json-pointer-hasql" = dontDistribute super."json-pointer-hasql";
@@ -4629,6 +4689,7 @@ self: super: {
   "language-asn1" = dontDistribute super."language-asn1";
   "language-bash" = dontDistribute super."language-bash";
   "language-boogie" = dontDistribute super."language-boogie";
+  "language-c" = doDistribute super."language-c_0_4_7";
   "language-c-comments" = dontDistribute super."language-c-comments";
   "language-c-inline" = dontDistribute super."language-c-inline";
   "language-c-quote" = dontDistribute super."language-c-quote";
@@ -4642,6 +4703,7 @@ self: super: {
   "language-go" = dontDistribute super."language-go";
   "language-guess" = dontDistribute super."language-guess";
   "language-java-classfile" = dontDistribute super."language-java-classfile";
+  "language-javascript" = doDistribute super."language-javascript_0_5_14_6";
   "language-kort" = dontDistribute super."language-kort";
   "language-lua" = dontDistribute super."language-lua";
   "language-lua-qq" = dontDistribute super."language-lua-qq";
@@ -4702,6 +4764,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_10_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4895,6 +4958,7 @@ self: super: {
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
+  "luis-client" = dontDistribute super."luis-client";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1_2";
   "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
@@ -4915,6 +4979,7 @@ self: super: {
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
+  "machines-io" = doDistribute super."machines-io_0_2_0_8";
   "machines-zlib" = dontDistribute super."machines-zlib";
   "macho" = dontDistribute super."macho";
   "maclight" = dontDistribute super."maclight";
@@ -4933,6 +4998,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_2";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -4969,6 +5035,7 @@ self: super: {
   "marxup" = dontDistribute super."marxup";
   "masakazu-bot" = dontDistribute super."masakazu-bot";
   "mastermind" = dontDistribute super."mastermind";
+  "matcher" = dontDistribute super."matcher";
   "matchers" = dontDistribute super."matchers";
   "mathblog" = dontDistribute super."mathblog";
   "mathgenealogy" = dontDistribute super."mathgenealogy";
@@ -5027,6 +5094,7 @@ self: super: {
   "mgeneric" = dontDistribute super."mgeneric";
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
+  "microformats2-parser" = doDistribute super."microformats2-parser_1_0_1_4";
   "microformats2-types" = dontDistribute super."microformats2-types";
   "microlens-each" = dontDistribute super."microlens-each";
   "microtimer" = dontDistribute super."microtimer";
@@ -5130,6 +5198,7 @@ self: super: {
   "monads-fd" = dontDistribute super."monads-fd";
   "monadtransform" = dontDistribute super."monadtransform";
   "monarch" = dontDistribute super."monarch";
+  "mondo" = dontDistribute super."mondo";
   "mongodb-queue" = dontDistribute super."mongodb-queue";
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
@@ -5149,6 +5218,7 @@ self: super: {
   "moonshine" = dontDistribute super."moonshine";
   "morfette" = dontDistribute super."morfette";
   "morfeusz" = dontDistribute super."morfeusz";
+  "morte" = doDistribute super."morte_1_4_2";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
   "mountpoints" = dontDistribute super."mountpoints";
@@ -5201,6 +5271,7 @@ self: super: {
   "multistate" = dontDistribute super."multistate";
   "muon" = dontDistribute super."muon";
   "murder" = dontDistribute super."murder";
+  "murmur" = dontDistribute super."murmur";
   "murmur3" = dontDistribute super."murmur3";
   "murmurhash3" = dontDistribute super."murmurhash3";
   "music-articulation" = dontDistribute super."music-articulation";
@@ -5533,6 +5604,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_16_0_2";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
   "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
@@ -5691,7 +5763,9 @@ self: super: {
   "pipes-courier" = dontDistribute super."pipes-courier";
   "pipes-errors" = dontDistribute super."pipes-errors";
   "pipes-extra" = dontDistribute super."pipes-extra";
+  "pipes-extras" = doDistribute super."pipes-extras_1_0_2";
   "pipes-files" = dontDistribute super."pipes-files";
+  "pipes-group" = doDistribute super."pipes-group_1_0_3";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
   "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -5787,6 +5861,7 @@ self: super: {
   "posix-timer" = dontDistribute super."posix-timer";
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
+  "post-mess-age" = doDistribute super."post-mess-age_0_2_0_0";
   "postcodes" = dontDistribute super."postcodes";
   "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
@@ -5841,6 +5916,7 @@ self: super: {
   "primula-bot" = dontDistribute super."primula-bot";
   "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
+  "printf-safe" = dontDistribute super."printf-safe";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
   "priority-sync" = dontDistribute super."priority-sync";
@@ -5975,6 +6051,7 @@ self: super: {
   "quicktest" = dontDistribute super."quicktest";
   "quickwebapp" = dontDistribute super."quickwebapp";
   "quiver" = dontDistribute super."quiver";
+  "quiver-binary" = dontDistribute super."quiver-binary";
   "quiver-bytestring" = dontDistribute super."quiver-bytestring";
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
@@ -6034,6 +6111,7 @@ self: super: {
   "re2" = dontDistribute super."re2";
   "react-flux" = dontDistribute super."react-flux";
   "react-haskell" = dontDistribute super."react-haskell";
+  "react-tutorial-haskell-server" = dontDistribute super."react-tutorial-haskell-server";
   "reaction-logic" = dontDistribute super."reaction-logic";
   "reactive" = dontDistribute super."reactive";
   "reactive-bacon" = dontDistribute super."reactive-bacon";
@@ -6070,7 +6148,9 @@ self: super: {
   "reddit" = dontDistribute super."reddit";
   "redis" = dontDistribute super."redis";
   "redis-hs" = dontDistribute super."redis-hs";
+  "redis-io" = doDistribute super."redis-io_0_5_2";
   "redis-job-queue" = dontDistribute super."redis-job-queue";
+  "redis-resp" = doDistribute super."redis-resp_0_3_2";
   "redis-simple" = dontDistribute super."redis-simple";
   "redo" = dontDistribute super."redo";
   "reedsolomon" = dontDistribute super."reedsolomon";
@@ -6106,6 +6186,7 @@ self: super: {
   "regex-tdfa-unittest" = dontDistribute super."regex-tdfa-unittest";
   "regex-tdfa-utf8" = dontDistribute super."regex-tdfa-utf8";
   "regex-tre" = dontDistribute super."regex-tre";
+  "regex-type" = dontDistribute super."regex-type";
   "regex-xmlschema" = dontDistribute super."regex-xmlschema";
   "regexchar" = dontDistribute super."regexchar";
   "regexdot" = dontDistribute super."regexdot";
@@ -6195,6 +6276,7 @@ self: super: {
   "retryer" = dontDistribute super."retryer";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
+  "reverse-arguments" = dontDistribute super."reverse-arguments";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
   "reversi" = dontDistribute super."reversi";
   "rewrite" = dontDistribute super."rewrite";
@@ -6329,6 +6411,8 @@ self: super: {
   "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "scanner" = dontDistribute super."scanner";
+  "scanner-attoparsec" = dontDistribute super."scanner-attoparsec";
   "scat" = dontDistribute super."scat";
   "scc" = dontDistribute super."scc";
   "scenegraph" = dontDistribute super."scenegraph";
@@ -6357,11 +6441,13 @@ self: super: {
   "scotty-fay" = dontDistribute super."scotty-fay";
   "scotty-hastache" = dontDistribute super."scotty-hastache";
   "scotty-params-parser" = dontDistribute super."scotty-params-parser";
+  "scotty-resource" = dontDistribute super."scotty-resource";
   "scotty-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
   "scp-streams" = dontDistribute super."scp-streams";
   "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrape-changes" = dontDistribute super."scrape-changes";
   "scrobble" = dontDistribute super."scrobble";
   "scroll" = dontDistribute super."scroll";
   "scrz" = dontDistribute super."scrz";
@@ -6467,6 +6553,7 @@ self: super: {
   "shake-pack" = dontDistribute super."shake-pack";
   "shake-persist" = dontDistribute super."shake-persist";
   "shaker" = dontDistribute super."shaker";
+  "shakespeare" = doDistribute super."shakespeare_2_0_7";
   "shakespeare-babel" = dontDistribute super."shakespeare-babel";
   "shakespeare-css" = dontDistribute super."shakespeare-css";
   "shakespeare-i18n" = dontDistribute super."shakespeare-i18n";
@@ -6560,6 +6647,7 @@ self: super: {
   "skeleton" = dontDistribute super."skeleton";
   "skell" = dontDistribute super."skell";
   "skemmtun" = dontDistribute super."skemmtun";
+  "skulk" = dontDistribute super."skulk";
   "skype4hs" = dontDistribute super."skype4hs";
   "skypelogexport" = dontDistribute super."skypelogexport";
   "slack" = dontDistribute super."slack";
@@ -6657,11 +6745,13 @@ self: super: {
   "snowglobe" = dontDistribute super."snowglobe";
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
+  "socket" = doDistribute super."socket_0_5_3_0";
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
+  "solr" = dontDistribute super."solr";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
   "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
@@ -6741,6 +6831,7 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_2";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
@@ -6843,6 +6934,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_2";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6866,6 +6958,7 @@ self: super: {
   "superdoc" = dontDistribute super."superdoc";
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
+  "supplemented" = dontDistribute super."supplemented";
   "suspend" = dontDistribute super."suspend";
   "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_2";
@@ -6925,6 +7018,9 @@ self: super: {
   "system-uuid" = dontDistribute super."system-uuid";
   "systemd" = dontDistribute super."systemd";
   "t-regex" = dontDistribute super."t-regex";
+  "t3-client" = dontDistribute super."t3-client";
+  "t3-game" = dontDistribute super."t3-game";
+  "t3-server" = dontDistribute super."t3-server";
   "ta" = dontDistribute super."ta";
   "table" = dontDistribute super."table";
   "table-tennis" = dontDistribute super."table-tennis";
@@ -6961,6 +7057,7 @@ self: super: {
   "task-distribution" = dontDistribute super."task-distribution";
   "taskpool" = dontDistribute super."taskpool";
   "tasty-groundhog-converters" = dontDistribute super."tasty-groundhog-converters";
+  "tasty-hspec" = doDistribute super."tasty-hspec_1_1_2";
   "tasty-hunit-adapter" = dontDistribute super."tasty-hunit-adapter";
   "tasty-integrate" = dontDistribute super."tasty-integrate";
   "tasty-laws" = dontDistribute super."tasty-laws";
@@ -7028,6 +7125,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_5";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7063,6 +7161,7 @@ self: super: {
   "th-build" = dontDistribute super."th-build";
   "th-cas" = dontDistribute super."th-cas";
   "th-context" = dontDistribute super."th-context";
+  "th-expand-syns" = doDistribute super."th-expand-syns_0_3_0_6";
   "th-fold" = dontDistribute super."th-fold";
   "th-inline-io-action" = dontDistribute super."th-inline-io-action";
   "th-instance-reification" = dontDistribute super."th-instance-reification";
@@ -7126,6 +7225,7 @@ self: super: {
   "timeconsole" = dontDistribute super."timeconsole";
   "timeless" = dontDistribute super."timeless";
   "timelike" = dontDistribute super."timelike";
+  "timelike-clock" = dontDistribute super."timelike-clock";
   "timelike-time" = dontDistribute super."timelike-time";
   "timemap" = dontDistribute super."timemap";
   "timeout" = dontDistribute super."timeout";
@@ -7212,6 +7312,7 @@ self: super: {
   "trivia" = dontDistribute super."trivia";
   "trivial-constraint" = dontDistribute super."trivial-constraint";
   "tropical" = dontDistribute super."tropical";
+  "true-name" = doDistribute super."true-name_0_1_0_0";
   "truelevel" = dontDistribute super."truelevel";
   "trurl" = dontDistribute super."trurl";
   "truthful" = dontDistribute super."truthful";
@@ -7239,6 +7340,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle" = doDistribute super."turtle_1_2_5";
   "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twee" = dontDistribute super."twee";
@@ -7261,7 +7363,9 @@ self: super: {
   "twisty" = dontDistribute super."twisty";
   "twitch" = dontDistribute super."twitch";
   "twitter" = dontDistribute super."twitter";
+  "twitter-conduit" = doDistribute super."twitter-conduit_0_1_2";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = doDistribute super."twitter-types_0_7_2";
   "tx" = dontDistribute super."tx";
   "txt-sushi" = dontDistribute super."txt-sushi";
   "txt2rtf" = dontDistribute super."txt2rtf";
@@ -7388,6 +7492,7 @@ self: super: {
   "unsafely" = dontDistribute super."unsafely";
   "unsafeperformst" = dontDistribute super."unsafeperformst";
   "unscramble" = dontDistribute super."unscramble";
+  "unsequential" = dontDistribute super."unsequential";
   "unusable-pkg" = dontDistribute super."unusable-pkg";
   "uom-plugin" = dontDistribute super."uom-plugin";
   "up" = dontDistribute super."up";
@@ -7433,9 +7538,11 @@ self: super: {
   "uuagc-cabal" = dontDistribute super."uuagc-cabal";
   "uuagc-diagrams" = dontDistribute super."uuagc-diagrams";
   "uuagd" = dontDistribute super."uuagd";
+  "uuid" = doDistribute super."uuid_1_3_11";
   "uuid-aeson" = dontDistribute super."uuid-aeson";
   "uuid-le" = dontDistribute super."uuid-le";
   "uuid-quasi" = dontDistribute super."uuid-quasi";
+  "uuid-types" = doDistribute super."uuid-types_1_0_2";
   "uulib" = dontDistribute super."uulib";
   "uvector" = dontDistribute super."uvector";
   "uvector-algorithms" = dontDistribute super."uvector-algorithms";
@@ -7489,6 +7596,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_4";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7528,8 +7636,10 @@ self: super: {
   "vulkan" = dontDistribute super."vulkan";
   "wacom-daemon" = dontDistribute super."wacom-daemon";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_2_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_4_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7617,6 +7727,7 @@ self: super: {
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
   "werewolf" = dontDistribute super."werewolf";
+  "werewolf-slack" = dontDistribute super."werewolf-slack";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7686,6 +7797,7 @@ self: super: {
   "xcffib" = dontDistribute super."xcffib";
   "xchat-plugin" = dontDistribute super."xchat-plugin";
   "xcp" = dontDistribute super."xcp";
+  "xdcc" = dontDistribute super."xdcc";
   "xdg-userdirs" = dontDistribute super."xdg-userdirs";
   "xdot" = dontDistribute super."xdot";
   "xfconf" = dontDistribute super."xfconf";
@@ -7784,8 +7896,10 @@ self: super: {
   "yeganesh" = dontDistribute super."yeganesh";
   "yeller" = dontDistribute super."yeller";
   "yeshql" = dontDistribute super."yeshql";
+  "yesod" = doDistribute super."yesod_1_4_2";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_12";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7795,16 +7909,19 @@ self: super: {
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
   "yesod-auth-zendesk" = dontDistribute super."yesod-auth-zendesk";
+  "yesod-bin" = doDistribute super."yesod-bin_1_4_17_1";
   "yesod-bootstrap" = dontDistribute super."yesod-bootstrap";
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_19";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
   "yesod-datatables" = dontDistribute super."yesod-datatables";
   "yesod-dsl" = dontDistribute super."yesod-dsl";
   "yesod-examples" = dontDistribute super."yesod-examples";
+  "yesod-form" = doDistribute super."yesod-form_1_4_6";
   "yesod-form-json" = dontDistribute super."yesod-form-json";
   "yesod-form-richtext" = dontDistribute super."yesod-form-richtext";
   "yesod-goodies" = dontDistribute super."yesod-goodies";
@@ -7817,6 +7934,7 @@ self: super: {
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
+  "yesod-persistent" = doDistribute super."yesod-persistent_1_4_0_3";
   "yesod-platform" = dontDistribute super."yesod-platform";
   "yesod-pnotify" = dontDistribute super."yesod-pnotify";
   "yesod-pure" = dontDistribute super."yesod-pure";
@@ -7833,7 +7951,9 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_2";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
+  "yesod-test" = doDistribute super."yesod-test_1_5_0_1";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
   "yesod-transloadit" = dontDistribute super."yesod-transloadit";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 2182469ef2d87..6c308fbd74920 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1531,6 +1531,7 @@ self: {
          aeson base binary cereal QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/BiobaseNewick";
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
@@ -1597,6 +1598,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/BiobaseTypes";
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
@@ -1906,6 +1908,7 @@ self: {
          process split strict temporary transformers
        ];
        executableHaskellDepends = [ base cmdargs ];
+       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -1915,21 +1918,21 @@ self: {
   "BlogLiterately" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
-     , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
-     , pandoc-types, parsec, process, split, strict, temporary
-     , transformers
+     , highlighting-kate, hscolour, HTTP, lens, mtl, pandoc
+     , pandoc-citeproc, pandoc-types, parsec, process, split, strict
+     , tagsoup, temporary, transformers
      }:
      mkDerivation {
        pname = "BlogLiterately";
-       version = "0.8.1.6";
-       sha256 = "924b9fca47100cb02d3eb37d1f5aff18d519db5315bbcd5c812b9420efa208c7";
+       version = "0.8.2";
+       sha256 = "dbb759403abbda0f0a6f0c3a172fbca1eddf6754df66a5bf064b140b54c517c6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base blaze-html bool-extras bytestring cmdargs containers
          data-default directory filepath HaXml haxr highlighting-kate
-         hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
-         process split strict temporary transformers
+         hscolour HTTP lens mtl pandoc pandoc-citeproc pandoc-types parsec
+         process split strict tagsoup temporary transformers
        ];
        executableHaskellDepends = [ base cmdargs ];
        homepage = "http://byorgey.wordpress.com/blogliterately/";
@@ -1982,7 +1985,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately-diagrams" = callPackage
+  "BlogLiterately-diagrams_0_2_0_2" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
      , diagrams-lib, diagrams-rasterific, directory, filepath
      , JuicyPixels, pandoc, safe
@@ -1998,12 +2001,13 @@ self: {
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
        executableHaskellDepends = [ base BlogLiterately ];
+       jailbreak = true;
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately-diagrams_0_2_0_3" = callPackage
+  "BlogLiterately-diagrams" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
      , diagrams-lib, diagrams-rasterific, directory, filepath
      , JuicyPixels, pandoc, safe
@@ -2021,7 +2025,7 @@ self: {
        executableHaskellDepends = [ base BlogLiterately ];
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -5176,7 +5180,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Earley" = callPackage
+  "Earley_0_10_1_0" = callPackage
     ({ mkDerivation, base, ListLike, tasty, tasty-hunit
      , tasty-quickcheck, unordered-containers
      }:
@@ -5193,9 +5197,10 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Earley_0_11_0_0" = callPackage
+  "Earley" = callPackage
     ({ mkDerivation, base, ListLike, tasty, tasty-hunit
      , tasty-quickcheck, unordered-containers
      }:
@@ -5208,6 +5213,24 @@ self: {
        libraryHaskellDepends = [ base ListLike ];
        executableHaskellDepends = [ base unordered-containers ];
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       doCheck = false;
+       description = "Parsing all context-free grammars using Earley's algorithm";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "Earley_0_11_0_1" = callPackage
+    ({ mkDerivation, base, ListLike, tasty, tasty-hunit
+     , tasty-quickcheck, unordered-containers
+     }:
+     mkDerivation {
+       pname = "Earley";
+       version = "0.11.0.1";
+       sha256 = "c207a40926bb0b9de05641a0fc03c22849a2c7e0bc007d2ffef37f33793985b3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ListLike ];
+       executableHaskellDepends = [ base unordered-containers ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6506,11 +6529,10 @@ self: {
     ({ mkDerivation, base, libX11, mesa, OpenGL }:
      mkDerivation {
        pname = "GLFW";
-       version = "0.5.2.4";
-       sha256 = "48fc9efb1da85b4bf20c506341999987e3bfeadf750ad19794030e927e4f4ca9";
+       version = "0.5.2.5";
+       sha256 = "37c1d72bd878e9e58b8e4180f82aa5742a216bd92fd63c9da3d7e4e9b5e03a09";
        libraryHaskellDepends = [ base OpenGL ];
        librarySystemDepends = [ libX11 mesa ];
-       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
@@ -6531,7 +6553,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
-  "GLFW-b" = callPackage
+  "GLFW-b_1_4_7_3" = callPackage
     ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework
      , test-framework-hunit
      }:
@@ -6547,6 +6569,25 @@ self: {
        doCheck = false;
        description = "Bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "GLFW-b" = callPackage
+    ({ mkDerivation, base, bindings-GLFW, HUnit, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "GLFW-b";
+       version = "1.4.8.0";
+       sha256 = "4e88c518d527e28606c9f150c74ace2e350bbb5630d51e4f365a13b2c14ef4ef";
+       libraryHaskellDepends = [ base bindings-GLFW ];
+       testHaskellDepends = [
+         base bindings-GLFW HUnit test-framework test-framework-hunit
+       ];
+       jailbreak = true;
+       doCheck = false;
+       description = "Bindings to GLFW OpenGL library";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
@@ -8111,23 +8152,22 @@ self: {
 
   "HGamer3D" = callPackage
     ({ mkDerivation, base, bytestring, cereal, clock, containers
-     , directory, filepath, hgamer3d062, messagepack, text, Urho3D, vect
+     , directory, filepath, fresco-binding, messagepack, text, vect
      }:
      mkDerivation {
        pname = "HGamer3D";
-       version = "0.6.2";
-       sha256 = "28076dcd6bf141b4d88939be49f3e2f370eae02d53e3845521715dfa36aac1ba";
+       version = "0.7.1";
+       sha256 = "debd2a5f6d7cf4f8e2ffb416fcf3776d7cef3cebe7481dbc01737f22af478a34";
        libraryHaskellDepends = [
          base bytestring cereal clock containers directory filepath
-         messagepack text vect
+         fresco-binding messagepack text vect
        ];
-       librarySystemDepends = [ hgamer3d062 Urho3D ];
        jailbreak = true;
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {Urho3D = null; hgamer3d062 = null;};
+     }) {};
 
   "HGamer3D-API" = callPackage
     ({ mkDerivation, base, haskell98, HGamer3D-Data
@@ -10845,8 +10885,8 @@ self: {
      }:
      mkDerivation {
        pname = "Hish";
-       version = "0.1.2.2";
-       sha256 = "5094eee275eb1d9dba7929c1bd812cb1b299dce18be5eefcfde3b2cd48d5365a";
+       version = "0.1.2.4";
+       sha256 = "a9f723b5ff39cb738430f2425e6f2e764c8e5389c8a7a933c9280fd2d9a6b4ed";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13345,21 +13385,21 @@ self: {
      }) {};
 
   "MailchimpSimple" = callPackage
-    ({ mkDerivation, aeson, aeson-lens, base, bytestring, directory
-     , filepath, http-conduit, http-types, lens, text, time
-     , transformers, vector
+    ({ mkDerivation, aeson, aeson-lens, base, base16-bytestring
+     , bytestring, cryptohash, directory, filepath, http-conduit
+     , http-types, lens, safe, text, time, transformers, vector
      }:
      mkDerivation {
        pname = "MailchimpSimple";
-       version = "0.1.0.0";
-       sha256 = "56d883bca6efde9bd9fd776d9bcf88a4f4cfba562a79687fed2bb47ea2a8eb78";
+       version = "0.2.0.0";
+       sha256 = "60f525ea74400168bc5a3d1d348c8ad3431baad772ff937982c02351bbfdc98d";
        libraryHaskellDepends = [
-         aeson aeson-lens base bytestring directory filepath http-conduit
-         http-types lens text time transformers vector
+         aeson aeson-lens base base16-bytestring bytestring cryptohash
+         directory filepath http-conduit http-types lens safe text time
+         transformers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/Dananji/MailchimpSimple";
-       description = "A Haskell library to handle mailing lists in MailchimpSimple using its JSON API";
+       description = "Haskell library to interact with Mailchimp JSON API Version 3.0";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -16008,6 +16048,20 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
+  "PortMidi_0_1_6_0" = callPackage
+    ({ mkDerivation, alsaLib, base }:
+     mkDerivation {
+       pname = "PortMidi";
+       version = "0.1.6.0";
+       sha256 = "54599bc0377847ab17b175641023ec495587ca82807fd2360e17f4c5575814b1";
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ alsaLib ];
+       homepage = "http://haskell.org/haskellwiki/PortMidi";
+       description = "A binding for PortMedia/PortMidi";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) alsaLib;};
+
   "PostgreSQL" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -16039,6 +16093,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -16737,8 +16792,8 @@ self: {
      }:
      mkDerivation {
        pname = "RNAlien";
-       version = "1.1.0";
-       sha256 = "450d898235dadc7879eef1bb025713b7d55e8a271332760d8d744b4deb9636d8";
+       version = "1.1.1";
+       sha256 = "975a187bbe34324b62e57fb132e9dd38ada86409bb010b1631c8c5b86346ebee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -20164,7 +20219,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ViennaRNAParser" = callPackage
+  "ViennaRNAParser_1_2_8" = callPackage
     ({ mkDerivation, base, hspec, parsec, process, transformers }:
      mkDerivation {
        pname = "ViennaRNAParser";
@@ -20174,9 +20229,10 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ViennaRNAParser_1_2_9" = callPackage
+  "ViennaRNAParser" = callPackage
     ({ mkDerivation, base, hspec, parsec, process, transformers }:
      mkDerivation {
        pname = "ViennaRNAParser";
@@ -20186,7 +20242,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vulkan" = callPackage
@@ -22204,6 +22259,17 @@ self: {
        license = "unknown";
      }) {};
 
+  "acme-left-pad" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "acme-left-pad";
+       version = "3.0";
+       sha256 = "acbac093f071fc08b8cd4081c3e3675d369304626bcba85ef011ddc169f9370d";
+       libraryHaskellDepends = [ base text ];
+       description = "free your haskell from the tyranny of npm!";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "acme-lolcat" = callPackage
     ({ mkDerivation, base, parsec, random, random-shuffle, text }:
      mkDerivation {
@@ -22337,12 +22403,12 @@ self: {
      }) {};
 
   "acme-php" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, acme-left-pad, base }:
      mkDerivation {
        pname = "acme-php";
-       version = "0.0.3";
-       sha256 = "df37993a472d9f867ce7cdb16ab2f8db1e4aa7fa92a0f617344c0542c66b2d24";
-       libraryHaskellDepends = [ base ];
+       version = "0.0.4";
+       sha256 = "c3015f1f75edeec2f42b7334cfaf7d69325b1c6ade573fe35fc487b4b81dc452";
+       libraryHaskellDepends = [ acme-left-pad base ];
        description = "The flexibility of Haskell and the safety of PHP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23128,7 +23194,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson" = callPackage
+  "aeson_0_9_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
      , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
      , syb, template-haskell, test-framework, test-framework-hunit
@@ -23156,6 +23222,7 @@ self: {
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_0_10_0_0" = callPackage
@@ -23188,7 +23255,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson_0_11_1_4" = callPackage
+  "aeson" = callPackage
     ({ mkDerivation, attoparsec, base, base-orphans, bytestring
      , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
      , QuickCheck, quickcheck-instances, scientific, semigroups, syb
@@ -23214,7 +23281,6 @@ self: {
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -23320,13 +23386,14 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-compat#readme";
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-compat" = callPackage
+  "aeson-compat_0_3_1_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , exceptions, hashable, nats, QuickCheck, quickcheck-instances
      , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time
@@ -23336,8 +23403,8 @@ self: {
        pname = "aeson-compat";
        version = "0.3.1.0";
        sha256 = "9275040d031433eb0006bce8228a0828e058d547c7d07d61ab0b22154286d736";
-       revision = "1";
-       editedCabalFile = "88dde146e4177a807888b7058f8e24d057fa826205a005ade669ce1fc395f4a2";
+       revision = "2";
+       editedCabalFile = "6ed5f912700689e2c9bd91426168e69e2d366c48aec7de40f75030e30a365f4b";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers exceptions hashable
          nats scientific text time time-locale-compat unordered-containers
@@ -23352,6 +23419,34 @@ self: {
        homepage = "https://github.com/phadej/aeson-compat#readme";
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "aeson-compat" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-compat, base-orphans
+     , bytestring, containers, exceptions, hashable, nats, QuickCheck
+     , quickcheck-instances, scientific, semigroups, tagged, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-compat";
+       version = "0.3.2.0";
+       sha256 = "ab594edc5bb15e42975536e689485d0b356d25727b0645d7bfd2f4fa9e27d338";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-compat bytestring containers exceptions
+         hashable nats scientific semigroups tagged text time
+         time-locale-compat unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base-compat base-orphans bytestring
+         containers exceptions hashable nats QuickCheck quickcheck-instances
+         scientific semigroups tagged tasty tasty-hunit tasty-quickcheck
+         text time time-locale-compat unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-compat#readme";
+       description = "Compatibility layer for aeson";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "aeson-diff" = callPackage
@@ -23520,6 +23615,7 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell text these time
          time-parsers unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -23634,7 +23730,6 @@ self: {
        libraryHaskellDepends = [
          aeson base parsec scientific text unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/FPBrno/aeson-parsec-picky";
        description = "Alternative JSON parser based on Parsec and Aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -23962,6 +24057,7 @@ self: {
        version = "0.1.1";
        sha256 = "b71317e0a87bbd84d6ec407a307299201070a10e3b2cf9d28c4afb5cf8b0dad2";
        libraryHaskellDepends = [ aeson base ];
+       jailbreak = true;
        homepage = "https://github.com/tejon/aeson-yak";
        description = "Handle JSON that may or may not be a list, or exist";
        license = stdenv.lib.licenses.mit;
@@ -24540,7 +24636,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "alarmclock" = callPackage
+  "alarmclock_0_2_0_8" = callPackage
     ({ mkDerivation, base, stm, time, unbounded-delays }:
      mkDerivation {
        pname = "alarmclock";
@@ -24551,6 +24647,22 @@ self: {
        homepage = "https://bitbucket.org/davecturner/alarmclock";
        description = "Wake up and perform an action at a certain time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "alarmclock" = callPackage
+    ({ mkDerivation, base, stm, time, unbounded-delays }:
+     mkDerivation {
+       pname = "alarmclock";
+       version = "0.2.0.9";
+       sha256 = "606b06d8e037258cdd51a4f0aa9869b33dfa9dc34eb605c2f6a7357778bd676d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base stm time unbounded-delays ];
+       executableHaskellDepends = [ base time ];
+       homepage = "https://bitbucket.org/davecturner/alarmclock";
+       description = "Wake up and perform an action at a certain time";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "alea" = callPackage
@@ -30830,7 +30942,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "apiary" = callPackage
+  "apiary_1_4_5" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
      , bytestring, bytestring-read, case-insensitive, data-default-class
      , exceptions, hashable, http-date, http-types, HUnit, mime-types
@@ -30860,6 +30972,38 @@ self: {
        homepage = "https://github.com/philopon/apiary";
        description = "Simple and type safe web framework that generate web API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "apiary" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, bytestring-read, case-insensitive
+     , data-default-class, directory, exceptions, hashable, http-date
+     , http-types, HUnit, mime-types, monad-control, mtl, process
+     , resourcet, stringsearch, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, time, transformers, transformers-base
+     , types-compat, unix-compat, unordered-containers, vault, wai
+     , wai-extra, web-routing
+     }:
+     mkDerivation {
+       pname = "apiary";
+       version = "2.0.1.1";
+       sha256 = "dd804df65c6ffc9f3bdd8994dd39668796e54e424b6a140bd7577551e7220554";
+       libraryHaskellDepends = [
+         aeson base blaze-builder blaze-html blaze-markup bytestring
+         bytestring-read case-insensitive data-default-class exceptions
+         hashable http-date http-types mime-types monad-control mtl process
+         resourcet stringsearch template-haskell text time transformers
+         transformers-base types-compat unix-compat unordered-containers
+         vault wai wai-extra web-routing
+       ];
+       testHaskellDepends = [
+         aeson base bytestring directory http-types HUnit mtl tasty
+         tasty-hunit tasty-quickcheck wai wai-extra
+       ];
+       homepage = "https://github.com/philopon/apiary";
+       description = "Simple and type safe web framework that generate web API documentation";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "apiary-authenticate" = callPackage
@@ -30872,8 +31016,8 @@ self: {
        pname = "apiary-authenticate";
        version = "1.4.0";
        sha256 = "40dbdb0d6799ba7091ae9b72929c7d62a74dd251b5a6e01f8979314d75dbd107";
-       revision = "4";
-       editedCabalFile = "5888af016171726e81bde323d1cd9044a24b70930c1fe5946ac0336a0f23f193";
+       revision = "5";
+       editedCabalFile = "34972b3238ea7fe3423f720891b9fb97614165da20b4751a09d0b26d3253cd4a";
        libraryHaskellDepends = [
          apiary apiary-session authenticate base blaze-builder bytestring
          cereal data-default-class http-client http-client-tls http-types
@@ -30893,8 +31037,8 @@ self: {
        pname = "apiary-clientsession";
        version = "1.4.0";
        sha256 = "a6bba1337d2ee7ded7303f2801b09b9d93cdafb93f5115328c797bef3e6126fd";
-       revision = "2";
-       editedCabalFile = "b3780175a0912ef55de02d916822dbe38b98acec5705a63f808517cda16ab90c";
+       revision = "3";
+       editedCabalFile = "4f89144896c4424f795151ea1e90863feb968314d18250e8aa78e71a2aaf6c1a";
        libraryHaskellDepends = [
          apiary apiary-cookie apiary-session base bytestring cereal
          clientsession data-default-class time unix-compat vault
@@ -30912,8 +31056,8 @@ self: {
        pname = "apiary-cookie";
        version = "1.4.0";
        sha256 = "3dcf4cf38377685340ec5c6ab105a0df3ba2b0a4d0d7079fc88593bd15eeeb04";
-       revision = "3";
-       editedCabalFile = "5b9c1a2c95bbedcb6b12196953ce1ebbe8e7c825fbb8ae5e0ddb4c846d3a752b";
+       revision = "4";
+       editedCabalFile = "ecc5670e535c8eb25acf5cc8973555dc1b8f4384e76f35472ceba3a9e4b78561";
        libraryHaskellDepends = [
          apiary base blaze-builder blaze-html bytestring cookie time
          types-compat wai web-routing
@@ -30929,8 +31073,8 @@ self: {
        pname = "apiary-eventsource";
        version = "1.4.0";
        sha256 = "a7c9f566fea8501864ac194d744dfe94c0ee04d174ccb51161c4a64243bd0176";
-       revision = "1";
-       editedCabalFile = "368e1b555b07ff026b4753cab0364d0f70a4e2536166f756bde35f8ce9fb9ae6";
+       revision = "2";
+       editedCabalFile = "0ffc00bdbd735fd5ee59130daa2b6800dc66306bc3da2fccb48145961b04cc95";
        libraryHaskellDepends = [ apiary base blaze-builder wai-extra ];
        homepage = "https://github.com/philopon/apiary";
        description = "eventsource support for apiary web framework";
@@ -30946,8 +31090,8 @@ self: {
        pname = "apiary-helics";
        version = "1.4.0";
        sha256 = "0a4dc7d59aa5cc626922d10e61bfad4fd56628c48701919d51b239f5a175a9e2";
-       revision = "1";
-       editedCabalFile = "80ce4b1a9dd5c7a30099392219d0077b9281b9ceeabbb01843f12754df0b0827";
+       revision = "2";
+       editedCabalFile = "82a65528a2b50525b5e4c06eef79248592d529739d4159a171407a212d3a2797";
        libraryHaskellDepends = [
          apiary base bytestring data-default-class helics helics-wai
          monad-control text transformers types-compat vault wai
@@ -30967,6 +31111,8 @@ self: {
        pname = "apiary-http-client";
        version = "0.1.1.0";
        sha256 = "4e7b6ba5741f0f194ee23679cceb87167a7bac44ad2bca7789e4488320e103bd";
+       revision = "2";
+       editedCabalFile = "8238cab98333b055b04dd16fed558be1c969b7004e1ab06ebf2567ee9a64523b";
        libraryHaskellDepends = [
          apiary base bytestring data-default-class http-client http-types
          text transformers types-compat wai
@@ -30985,8 +31131,8 @@ self: {
        pname = "apiary-logger";
        version = "1.4.0";
        sha256 = "884cf856a25685db351f76ab2df43126456cfe4c1a8640b72ac055623518c05d";
-       revision = "3";
-       editedCabalFile = "03f6b1ac0e588631c2deed8459e527f935a74a86c15455c3f509270ba5bbd5f7";
+       revision = "4";
+       editedCabalFile = "44884053de8a5d4c2b3e6a97f7b9592477cdbb1f6970d2d223cb2f1f557743e3";
        libraryHaskellDepends = [
          apiary base data-default-class fast-logger lifted-base
          monad-control monad-logger transformers transformers-base
@@ -31005,8 +31151,8 @@ self: {
        pname = "apiary-memcached";
        version = "1.4.0";
        sha256 = "7e3d225c9ac983d798b88a1e8ebc0221852174d0f0765daa8e9e20e6d79193e7";
-       revision = "1";
-       editedCabalFile = "7a332392add31b3f5ef9fcc2e69069de3a23bdbfdcfeececc47d2832ec767c29";
+       revision = "2";
+       editedCabalFile = "3a79077bacef2ea2448b870b099c41d8a4cb726cfbd82bd1310e7f9801bf1de7";
        libraryHaskellDepends = [
          apiary base bytestring data-default-class memcached-binary
          monad-control text transformers types-compat
@@ -31025,8 +31171,8 @@ self: {
        pname = "apiary-mongoDB";
        version = "1.4.0";
        sha256 = "8d97a32e5d55334d1a4f5d318d6a590a74c0b8ad6c84877956728318b89f36eb";
-       revision = "1";
-       editedCabalFile = "e2578f19108129ed47946fa7369c86203610d5b447a6a7a8f1af5f2537d55a4b";
+       revision = "2";
+       editedCabalFile = "de12b5ad3582eb1287753d02751b63f66ea84001d0fea9b15f34ff92675760de";
        libraryHaskellDepends = [
          apiary base bson data-default-class lifted-base monad-control
          mongoDB resource-pool text time transformers types-compat
@@ -31045,8 +31191,8 @@ self: {
        pname = "apiary-persistent";
        version = "1.4.0";
        sha256 = "09c6c5730d6ad65b544e994f2d73f5412aae92aac093fd308234c8bea68f4a02";
-       revision = "2";
-       editedCabalFile = "7f1c18de1d41b15397df81d9a3377e109cc07f6efc07390584e0e2952d34e889";
+       revision = "3";
+       editedCabalFile = "8235c7aa7dd8f1ca78cc288abfed6e796da50b95040ae72bfd304c2115a2239e";
        libraryHaskellDepends = [
          apiary apiary-logger base monad-control monad-logger persistent
          resource-pool resourcet transformers transformers-base types-compat
@@ -31066,8 +31212,8 @@ self: {
        pname = "apiary-purescript";
        version = "1.4.0";
        sha256 = "5f0e15fb72ae61b44349488bb945c1cd9d63b54986c73bbbd9cb207531172d7c";
-       revision = "1";
-       editedCabalFile = "9f716a5d9173c31c6472a4bf7decc34523bdc761540d440f5d0ad4f9521bf98c";
+       revision = "2";
+       editedCabalFile = "915a9c1861d5c4425a2ef6b721dbbf952801304aa1d9197f2f03758f7e554fff";
        libraryHaskellDepends = [
          apiary base bytestring data-default-class filepath Glob parsec
          purescript text transformers types-compat unordered-containers
@@ -31085,8 +31231,8 @@ self: {
        pname = "apiary-session";
        version = "1.4.0";
        sha256 = "434cd8b985a95bd4c72dde7ac521768d1c1402f3cc8b4835dded6736bdbcd74a";
-       revision = "2";
-       editedCabalFile = "777f476e799ceaa21a20e42c6382baec92644fc898e11aea09dcfa96a5e90034";
+       revision = "3";
+       editedCabalFile = "1983d57af9d671319eaa96f055995e8de55d50ab52c5bdf1f210ae66c4a5d913";
        libraryHaskellDepends = [
          apiary base types-compat wai web-routing
        ];
@@ -31103,8 +31249,8 @@ self: {
        pname = "apiary-websockets";
        version = "1.4.0";
        sha256 = "e15e7e9281b72d9fa2419c1d3dbbf0c11e08dc139fe0d0242a5612a181ff545b";
-       revision = "1";
-       editedCabalFile = "5162825445fc14b48d11a0a1f63d67e8d66a8c5aaeaf1e117a1f2302474d7581";
+       revision = "2";
+       editedCabalFile = "72d8024aad88c6ea1185776d4612d05f68202ce78ab21d79edde2803c3bc15e9";
        libraryHaskellDepends = [
          apiary base wai-websockets web-routing websockets
        ];
@@ -31761,6 +31907,7 @@ self: {
          pcre-light process-extras tasty tasty-golden tasty-hunit time
          transformers unix utf8-string
        ];
+       jailbreak = true;
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -31791,6 +31938,7 @@ self: {
          pcre-light process-extras tasty tasty-golden tasty-hunit time
          transformers unix utf8-string
        ];
+       jailbreak = true;
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -31986,7 +32134,7 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "argon" = callPackage
+  "argon_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
      , containers, directory, docopt, filepath, ghc, ghc-paths
      , ghc-syb-utils, hlint, hspec, lens-simple, pathwalk, pipes
@@ -32011,13 +32159,15 @@ self: {
          docopt filepath ghc ghc-paths ghc-syb-utils hlint hspec lens-simple
          pathwalk pipes pipes-group QuickCheck syb
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/rubik/argon";
        description = "Measure your code's complexity";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "argon_0_4_1_0" = callPackage
+  "argon" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
      , containers, directory, docopt, filepath, ghc, ghc-paths
      , ghc-syb-utils, hlint, hspec, lens-simple, pipes, pipes-bytestring
@@ -32042,7 +32192,6 @@ self: {
        homepage = "http://github.com/rubik/argon";
        description = "Measure your code's complexity";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "argon2" = callPackage
@@ -32628,8 +32777,8 @@ self: {
      }:
      mkDerivation {
        pname = "asciidiagram";
-       version = "1.2";
-       sha256 = "5ea87f5932463b8cb62873a0551fdbbf17525b45819ffb54ebcf5de400e8d098";
+       version = "1.3.1";
+       sha256 = "69087e7ae41bc117f78411b6b5065b5cd5c93604ff9660b6996794dabe299f1b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -32953,12 +33102,15 @@ self: {
      }) {inherit (pkgs) assimp;};
 
   "astar" = callPackage
-    ({ mkDerivation, base, containers, PSQueue }:
+    ({ mkDerivation, base, hashable, psqueues, unordered-containers }:
      mkDerivation {
        pname = "astar";
-       version = "0.2.1";
-       sha256 = "6815cdca09d9b40459c2dc180d35f9be2f5c67748f969644a2154cae94affe61";
-       libraryHaskellDepends = [ base containers PSQueue ];
+       version = "0.3.0.0";
+       sha256 = "2117c007d5daa88401a49c994b8e3361ddae331d458b1a403fac2a4f304b9b87";
+       libraryHaskellDepends = [
+         base hashable psqueues unordered-containers
+       ];
+       homepage = "https://github.com/weissi/astar";
        description = "General A* search algorithm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -33081,6 +33233,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "async-dejafu_0_1_1_0" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit, hunit-dejafu }:
+     mkDerivation {
+       pname = "async-dejafu";
+       version = "0.1.1.0";
+       sha256 = "13a3b0bd80363d90fee27abcab299082b4947bf1197716e9f7df9dbace306595";
+       libraryHaskellDepends = [ base dejafu exceptions ];
+       testHaskellDepends = [ base dejafu HUnit hunit-dejafu ];
+       jailbreak = true;
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Run MonadConc operations asynchronously and wait for their results";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "async-extras" = callPackage
     ({ mkDerivation, async, base, lifted-async, lifted-base
      , monad-control, SafeSemaphore, stm, transformers-base
@@ -33274,6 +33441,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "atndapi" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, conduit, data-default
+     , hspec, http-conduit, http-types, lifted-base, monad-control
+     , monad-logger, mtl, parsec, QuickCheck, resourcet, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "atndapi";
+       version = "0.1.1.0";
+       sha256 = "1c4be357e322c13dd0197252fca5a2eff6ebdd913920e2a9ae66e295aadbfeda";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit data-default http-conduit http-types
+         lifted-base monad-control monad-logger mtl parsec resourcet text
+         time transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conduit data-default hspec http-conduit
+         http-types lifted-base monad-control monad-logger mtl parsec
+         QuickCheck resourcet text time transformers
+       ];
+       homepage = "http://github.com/ynishi/atndapi#readme";
+       description = "An interface of ATND API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "atom" = callPackage
     ({ mkDerivation, base, bimap, containers, mtl, process, syb }:
      mkDerivation {
@@ -33946,17 +34138,18 @@ self: {
      }) {};
 
   "aur" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, filepath, lens
-     , lens-aeson, mtl, text, vector, wreq
+    ({ mkDerivation, aeson, base, http-client, http-client-tls, mtl
+     , servant, servant-client, text, transformers
      }:
      mkDerivation {
        pname = "aur";
-       version = "4.0.2";
-       sha256 = "918c575536b17ce232e023b0c7e408f1c156a580cc770f78be2953190a465d8e";
+       version = "5.0.0";
+       sha256 = "626b590839ca942a6453261deb2abc1f23bfc001fc73fa8fd1cc8161c7ed06e3";
        libraryHaskellDepends = [
-         aeson aeson-pretty base filepath lens lens-aeson mtl text vector
-         wreq
+         aeson base http-client http-client-tls mtl servant servant-client
+         text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/fosskers/haskell-aur";
        description = "Access metadata from the Arch Linux User Repository";
        license = stdenv.lib.licenses.gpl3;
@@ -34314,7 +34507,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers" = callPackage
+  "avers_0_0_14" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, clock, containers, cryptohash, filepath, hspec
      , inflections, MonadRandom, mtl, network, network-uri
@@ -34339,6 +34532,34 @@ self: {
        ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "avers" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, clock, containers, cryptohash, filepath, hspec
+     , inflections, MonadRandom, mtl, network, network-uri
+     , resource-pool, rethinkdb-client-driver, safe, scrypt, stm
+     , template-haskell, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "avers";
+       version = "0.0.15";
+       sha256 = "538d2461859dae2edd6a6b2abcd5ca45447a1927017fa94cb777c896c2bf7e5e";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring clock containers
+         cryptohash filepath inflections MonadRandom mtl network network-uri
+         resource-pool rethinkdb-client-driver safe scrypt stm
+         template-haskell text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring containers
+         cryptohash hspec inflections MonadRandom mtl resource-pool
+         rethinkdb-client-driver scrypt stm text time unordered-containers
+         vector
+       ];
+       description = "empty";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "avers-api_0_0_1" = callPackage
@@ -34359,7 +34580,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-api" = callPackage
+  "avers-api_0_0_2" = callPackage
     ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
      , text, time
      }:
@@ -34374,6 +34595,24 @@ self: {
        homepage = "http://github.com/wereHamster/avers-api";
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "avers-api" = callPackage
+    ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
+     , text, time, vector
+     }:
+     mkDerivation {
+       pname = "avers-api";
+       version = "0.0.4";
+       sha256 = "f2bf956a64a2579cea7ab787cdf3d99c5f9ac3e2525d83c777072a9b87fee61a";
+       libraryHaskellDepends = [
+         aeson avers base bytestring cookie servant text time vector
+       ];
+       doHaddock = false;
+       homepage = "http://github.com/wereHamster/avers-api";
+       description = "Types describing the core and extended Avers APIs";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "avers-server_0_0_1" = callPackage
@@ -34397,7 +34636,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-server" = callPackage
+  "avers-server_0_0_2" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
      , bytestring, bytestring-conversion, cookie, cryptohash, either
      , http-types, mtl, resource-pool, rethinkdb-client-driver, servant
@@ -34417,6 +34656,30 @@ self: {
        homepage = "http://github.com/wereHamster/avers-server";
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "avers-server" = callPackage
+    ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
+     , bytestring, bytestring-conversion, containers, cookie, cryptohash
+     , either, http-types, mtl, resource-pool, rethinkdb-client-driver
+     , servant, servant-server, stm, text, time, transformers, wai
+     , wai-websockets, websockets
+     }:
+     mkDerivation {
+       pname = "avers-server";
+       version = "0.0.3";
+       sha256 = "12ac2544d6c2f916298c8f269d16421d0a746fd59faf43359ad62d8100274a40";
+       libraryHaskellDepends = [
+         aeson avers avers-api base base64-bytestring bytestring
+         bytestring-conversion containers cookie cryptohash either
+         http-types mtl resource-pool rethinkdb-client-driver servant
+         servant-server stm text time transformers wai wai-websockets
+         websockets
+       ];
+       homepage = "http://github.com/wereHamster/avers-server";
+       description = "Server implementation of the Avers API";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "avl-static" = callPackage
@@ -37350,6 +37613,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bibdb" = callPackage
+    ({ mkDerivation, alex, array, base, bibtex, bytestring, containers
+     , curl, download-curl, filepath, happy, microlens, microlens-mtl
+     , microlens-th, mtl, optparse-applicative, parsec, pretty
+     , transformers
+     }:
+     mkDerivation {
+       pname = "bibdb";
+       version = "0.3.0";
+       sha256 = "e90d5952020d7bfe6ba5ae8abc447377eff553ce0bf7d5cfa4ff52dcc74cd0a9";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bibtex bytestring containers curl download-curl filepath
+         microlens microlens-mtl microlens-th mtl optparse-applicative
+         parsec pretty transformers
+       ];
+       executableToolDepends = [ alex happy ];
+       jailbreak = true;
+       homepage = "https://github.com/cacay/bibdb";
+       description = "A database based bibliography manager for BibTeX";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bibtex" = callPackage
     ({ mkDerivation, base, latex, parsec, utility-ht }:
      mkDerivation {
@@ -38322,6 +38609,7 @@ self: {
          SHA tagged tasty tasty-quickcheck text time unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/binary-tagged#readme";
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
@@ -38511,7 +38799,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {esound = null;};
 
-  "bindings-GLFW" = callPackage
+  "bindings-GLFW_3_1_1_4" = callPackage
     ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor
      , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm
      , mesa, test-framework, test-framework-hunit
@@ -38532,6 +38820,34 @@ self: {
        doCheck = false;
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; 
+         inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; 
+         inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; 
+         inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXxf86vm; 
+         inherit (pkgs) mesa;};
+
+  "bindings-GLFW" = callPackage
+    ({ mkDerivation, base, bindings-DSL, HUnit, libX11, libXcursor
+     , libXext, libXfixes, libXi, libXinerama, libXrandr, libXxf86vm
+     , mesa, template-haskell, test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "bindings-GLFW";
+       version = "3.1.2.0";
+       sha256 = "8ed860cea817a213f4972d68860c48ca81377d4fcd488dee29677ff02c2d4ea1";
+       libraryHaskellDepends = [ base bindings-DSL template-haskell ];
+       librarySystemDepends = [
+         libX11 libXcursor libXext libXfixes libXi libXinerama libXrandr
+         libXxf86vm mesa
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       jailbreak = true;
+       doCheck = false;
+       description = "Low-level bindings to GLFW OpenGL library";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; 
@@ -39225,6 +39541,20 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "bindings-wlc" = callPackage
+    ({ mkDerivation, base, bindings-DSL, convertible, wlc }:
+     mkDerivation {
+       pname = "bindings-wlc";
+       version = "0.1.0.7";
+       sha256 = "633d9ebb1aa9a20f8a49c1a84003cb2baedb0341bbcfd354d11aae380d672422";
+       libraryHaskellDepends = [ base bindings-DSL convertible ];
+       librarySystemDepends = [ wlc ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/aktowns/bindings-wlc#readme";
+       description = "Bindings against the wlc library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) wlc;};
+
   "bindings-yices" = callPackage
     ({ mkDerivation, base, gmp, yices }:
      mkDerivation {
@@ -39881,6 +40211,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bits-bytestring" = callPackage
+    ({ mkDerivation, base, bits, bytestring, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "bits-bytestring";
+       version = "0.1.0.1";
+       sha256 = "d9e90f0b05589d9fcb4a807242a3b92e25786c118d168cbb7ccdbaf8076b6152";
+       libraryHaskellDepends = [ base bits bytestring ];
+       testHaskellDepends = [ base bits bytestring hspec QuickCheck ];
+       homepage = "https://github.com/oldmanmike/bits-bytestring";
+       description = "Bits instance for bytestrings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "bits-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, hspec, HUnit, mtl }:
      mkDerivation {
@@ -41137,7 +41480,7 @@ self: {
          QuickCheck quickcheck-properties semigroups text time
          unordered-containers vector
        ];
-       jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -41385,6 +41728,7 @@ self: {
          monad-loops pretty QuickCheck tasty tasty-golden tasty-hunit
          tasty-quickcheck text
        ];
+       jailbreak = true;
        homepage = "https://github.com/Microsoft/bond";
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
@@ -41430,6 +41774,7 @@ self: {
          aeson base bond bytestring cmdargs directory filepath monad-loops
        ];
        testHaskellDepends = [ base ];
+       jailbreak = true;
        homepage = "http://github.com/rblaze/bond-haskell#readme";
        description = "Bond code generator for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -43398,8 +43743,8 @@ self: {
        pname = "bytestring-read";
        version = "0.3.1";
        sha256 = "0048cd84ec6c0c684fa8bb65bc20f280ee3e3dc164bf02d59ba139e8caaac635";
-       revision = "2";
-       editedCabalFile = "3746d301ac907af3750c2cd06d0e7f397e77a8bf33fbe7efd92b83ddef90752f";
+       revision = "3";
+       editedCabalFile = "cc2bffb995e06c44359a91c95da55ebe952656fe4320f57d86aa2daf3eb29195";
        libraryHaskellDepends = [ base bytestring types-compat ];
        testHaskellDepends = [
          base bytestring doctest tasty tasty-quickcheck
@@ -43592,6 +43937,7 @@ self: {
        version = "0.3.1";
        sha256 = "fc9a30c237a4c0c077871a59dc0cb47634ea66271e115bc25ef1dc6c441b1212";
        libraryHaskellDepends = [ base language-c ];
+       jailbreak = true;
        description = "A higher level DSL on top of language-c";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -43676,6 +44022,7 @@ self: {
          transformers
        ];
        doHaddock = false;
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
@@ -43702,13 +44049,14 @@ self: {
          base filepath HUnit shelly test-framework test-framework-hunit text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "c2hs" = callPackage
+  "c2hs_0_27_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , dlist, filepath, HUnit, language-c, pretty, process, shelly
      , test-framework, test-framework-hunit, text, transformers
@@ -43727,6 +44075,32 @@ self: {
          base filepath HUnit shelly test-framework test-framework-hunit text
          transformers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/haskell/c2hs";
+       description = "C->Haskell FFI tool that gives some cross-language type safety";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "c2hs" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, directory
+     , dlist, filepath, HUnit, language-c, pretty, process, shelly
+     , test-framework, test-framework-hunit, text, transformers
+     }:
+     mkDerivation {
+       pname = "c2hs";
+       version = "0.28.1";
+       sha256 = "95b04ef42cf43a1078e9c8a4bf9264dd26e8653b441b3fb7f2296c8b3a0752bb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring containers directory dlist filepath
+         language-c pretty process
+       ];
+       testHaskellDepends = [
+         base filepath HUnit shelly test-framework test-framework-hunit text
+         transformers
+       ];
        homepage = "https://github.com/haskell/c2hs";
        description = "C->Haskell FFI tool that gives some cross-language type safety";
        license = stdenv.lib.licenses.gpl2;
@@ -44840,7 +45214,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-rpm" = callPackage
+  "cabal-rpm_0_9_9" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process, time
      , unix
      }:
@@ -44856,9 +45230,10 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-rpm_0_9_10" = callPackage
+  "cabal-rpm" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process, time
      , unix
      }:
@@ -44874,7 +45249,6 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -47211,20 +47585,19 @@ self: {
     ({ mkDerivation, aeson, ansi-wl-pprint, base, bytestring, Cabal
      , containers, directory, filepath, mtl, optparse-applicative
      , process, safe, stringsearch, tar, text, transformers, unix
-     , Unixutils, utf8-string, zlib
+     , Unixutils, utf8-string, vector, zlib
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.20.0";
-       sha256 = "0cc8cf5888d0dc87be47a2e11c641e8f3c8f64f3e09b242694c74b69a1b093e5";
+       version = "0.21.0";
+       sha256 = "a69470286432b822b2aca531c147794b3e8a5a2702cf9f2170aeda9e4058549f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson ansi-wl-pprint base bytestring Cabal containers directory
          filepath mtl optparse-applicative process safe stringsearch tar
-         text transformers unix Unixutils utf8-string zlib
+         text transformers unix Unixutils utf8-string vector zlib
        ];
-       jailbreak = true;
        description = "Tool to maintain a database of CABAL packages and their dependencies";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49103,6 +49476,7 @@ self: {
          lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit
          tasty-th transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://clafer.org";
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
@@ -49177,7 +49551,7 @@ self: {
        librarySystemDepends = [ clang ];
        description = "Pure C++ code analysis with libclang";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (self.llvmPackages) clang;};
 
   "clanki" = callPackage
@@ -51191,6 +51565,7 @@ self: {
          web-routes-happstack web-routes-hsp web-routes-th xss-sanitize
        ];
        librarySystemDepends = [ openssl ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "A secure, reliable content management system (CMS) and blogging platform";
        license = stdenv.lib.licenses.bsd3;
@@ -51364,6 +51739,7 @@ self: {
          tagsoup template-haskell text time time-locale-compat uuid
          web-plugins web-routes web-routes-happstack web-routes-th
        ];
+       jailbreak = true;
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
@@ -51721,7 +52097,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clock_0_5_1" = callPackage
+  "clock" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "clock";
@@ -51729,13 +52105,13 @@ self: {
        sha256 = "7c7a1f89bc4fa2f995d31a214bb7e3ad44c3570cb46b8f18e7de6011f78197d9";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base tasty tasty-quickcheck ];
+       doCheck = false;
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clock" = callPackage
+  "clock_0_6_0_1" = callPackage
     ({ mkDerivation, base, tasty, tasty-quickcheck }:
      mkDerivation {
        pname = "clock";
@@ -51747,6 +52123,7 @@ self: {
        homepage = "https://github.com/corsis/clock";
        description = "High-resolution clock functions: monotonic, realtime, cputime";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clocked" = callPackage
@@ -52045,7 +52422,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cmark" = callPackage
+  "cmark_0_5_1" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
@@ -52056,6 +52433,20 @@ self: {
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cmark" = callPackage
+    ({ mkDerivation, base, bytestring, HUnit, text }:
+     mkDerivation {
+       pname = "cmark";
+       version = "0.5.2";
+       sha256 = "757243bd8b479a29b60c39e549988e6003fc0744f827772ee91b4a58e48ecea4";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [ base HUnit text ];
+       homepage = "https://github.com/jgm/commonmark-hs";
+       description = "Fast, accurate CommonMark (Markdown) parser and renderer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cmath" = callPackage
@@ -52512,7 +52903,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "codex" = callPackage
+  "codex_0_4_0_8" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash
      , directory, either, filepath, hackage-db, http-client, lens
      , machines, machines-directory, MissingH, monad-loops, network
@@ -52533,6 +52924,34 @@ self: {
          base bytestring Cabal directory either filepath hackage-db MissingH
          monad-loops network process transformers wreq yaml
        ];
+       jailbreak = true;
+       homepage = "http://github.com/aloiscochard/codex";
+       description = "A ctags file generator for cabal project dependencies";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "codex" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, cryptohash
+     , directory, either, filepath, hackage-db, http-client, lens
+     , machines, machines-directory, MissingH, monad-loops, network
+     , process, tar, text, transformers, wreq, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "codex";
+       version = "0.4.0.10";
+       sha256 = "1dd23ef2991b14e6c212b91b86ef2c14de86ece126ab7bcf4ed926d1413ad812";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring Cabal containers cryptohash directory either
+         filepath hackage-db http-client lens machines machines-directory
+         process tar text transformers wreq yaml zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory either filepath hackage-db MissingH
+         monad-loops network process transformers wreq yaml
+       ];
        homepage = "http://github.com/aloiscochard/codex";
        description = "A ctags file generator for cabal project dependencies";
        license = stdenv.lib.licenses.asl20;
@@ -52626,7 +53045,6 @@ self: {
          random scientific tasty tasty-hunit tasty-quickcheck tasty-th time
          transformers unordered-containers uuid websockets
        ];
-       jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -53357,7 +53775,10 @@ self: {
        pname = "compact-string";
        version = "0.3.1";
        sha256 = "48da37dc629ee3bfe55d05d5284c2c6b067deb034cf3feab3982572910ed980a";
+       revision = "1";
+       editedCabalFile = "12c9508bf68b6da11d38adb71248376aeb23eaf7cd6ae1b4571c83d748079c0d";
        libraryHaskellDepends = [ base bytestring ];
+       jailbreak = true;
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
@@ -53793,6 +54214,7 @@ self: {
          base compdata containers deepseq deepseq-generics ghc-prim lens
          template-haskell th-expand-syns
        ];
+       jailbreak = true;
        homepage = "https://github.com/jkoppel/comptrans";
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
@@ -54133,6 +54555,18 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "concurrent-rpc" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "concurrent-rpc";
+       version = "0.1.0.0";
+       sha256 = "efed4a49b87a1f8f51cea08f3cd842bdd3735bd191ab7c20de92746bbae2114c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/lpeterse/haskell-concurrent-rpc";
+       description = "An abstraction for inter-thread RPC based on MVars";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "concurrent-sa" = callPackage
     ({ mkDerivation, base, MonadRandom }:
      mkDerivation {
@@ -55211,7 +55645,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-extra" = callPackage
+  "conduit-extra_1_1_11" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, directory, exceptions, filepath
      , hspec, monad-control, network, primitive, process, resourcet, stm
@@ -55234,6 +55668,33 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "conduit-extra" = callPackage
+    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
+     , bytestring-builder, conduit, directory, exceptions, filepath
+     , hspec, monad-control, network, primitive, process, QuickCheck
+     , resourcet, stm, streaming-commons, text, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.1.13.1";
+       sha256 = "16910191be60a573a3dd933655ced6bc91564fd96e61e89e4d97ac52e6d75810";
+       libraryHaskellDepends = [
+         async attoparsec base blaze-builder bytestring conduit directory
+         exceptions filepath monad-control network primitive process
+         resourcet stm streaming-commons text transformers transformers-base
+       ];
+       testHaskellDepends = [
+         async attoparsec base blaze-builder bytestring bytestring-builder
+         conduit exceptions hspec process QuickCheck resourcet stm
+         streaming-commons text transformers transformers-base
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "conduit-iconv" = callPackage
@@ -55348,19 +55809,19 @@ self: {
 
   "config-manager" = callPackage
     ({ mkDerivation, base, directory, filepath, HUnit, parsec
-     , temporary, test-framework, test-framework-hunit, text
+     , temporary, test-framework, test-framework-hunit, text, time
      , unordered-containers
      }:
      mkDerivation {
        pname = "config-manager";
-       version = "0.1.0.0";
-       sha256 = "fbb14182265aa28076a221fc64020bd9e3338e9a88634d08c5e9e3c8edfd558d";
+       version = "0.2.0.0";
+       sha256 = "006e454220f88f4f7d8ccb89abb9ce80ebd88fa75147100fdf76e76690a0863a";
        libraryHaskellDepends = [
-         base filepath parsec text unordered-containers
+         base filepath parsec text time unordered-containers
        ];
        testHaskellDepends = [
          base directory HUnit temporary test-framework test-framework-hunit
-         text unordered-containers
+         text time unordered-containers
        ];
        homepage = "https://gitlab.com/guyonvarch/config-manager";
        description = "Configuration management";
@@ -55728,8 +56189,8 @@ self: {
     ({ mkDerivation, base, tagged, void }:
      mkDerivation {
        pname = "constrained-categories";
-       version = "0.2.1.1";
-       sha256 = "fe2b93bb06a5acf4ebd872af25d7fd9b838067a676f56571845d36a0f6148c54";
+       version = "0.2.5.1";
+       sha256 = "660941f0cfc79793a2102a8638802f5df009a8cc155ca3194c76e3902feaede8";
        libraryHaskellDepends = [ base tagged void ];
        homepage = "https://github.com/leftaroundabout/constrained-categories";
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
@@ -57304,6 +57765,7 @@ self: {
        libraryHaskellDepends = [ aeson base shakespeare text ];
        executableHaskellDepends = [ base tagsoup text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
@@ -57464,8 +57926,8 @@ self: {
      }:
      mkDerivation {
        pname = "cplex-hs";
-       version = "0.2.0.1";
-       sha256 = "4d2c06753d28eba293ea0a4ef6a6dc3a1a5875c9111932dface41a3f3776c7b0";
+       version = "0.2.0.2";
+       sha256 = "5f6de007fa0b2548d40fdb18cb44b37b8f02cc7cbe631e74ba20ab1aec811554";
        libraryHaskellDepends = [
          base containers mtl primitive transformers vector
        ];
@@ -58157,6 +58619,49 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "craze" = callPackage
+    ({ mkDerivation, async, base, bytestring, curl, data-default-class
+     , doctest, doctest-discover, haxy, hspec, hspec-discover, HTTP
+     , http-types, optparse-generic, text, transformers
+     }:
+     mkDerivation {
+       pname = "craze";
+       version = "0.0.1.1";
+       sha256 = "7580164fe2534d8af70d9ccbbc429fbf2d72cee63f7992b7c174f9a264bc1631";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring curl data-default-class transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring curl optparse-generic text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring curl doctest doctest-discover haxy hspec
+         hspec-discover HTTP http-types transformers
+       ];
+       homepage = "https://github.com/etcinit/craze#readme";
+       description = "HTTP Racing Library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "crc" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , resourcet, tasty, tasty-golden, vector
+     }:
+     mkDerivation {
+       pname = "crc";
+       version = "0.0.1.1";
+       sha256 = "e4bc5247baa81d1293f75de7e394176b275fda4793251ca0747862ab270096eb";
+       libraryHaskellDepends = [ base bytestring vector ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-extra resourcet tasty tasty-golden
+       ];
+       homepage = "http://github.com/MichaelXavier/crc";
+       description = "Implements various Cyclic Redundancy Checks (CRC)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "crc16" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -59060,14 +59565,16 @@ self: {
      }) {};
 
   "cryptohash" = callPackage
-    ({ mkDerivation, base, byteable, bytestring, ghc-prim, HUnit
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+    ({ mkDerivation, base, byteable, bytestring, cryptonite, ghc-prim
+     , HUnit, memory, QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptohash";
-       version = "0.11.7";
-       sha256 = "da297489f6b2a029a14e08f53ff841743ca7bd35646ee7c05ebcd0028b9d0e30";
-       libraryHaskellDepends = [ base byteable bytestring ghc-prim ];
+       version = "0.11.9";
+       sha256 = "c28f847fc1fcd65b6eea2e74a100300af940919f04bb21d391f6a773968f22fb";
+       libraryHaskellDepends = [
+         base byteable bytestring cryptonite ghc-prim memory
+       ];
        testHaskellDepends = [
          base byteable bytestring HUnit QuickCheck tasty tasty-hunit
          tasty-quickcheck
@@ -59094,7 +59601,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cryptohash-cryptoapi" = callPackage
+  "cryptohash-cryptoapi_0_1_3" = callPackage
     ({ mkDerivation, base, bytestring, cereal, crypto-api, cryptohash
      , tagged
      }:
@@ -59108,6 +59615,23 @@ self: {
        homepage = "http://github.com/vincenthz/hs-cryptohash-cryptoapi";
        description = "Crypto-api interfaces for cryptohash";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cryptohash-cryptoapi" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, crypto-api, cryptonite
+     , memory, tagged
+     }:
+     mkDerivation {
+       pname = "cryptohash-cryptoapi";
+       version = "0.1.4";
+       sha256 = "717a8664ebfaa1c31aaec1d78c9b7c776a5adcfdfc50ad88e21a34566f72058e";
+       libraryHaskellDepends = [
+         base bytestring cereal crypto-api cryptonite memory tagged
+       ];
+       homepage = "https://github.com/vincenthz/hs-cryptohash-cryptoapi";
+       description = "Crypto-api interfaces for cryptohash";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cryptol_2_2_1" = callPackage
@@ -59448,8 +59972,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-catalog";
-       version = "0.4.0";
-       sha256 = "721440f3f891f3117fd38042ad8111b9a23dc0259ea51c177b17115763bac157";
+       version = "0.5.0";
+       sha256 = "6eacf0967f30ae543f25e3a0982f015c10d7241dba680b5d889bfe5a4ad6d29e";
        libraryHaskellDepends = [
          base csound-expression csound-sampler sharc-timbre transformers
        ];
@@ -59467,8 +59991,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression";
-       version = "4.9.1";
-       sha256 = "c0dcb47cba9902f81bd3567ad79250a6cc2c4b421da3f0ffea40dfcace513d23";
+       version = "5.0.1";
+       sha256 = "ed771c3351358b67b25aecfaebdacdf38c5dffe2dddf306dc93466fd440c3978";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          csound-expression-opcodes csound-expression-typed data-default
@@ -59485,8 +60009,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-dynamic";
-       version = "0.1.5";
-       sha256 = "65a80a536d28e5e8b55e3aed7121df88635636a5b337f7706301a319edbcf80c";
+       version = "0.1.6";
+       sha256 = "846b3c456ba92f538b101a682fe796e91352c680070344f6296db99b740a64a2";
        libraryHaskellDepends = [
          array base Boolean containers data-default data-fix data-fix-cse
          hashable transformers wl-pprint
@@ -59502,8 +60026,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-opcodes";
-       version = "0.0.3";
-       sha256 = "65e954adabbd4e4949f2782063ee97f8df9861f4c277b5130e23ea9b6de6f638";
+       version = "0.0.3.1";
+       sha256 = "c725eab85daca0de9dd689b40013f5af95089ef09539c009c58ebd020b161136";
        libraryHaskellDepends = [
          base csound-expression-dynamic csound-expression-typed transformers
        ];
@@ -59518,8 +60042,8 @@ self: {
      }:
      mkDerivation {
        pname = "csound-expression-typed";
-       version = "0.0.9.1";
-       sha256 = "d578b5bae42df143962d2d1121385a4dea39d751eaebbe11f07e08b615320a12";
+       version = "0.0.9.3";
+       sha256 = "b63d2a0634f789a851b897755db0d0596c48ba4348bd224c60d450e7c8803a06";
        libraryHaskellDepends = [
          base Boolean colour containers csound-expression-dynamic
          data-default deepseq ghc-prim hashable temporal-media transformers
@@ -59534,8 +60058,8 @@ self: {
     ({ mkDerivation, base, csound-expression, transformers }:
      mkDerivation {
        pname = "csound-sampler";
-       version = "0.0.6.4";
-       sha256 = "e3928a9f104b4c81ed9b4724a3f8352b7fbf2b1df60ebec66c45d2ddbac950d6";
+       version = "0.0.6.5";
+       sha256 = "f68d07f9099f4f89395fe60093164a4ac2bbe2bf6aa2aaa3d3eae0fb7b349058";
        libraryHaskellDepends = [ base csound-expression transformers ];
        homepage = "https://github.com/anton-k/csound-sampler";
        description = "A musical sampler based on Csound";
@@ -62277,6 +62801,7 @@ self: {
          aeson auto-update base buffer-builder bytestring lens lifted-base
          monad-control network old-locale text time transformers-base
        ];
+       jailbreak = true;
        homepage = "https://github.com/iand675/datadog";
        description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
        license = stdenv.lib.licenses.mit;
@@ -63118,8 +63643,8 @@ self: {
      }:
      mkDerivation {
        pname = "dead-code-detection";
-       version = "0.5";
-       sha256 = "3bb75cd30e6ed043da2cee902eddd02f75e000dbcc1b6d9edbe0523b0dc2e59c";
+       version = "0.6";
+       sha256 = "477614d43048109bfa4a3116204d70c3ea822524c3caba410cf6aac90b3804ee";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -63727,6 +64252,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "dejafu_0_3_0_0" = callPackage
+    ({ mkDerivation, array, atomic-primops, base, containers, deepseq
+     , dpor, exceptions, monad-control, monad-loops, mtl, semigroups
+     , stm, template-haskell, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "dejafu";
+       version = "0.3.0.0";
+       sha256 = "8df9b8ff0d09c75069c4abd06b879eb3b9ebba4e61d7429c45573cc0a108a7e1";
+       libraryHaskellDepends = [
+         array atomic-primops base containers deepseq dpor exceptions
+         monad-control monad-loops mtl semigroups stm template-haskell
+         transformers transformers-base
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Overloadable primitives for testable, potentially non-deterministic, concurrency";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "deka" = callPackage
     ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }:
      mkDerivation {
@@ -64192,7 +64737,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "derive" = callPackage
+  "derive_2_5_23" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src-exts, pretty, process, syb, template-haskell
      , transformers, uniplate
@@ -64210,9 +64755,10 @@ self: {
        homepage = "https://github.com/ndmitchell/derive#readme";
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "derive_2_5_24" = callPackage
+  "derive" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , haskell-src-exts, pretty, process, syb, template-haskell
      , transformers, uniplate
@@ -64231,7 +64777,6 @@ self: {
        homepage = "https://github.com/ndmitchell/derive#readme";
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-IG" = callPackage
@@ -67009,6 +67554,7 @@ self: {
          aeson base bytestring digestive-functors HUnit mtl scientific tasty
          tasty-hunit text
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
@@ -67674,6 +68220,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "discogs-haskell" = callPackage
+    ({ mkDerivation, aeson, api-builder, base, bytestring, Cabal
+     , data-default-class, free, hspec, http-client, http-client-tls
+     , http-types, network, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "discogs-haskell";
+       version = "0.0.5.0";
+       sha256 = "acd7f94dfea9c72ecff0319507fba7962502d0d315824fdeb26f4d9a4a61ed42";
+       libraryHaskellDepends = [
+         aeson api-builder base bytestring data-default-class free
+         http-client http-client-tls http-types network text time
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson api-builder base bytestring Cabal hspec text time
+         transformers
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/accraze/discogs-haskell";
+       description = "Client for Discogs REST API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discordian-calendar" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -68877,13 +69448,14 @@ self: {
          aeson aeson-pretty attoparsec base bytestring lens patches-vector
          servant servant-blaze servant-docs shakespeare text time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dixi" = callPackage
+  "dixi_0_6_0_5" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
      , base-orphans, blaze-html, blaze-markup, bytestring
      , composition-tree, containers, data-default, directory, either
@@ -68916,12 +69488,14 @@ self: {
          patches-vector servant servant-blaze servant-docs shakespeare text
          time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dixi_0_6_9_0" = callPackage
+  "dixi" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
      , base-orphans, blaze-html, blaze-markup, bytestring
      , composition-tree, containers, data-default, directory, either
@@ -68958,7 +69532,6 @@ self: {
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "djembe" = callPackage
@@ -69475,6 +70048,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "doctest_0_11_0" = callPackage
+    ({ mkDerivation, base, base-compat, deepseq, directory, filepath
+     , ghc, ghc-paths, hspec, HUnit, process, QuickCheck, setenv
+     , silently, stringbuilder, syb, transformers, with-location
+     }:
+     mkDerivation {
+       pname = "doctest";
+       version = "0.11.0";
+       sha256 = "d225c28a44281f32eb189dc11a4f1c9d15528ac0f973cf636567d69143df6477";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base-compat deepseq directory filepath ghc ghc-paths process
+         syb transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base base-compat deepseq directory filepath ghc ghc-paths hspec
+         HUnit process QuickCheck setenv silently stringbuilder syb
+         transformers with-location
+       ];
+       homepage = "https://github.com/sol/doctest#readme";
+       description = "Test interactive Haskell examples";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "doctest-discover" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest
      , filepath
@@ -70095,6 +70695,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
+  "dpor" = callPackage
+    ({ mkDerivation, base, containers, deepseq, random, semigroups }:
+     mkDerivation {
+       pname = "dpor";
+       version = "0.1.0.0";
+       sha256 = "b7ec6ffe767e68e7fd37b2b00eac9fe788c56f2aa00a60a60795b27120903d48";
+       libraryHaskellDepends = [
+         base containers deepseq random semigroups
+       ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "drClickOn" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -71628,6 +72242,24 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "editpipe" = callPackage
+    ({ mkDerivation, base, optparse-applicative, process, temporary
+     , unix
+     }:
+     mkDerivation {
+       pname = "editpipe";
+       version = "0.1.0.0";
+       sha256 = "3a86d0e015ddd64c21516d4095d1cdf32d7b7f0bc7d9b8150995471519d37b0f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base optparse-applicative process temporary unix
+       ];
+       homepage = "http://github.com/puffnfresh/editpipe#readme";
+       description = "Edit stdin using an editor before sending to stdout";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "effect-handlers_0_1_0_6" = callPackage
     ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
      , kan-extensions, mtl, QuickCheck
@@ -72083,6 +72715,7 @@ self: {
          aeson base bytestring ekg-core ekg-json filepath network snap-core
          snap-server text time transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
@@ -72120,6 +72753,7 @@ self: {
          aeson base ekg-core http-client lens network network-uri old-locale
          text time unordered-containers vector wreq
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/ekg-bosun";
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
@@ -72169,6 +72803,7 @@ self: {
        libraryHaskellDepends = [
          aeson base ekg-core text unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
@@ -72389,6 +73024,7 @@ self: {
        testHaskellDepends = [
          aeson base containers hspec QuickCheck text
        ];
+       jailbreak = true;
        homepage = "http://github.com/agrafix/elm-bridge";
        description = "Derive Elm types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
@@ -73192,6 +73828,7 @@ self: {
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
@@ -74944,6 +75581,7 @@ self: {
        testHaskellDepends = [
          aeson base stm tasty tasty-hunit text time
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/YoEight/eventstore";
        description = "EventStore TCP Client";
@@ -75088,7 +75726,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "exact-real" = callPackage
+  "exact-real_0_12_0" = callPackage
     ({ mkDerivation, base, checkers, directory, doctest, filepath
      , groups, integer-gmp, memoize, QuickCheck, random, tasty
      , tasty-hunit, tasty-quickcheck, tasty-th
@@ -75105,6 +75743,26 @@ self: {
        homepage = "http://github.com/expipiplus1/exact-real";
        description = "Exact real arithmetic";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "exact-real" = callPackage
+    ({ mkDerivation, base, checkers, directory, doctest, filepath
+     , groups, integer-gmp, memoize, QuickCheck, random, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-th
+     }:
+     mkDerivation {
+       pname = "exact-real";
+       version = "0.12.1";
+       sha256 = "935f55ec8ae751e67a8e25b19f70e78c613728500e998a2912e1590efe29d7f0";
+       libraryHaskellDepends = [ base integer-gmp memoize random ];
+       testHaskellDepends = [
+         base checkers directory doctest filepath groups QuickCheck random
+         tasty tasty-hunit tasty-quickcheck tasty-th
+       ];
+       homepage = "http://github.com/expipiplus1/exact-real";
+       description = "Exact real arithmetic";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "exception-hierarchy" = callPackage
@@ -76261,6 +76919,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fadno-braids" = callPackage
+    ({ mkDerivation, base, containers, diagrams, diagrams-lib
+     , diagrams-rasterific, lens, transformers-compat
+     }:
+     mkDerivation {
+       pname = "fadno-braids";
+       version = "0.0.2";
+       sha256 = "1d874bef4fa5c693e3b5aac15f239a2d4862b7c342ea96fe24c476d1511644a9";
+       libraryHaskellDepends = [
+         base containers diagrams diagrams-lib diagrams-rasterific lens
+         transformers-compat
+       ];
+       homepage = "http://github.com/slpopejoy/";
+       description = "Braid representations in Haskell";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "fail" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79968,7 +80643,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "flow" = callPackage
+  "flow_1_0_5" = callPackage
     ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
      mkDerivation {
        pname = "flow";
@@ -79979,6 +80654,20 @@ self: {
        homepage = "https://github.com/tfausak/flow#readme";
        description = "Write more understandable Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "flow" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.6";
+       sha256 = "76d69c76339ec401f7915acaa59a54c527e2379546775e163efea988cd2f6702";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       homepage = "https://github.com/tfausak/flow#readme";
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "flow2dot" = callPackage
@@ -80015,6 +80704,7 @@ self: {
          lens lens-action mtl network pipes pipes-aeson pipes-http
          pipes-parse template-haskell text unordered-containers uuid
        ];
+       jailbreak = true;
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -80668,7 +81358,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "foldl" = callPackage
+  "foldl_1_1_6" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
      , primitive, profunctors, text, transformers, vector
      }:
@@ -80682,6 +81372,24 @@ self: {
        ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "foldl" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers
+     , contravariant, mwc-random, primitive, profunctors, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.2.0";
+       sha256 = "05591f82585aa87634b4faa135dc3f2df1ed963995b6b685b2559654ded786f1";
+       libraryHaskellDepends = [
+         base bytestring comonad containers contravariant mwc-random
+         primitive profunctors text transformers vector
+       ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -82166,6 +82874,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fresco-binding" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, messagepack
+     , text, unix
+     }:
+     mkDerivation {
+       pname = "fresco-binding";
+       version = "0.1.1";
+       sha256 = "4188b09395be7e8ba8b5f6c06a6eafed177e3738cf8337eac7c74e4232e74096";
+       libraryHaskellDepends = [
+         base bytestring cereal containers messagepack text unix
+       ];
+       description = "Fresco binding for Haskell";
+       license = "unknown";
+     }) {};
+
   "fresh" = callPackage
     ({ mkDerivation, base, containers, haskell-src-exts, syb }:
      mkDerivation {
@@ -84791,6 +85514,7 @@ self: {
          aeson base bytestring ghc optparse-applicative pretty pretty-show
          process unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/edsko/ghc-dump-tree";
        description = "Dump GHC's parsed, renamed, and type checked ASTs";
        license = stdenv.lib.licenses.bsd3;
@@ -84960,31 +85684,37 @@ self: {
      }) {};
 
   "ghc-imported-from" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
-     , ghc-mod, ghc-paths, ghc-syb-utils, hspec, monad-journal, mtl
-     , optparse-applicative, parsec, process, safe, syb, transformers
+    ({ mkDerivation, base, bytestring, Cabal, containers, directory
+     , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils
+     , haddock-api, hspec, hspec-discover, monad-journal, mtl
+     , optparse-applicative, parsec, process, process-streaming, safe
+     , syb, transformers
      }:
      mkDerivation {
        pname = "ghc-imported-from";
-       version = "0.2.1.1";
-       sha256 = "6ef8612bbcc230323fa844310b504a4174706b99ca769bdcb79168f8f69bc74f";
+       version = "0.3.0.2";
+       sha256 = "7be48f1328fa0faa7a99effd04cdd17ef4058a7f6f716cb09d381055b30e59eb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-mod ghc-paths
-         ghc-syb-utils monad-journal mtl optparse-applicative parsec process
-         safe syb transformers
+         base bytestring Cabal containers directory exceptions filepath ghc
+         ghc-mod ghc-paths ghc-syb-utils haddock-api hspec hspec-discover
+         monad-journal mtl optparse-applicative parsec process
+         process-streaming safe syb transformers
        ];
        executableHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-mod ghc-paths
-         ghc-syb-utils hspec monad-journal mtl optparse-applicative parsec
-         process safe syb transformers
+         base bytestring Cabal containers directory exceptions filepath ghc
+         ghc-mod ghc-paths ghc-syb-utils haddock-api hspec hspec-discover
+         monad-journal mtl optparse-applicative parsec process
+         process-streaming safe syb transformers
        ];
        testHaskellDepends = [
-         base Cabal containers directory filepath ghc ghc-mod ghc-paths
-         ghc-syb-utils hspec monad-journal mtl optparse-applicative parsec
-         process safe syb transformers
+         base bytestring Cabal containers directory exceptions filepath ghc
+         ghc-mod ghc-paths ghc-syb-utils haddock-api hspec hspec-discover
+         monad-journal mtl optparse-applicative parsec process
+         process-streaming safe syb transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
@@ -85960,8 +86690,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "0.2.18.12";
-       sha256 = "00f4542fb4da78adbf0a84f5c81f386e645bc82a811d44b32e031df7721fae66";
+       version = "0.2.18.13";
+       sha256 = "2127e52f83f3cb6c4db30d69a9f19d3dfea987c13816bb9ce6421a35f704b496";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -85979,8 +86709,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "0.1.14.12";
-       sha256 = "8d023a70208100d4d8f634bbe408d2f956f3afe8f73dce3411747d753974b173";
+       version = "0.1.14.13";
+       sha256 = "d7055a146fc315244c21fdccdc0cfbac7a2d2a95cdcc38d8330380b3104600cc";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -85998,8 +86728,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "0.3.18.12";
-       sha256 = "9cde9b8e62af1123c134d576c634846514b5e7f9561d5cc0692a68ad64306190";
+       version = "0.3.18.13";
+       sha256 = "f0872053ddd8bed0e10d794b55b4ccec169747a545c4d403b78dd06e6d203f40";
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-pango haskell-gi-base text transformers
@@ -86017,8 +86747,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "0.2.32.12";
-       sha256 = "0b3b3188250602969b06520b82ba3b1a4df52bc303c6a16ec22495b4f3b356e6";
+       version = "0.2.32.13";
+       sha256 = "862d88afbea9c624d3bc4365b5cfdd26f3d0a664a8b1cf31ff9978624c2d56bd";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -86036,8 +86766,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "0.2.46.12";
-       sha256 = "c200b349cb53e9d52f2592c714a39734f45129c0d94a5a21815630e66e993d1f";
+       version = "0.2.46.13";
+       sha256 = "7a44b89ec398d272f601a4526cd208373f6f8b0435429f0f30f17e6bb8d1ee27";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -86055,14 +86785,13 @@ self: {
      }:
      mkDerivation {
        pname = "gi-girepository";
-       version = "0.1.44.12";
-       sha256 = "c7f53dee512511df7a4c8f00d2e5ae37ae52f49859efd83afef77e9c3f71fd80";
+       version = "0.1.46.13";
+       sha256 = "da0a3b9be77596e8f47436652de9c1ebd9045a13648d93e2d3ade370c9e54666";
        libraryHaskellDepends = [
          base bytestring containers gi-gobject haskell-gi-base text
          transformers
        ];
        libraryPkgconfigDepends = [ gobjectIntrospection ];
-       jailbreak = true;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GIRepository bindings";
        license = stdenv.lib.licenses.lgpl21;
@@ -86075,8 +86804,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "0.2.46.12";
-       sha256 = "5b0bff30b5a1a4cc3f5f55437d357917153e3e6f51f506593543e9e13a103d1b";
+       version = "0.2.46.13";
+       sha256 = "3763379e018fcd86ad2f924a8c9dd40ce84a33cf8f8bcddcdd69433c5c58d1e8";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -86093,8 +86822,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "0.2.46.12";
-       sha256 = "990287820c8e0855249d6e5a41ec0ae3d6beaa6594c44d156316670477b508dc";
+       version = "0.2.46.13";
+       sha256 = "07689ff907eceb5165c65ab3948d40aa3d8b92e1ac5f0179f482d413bd6458d6";
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi-base text
          transformers
@@ -86106,6 +86835,80 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) glib;};
 
+  "gi-gst" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
+     , gstreamer, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gst";
+       version = "0.1.6.13";
+       sha256 = "8b3eb8f93a6f32c9e8db6ebb02d33f78eda651a8428926e2e6c0a22d10ed8ea2";
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ gstreamer ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Gst bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gstreamer;};
+
+  "gi-gstaudio" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
+     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi-base, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gstaudio";
+       version = "0.1.6.13";
+       sha256 = "307b12f1f6ba52a3b95fcfe4433ac9f947abdf45527329c3e8f0350a3084998b";
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GstAudio bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gst_plugins_base;};
+
+  "gi-gstbase" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
+     , gi-gst, gst_plugins_base, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gstbase";
+       version = "0.1.6.13";
+       sha256 = "aab56f2d440b225604842451a94bba851c35bd177b48132da83c7890440e445c";
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject gi-gst
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GstBase bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gst_plugins_base;};
+
+  "gi-gstvideo" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-glib, gi-gobject
+     , gi-gst, gi-gstbase, gst_plugins_base, haskell-gi-base, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-gstvideo";
+       version = "0.1.6.13";
+       sha256 = "e35c5f20f8e09dc8232e5d26ff97948fd0dc42d0de8bf20a5c29c22788f03186";
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject gi-gst gi-gstbase
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ gst_plugins_base ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GstVideo bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gst_plugins_base;};
+
   "gi-gtk" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-atk, gi-cairo
      , gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
@@ -86113,8 +86916,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "0.3.18.12";
-       sha256 = "f1bdacb55a80b26ee36f5f1fea6cfdb9f7505429432797389b0bd1b4c22f40f3";
+       version = "0.3.18.13";
+       sha256 = "fed4dae7e04ee55819be887aac949df1e57c9d4f42804620cd78377b961cdc8a";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
@@ -86133,8 +86936,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "0.2.10.12";
-       sha256 = "e078b90cf16904c7e93e9f6d4274ae2f847597f03137a4ecbb2808a33ec8ad18";
+       version = "0.2.10.13";
+       sha256 = "15518556f06c707710899cf1d3277e6e5a0c14e4310e3b288f31d86e55e256c7";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -86152,8 +86955,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.2.32.12";
-       sha256 = "fff3910ced837a9bafbc39d3965a06c925976c9c7853286d1234a671e90f5a49";
+       version = "0.2.32.13";
+       sha256 = "1b644d4d5ce7cbf93fdeea6f1fd92506f878449a0da28ea8e027b25177412699";
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -86171,8 +86974,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "0.1.38.12";
-       sha256 = "dd542ea85468b8c6188f02e4ec546dc18ad57f498ad0775714edd040cffbe016";
+       version = "0.1.38.13";
+       sha256 = "1398cf18aacad90acbcea526e7c35816385676530abc5896dc5f571a52350766";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -86190,8 +86993,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-poppler";
-       version = "0.0.34.12";
-       sha256 = "b4f6222d6912232b172481c9cdff2bf94a3e8c88753b5a2549e59e18810aa670";
+       version = "0.0.34.13";
+       sha256 = "22104ebf4726ba393968011dfc09c5d4333b26c8b630b2d2258dc5ff835b75a8";
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -86209,8 +87012,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "0.2.52.12";
-       sha256 = "ca5e1f931dba96aa9006cec559316b308f14d427afefbbb221e7a154df755a6d";
+       version = "0.2.52.13";
+       sha256 = "ffe480948998273a6b2454c85ad3bc05e67fd3b614c7932a44b954cdc77fd9de";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -86229,8 +87032,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "0.0.42.12";
-       sha256 = "15e2828c0fefd118e4fd4e3081a99af7b85f7615e5298db86b7f2a01bac2bc88";
+       version = "0.0.42.13";
+       sha256 = "f69c75e5cd250452463b465fa308f08fcc3c2c15be07862c4dcdcbdae8f60039";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
          gi-gtk gi-pango haskell-gi-base text transformers
@@ -86250,8 +87053,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "0.2.4.12";
-       sha256 = "3b0cddc3f28d6acd4583224b72c289d3f7239302f4b8d01d79b8e98f8786fc08";
+       version = "0.2.4.13";
+       sha256 = "a7f0a613c96944a90ac9a178ae58467028daa599805ea44f3440461450a7b77b";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
@@ -86272,8 +87075,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "0.2.10.12";
-       sha256 = "71872b4690056320f20ddc4a468f04b525e29bef06137963ca8406da72e2056a";
+       version = "0.2.10.13";
+       sha256 = "6668a9dd9785cffc783051ea78a8cac92466f1cb1760854b96a90c1ddf537a07";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gio gi-glib
          gi-gobject gi-gtk gi-javascriptcore gi-soup haskell-gi-base text
@@ -86293,8 +87096,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2webextension";
-       version = "0.2.10.12";
-       sha256 = "1ca70e16d94719c5a6fc97e198c50ee5d5bb0edb8e956b4f89387fd793530ff2";
+       version = "0.2.10.13";
+       sha256 = "7e3f0878325c7d67757762f93648ebcd703ed7fc4003fc27f2d2026a50892ec0";
        libraryHaskellDepends = [
          base bytestring containers gi-gobject gi-gtk gi-javascriptcore
          gi-soup haskell-gi-base text transformers
@@ -86325,8 +87128,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.1.7.0";
-       sha256 = "07acb34e888171d765487e559d2e6bfa018ad0e040c06d3fc66b7f5903b32b16";
+       version = "0.1.8.0";
+       sha256 = "b09eeb70e68c50637ade30c385b7ec99a97baf378a76d802e3f550b3b59d3409";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86503,6 +87306,7 @@ self: {
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -86525,6 +87329,7 @@ self: {
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -86555,28 +87360,54 @@ self: {
   "giphy-api" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, either, hspec, lens, microlens, microlens-th, mtl
-     , network-uri, optparse-applicative, servant, servant-client, text
+     , network-uri, servant, servant-client, text
      }:
      mkDerivation {
        pname = "giphy-api";
-       version = "0.1.0.0";
-       sha256 = "b854ab4ffc977bf54a8b7c45b23799a3d81747394c4c4c3d93f32e9242653dd6";
+       version = "0.2.5.0";
+       sha256 = "63630c590dbdf0d2681e4d15121439f0b5762b284c77411148edf7155df8881b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers either microlens microlens-th mtl network-uri
          servant servant-client text
        ];
-       executableHaskellDepends = [
-         base lens network-uri optparse-applicative text
+       executableHaskellDepends = [ base network-uri text ];
+       testHaskellDepends = [
+         aeson base basic-prelude bytestring containers directory hspec lens
+         network-uri text
+       ];
+       homepage = "http://github.com/passy/giphy-api#readme";
+       description = "Giphy HTTP API wrapper and CLI search tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "giphy-api_0_3_0_0" = callPackage
+    ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
+     , directory, hspec, http-api-data, http-client, http-client-tls
+     , lens, microlens, microlens-th, mtl, network-uri, servant
+     , servant-client, text
+     }:
+     mkDerivation {
+       pname = "giphy-api";
+       version = "0.3.0.0";
+       sha256 = "55fbe10b9fd72dba376710e2a6a98e9f53983e0601c6a995006433dd140627a7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers http-api-data http-client http-client-tls
+         microlens microlens-th mtl network-uri servant servant-client text
        ];
+       executableHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [
          aeson base basic-prelude bytestring containers directory hspec lens
          network-uri text
        ];
+       jailbreak = true;
        homepage = "http://github.com/passy/giphy-api#readme";
        description = "Giphy HTTP API wrapper and CLI search tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gist" = callPackage
@@ -87223,6 +88054,7 @@ self: {
          aeson-compat base base-compat file-embed hspec unordered-containers
          vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
@@ -88247,15 +89079,16 @@ self: {
      }) {};
 
   "gll" = callPackage
-    ({ mkDerivation, array, base, containers, pretty, TypeCompose }:
+    ({ mkDerivation, array, base, containers, pretty, regex-applicative
+     , text, TypeCompose
+     }:
      mkDerivation {
        pname = "gll";
-       version = "0.3.0.1";
-       sha256 = "a488ef62504c0259cde1daaeb9b240bb7ce75a2deeadcb763417e7fea8f0937b";
+       version = "0.3.0.7";
+       sha256 = "6d139f9b239944a442473096d055eb8f0bfb52fa9f5497a29d86d00e78e015da";
        libraryHaskellDepends = [
-         array base containers pretty TypeCompose
+         array base containers pretty regex-applicative text TypeCompose
        ];
-       jailbreak = true;
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -88978,6 +89811,7 @@ self: {
          base directory goal-core goal-geometry goal-probability hmatrix mtl
          vector
        ];
+       jailbreak = true;
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -90213,15 +91047,15 @@ self: {
      }) {};
 
   "google-mail-filters" = callPackage
-    ({ mkDerivation, base, containers, google-search, old-locale, text
-     , time, xml-conduit
+    ({ mkDerivation, base, containers, google-search, text, time
+     , xml-conduit
      }:
      mkDerivation {
        pname = "google-mail-filters";
-       version = "0.0.1.1";
-       sha256 = "21588dbfdcd5de6a5cfc307846532dfd541ab4c826e8b70936a3406140a6ba33";
+       version = "0.0.1.2";
+       sha256 = "dafa3e765f9f875ae2601e2854e36500204469d1833b1da0cc08e9dc8c0b4ce5";
        libraryHaskellDepends = [
-         base containers google-search old-locale text time xml-conduit
+         base containers google-search text time xml-conduit
        ];
        testHaskellDepends = [ base google-search text time xml-conduit ];
        homepage = "https://github.com/liyang/google-mail-filters";
@@ -90236,8 +91070,8 @@ self: {
      }:
      mkDerivation {
        pname = "google-oauth2";
-       version = "0.2.0";
-       sha256 = "087c6429fafea6c80eb83488ff874eeda090dd7663820cfc872f2c8ef2e25895";
+       version = "0.2.1";
+       sha256 = "ff16b3d74d6b1d4b81dcabc07f40020d19d39c04956d0067c1fe111e9b8d14ca";
        libraryHaskellDepends = [
          aeson base bytestring HTTP http-conduit
        ];
@@ -90250,12 +91084,12 @@ self: {
      }) {};
 
   "google-search" = callPackage
-    ({ mkDerivation, base, free, nats, old-locale, text, time }:
+    ({ mkDerivation, base, free, nats, text, time }:
      mkDerivation {
        pname = "google-search";
-       version = "0.1.0.1";
-       sha256 = "a7960a8421976aad8f3f06d25fdf2fcd2c936bdebd7cb3319c7538f9cbdd775a";
-       libraryHaskellDepends = [ base free nats old-locale text time ];
+       version = "0.2.0.0";
+       sha256 = "199ed69f577e4c65f64858648aaf366d8c8e6def4742ad2949c650367d14c2ca";
+       libraryHaskellDepends = [ base free nats text time ];
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -91402,6 +92236,7 @@ self: {
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/janmasrovira/am3-project/overview";
        description = "GRASP implementation for the AMMM project";
        license = stdenv.lib.licenses.bsd3;
@@ -93186,8 +94021,8 @@ self: {
      }:
      mkDerivation {
        pname = "hArduino";
-       version = "0.9";
-       sha256 = "4400fa234046582d2ad0ef6bbfe7c97afc725c13949ccafe11766cac1203980f";
+       version = "1.1";
+       sha256 = "eb04ab1d680c9174296c85c9bdd64097f499fd5636fd193c2b18de47cd27fbf6";
        libraryHaskellDepends = [
          base bytestring containers mtl serialport time
        ];
@@ -95057,7 +95892,6 @@ self: {
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
@@ -95178,6 +96012,7 @@ self: {
          http-client http-client-tls http-types tagsoup text time
          transformers
        ];
+       jailbreak = true;
        description = "Mailgun REST api interface for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -95779,6 +96614,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
@@ -96323,7 +97159,6 @@ self: {
          aeson array base binary data-default GLUT OpenGL opengl-dlp-stereo
          split vector-space
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/bwbush/handa-opengl";
        description = "Utility functions for OpenGL and GLUT";
        license = stdenv.lib.licenses.mit;
@@ -98795,8 +99630,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.12";
-       sha256 = "6d9f041a551dec6d557fa51a59fb7cbb01abbda82f5768146a9fd9b1b954b154";
+       version = "0.13";
+       sha256 = "657c8b2b1a466fbbcb21d348bf0c4ab27f0415e73e18b611efc997560a161680";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -98817,8 +99652,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.12";
-       sha256 = "3f6fc64b2c878ebc1856f917fccb18dd6c990bd115019b851c96f121442ec8f7";
+       version = "0.13";
+       sha256 = "57c33125b0fac446007b7cc6ea5d0d853bcdf725cdca8028c879561d977d0363";
        libraryHaskellDepends = [
          base bytestring containers text transformers
        ];
@@ -99059,6 +99894,7 @@ self: {
          base containers filemanip filepath haskell-src-exts mtl pretty-show
          tasty tasty-golden traverse-with-class
        ];
+       jailbreak = true;
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -100194,8 +101030,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "2.2.1";
-       sha256 = "2a3ce64f81105d0ff7d728bce181665edddbec3432eefbebd4bc4b58f2412361";
+       version = "2.2.2";
+       sha256 = "d7f890fc2f981d58843bbbd8a68e7cbbecc303ddb47e45db6d9a062e2bf1e47c";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -100441,6 +101277,7 @@ self: {
          aeson base bytestring containers http-streams io-streams time
          vector
        ];
+       jailbreak = true;
        description = "A haskell wrapper for PokeAPI.co (www.pokeapi.co)";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101924,6 +102761,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haste-gapi" = callPackage
+    ({ mkDerivation, base, data-default, haste-compiler, transformers
+     }:
+     mkDerivation {
+       pname = "haste-gapi";
+       version = "0.1.0.1";
+       sha256 = "007f67b874d4f7328ad5825f0220327d5ad26673f1fb69eff6989434390d7f1f";
+       libraryHaskellDepends = [
+         base data-default haste-compiler transformers
+       ];
+       description = "Google API bindings for the Haste compiler";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haste-markup" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, haste-lib
      }:
@@ -103436,6 +104287,7 @@ self: {
          aeson aeson-pretty base bytestring directory filepath haskeline
          time
        ];
+       jailbreak = true;
        homepage = "https://github.com/aka-bash0r/headergen";
        description = "Creates a header for a haskell source file";
        license = stdenv.lib.licenses.mit;
@@ -103624,18 +104476,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hedis_0_7_8" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, bytestring-lexing
-     , deepseq, HUnit, mtl, network, resource-pool, slave-thread
-     , test-framework, test-framework-hunit, time, vector
+  "hedis_0_8_0" = callPackage
+    ({ mkDerivation, base, bytestring, bytestring-lexing, deepseq
+     , HUnit, mtl, network, resource-pool, scanner, slave-thread
+     , test-framework, test-framework-hunit, text, time, vector
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.7.8";
-       sha256 = "079cdbde01306818003ce306f98fcc5b4b51ef0bdcf8ac5154ebbf58824d43a8";
+       version = "0.8.0";
+       sha256 = "8bde5dcda10b768bdc55a0e0c529f2dacd06f02f88839b986cf75ae426c4811b";
        libraryHaskellDepends = [
-         attoparsec base bytestring bytestring-lexing deepseq mtl network
-         resource-pool time vector
+         base bytestring bytestring-lexing deepseq mtl network resource-pool
+         scanner text time vector
        ];
        testHaskellDepends = [
          base bytestring HUnit mtl slave-thread test-framework
@@ -104012,6 +104864,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
+       jailbreak = true;
        homepage = "https://ajnsit.github.io/helix/";
        description = "Web development micro framework for haskell with typesafe URLs";
        license = stdenv.lib.licenses.mit;
@@ -105291,6 +106144,7 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring directory filepath process template-haskell
        ];
+       jailbreak = true;
        homepage = "https://github.com/LukeHoersten/hgrev";
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.mit;
@@ -105529,6 +106383,8 @@ self: {
        pname = "hierarchy";
        version = "0.3.1";
        sha256 = "4ff6dcb89691dbf20de993964ad32904508f5b6569af1e83eaaaf73a271c9c5f";
+       revision = "1";
+       editedCabalFile = "d5f57b7a5087193876ddccfb410a297bcc4d0babb0b7b8233a4bb591d6d0e5eb";
        libraryHaskellDepends = [
          base exceptions free mmorph monad-control mtl pipes semigroups
          transformers transformers-base transformers-compat
@@ -105537,7 +106393,6 @@ self: {
          base directory doctest filepath hspec hspec-expectations mtl pipes
          semigroups transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/jwiegley/hierarchy";
        description = "Pipes-based library for predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
@@ -107226,7 +108081,6 @@ self: {
          aeson base containers data-default mtl text unordered-containers
          websockets
        ];
-       jailbreak = true;
        homepage = "https://bitbucket.org/bwbush/hleap";
        description = "Web Socket interface to Leap Motion controller";
        license = stdenv.lib.licenses.mit;
@@ -108151,7 +109005,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_31" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -108171,9 +109025,10 @@ self: {
        homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint_1_9_32" = callPackage
+  "hlint" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -108193,7 +109048,6 @@ self: {
        homepage = "https://github.com/ndmitchell/hlint#readme";
        description = "Source code suggestions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlogger" = callPackage
@@ -109037,8 +109891,8 @@ self: {
      }:
      mkDerivation {
        pname = "hnn";
-       version = "0.2.0.0";
-       sha256 = "5cea3b1ab4be9df69328ad31c77fbf3daf0be39c0c92e17e15709ea582ce228e";
+       version = "0.3";
+       sha256 = "d99d8546cd6f34d3ab63d92c36bf46124ce10618d77de04c0d3ac65c12fd1543";
        libraryHaskellDepends = [
          base binary bytestring hmatrix mwc-random random vector
          vector-binary-instances zlib
@@ -109256,6 +110110,7 @@ self: {
          aeson base bytestring containers http-conduit http-types text wai
          warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
@@ -110471,7 +111326,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hopenpgp-tools" = callPackage
+  "hopenpgp-tools_0_17" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
@@ -110499,9 +111354,10 @@ self: {
        homepage = "http://floss.scru.org/hopenpgp-tools";
        description = "hOpenPGP-based command-line tools";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hopenpgp-tools_0_17_1" = callPackage
+  "hopenpgp-tools" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
@@ -110529,7 +111385,6 @@ self: {
        homepage = "http://floss.scru.org/hopenpgp-tools";
        description = "hOpenPGP-based command-line tools";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopenssl" = callPackage
@@ -111061,7 +111916,6 @@ self: {
          filepath Glob hspec interpolate mockery temporary text
          unordered-containers yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
@@ -111236,7 +112090,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hpc-coveralls" = callPackage
+  "hpc-coveralls_1_0_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
      , containers, curl, directory, directory-tree, hpc, HUnit, process
      , pureMD5, regex-posix, retry, safe, split, transformers
@@ -111257,6 +112111,34 @@ self: {
          transformers
        ];
        testHaskellDepends = [ base HUnit ];
+       jailbreak = true;
+       homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
+       description = "Coveralls.io support for Haskell.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hpc-coveralls" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, Cabal, cmdargs
+     , containers, curl, directory, directory-tree, hpc, HUnit, process
+     , pureMD5, regex-posix, retry, safe, split, transformers
+     }:
+     mkDerivation {
+       pname = "hpc-coveralls";
+       version = "1.0.4";
+       sha256 = "32f3f4104044a8ec16efe0a0846baf6eba48672eb9302e6dd9463e94b522fe00";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 retry safe split transformers
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring Cabal cmdargs containers curl directory
+         directory-tree hpc process pureMD5 regex-posix retry safe split
+         transformers
+       ];
+       testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
@@ -113299,8 +114181,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.7.1";
-       sha256 = "adc1df9c7706445daccec30b6a71e5286de338059f696919e368e10b61b6a7c6";
+       version = "0.1.7.3";
+       sha256 = "8da9d590ae0f43905acef2cf62f95b531409364bd7de2adc094092ce221f48b6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113418,7 +114300,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hsebaysdk" = callPackage
+  "hsebaysdk_0_3_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client, http-types
      , text, time, transformers, unordered-containers
      }:
@@ -113433,9 +114315,10 @@ self: {
        homepage = "https://github.com/creichert/hsebaysdk";
        description = "Haskell eBay SDK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hsebaysdk_0_3_1_0" = callPackage
+  "hsebaysdk" = callPackage
     ({ mkDerivation, aeson, base, bytestring, http-client, http-types
      , text, time, transformers, unordered-containers
      }:
@@ -113450,7 +114333,6 @@ self: {
        homepage = "https://github.com/creichert/hsebaysdk";
        description = "Haskell eBay SDK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsemail" = callPackage
@@ -113985,6 +114867,7 @@ self: {
        testHaskellDepends = [
          base conduit hspec QuickCheck split stm transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/bartavelle/hslogstash";
        description = "A library to work with, or as, a logstash server";
        license = stdenv.lib.licenses.bsd3;
@@ -114519,7 +115402,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec" = callPackage
+  "hspec_2_2_2" = callPackage
     ({ mkDerivation, base, directory, hspec-core, hspec-discover
      , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
      , transformers
@@ -114535,6 +115418,29 @@ self: {
        testHaskellDepends = [
          base directory hspec-core hspec-meta stringbuilder
        ];
+       jailbreak = true;
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hspec" = callPackage
+    ({ mkDerivation, base, directory, hspec-core, hspec-discover
+     , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.2.3";
+       sha256 = "511e994ee86d85c610bf20a3eb8309e79816e984dc46f4d0f95bd7dc676f6210";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations HUnit QuickCheck
+         transformers
+       ];
+       testHaskellDepends = [
+         base directory hspec-core hspec-meta stringbuilder
+       ];
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -114807,7 +115713,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-core" = callPackage
+  "hspec-core_2_2_2" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, deepseq
      , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
      , quickcheck-io, random, setenv, silently, tf-random, time
@@ -114829,6 +115735,31 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hspec-core" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, deepseq
+     , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
+     , quickcheck-io, random, setenv, silently, tf-random, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.2.3";
+       sha256 = "01fa6959921ae0ed3de5e3f612451fe788800f9670c7f425a241f5f0dec99652";
+       libraryHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations HUnit
+         QuickCheck quickcheck-io random setenv tf-random time transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal async base deepseq hspec-expectations hspec-meta
+         HUnit process QuickCheck quickcheck-io random setenv silently
+         tf-random time transformers
+       ];
+       homepage = "http://hspec.github.io/";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hspec-discover_2_1_2" = callPackage
@@ -114968,7 +115899,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-discover" = callPackage
+  "hspec-discover_2_2_2" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
@@ -114982,6 +115913,23 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hspec-discover" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.2.3";
+       sha256 = "dc6053d7ad628a133fab01f11ad6d7dfecd23873e2bbe9419d30ee0318b5a92f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [ base directory filepath hspec-meta ];
+       homepage = "http://hspec.github.io/";
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hspec-expectations_0_6_1" = callPackage
@@ -115089,7 +116037,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-expectations-pretty-diff" = callPackage
+  "hspec-expectations-pretty-diff_0_7_2_3" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, Diff, haskell-src-exts
      , hindent, hscolour, hspec, HUnit, text
      }:
@@ -115105,6 +116053,24 @@ self: {
        homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
        description = "Catchy combinators for HUnit";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hspec-expectations-pretty-diff" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, Diff, hscolour, hspec
+     , HUnit, nicify-lib, text
+     }:
+     mkDerivation {
+       pname = "hspec-expectations-pretty-diff";
+       version = "0.7.2.4";
+       sha256 = "1bbfd524330be3cb0b27945556d01f48e3005e042ee475cdf6e441ba21b51b0a";
+       libraryHaskellDepends = [
+         ansi-terminal base Diff hscolour HUnit nicify-lib text
+       ];
+       testHaskellDepends = [ aeson base hspec HUnit text ];
+       homepage = "https://github.com/myfreeweb/hspec-expectations-pretty-diff#readme";
+       description = "Catchy combinators for HUnit";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hspec-experimental" = callPackage
@@ -115399,7 +116365,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-snap" = callPackage
+  "hspec-snap_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , digestive-functors, directory, HandsomeSoup, hspec, hspec-core
      , hxt, lens, mtl, snap, snap-core, text, transformers
@@ -115417,12 +116383,14 @@ self: {
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-snap_0_4_0_1" = callPackage
+  "hspec-snap" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , digestive-functors, directory, HandsomeSoup, hspec, hspec-core
      , hxt, lens, mtl, snap, snap-core, text, transformers
@@ -115440,11 +116408,9 @@ self: {
          HandsomeSoup hspec hspec-core hxt lens mtl snap snap-core text
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/dbp/hspec-snap";
        description = "A library for testing with Hspec and the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-structured-formatter" = callPackage
@@ -119567,6 +120533,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hw-succinct" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, conduit
+     , deepseq, ghc-prim, hspec, lens, mmap, mono-traversable, parsec
+     , QuickCheck, random, resourcet, safe, text, transformers, vector
+     , word8
+     }:
+     mkDerivation {
+       pname = "hw-succinct";
+       version = "0.0.0.1";
+       sha256 = "22faed7c70d7675a2f7ca2d594a5b26de6e43e8f659ca3124feaa36457d60aae";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array attoparsec base bytestring conduit deepseq ghc-prim lens mmap
+         mono-traversable parsec QuickCheck random resourcet safe text
+         vector word8
+       ];
+       executableHaskellDepends = [ attoparsec base conduit resourcet ];
+       testHaskellDepends = [
+         attoparsec base bytestring conduit hspec mmap parsec QuickCheck
+         resourcet transformers vector
+       ];
+       homepage = "http://github.com/haskell-works/hw-succinct#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hwall-auth-iitk" = callPackage
     ({ mkDerivation, base, bytestring, haskeline, http-conduit
      , http-types, mtl, regex-compat, unix
@@ -119904,7 +120897,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hxt-css" = callPackage
+  "hxt-css_0_1_0_1" = callPackage
     ({ mkDerivation, base, hxt, parsec, split }:
      mkDerivation {
        pname = "hxt-css";
@@ -119916,6 +120909,21 @@ self: {
        homepage = "https://github.com/redneb/hxt-css";
        description = "CSS selectors for HXT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hxt-css" = callPackage
+    ({ mkDerivation, base, hxt, parsec, split }:
+     mkDerivation {
+       pname = "hxt-css";
+       version = "0.1.0.2";
+       sha256 = "c3adfe73846b1274249835c142174dfc88167029be350761ec46cd97dc39c672";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base hxt parsec split ];
+       homepage = "https://github.com/redneb/hxt-css";
+       description = "CSS selectors for HXT";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hxt-curl" = callPackage
@@ -120586,6 +121594,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hylogen" = callPackage
+    ({ mkDerivation, base, filepath, hinotify, process, random, text
+     , websockets
+     }:
+     mkDerivation {
+       pname = "hylogen";
+       version = "0.1.0.2";
+       sha256 = "4efda349a9758123ea147198c7c50ae296d5c8a77763fa82abdc02c1a29078c0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [
+         base filepath hinotify process random text websockets
+       ];
+       homepage = "https://github.com/sleexyz/hylogen";
+       description = "a tiny EDSL for live-coding fragment shaders";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hylolib" = callPackage
     ({ mkDerivation, array, base, containers, mtl, pretty, QuickCheck
      , random, uniplate
@@ -121901,8 +122928,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.10.3";
-       sha256 = "63fd7bade38873e3c9933fa883bacdedffc73c5fec5a6e79a981ccf7ae990e85";
+       version = "0.11";
+       sha256 = "e0ea4df41f63f9d4292fe2ae9d3031cbc511a96c80e43240df16374335261a2a";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -122307,6 +123334,7 @@ self: {
          stm strict system-argv0 text transformers unix unordered-containers
          utf8-string uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
@@ -122926,23 +123954,23 @@ self: {
      }) {};
 
   "imperative-edsl" = callPackage
-    ({ mkDerivation, array, base, BoundedChan, constraints, containers
-     , directory, exception-transformers, language-c-quote
+    ({ mkDerivation, array, base, BoundedChan, containers, deepseq
+     , directory, exception-transformers, ghc-prim, language-c-quote
      , mainland-pretty, microlens, microlens-mtl, microlens-th, mtl
      , open-typerep, operational-alacarte, process, srcloc, syntactic
-     , tagged
+     , tasty-quickcheck, tasty-th, time
      }:
      mkDerivation {
        pname = "imperative-edsl";
-       version = "0.4.1";
-       sha256 = "5b78994b208351b4fdd8465146559d7198c6969dfaaa3767ed667d9df29bfad4";
+       version = "0.5";
+       sha256 = "37cd2e3c9e389cff09d5d8971b020866ff44958e17607f02012d54d3430233a8";
        libraryHaskellDepends = [
-         array base BoundedChan constraints containers
-         exception-transformers language-c-quote mainland-pretty microlens
-         microlens-mtl microlens-th mtl open-typerep operational-alacarte
-         srcloc syntactic tagged
+         array base BoundedChan containers deepseq directory
+         exception-transformers ghc-prim language-c-quote mainland-pretty
+         microlens microlens-mtl microlens-th mtl open-typerep
+         operational-alacarte process srcloc syntactic time
        ];
-       testHaskellDepends = [ base directory mainland-pretty process ];
+       testHaskellDepends = [ base syntactic tasty-quickcheck tasty-th ];
        homepage = "https://github.com/emilaxelsson/imperative-edsl";
        description = "Deep embedding of imperative programs with code generation";
        license = stdenv.lib.licenses.bsd3;
@@ -123935,6 +124963,7 @@ self: {
        testHaskellDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "https://github.com/k0001/instant-aeson";
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
@@ -124339,6 +125368,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "interruptible" = callPackage
+    ({ mkDerivation, base, Cabal, either, lifted-base, monad-control
+     , transformers
+     }:
+     mkDerivation {
+       pname = "interruptible";
+       version = "0.1.1.0";
+       sha256 = "68fbb16e5044eca8c5cd1f6a365e60ce11f8f3621dadf47f7be3a6b843c34264";
+       libraryHaskellDepends = [
+         base either lifted-base monad-control transformers
+       ];
+       testHaskellDepends = [ base Cabal either transformers ];
+       homepage = "https://sealgram.com/git/haskell/interruptible/";
+       description = "Monad transformers that can be run and resumed later, conserving their context";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "interspersed" = callPackage
+    ({ mkDerivation, base-prelude, transformers }:
+     mkDerivation {
+       pname = "interspersed";
+       version = "0.1.0.1";
+       sha256 = "f4a6ec7009696f80e7e6b778c15090949bfd90b5a7b6bf1f95738b1370500558";
+       libraryHaskellDepends = [ base-prelude transformers ];
+       homepage = "https://github.com/nikita-volkov/interspersed";
+       description = "An abstraction over interspersing monadic actions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "intervals_0_7_0_1" = callPackage
     ({ mkDerivation, array, base, directory, distributive, doctest
      , filepath, ghc-prim
@@ -125108,6 +126166,7 @@ self: {
        executableHaskellDepends = [
          base filepath mtl parsec text transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -125133,6 +126192,7 @@ self: {
        executableHaskellDepends = [
          base filepath mtl parsec text transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -125306,8 +126366,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-dcc";
-       version = "1.0.0";
-       sha256 = "5cb2dc63d786b76a6d6145a2b6e5599855284c1c3d9609a59f21842905d9cd3f";
+       version = "1.1.0";
+       sha256 = "4f33a7ae01f36638f5b7bcdbbf161f85f413ea68f76f8d5cd2ca3987028e1415";
        libraryHaskellDepends = [
          attoparsec base binary bytestring errors io-streams iproute
          irc-ctcp network path transformers utf8-string
@@ -125465,6 +126525,7 @@ self: {
        executableHaskellDepends = [
          base extra multistate text transformers unordered-containers yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/lspitzner/iridium";
        description = "Automated Testing and Package Uploading";
        license = stdenv.lib.licenses.bsd3;
@@ -125662,6 +126723,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ispositive" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "ispositive";
+       version = "0.2";
+       sha256 = "05803c16d6ff6ce25a4d31a3693dd40724e2b71e1f6dc7f75d32311fac10db56";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       description = "Positive integers test";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "itanium-abi" = callPackage
     ({ mkDerivation, base, boomerang, HUnit, process, test-framework
      , test-framework-hunit, text, transformers, unordered-containers
@@ -126815,31 +127888,29 @@ self: {
 
   "jose" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
-     , bifunctors, byteable, bytestring, crypto-pubkey
-     , crypto-pubkey-types, crypto-random, cryptohash
-     , data-default-class, ghc-prim, hspec, integer-gmp, lens
-     , network-uri, safe, semigroups, template-haskell, text, time
+     , bifunctors, byteable, bytestring, cryptonite, data-default-class
+     , hspec, lens, memory, mtl, network-uri, QuickCheck
+     , quickcheck-instances, safe, semigroups, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, text, time
      , unordered-containers, vector, x509
      }:
      mkDerivation {
        pname = "jose";
-       version = "0.3.41.2";
-       sha256 = "8593c745330b58426075bb2ff8077551777bfcd7ba6ebd2cbfbfa03b7978555d";
+       version = "0.4.0.1";
+       sha256 = "b9870212d6fa4ab2233f4cfff02f161bad069724fab7e3d7034b4b76fa01ee1c";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
-         bytestring crypto-pubkey crypto-pubkey-types crypto-random
-         cryptohash data-default-class ghc-prim integer-gmp lens network-uri
-         safe semigroups template-haskell text time unordered-containers
-         vector x509
+         bytestring cryptonite data-default-class lens memory mtl
+         network-uri QuickCheck quickcheck-instances safe semigroups
+         template-haskell text time unordered-containers vector x509
        ];
        testHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors byteable
-         bytestring crypto-pubkey crypto-pubkey-types crypto-random
-         cryptohash data-default-class hspec lens network-uri safe
-         semigroups template-haskell text time unordered-containers vector
-         x509
+         bytestring cryptonite data-default-class hspec lens memory mtl
+         network-uri QuickCheck quickcheck-instances safe semigroups tasty
+         tasty-hspec tasty-quickcheck template-haskell text time
+         unordered-containers vector x509
        ];
-       jailbreak = true;
        homepage = "https://github.com/frasertweedale/hs-jose";
        description = "Javascript Object Signing and Encryption and JSON Web Token library";
        license = stdenv.lib.licenses.asl20;
@@ -127027,7 +128098,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery" = callPackage
+  "js-jquery_1_12_1" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -127039,9 +128110,10 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery_1_12_2" = callPackage
+  "js-jquery" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -127053,7 +128125,6 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsaddle" = callPackage
@@ -127063,8 +128134,8 @@ self: {
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.3.0.1";
-       sha256 = "91511d9b4df73285f0f060418697028bc5384022da93d6dd9b5573214020aaaf";
+       version = "0.3.0.3";
+       sha256 = "8dcb54c32c281409da90e7d155913bfae5da1a2f4c71b409f70290c5f5ba2c89";
        libraryHaskellDepends = [
          base glib gtk3 lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
@@ -127073,6 +128144,7 @@ self: {
          base doctest glib gtk3 QuickCheck text vector webkitgtk3
          webkitgtk3-javascriptcore
        ];
+       doCheck = false;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -127516,13 +128588,12 @@ self: {
      }:
      mkDerivation {
        pname = "json-encoder";
-       version = "0.1.5";
-       sha256 = "bd71014bca5df3be295bfd851eb39d4c30bc38acaa7fd277f6cb6d8ac60c9bd4";
+       version = "0.1.6";
+       sha256 = "c19d6d4530d654f31637db1ab409295a0b33f5a3bbd16724253c0e9c347d17d9";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras scientific semigroups text
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/json-encoder";
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
@@ -127588,6 +128659,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "json-incremental-decoder" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, bytestring
+     , ghc-prim, hashable, interspersed, matcher, monad-par, QuickCheck
+     , quickcheck-instances, rebase, scientific, success, supplemented
+     , tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck, text
+     , transformers, unordered-containers, unsequential, vector
+     }:
+     mkDerivation {
+       pname = "json-incremental-decoder";
+       version = "0.1.0.3";
+       sha256 = "a8968d55ea5655aa63ebc618753751e609c4733ee9cac121269d7375dc3112fd";
+       libraryHaskellDepends = [
+         attoparsec base base-prelude bytestring ghc-prim hashable
+         interspersed matcher monad-par scientific success supplemented text
+         transformers unordered-containers unsequential vector
+       ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rebase tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/nikita-volkov/json-incremental-decoder";
+       description = "Incremental JSON parser with early termination and a declarative DSL";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-litobj" = callPackage
     ({ mkDerivation, base, hspec, json, QuickCheck }:
      mkDerivation {
@@ -128009,6 +129105,7 @@ self: {
          aeson base generics-sop lens-sop tagged text time transformers
          unordered-containers vector
        ];
+       jailbreak = true;
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -128192,6 +129289,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring conduit conduit-extra hspec text
        ];
+       jailbreak = true;
        description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -128810,6 +129908,7 @@ self: {
          lens-aeson quickcheck-instances scientific stm tasty tasty-hunit
          tasty-quickcheck text time transformers unordered-containers vector
        ];
+       doCheck = false;
        description = "ElasticSearch scribe for the Katip logging framework";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -131252,7 +132351,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-c" = callPackage
+  "language-c_0_4_7" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, filepath, happy, pretty, process, syb
      }:
@@ -131268,9 +132367,10 @@ self: {
        homepage = "http://www.sivity.net/projects/language.c/";
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-c_0_5_0" = callPackage
+  "language-c" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
      , directory, filepath, happy, pretty, process, syb
      }:
@@ -131286,7 +132386,6 @@ self: {
        homepage = "http://visq.github.io/language-c/";
        description = "Analysis and generation of C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-comments" = callPackage
@@ -131600,8 +132699,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-c-quote";
-       version = "0.11.4.1";
-       sha256 = "37c2183ddbf95ee21d298e241266a09f73ac74065e51a0cf2fb28b45aefa9591";
+       version = "0.11.5";
+       sha256 = "b939d141e1825338fdcc87a6155600a6f2cdaeb2e3d2379500a80bae4c783000";
        libraryHaskellDepends = [
          array base bytestring containers exception-mtl
          exception-transformers filepath haskell-src-meta mainland-pretty
@@ -131612,7 +132711,7 @@ self: {
          base bytestring HUnit mainland-pretty srcloc symbol test-framework
          test-framework-hunit
        ];
-       homepage = "http://www.cs.drexel.edu/~mainland/";
+       homepage = "http://www.drexel.edu/~mainland/";
        description = "C/CUDA/OpenCL/Objective-C quasiquoting library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -132086,7 +133185,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-javascript" = callPackage
+  "language-javascript_0_5_14_6" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, HUnit, mtl, QuickCheck, test-framework
      , test-framework-hunit, utf8-light, utf8-string
@@ -132107,17 +133206,41 @@ self: {
        homepage = "http://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "language-javascript" = callPackage
+    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
+     , Cabal, containers, happy, HUnit, mtl, QuickCheck, test-framework
+     , test-framework-hunit, utf8-light, utf8-string
+     }:
+     mkDerivation {
+       pname = "language-javascript";
+       version = "0.5.14.7";
+       sha256 = "9187f36c5645bf7c3bf64cab1b90c4beadcacfecc367c1f33c15601d4d98d93a";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers mtl utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       testHaskellDepends = [
+         array base blaze-builder bytestring Cabal containers HUnit mtl
+         QuickCheck test-framework test-framework-hunit utf8-light
+         utf8-string
+       ];
+       homepage = "http://github.com/erikd/language-javascript";
+       description = "Parser for JavaScript";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "language-javascript_0_6_0_3" = callPackage
+  "language-javascript_0_6_0_4" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, hspec, mtl, QuickCheck, text
      , utf8-light, utf8-string
      }:
      mkDerivation {
        pname = "language-javascript";
-       version = "0.6.0.3";
-       sha256 = "d6010de849a0783705fc34755cb540be98a15979bfeee41f3660b50cddafa49f";
+       version = "0.6.0.4";
+       sha256 = "850e86f58fdbe6a5bf4f559d8c3ae9326d41aa6f01cc2ccac0d33d6903b0e5fb";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers mtl text utf8-string
        ];
@@ -133730,6 +134853,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/lens/lens-aeson/";
        description = "Law-abiding lenses for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -134024,7 +135148,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lentil" = callPackage
+  "lentil_0_1_10_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , regex-tdfa
@@ -134046,9 +135170,10 @@ self: {
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lentil_0_1_11_0" = callPackage
+  "lentil" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , regex-tdfa
@@ -134070,7 +135195,6 @@ self: {
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz" = callPackage
@@ -136281,32 +137405,29 @@ self: {
      }) {};
 
   "liquid-fixpoint" = callPackage
-    ({ mkDerivation, ansi-terminal, array, attoparsec, base, bifunctors
-     , bytestring, cmdargs, containers, deepseq, directory, filemanip
-     , filepath, ghc-prim, hashable, intern, mtl, ocaml, parsec, pretty
-     , process, syb, tasty, tasty-hunit, tasty-rerun, text, text-format
-     , transformers, unordered-containers, z3
+    ({ mkDerivation, ansi-terminal, array, ascii-progress, async
+     , attoparsec, base, bifunctors, binary, boxes, bytestring, cereal
+     , cmdargs, containers, deepseq, directory, dotgen, fgl
+     , fgl-visualize, filemanip, filepath, ghc-prim, hashable, intern
+     , located-base, mtl, ocaml, parallel, parsec, pretty, process, syb
+     , tasty, tasty-hunit, tasty-rerun, text, text-format, transformers
+     , unordered-containers, z3
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.4.0.0";
-       sha256 = "7414b580a3ec8185da5e5148b46cef5d15e347080eb2561fcd228c72e7669816";
-       revision = "2";
-       editedCabalFile = "10397e387d91256dcd35cae36cb27ae302418c3c80da6e65d417657783beaf6b";
+       version = "0.5.0.0";
+       sha256 = "7be110035c09edfa492b369e504349538c76dd94e811d487352c5258e19cf40d";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal array attoparsec base bifunctors bytestring cmdargs
-         containers deepseq directory filemanip filepath ghc-prim hashable
-         intern mtl parsec pretty process syb text text-format transformers
-         unordered-containers
-       ];
-       executableHaskellDepends = [
-         ansi-terminal array base bifunctors bytestring cmdargs containers
-         deepseq directory filepath hashable mtl parsec pretty process syb
-         text text-format unordered-containers
+         ansi-terminal array ascii-progress async attoparsec base bifunctors
+         binary boxes bytestring cereal cmdargs containers deepseq directory
+         dotgen fgl fgl-visualize filemanip filepath ghc-prim hashable
+         intern located-base mtl parallel parsec pretty process syb text
+         text-format transformers unordered-containers
        ];
+       executableHaskellDepends = [ base ];
        executableSystemDepends = [ ocaml ];
        testHaskellDepends = [
          base directory filepath process tasty tasty-hunit tasty-rerun text
@@ -138886,6 +140007,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "luis-client" = callPackage
+    ({ mkDerivation, aeson, base, http-client, lens, text, vector, wreq
+     }:
+     mkDerivation {
+       pname = "luis-client";
+       version = "0.0.2";
+       sha256 = "9b4e06adf6e636f6a5adef256d2b62bf7453a9e1ac8a7d438aebad2ef79f03c5";
+       libraryHaskellDepends = [
+         aeson base http-client lens text vector wreq
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/micxjo/hs-luis-client";
+       description = "An unofficial client for the LUIS NLP service";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "luka" = callPackage
     ({ mkDerivation, air, base, bytestring, libffi, objc }:
      mkDerivation {
@@ -139576,7 +140713,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "machines-io" = callPackage
+  "machines-io_0_2_0_8" = callPackage
     ({ mkDerivation, base, bytestring, chunked-data, machines
      , transformers
      }:
@@ -139590,6 +140727,23 @@ self: {
        homepage = "http://github.com/aloiscochard/machines-io";
        description = "IO utilities for the machines library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "machines-io" = callPackage
+    ({ mkDerivation, base, bytestring, chunked-data, machines
+     , transformers
+     }:
+     mkDerivation {
+       pname = "machines-io";
+       version = "0.2.0.10";
+       sha256 = "11619ece5dda940bef3546bad77fa050a3a97488e0fae8c522a0b702450f1165";
+       libraryHaskellDepends = [
+         base bytestring chunked-data machines transformers
+       ];
+       homepage = "http://github.com/aloiscochard/machines-io";
+       description = "IO utilities for the machines library";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "machines-process_0_2_0_0" = callPackage
@@ -139908,7 +141062,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mainland-pretty" = callPackage
+  "mainland-pretty_0_4_1_2" = callPackage
     ({ mkDerivation, base, containers, srcloc, text }:
      mkDerivation {
        pname = "mainland-pretty";
@@ -139918,6 +141072,19 @@ self: {
        homepage = "http://www.cs.drexel.edu/~mainland/";
        description = "Pretty printing designed for printing source code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mainland-pretty" = callPackage
+    ({ mkDerivation, base, containers, srcloc, text }:
+     mkDerivation {
+       pname = "mainland-pretty";
+       version = "0.4.1.3";
+       sha256 = "d833485def1f7b9320b76fee7f7cbc1462d6358e87af05aea049ddd6cc7b4640";
+       libraryHaskellDepends = [ base containers srcloc text ];
+       homepage = "http://www.cs.drexel.edu/~mainland/";
+       description = "Pretty printing designed for printing source code";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "majordomo" = callPackage
@@ -140034,7 +141201,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "managed" = callPackage
+  "managed_1_0_2" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "managed";
@@ -140043,6 +141210,18 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "managed" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "managed";
+       version = "1.0.3";
+       sha256 = "67e9f15717db54abcd3864d4f20cdcdf709a7f82c087fa77ad0bcb456bb631b2";
+       libraryHaskellDepends = [ base transformers ];
+       description = "A monad for managed values";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "manatee" = callPackage
@@ -140525,6 +141704,7 @@ self: {
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
+       jailbreak = true;
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140549,6 +141729,7 @@ self: {
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
+       jailbreak = true;
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -140574,6 +141755,7 @@ self: {
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
+       jailbreak = true;
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -141246,6 +142428,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "matcher" = callPackage
+    ({ mkDerivation, base-prelude, profunctors, success, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "matcher";
+       version = "0.1.1.2";
+       sha256 = "d08f0499be5779a2d9ed1890fbce76ee369cc3e5a1d82f538bc7ea61456e48a8";
+       libraryHaskellDepends = [
+         base-prelude profunctors success text transformers
+       ];
+       homepage = "https://github.com/sannsyn/matcher";
+       description = "A composable abstraction for checking or converting a context value";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "matchers" = callPackage
     ({ mkDerivation, base, bytestring, pcre, prednote, text }:
      mkDerivation {
@@ -142571,8 +143769,8 @@ self: {
     ({ mkDerivation, base, text, time }:
      mkDerivation {
        pname = "metadata";
-       version = "0.4.2.0";
-       sha256 = "1b33c343e12766fb329345a2f687c4348bb8fc36792adc88e41b0510e6ed456a";
+       version = "0.4.3.0";
+       sha256 = "bfb2da5ff25544a36364e2e1560034ad9bfed0bd76e317567e4a6d3def7bc020";
        libraryHaskellDepends = [ base text time ];
        homepage = "https://github.com/cutsea110/metadata";
        description = "metadata library for semantic web";
@@ -142779,7 +143977,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microformats2-parser" = callPackage
+  "microformats2-parser_1_0_1_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
      , base-compat, blaze-html, blaze-markup, bytestring, containers
      , data-default, either, errors, hspec
@@ -142814,6 +144012,44 @@ self: {
        homepage = "https://github.com/myfreeweb/microformats2-parser";
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microformats2-parser" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, aeson-qq, attoparsec, base
+     , base-compat, blaze-html, blaze-markup, bytestring, containers
+     , data-default, either, errors, hspec
+     , hspec-expectations-pretty-diff, html-conduit, lens-aeson, mtl
+     , network, network-uri, options, pcre-heavy, raw-strings-qq, safe
+     , scotty, streaming-commons, tagsoup, template-haskell, text, time
+     , transformers, unordered-containers, vector, wai-extra, warp
+     , xml-lens, xss-sanitize
+     }:
+     mkDerivation {
+       pname = "microformats2-parser";
+       version = "1.0.1.5";
+       sha256 = "45be8a1f330be4dc435302dae223f80b21e5be388fbca9a8abf8a8489f4938cc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-qq attoparsec base base-compat blaze-markup bytestring
+         containers data-default either errors html-conduit lens-aeson
+         network-uri pcre-heavy safe tagsoup text time transformers
+         unordered-containers vector xml-lens xss-sanitize
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty base base-compat blaze-html blaze-markup
+         data-default network network-uri options scotty streaming-commons
+         text wai-extra warp
+       ];
+       testHaskellDepends = [
+         aeson-qq base base-compat bytestring data-default hspec
+         hspec-expectations-pretty-diff html-conduit mtl network-uri
+         raw-strings-qq template-haskell text time xml-lens
+       ];
+       homepage = "https://github.com/myfreeweb/microformats2-parser";
+       description = "A Microformats 2 parser";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "microformats2-types" = callPackage
@@ -142900,6 +144136,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/fosskers/microlens-aeson/";
        description = "Law-abiding lenses for Aeson, using microlens";
        license = stdenv.lib.licenses.mit;
@@ -146267,6 +147504,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mondo" = callPackage
+    ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
+     , containers, http-client, http-client-tls, mtl, servant
+     , servant-client, text, transformers
+     }:
+     mkDerivation {
+       pname = "mondo";
+       version = "0.2.0.0";
+       sha256 = "15b796b677545c351a44517e3f1c4db92a8d4d1ce22ccbe300e40b042c8393cf";
+       libraryHaskellDepends = [
+         aeson authenticate-oauth base bytestring containers http-client
+         http-client-tls mtl servant servant-client text transformers
+       ];
+       jailbreak = true;
+       description = "Haskell bindings for the Mondo API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mongoDB_2_0_3" = callPackage
     ({ mkDerivation, array, base, binary, bson, bytestring, containers
      , cryptohash, hashtables, lifted-base, monad-control, mtl, network
@@ -147191,7 +148446,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {morfeusz = null;};
 
-  "morte" = callPackage
+  "morte_1_4_2" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, managed, microlens
      , microlens-mtl, optparse-applicative, pipes, system-fileio
@@ -147210,11 +148465,13 @@ self: {
        ];
        libraryToolDepends = [ alex ];
        executableHaskellDepends = [ base optparse-applicative text ];
+       jailbreak = true;
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "morte_1_5_0" = callPackage
+  "morte" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers, deepseq
      , Earley, http-client, http-client-tls, microlens, microlens-mtl
      , mtl, optparse-applicative, pipes, QuickCheck, system-fileio
@@ -147223,8 +148480,8 @@ self: {
      }:
      mkDerivation {
        pname = "morte";
-       version = "1.5.0";
-       sha256 = "34b2bc43e743223b1a917432d1ca2d727166f41e9ee3da1ef0a583f452f08581";
+       version = "1.5.1";
+       sha256 = "51868301687ac66d80597267a36c99622a1a357a88690fadf283974d7936f0f8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -147240,7 +148497,6 @@ self: {
        ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -148035,6 +149291,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/aka-bash0r/multi-cabal";
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
@@ -148407,6 +149664,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "murmur" = callPackage
+    ({ mkDerivation, authenticate-oauth, base, bytestring, conduit
+     , conduit-extra, data-default, directory, http-conduit, lens
+     , optparse-declarative, resourcet, text, transformers
+     , twitter-conduit, twitter-types-lens
+     }:
+     mkDerivation {
+       pname = "murmur";
+       version = "0.0.0.1";
+       sha256 = "3c2f11a2d21346fa92e62fd878dccac1020a897759e39d8f0b2ed93a87fbdfc7";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         authenticate-oauth base bytestring conduit conduit-extra
+         data-default http-conduit lens resourcet text transformers
+         twitter-conduit twitter-types-lens
+       ];
+       executableHaskellDepends = [
+         base directory optparse-declarative transformers twitter-conduit
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/tokiwoousaka/murmur#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "murmur-hash" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -148932,6 +150215,7 @@ self: {
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
        ];
+       jailbreak = true;
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152501,8 +153785,8 @@ self: {
     ({ mkDerivation, base, bytestring, http-conduit, xml }:
      mkDerivation {
        pname = "nist-beacon";
-       version = "0.1.0.1";
-       sha256 = "00aeb52bcda5e0f3cd3519857d96af3697ca45cee87ee3cc7b521a282f4579e4";
+       version = "0.2.0.0";
+       sha256 = "fe967f892da92b9aae0cfd10be38166b0e5f915760f734df15b1bada95d9722c";
        libraryHaskellDepends = [ base bytestring http-conduit xml ];
        homepage = "https://github.com/bstamour/haskell-nist-beacon";
        description = "Haskell interface to the nist random beacon";
@@ -153623,6 +154907,7 @@ self: {
          aeson base bytestring lens lens-aeson pipes pipes-aeson
          pipes-bytestring pipes-http pipes-parse text time wreq
        ];
+       jailbreak = true;
        homepage = "https://github.com/bts/nylas-hs";
        description = "Client for the Nylas API";
        license = stdenv.lib.licenses.bsd3;
@@ -153829,31 +155114,8 @@ self: {
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.4.5";
-       sha256 = "b191dc176c5e17d1749a8cacbe9a6c1e6983a0aa9fe3cfad67002dde2d96094f";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary binary-bits bytestring containers data-binary-ieee754
-         deepseq text
-       ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base binary binary-bits bytestring containers tasty tasty-hspec
-       ];
-       homepage = "https://github.com/tfausak/octane#readme";
-       description = "Parse Rocket League replays";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "octane_0_4_9" = callPackage
-    ({ mkDerivation, base, binary, binary-bits, bytestring, containers
-     , data-binary-ieee754, deepseq, tasty, tasty-hspec, text
-     }:
-     mkDerivation {
-       pname = "octane";
-       version = "0.4.9";
-       sha256 = "5ed8ab1abcc8061cebe6e978d9b3de6419bb7a9b042796f17f28c6da36fbf708";
+       version = "0.4.10";
+       sha256 = "140b33b6a11389da7eae39d4236c884dce9868bc870804bb55e2ab01fa10b859";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -153867,7 +155129,6 @@ self: {
        homepage = "https://github.com/tfausak/octane#readme";
        description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "octohat" = callPackage
@@ -154033,8 +155294,8 @@ self: {
     ({ mkDerivation, base, comonad, directory, filepath, parallel }:
      mkDerivation {
        pname = "oi";
-       version = "0.4.0.1";
-       sha256 = "b010502da66dbefca57630b05cfe5827363ec2a79c2da634027213bb2b760e3d";
+       version = "0.4.0.2";
+       sha256 = "1595ed94430da135de164fd732d807e3ec14fab9086e2ddcd148baad4cefd7a3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -155289,8 +156550,8 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "operational-alacarte";
-       version = "0.1.1";
-       sha256 = "123eca69007a2be60987e323facbaa8639b34073507584b753665619012e24ef";
+       version = "0.2";
+       sha256 = "c42e3e6c4528c0a185a658665fc1033c8f3dd2cd78035f50fc51ba09497da903";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base ];
        homepage = "https://github.com/emilaxelsson/operational-alacarte";
@@ -156155,6 +157416,7 @@ self: {
          aeson base binary HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
+       jailbreak = true;
        homepage = "https://github.com/operational-transformation/ot.hs";
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
@@ -156182,8 +157444,8 @@ self: {
      }:
      mkDerivation {
        pname = "overloaded-records";
-       version = "0.3.0.0";
-       sha256 = "54cc3bfdf30ceaf6f7dbcf481c68a282bf5ac872c79b4665acfc9209b628a3d4";
+       version = "0.4.1.0";
+       sha256 = "f97b08e420bfc9d435a77ec391fec1da305000faaaf0c01ad84217de003b5a76";
        libraryHaskellDepends = [
          base data-default-class template-haskell
        ];
@@ -156598,6 +157860,7 @@ self: {
          time-locale-compat transformers transformers-base
          transformers-compat unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/brendanhay/pagerduty";
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
@@ -157146,7 +158409,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc" = callPackage
+  "pandoc_1_16_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
@@ -157186,12 +158449,15 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       jailbreak = true;
+       doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc_1_17_0_2" = callPackage
+  "pandoc" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
@@ -157206,8 +158472,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc";
-       version = "1.17.0.2";
-       sha256 = "f099eecf102cf215741da7a993d90f0ab135d6f84cb23f9da77050bd1c9a9d53";
+       version = "1.17.0.3";
+       sha256 = "7b14e1bcb78a7e2ad1e585f127be7efd20225c9f9b5131d507b376b62cd77e32";
        configureFlags = [ "-fhttps" ];
        isLibrary = true;
        isExecutable = true;
@@ -157231,10 +158497,10 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc_0_6" = callPackage
@@ -157328,6 +158594,7 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
+       jailbreak = true;
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -157360,6 +158627,7 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
+       jailbreak = true;
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -157392,6 +158660,7 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
+       jailbreak = true;
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -157425,6 +158694,7 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
+       jailbreak = true;
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -157458,6 +158728,7 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
@@ -157523,8 +158794,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.2.0.0";
-       sha256 = "e7039ced02eaaec80f0814d1d242dd06002d76dc3bed784fd18e50ddec77e3bd";
+       version = "0.2.0.1";
+       sha256 = "44bdbc38d8d7a743951a2333fb70b33a6497b2d50ccdb5696736fdc5133aef21";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157756,6 +159027,7 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq-generics ghc-prim syb
        ];
+       jailbreak = true;
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
@@ -157773,6 +159045,7 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim syb
        ];
+       jailbreak = true;
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
@@ -161837,6 +163110,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -161862,6 +163136,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -161941,6 +163216,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -162026,8 +163302,8 @@ self: {
      }:
      mkDerivation {
        pname = "persona";
-       version = "0.1.0.0";
-       sha256 = "d01e98c5fc79ef678c3133c4f0d5c31fc414220194108bd163682e3f470d35f0";
+       version = "0.2.0.0";
+       sha256 = "bc8a1674a5f5ce96eb0e2ad1fcac8836bad47f13135214025c2e63ca2d908d6b";
        libraryHaskellDepends = [
          aeson base data-default-class jose lens network-uri text time
          unordered-containers
@@ -162381,8 +163657,8 @@ self: {
     ({ mkDerivation, base, bytestring, phonenumber }:
      mkDerivation {
        pname = "phone-numbers";
-       version = "0.0.5";
-       sha256 = "54cb314927e399b6a92e1ffbbbd34d52b8fb904f06b1a936b4f708081262f410";
+       version = "0.0.6";
+       sha256 = "4c7027177d003112fc8d6cfb817810fb17bbf9aba3ccd52dbb56e43f6e531b69";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ phonenumber ];
        homepage = "https://github.com/christian-marie/phone-numbers";
@@ -162727,8 +164003,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.9.3";
-       sha256 = "82d5200e79ea18df196a5d8543d32f1dcf7e3ff43579590dcba80e78c712c288";
+       version = "0.9.4";
+       sha256 = "c4dd355b6f9a0a25d9db2c7c286ccce2b598b0fabe54a79dcb9057401e7bf756";
        libraryHaskellDepends = [
          aeson base bytestring containers either http-client http-client-tls
          http-types mtl network old-locale profunctors random text time
@@ -162970,6 +164246,7 @@ self: {
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -162988,6 +164265,7 @@ self: {
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -163489,7 +164767,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-extras" = callPackage
+  "pipes-extras_1_0_2" = callPackage
     ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
      , test-framework-hunit, transformers
      }:
@@ -163501,6 +164779,24 @@ self: {
        testHaskellDepends = [
          base HUnit pipes test-framework test-framework-hunit transformers
        ];
+       jailbreak = true;
+       description = "Extra utilities for pipes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-extras" = callPackage
+    ({ mkDerivation, base, foldl, HUnit, pipes, test-framework
+     , test-framework-hunit, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-extras";
+       version = "1.0.3";
+       sha256 = "b6113e1371ef9a66df82820e3d6addfa9ebd83b327decdae3acc4ba7c4656344";
+       libraryHaskellDepends = [ base foldl pipes transformers ];
+       testHaskellDepends = [
+         base HUnit pipes test-framework test-framework-hunit transformers
+       ];
        description = "Extra utilities for pipes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -163531,6 +164827,8 @@ self: {
        pname = "pipes-files";
        version = "0.1.1";
        sha256 = "a895f464790996ca19195fe605040520660087a36e8c6316fe6647bc23d516aa";
+       revision = "1";
+       editedCabalFile = "5ac3b0b50d526ba7e9018a8870d0df0e981c0365d1a0650bc84959dd1a80da83";
        libraryHaskellDepends = [
          attoparsec base bytestring directory exceptions filepath free
          hierarchy mmorph monad-control mtl pipes pipes-safe posix-paths
@@ -163542,7 +164840,6 @@ self: {
          hspec-expectations mtl pipes pipes-safe process semigroups text
          transformers unix
        ];
-       jailbreak = true;
        homepage = "https://github.com/jwiegley/pipes-files";
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -163563,7 +164860,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-group" = callPackage
+  "pipes-group_1_0_3" = callPackage
     ({ mkDerivation, base, doctest, free, lens-family-core, pipes
      , pipes-parse, transformers
      }:
@@ -163577,6 +164874,23 @@ self: {
        testHaskellDepends = [ base doctest lens-family-core ];
        description = "Group streams into substreams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-group" = callPackage
+    ({ mkDerivation, base, doctest, free, lens-family-core, pipes
+     , pipes-parse, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-group";
+       version = "1.0.4";
+       sha256 = "08dc7e174f964f9708e5843a1443eb9c2b46e02fa931f4b2a00dcd8d3d7b3fae";
+       libraryHaskellDepends = [
+         base free pipes pipes-parse transformers
+       ];
+       testHaskellDepends = [ base doctest lens-family-core ];
+       description = "Group streams into substreams";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-http" = callPackage
@@ -165774,7 +167088,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "post-mess-age" = callPackage
+  "post-mess-age_0_2_0_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "post-mess-age";
@@ -165783,6 +167097,18 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Send messages to a handle concurrently without getting them mixed";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "post-mess-age" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "post-mess-age";
+       version = "0.2.1.0";
+       sha256 = "d0f69ab1cb130a9f8bb54cd1f3b0167184af885fedba89ff32fec8e54e95d64c";
+       libraryHaskellDepends = [ base ];
+       description = "Send messages to a handle concurrently without getting them mixed";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "postcodes" = callPackage
@@ -166470,43 +167796,43 @@ self: {
      , case-insensitive, cassava, containers, contravariant, errors
      , hasql, hasql-pool, hasql-transaction, heredoc, hspec, hspec-wai
      , hspec-wai-json, HTTP, http-types, interpolatedstring-perl6, jwt
-     , monad-control, mtl, optparse-applicative, parsec, process
-     , Ranged-sets, regex-tdfa, safe, scientific, string-conversions
-     , text, time, transformers, transformers-base, unix
-     , unordered-containers, vector, wai, wai-cors, wai-extra
+     , lens, lens-aeson, monad-control, mtl, optparse-applicative
+     , parsec, process, Ranged-sets, regex-tdfa, safe, scientific
+     , string-conversions, text, time, transformers, transformers-base
+     , unix, unordered-containers, vector, wai, wai-cors, wai-extra
      , wai-middleware-static, warp
      }:
      mkDerivation {
        pname = "postgrest";
-       version = "0.3.1.0";
-       sha256 = "592a36bac9f78bfea68acd78f50c188223890fc6509c5f239dc05debd4c94191";
+       version = "0.3.1.1";
+       sha256 = "77e1446c9e123a2977faca95631410f3aee14d62751f766fe4e008b24c55cea4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base bytestring case-insensitive cassava containers
          contravariant errors hasql hasql-pool hasql-transaction HTTP
-         http-types interpolatedstring-perl6 jwt mtl optparse-applicative
-         parsec Ranged-sets regex-tdfa safe scientific string-conversions
-         text time unordered-containers vector wai wai-cors wai-extra
-         wai-middleware-static
+         http-types interpolatedstring-perl6 jwt lens lens-aeson mtl
+         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
+         string-conversions text time unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static warp
        ];
        executableHaskellDepends = [
          aeson base bytestring case-insensitive cassava containers
          contravariant errors hasql hasql-pool hasql-transaction HTTP
-         http-types interpolatedstring-perl6 jwt mtl optparse-applicative
-         parsec Ranged-sets regex-tdfa safe scientific string-conversions
-         text time unix unordered-containers vector wai wai-cors wai-extra
-         wai-middleware-static warp
+         http-types interpolatedstring-perl6 jwt lens lens-aeson mtl
+         optparse-applicative parsec Ranged-sets regex-tdfa safe scientific
+         string-conversions text time unix unordered-containers vector wai
+         wai-cors wai-extra wai-middleware-static warp
        ];
        testHaskellDepends = [
          aeson async base base64-string bytestring case-insensitive cassava
          containers contravariant errors hasql hasql-pool hasql-transaction
          heredoc hspec hspec-wai hspec-wai-json HTTP http-types
-         interpolatedstring-perl6 jwt monad-control mtl optparse-applicative
-         parsec process Ranged-sets regex-tdfa safe scientific
-         string-conversions text time transformers transformers-base unix
-         unordered-containers vector wai wai-cors wai-extra
-         wai-middleware-static warp
+         interpolatedstring-perl6 jwt lens lens-aeson monad-control mtl
+         optparse-applicative parsec process Ranged-sets regex-tdfa safe
+         scientific string-conversions text time transformers
+         transformers-base unix unordered-containers vector wai wai-cors
+         wai-extra wai-middleware-static warp
        ];
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
@@ -167175,8 +168501,8 @@ self: {
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "present";
-       version = "4.0.0";
-       sha256 = "358a493eaa38e27a46f9cf51e762225c004dd6069a9c96645524b409104e203f";
+       version = "4.0.2";
+       sha256 = "1eae62ac47ca11a2f13d8bebf7930b0f11e1197a5f0d8628bafce279e000600f";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/chrisdone/present";
        description = "Make presentations for data types";
@@ -167583,6 +168909,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "printf-safe" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "printf-safe";
+       version = "0.1.0.0";
+       sha256 = "492389dad3146efa2ab91fb2518c47c5dc6f94c993098e8e346cc5a77e3b5ed3";
+       libraryHaskellDepends = [ base ];
+       description = "Type safe interface for Text.Printf";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "printxosd" = callPackage
     ({ mkDerivation, base, xosd }:
      mkDerivation {
@@ -168534,14 +169871,14 @@ self: {
 
   "prometheus" = callPackage
     ({ mkDerivation, atomic-primops, base, bytestring, containers
-     , http-types, mtl, text, transformers, wai, warp
+     , http-types, text, transformers, wai, warp
      }:
      mkDerivation {
        pname = "prometheus";
-       version = "0.2.0";
-       sha256 = "6e053e03c30eb591d3e5467058c8fede0b56c961a2d8511cbd4fcf1b99b09c8a";
+       version = "0.3.1";
+       sha256 = "8883bfea72ed5fc34b0ea8820b4a0aa3ad8b033fd646bc08e24d686b96148a49";
        libraryHaskellDepends = [
-         atomic-primops base bytestring containers http-types mtl text
+         atomic-primops base bytestring containers http-types text
          transformers wai warp
        ];
        homepage = "http://github.com/LukeHoersten/prometheus#readme";
@@ -168640,26 +169977,26 @@ self: {
      }) {};
 
   "propellor" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl
-     , network, process, stm, text, time, transformers, unix
-     , unix-compat
+    ({ mkDerivation, ansi-terminal, async, base, bytestring
+     , concurrent-output, containers, directory, exceptions, filepath
+     , hslogger, IfElse, MissingH, mtl, network, process, stm, text
+     , time, transformers, unix, unix-compat
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.16.0";
-       sha256 = "d3779d3b521f7cbf015352a974f66d85f67a652a7a5d6c4b8819a6e9d77d5ee7";
+       version = "3.0.0";
+       sha256 = "bd53ac4d53bb9136c249238ad4b633fb00dd300017afd9093096db12b8cd011f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal async base bytestring containers directory exceptions
-         filepath hslogger IfElse MissingH mtl network process stm text time
-         transformers unix unix-compat
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions filepath hslogger IfElse MissingH mtl network
+         process stm text time transformers unix unix-compat
        ];
        executableHaskellDepends = [
-         ansi-terminal async base bytestring containers directory exceptions
-         filepath hslogger IfElse MissingH mtl network process stm text time
-         transformers unix unix-compat
+         ansi-terminal async base bytestring concurrent-output containers
+         directory exceptions filepath hslogger IfElse MissingH mtl network
+         process stm text time transformers unix unix-compat
        ];
        homepage = "https://propellor.branchable.com/";
        description = "property-based host configuration management in haskell";
@@ -169994,6 +171331,7 @@ self: {
          optparse-applicative parsec process time transformers
          transformers-compat
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
@@ -170034,6 +171372,7 @@ self: {
          HUnit mtl optparse-applicative parsec process time transformers
          transformers-compat
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
@@ -170054,8 +171393,8 @@ self: {
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.8.2.0";
-       sha256 = "eafb971c6730500e89f8a46e5d7afddb6093240c47ffa0e3523bff2052b9e4b4";
+       version = "0.8.3.0";
+       sha256 = "3081eb17a8e3a61ef2b41c993b74f29d9e1091a2a7739f3c9c31530b1baebda7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -170086,17 +171425,16 @@ self: {
      }) {};
 
   "purescript-bridge" = callPackage
-    ({ mkDerivation, base, Cabal, containers, directory, filepath
-     , generic-deriving, HUnit, text
+    ({ mkDerivation, base, containers, directory, filepath
+     , generic-deriving, text
      }:
      mkDerivation {
        pname = "purescript-bridge";
-       version = "0.3.0.6";
-       sha256 = "40f8d1499b86c0bca75f581b163c7eab9a29db144e18049064958f364503f886";
+       version = "0.3.1.1";
+       sha256 = "8e68c9481f2c4c1d9783ffdae66bb234f6d2e068a116787dd106adcd051027cd";
        libraryHaskellDepends = [
          base containers directory filepath generic-deriving text
        ];
-       testHaskellDepends = [ base Cabal HUnit ];
        description = "Generate PureScript data types from Haskell data types";
        license = stdenv.lib.licenses.agpl3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -170229,6 +171567,7 @@ self: {
          aeson base bytestring hspec http-client http-types mtl QuickCheck
          text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
@@ -171302,6 +172641,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quiver-binary" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hspec, QuickCheck
+     , quiver, quiver-bytestring, transformers
+     }:
+     mkDerivation {
+       pname = "quiver-binary";
+       version = "0.1.0.0";
+       sha256 = "9a13cd31c0bfe865f4660a00bb86f0b90fa88f1929d91bbd4160c509dd65a04d";
+       libraryHaskellDepends = [
+         base binary bytestring quiver quiver-bytestring
+       ];
+       testHaskellDepends = [ base hspec QuickCheck quiver transformers ];
+       description = "Binary serialisation support for Quivers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quiver-bytestring" = callPackage
     ({ mkDerivation, base, bytestring, quiver }:
      mkDerivation {
@@ -171470,8 +172825,8 @@ self: {
      }:
      mkDerivation {
        pname = "radium";
-       version = "0.5";
-       sha256 = "17572031f5bf539dc9c73670f06375c797262e233a553ca0c008d12c8fef0aee";
+       version = "0.6";
+       sha256 = "cc03e011817649426e527cb35f31b2daf7c2f8ab90c281d308dadddfd80f8500";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          base Cabal containers hspec parsec QuickCheck
@@ -172338,8 +173693,8 @@ self: {
      }:
      mkDerivation {
        pname = "rasterific-svg";
-       version = "0.3";
-       sha256 = "909c07e2db1ecd9f67aaa4728386d7b17932e53f3c68c7afef45726142eb9425";
+       version = "0.3.1.1";
+       sha256 = "4383c837b6157d91007bdea63464ff15ab901672aa69ee4d53bd8164a11296b2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -172660,8 +174015,8 @@ self: {
      }:
      mkDerivation {
        pname = "react-flux";
-       version = "1.0.5";
-       sha256 = "8860c51eae2ffa297ac9cd44758d4c99351cc59823945446708c9aa9d86e689e";
+       version = "1.0.7";
+       sha256 = "3d93ffdffbf966f208001be1e7f0b3b0275f7b2f5634bfee566cb2add589be33";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -172692,6 +174047,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "react-tutorial-haskell-server" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, scotty
+     , time, transformers
+     }:
+     mkDerivation {
+       pname = "react-tutorial-haskell-server";
+       version = "1.0.0";
+       sha256 = "0d7c7addb46114ea0e3c19b6f85b630143036f2bcd7a6fdc911335d1789cd6ba";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson aeson-pretty base bytestring scotty time transformers
+       ];
+       description = "react-tutorial web server";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "reaction-logic" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck }:
      mkDerivation {
@@ -173405,7 +174777,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "redis-io" = callPackage
+  "redis-io_0_5_2" = callPackage
     ({ mkDerivation, async, attoparsec, auto-update, base, bytestring
      , bytestring-conversion, containers, exceptions, iproute
      , monad-control, mtl, network, operational, redis-resp
@@ -173426,10 +174798,39 @@ self: {
          async base bytestring bytestring-conversion containers redis-resp
          tasty tasty-hunit tinylog transformers
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/twittner/redis-io/";
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "redis-io" = callPackage
+    ({ mkDerivation, async, attoparsec, auto-update, base, bytestring
+     , bytestring-conversion, containers, exceptions, iproute
+     , monad-control, mtl, network, operational, redis-resp
+     , resource-pool, semigroups, stm, tasty, tasty-hunit, time, tinylog
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "redis-io";
+       version = "0.7.0";
+       sha256 = "1f68cb184f29fd4dc27b7034ee6dd2c53a952fbda1084ba25afd83952518e619";
+       libraryHaskellDepends = [
+         attoparsec auto-update base bytestring containers exceptions
+         iproute monad-control mtl network operational redis-resp
+         resource-pool semigroups stm time tinylog transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         async base bytestring bytestring-conversion containers redis-resp
+         tasty tasty-hunit tinylog transformers
+       ];
+       doCheck = false;
+       homepage = "https://gitlab.com/twittner/redis-io/";
+       description = "Yet another redis client";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -173443,7 +174844,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "redis-resp" = callPackage
+  "redis-resp_0_3_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring
      , bytestring-conversion, containers, dlist, double-conversion
      , operational, semigroups, split, transformers
@@ -173461,9 +174862,10 @@ self: {
        homepage = "https://github.com/twittner/redis-resp/";
        description = "REdis Serialization Protocol (RESP) implementation";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "redis-resp_0_4_0" = callPackage
+  "redis-resp" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring
      , bytestring-conversion, containers, dlist, double-conversion
      , operational, semigroups, split, transformers
@@ -173479,7 +174881,6 @@ self: {
        homepage = "https://gitlab.com/twittner/redis-resp/";
        description = "REdis Serialization Protocol (RESP) implementation";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis-simple" = callPackage
@@ -174006,6 +175407,7 @@ self: {
          ref-tf reflex safe semigroups text these time transformers unix
          webkitgtk3 webkitgtk3-javascriptcore
        ];
+       jailbreak = true;
        description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -174025,6 +175427,7 @@ self: {
          http-types lens mtl random readable reflex reflex-dom safe
          string-conv text time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
@@ -174622,6 +176025,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) tre;};
 
+  "regex-type" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "regex-type";
+       version = "0.1.0.0";
+       sha256 = "fb19df907226e8b8c04110bb983c40028ebf9cecd33a46cf333e5de785a6fc0a";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/kcsongor/regex-type";
+       description = "Type-level regular expressions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regex-xmlschema" = callPackage
     ({ mkDerivation, base, haskell98, parsec }:
      mkDerivation {
@@ -174934,14 +176349,13 @@ self: {
      }:
      mkDerivation {
        pname = "rei";
-       version = "0.3.4.0";
-       sha256 = "df67570d3078ecb170a470e23c8f267b19c339b64dfe621e8f54f33b4df725ca";
+       version = "0.3.5.1";
+       sha256 = "f173c5574f8d81b9451add7f84c032f17283747e1b531cecaca4f9e470b5ad8f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          attoparsec base bytestring containers directory regex-tdfa split
        ];
-       jailbreak = true;
        homepage = "https://github.com/kerkomen/rei";
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
@@ -175078,13 +176492,16 @@ self: {
      }) {};
 
   "relational-record" = callPackage
-    ({ mkDerivation, base, relational-query, relational-query-HDBC }:
+    ({ mkDerivation, base, persistable-types-HDBC-pg, relational-query
+     , relational-query-HDBC
+     }:
      mkDerivation {
        pname = "relational-record";
-       version = "0.1.2.0";
-       sha256 = "c6425751ec48c90e660f54c09330dce38b332a9c4b8eef0f9ec6c647961f8b01";
+       version = "0.1.3.0";
+       sha256 = "7f7cf98fce68186028315dade3bf33e8b4bfb57ad1af9c8397e1bd8a1b88e282";
        libraryHaskellDepends = [
-         base relational-query relational-query-HDBC
+         base persistable-types-HDBC-pg relational-query
+         relational-query-HDBC
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Meta package of Relational Record";
@@ -176803,6 +178220,7 @@ self: {
          base bytestring HUnit mtl test-framework test-framework-hunit
          transformers transformers-compat unordered-containers
        ];
+       jailbreak = true;
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -177719,6 +179137,7 @@ self: {
        ];
        executableHaskellDepends = [ attoparsec base text ];
        testHaskellDepends = [ base doctest ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.1";
@@ -178096,6 +179515,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reverse-arguments" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "reverse-arguments";
+       version = "0.1.0.0";
+       sha256 = "f1d7866c908a728d22d9f61daf97a0ee16dd0e49866e1c60f6e0e34c8af92d39";
+       libraryHaskellDepends = [ base ];
+       description = "Reverse the arguments of arbitrary functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reverse-geocoding" = callPackage
     ({ mkDerivation, aeson, base, iso3166-country-codes, lens
      , lens-aeson, text, wreq
@@ -178109,6 +179539,7 @@ self: {
        libraryHaskellDepends = [
          aeson base iso3166-country-codes lens lens-aeson text wreq
        ];
+       jailbreak = true;
        homepage = "https://github.com/jcristovao/reverse-geocoding";
        description = "Simple reverse geocoding using OpenStreeMap";
        license = stdenv.lib.licenses.bsd3;
@@ -179394,17 +180825,21 @@ self: {
 
   "rtcm" = callPackage
     ({ mkDerivation, array, base, basic-prelude, binary, binary-bits
-     , bytestring, lens, tasty, tasty-hunit, template-haskell, word24
+     , bytestring, lens, random, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, word24
      }:
      mkDerivation {
        pname = "rtcm";
-       version = "0.1.3";
-       sha256 = "8ee905a36562c93b0bd60d799eb85d59795c775497411120324fa104b13943ab";
+       version = "0.1.4";
+       sha256 = "9f4343199636b5509c71c982f8d8be39eaadcdac0fb63b86323590c66ef43a03";
        libraryHaskellDepends = [
          array base basic-prelude binary binary-bits bytestring lens
          template-haskell word24
        ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+       testHaskellDepends = [
+         base basic-prelude binary binary-bits bytestring lens random tasty
+         tasty-hunit tasty-quickcheck word24
+       ];
        homepage = "http://github.com/swift-nav/librtcm";
        description = "RTCM Library";
        license = stdenv.lib.licenses.bsd3;
@@ -179732,10 +181167,9 @@ self: {
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
        pname = "safe-access";
-       version = "0.2.1.1";
-       sha256 = "e803e2cd23dcee8b222b1fdece54a3c7cf3c67c7b0d26855bd1a601a9197325e";
+       version = "0.2.1.2";
+       sha256 = "39d0dbfdcd0393aeba886b48df3b098442fac37a0328d26ff1ed191cac9c4345";
        libraryHaskellDepends = [ base mtl transformers ];
-       jailbreak = true;
        homepage = "http://hub.darcs.net/thoferon/safe-access";
        description = "A simple environment to control access to data";
        license = stdenv.lib.licenses.bsd3;
@@ -180925,6 +182359,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scanner" = callPackage
+    ({ mkDerivation, base, bytestring, hspec }:
+     mkDerivation {
+       pname = "scanner";
+       version = "0.2";
+       sha256 = "3a020d68a0372a5211c72e55eeb299738ea608d17184bc68f74d31ebe667a5e9";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/Yuras/scanner";
+       description = "Fast non-backtracking incremental combinator parsing for bytestrings";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "scanner-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, hspec, scanner }:
+     mkDerivation {
+       pname = "scanner-attoparsec";
+       version = "0.1";
+       sha256 = "b1affc0bd313d13e990e7048b8c681bacd3d71b0a56af7fbbe8bc3832b556cf4";
+       libraryHaskellDepends = [ attoparsec base scanner ];
+       testHaskellDepends = [ attoparsec base bytestring hspec scanner ];
+       homepage = "https://github.com/Yuras/scanner-attoparsec";
+       description = "Inject attoparsec parser with backtracking into non-backtracking scanner";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "scat" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, mtl
      , optparse-applicative, scrypt, vector
@@ -181652,6 +183112,7 @@ self: {
          async base data-default-class directory hspec hspec-wai http-types
          lifted-base network text wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/scotty-web/scotty";
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
@@ -181798,6 +183259,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "scotty-resource" = callPackage
+    ({ mkDerivation, base, containers, http-types, scotty, text
+     , transformers, wai
+     }:
+     mkDerivation {
+       pname = "scotty-resource";
+       version = "0.1.0.0";
+       sha256 = "54bb90b0cd35b4a22bbed7af58e1e9297344551badc0ebcc56620ce1bad1c5d5";
+       libraryHaskellDepends = [
+         base containers http-types scotty text transformers wai
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/taphu/scotty-resource";
+       description = "A Better way of modeling web resources";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "scotty-rest" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, convertible
      , data-default-class, hspec, hspec-wai, http-date, http-media
@@ -181900,6 +183378,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scrape-changes" = callPackage
+    ({ mkDerivation, async, attoparsec, base, bytestring, cron
+     , directory, email-validate, filepath, hashable, hslogger
+     , http-client, HUnit, lens, mime-mail, network-uri, QuickCheck
+     , semigroups, shakespeare, strict, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     , validation, wreq
+     }:
+     mkDerivation {
+       pname = "scrape-changes";
+       version = "0.1.0.0";
+       sha256 = "6665a3bdabd7225de542b1310494f7cc46199cd24d4795788618f7f39241478a";
+       libraryHaskellDepends = [
+         async attoparsec base bytestring cron directory email-validate
+         filepath hashable hslogger http-client lens mime-mail network-uri
+         semigroups strict text validation wreq
+       ];
+       testHaskellDepends = [
+         base cron email-validate hashable HUnit lens QuickCheck semigroups
+         shakespeare test-framework test-framework-hunit
+         test-framework-quickcheck2 text validation
+       ];
+       jailbreak = true;
+       description = "Scrape websites for changes";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "scrobble" = callPackage
     ({ mkDerivation, base, containers, curl, MissingH, network
      , network-uri, old-locale, pureMD5, time, url
@@ -182129,8 +183634,8 @@ self: {
      }:
      mkDerivation {
        pname = "sdl2-compositor";
-       version = "1.2.0.3";
-       sha256 = "c2f4ee694f2ee8444b6e2b5af51f0a86f415745181e7734e83dcc129cd655d12";
+       version = "1.2.0.4";
+       sha256 = "f4e80bef41513080e60c76d1f6d15fe6afe479acb92e9775cbe9e12d7ee15135";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183058,8 +184563,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "semiring-simple";
-       version = "1.0.0.0";
-       sha256 = "9567b7fa7d83f7f7d6abf9b0274c7e01e44a6357e2441d5b62e4a5720e57bf86";
+       version = "1.0.0.1";
+       sha256 = "c08d1b533f4559fc55119f563a6cf3d74ad7c6f5916c2efe00b50d2a5169fd28";
        libraryHaskellDepends = [ base ];
        description = "A module for dealing with semirings";
        license = stdenv.lib.licenses.bsd3;
@@ -183135,6 +184640,8 @@ self: {
        pname = "sensei";
        version = "0.1.0";
        sha256 = "fd3c1edc901298173782bf8c65744dd4fb25cdfb9d1012e28a6e5038dc7114ab";
+       revision = "1";
+       editedCabalFile = "315d7e05f9dbe6eb51d2a1f569f884e66c3edaf12d4973230e47d6c799de2854";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -183536,6 +185043,7 @@ self: {
        sha256 = "077c210212ff92611b3d8a3578f3ea1f78586c094057ccc5d1dcc3170fcf4dfc";
        libraryHaskellDepends = [ base bytestring unix ];
        testHaskellDepends = [ base bytestring HUnit ];
+       doCheck = false;
        homepage = "https://github.com/jputcu/serialport";
        description = "Cross platform serial port library";
        license = stdenv.lib.licenses.bsd3;
@@ -183774,7 +185282,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant_0_5" = callPackage
+  "servant_0_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , bytestring-conversion, case-insensitive, directory, doctest
      , filemanip, filepath, hspec, http-api-data, http-media, http-types
@@ -183783,10 +185291,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant";
-       version = "0.5";
-       sha256 = "b83ca161d81c0c62150d000266549fc6b5a09f7ecc15f597b7f0ae8bcc77caf5";
-       revision = "1";
-       editedCabalFile = "5b79e90dc1c884c4e90041e5a68a0bdf435a2ff93345f5cb38ee01d3f3c5c732";
+       version = "0.6";
+       sha256 = "6b5d37abfaaab871bc6fe5164d7b55839713883f162b2c551eb078b4dbaa63a4";
        libraryHaskellDepends = [
          aeson attoparsec base base-compat bytestring bytestring-conversion
          case-insensitive http-api-data http-media http-types network-uri
@@ -183893,12 +185399,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-blaze_0_5" = callPackage
+  "servant-blaze_0_6" = callPackage
     ({ mkDerivation, base, blaze-html, http-media, servant }:
      mkDerivation {
        pname = "servant-blaze";
-       version = "0.5";
-       sha256 = "d450aa2bbec21208fa9ae7e3e7f799b5447573cf8ba26874a79b109963e0f46c";
+       version = "0.6";
+       sha256 = "b69560b0169f175e53d73b9cdeb48e8e747ece65d787f9e1a36dbd83a8dd344f";
        libraryHaskellDepends = [ base blaze-html http-media servant ];
        jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
@@ -183911,8 +185417,8 @@ self: {
     ({ mkDerivation, base, cassava, http-media, servant, vector }:
      mkDerivation {
        pname = "servant-cassava";
-       version = "0.5";
-       sha256 = "57156e80c8bf4f04fe9fdcc61f3f117f14e9b0966915f3ad1e997ee02b654699";
+       version = "0.6";
+       sha256 = "ca050cda16220cc8483d0a41e952d6858cad01670b3e6576620a30a824c886d9";
        libraryHaskellDepends = [ base cassava http-media servant vector ];
        jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
@@ -184107,7 +185613,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-client_0_5" = callPackage
+  "servant-client_0_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bytestring, deepseq, exceptions, hspec, http-api-data
      , http-client, http-client-tls, http-media, http-types, HUnit
@@ -184117,8 +185623,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-client";
-       version = "0.5";
-       sha256 = "2433324deff198fcc61c5027538f1df27ccf9be341baec3a55940d3c4325f696";
+       version = "0.6";
+       sha256 = "f55942b5b7f70bdfda88ccc8d3680d86098217cbb0d8befd6946be9597d7c0cd";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bytestring exceptions
          http-api-data http-client http-client-tls http-media http-types
@@ -184333,7 +185839,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-docs_0_5" = callPackage
+  "servant-docs_0_6" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring
      , bytestring-conversion, case-insensitive, control-monad-omega
      , hashable, hspec, http-media, http-types, lens, servant
@@ -184341,8 +185847,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-docs";
-       version = "0.5";
-       sha256 = "2faa28f837628dcdc13f34ab178abf190fcf04d506eb45be64a47d11246d748a";
+       version = "0.6";
+       sha256 = "9cdcc0f09a8f0c7a36b35df816dbdf2b856ff6b7105e3bc53d655be46da32bde";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184439,8 +185945,8 @@ self: {
     ({ mkDerivation, base, hspec, http-types, lens, servant, text }:
      mkDerivation {
        pname = "servant-foreign";
-       version = "0.5";
-       sha256 = "108d9858820226260b5237b3bb213e29e2c5f3b0d2091e7ef846862997a497a1";
+       version = "0.6";
+       sha256 = "418a2d4ae181af1f41c0a6fbf04c089f4e37d5b5775996dc25d0a8920b5c4d3a";
        libraryHaskellDepends = [ base http-types lens servant text ];
        testHaskellDepends = [ base hspec ];
        jailbreak = true;
@@ -184666,8 +186172,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-js";
-       version = "0.5";
-       sha256 = "78a573a81d40ad659ed0c3097a138236ace7e6d7e7d889af64195165ebae0c18";
+       version = "0.6";
+       sha256 = "8da1c25454b65f0900878677e134dafbc5a55201bdf0c2f9728eff766a75835e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184692,8 +186198,8 @@ self: {
     ({ mkDerivation, base, http-media, lucid, servant }:
      mkDerivation {
        pname = "servant-lucid";
-       version = "0.5";
-       sha256 = "87cfb2fb1b4a00e649b0c418ee56a461fe1528f804be442d0e2fc7872dc298f2";
+       version = "0.6";
+       sha256 = "5488cc1577b1fbc431432b5b1c16a513bfc7e80a849ad0edd2789823895d4883";
        libraryHaskellDepends = [ base http-media lucid servant ];
        jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
@@ -184723,15 +186229,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-mock_0_5" = callPackage
+  "servant-mock_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, bytestring-conversion
      , hspec, hspec-wai, http-types, QuickCheck, servant, servant-server
      , transformers, wai, warp
      }:
      mkDerivation {
        pname = "servant-mock";
-       version = "0.5";
-       sha256 = "c508bf76282b6e4656d710b64d761c065ad06787388a3bcac2204d99f3f328ca";
+       version = "0.6";
+       sha256 = "98082a96e654e9050f54d998d9af68b3ae61f20ad9224a9c5ba95e60ec964227";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185081,6 +186587,7 @@ self: {
          network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -185118,7 +186625,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-server_0_5" = callPackage
+  "servant-server_0_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat
      , base64-bytestring, bytestring, bytestring-conversion, containers
      , directory, doctest, exceptions, filemanip, filepath, hspec
@@ -185130,8 +186637,8 @@ self: {
      }:
      mkDerivation {
        pname = "servant-server";
-       version = "0.5";
-       sha256 = "c7a7485edca3029e75b49470f1dfc00d40616352c8a89c3917c6ee76d4326d46";
+       version = "0.6";
+       sha256 = "1cdeb903f8d21b45a45c0008c04e18bcbebfb8e0706a20045daf300f65cf911d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185142,9 +186649,9 @@ self: {
        ];
        executableHaskellDepends = [ aeson base servant text wai warp ];
        testHaskellDepends = [
-         aeson base bytestring bytestring-conversion directory doctest
-         exceptions filemanip filepath hspec hspec-wai http-types mtl
-         network parsec QuickCheck safe servant should-not-typecheck
+         aeson base base-compat bytestring bytestring-conversion directory
+         doctest exceptions filemanip filepath hspec hspec-wai http-types
+         mtl network parsec QuickCheck safe servant should-not-typecheck
          string-conversions temporary text transformers transformers-compat
          wai wai-extra warp
        ];
@@ -186695,7 +188202,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "shakespeare" = callPackage
+  "shakespeare_2_0_7" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
      , process, scientific, template-haskell, text, time, transformers
@@ -186720,6 +188227,33 @@ self: {
        homepage = "http://www.yesodweb.com/book/shakespearean-templates";
        description = "A toolkit for making compile-time interpolated templates";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
+  "shakespeare" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec
+     , process, scientific, template-haskell, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "shakespeare";
+       version = "2.0.8";
+       sha256 = "d312757348fe94db091acc32eb4e87c07882c5375d884d082c50dced0a08bae3";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim parsec process scientific template-haskell text
+         time transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring containers directory
+         exceptions ghc-prim hspec HUnit parsec process template-haskell
+         text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/shakespearean-templates";
+       description = "A toolkit for making compile-time interpolated templates";
+       license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -189048,6 +190582,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "skulk" = callPackage
+    ({ mkDerivation, base, hspec }:
+     mkDerivation {
+       pname = "skulk";
+       version = "0.1.0.0";
+       sha256 = "c7442785a7211084928a4bc6ab2612bab96676d6e979b0d3debc6c8c13f8dd44";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/geekyfox/skulk";
+       description = "Eclectic collection of utility functions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "skype4hs" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, lifted-base
      , monad-control, mtl, stm, text, time, transformers-base, word8
@@ -189668,6 +191215,7 @@ self: {
        version = "0.4.1";
        sha256 = "f29484ce5a765334798b1107be91b4ef555f1e67a81bd3eb1049a91eec9e6e2e";
        libraryHaskellDepends = [ aeson base linear text vector ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
@@ -189681,6 +191229,7 @@ self: {
        version = "0.4.2.1";
        sha256 = "9b3dcba5880be61a4ebbd895ec711a9d137e6a246f55ee1575170c4e413ebade";
        libraryHaskellDepends = [ aeson base linear text vector ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
@@ -190419,6 +191968,7 @@ self: {
          base bytestring containers QuickCheck snap-core tasty tasty-hunit
          tasty-quickcheck
        ];
+       jailbreak = true;
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -190895,6 +192445,7 @@ self: {
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
@@ -191882,17 +193433,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "socket" = callPackage
+  "socket_0_5_3_0" = callPackage
     ({ mkDerivation, async, base, bytestring }:
      mkDerivation {
        pname = "socket";
        version = "0.5.3.0";
        sha256 = "f9d6ff67fa2a725c4184d38ecd635c955fd90ef83bcac02f16dbbb1179f26066";
+       revision = "1";
+       editedCabalFile = "2dd7a1d3117389e1efa5fa6149925c6bd912116a68c2b2ee1370911b106440fc";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [ async base bytestring ];
        homepage = "https://github.com/lpeterse/haskell-socket";
        description = "A portable and extensible sockets library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "socket" = callPackage
+    ({ mkDerivation, async, base, bytestring }:
+     mkDerivation {
+       pname = "socket";
+       version = "0.6.0.0";
+       sha256 = "c7b7458ab32259444f4426e2b52057ab925b098090c8458e19b091a027e235e6";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ async base bytestring ];
+       homepage = "https://github.com/lpeterse/haskell-socket";
+       description = "An extensible socket library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "socket-activation" = callPackage
@@ -191919,6 +193486,7 @@ self: {
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191936,6 +193504,7 @@ self: {
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -191966,6 +193535,7 @@ self: {
        libraryHaskellDepends = [ base bytestring socket ];
        librarySystemDepends = [ sctp ];
        testHaskellDepends = [ base bytestring socket ];
+       jailbreak = true;
        homepage = "https://github.com/lpeterse/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
@@ -192079,6 +193649,29 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "solr" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder
+     , case-insensitive, contravariant, http-client
+     , http-response-decoder, json-encoder, json-incremental-decoder
+     , matcher, profunctors, semigroups, text, transformers, uri-encode
+     }:
+     mkDerivation {
+       pname = "solr";
+       version = "0.2.1.5";
+       sha256 = "cafd40f77391330d1dd3746aec44e0be92a24fa9d860924d1016eda4cadb63a1";
+       libraryHaskellDepends = [
+         base-prelude bytestring bytestring-tree-builder case-insensitive
+         contravariant http-client http-response-decoder json-encoder
+         json-incremental-decoder matcher profunctors semigroups text
+         transformers uri-encode
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/sannsyn/solr";
+       description = "A minimal Solr client library";
+       license = stdenv.lib.licenses.mit;
+       broken = true;
+     }) {http-response-decoder = null;};
+
   "sonic-visualiser" = callPackage
     ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl
      , pretty, utf8-string, xml
@@ -194371,6 +195964,7 @@ self: {
          QuickCheck resourcet retry temporary text transformers unix-compat
        ];
        doHaddock = false;
+       jailbreak = true;
        doCheck = false;
        enableSharedExecutables = false;
        postInstall = ''
@@ -194385,7 +195979,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "stack" = callPackage
+  "stack_1_0_2" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-tagged, blaze-builder, byteable, bytestring, Cabal
@@ -194452,10 +196046,11 @@ self: {
        homepage = "http://haskellstack.org";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "stack_1_0_4_2" = callPackage
+  "stack" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, binary-tagged
      , blaze-builder, byteable, bytestring, Cabal, conduit
@@ -194508,7 +196103,7 @@ self: {
          http-conduit monad-logger path path-io process QuickCheck resourcet
          retry temporary text transformers unix-compat
        ];
-       jailbreak = true;
+       doCheck = false;
        enableSharedExecutables = false;
        postInstall = ''
          exe=$out/bin/stack
@@ -194518,7 +196113,6 @@ self: {
        homepage = "http://haskellstack.org";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
@@ -196664,7 +198258,6 @@ self: {
        sha256 = "17f488ef8e74a9dc4ad7e8a649abc386d010379a9b63f88d52638a078fbc16f6";
        libraryHaskellDepends = [ base clock transformers ];
        testHaskellDepends = [ base clock hspec ];
-       jailbreak = true;
        homepage = "https://github.com/debug-ito/stopwatch";
        description = "A simple stopwatch utility";
        license = stdenv.lib.licenses.bsd3;
@@ -197830,6 +199423,7 @@ self: {
          aeson base bytestring mtl text time transformers
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
@@ -197890,6 +199484,7 @@ self: {
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
        ];
+       jailbreak = true;
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
@@ -198369,6 +199964,7 @@ self: {
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
@@ -198399,13 +199995,14 @@ self: {
          haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
          yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stylish-haskell" = callPackage
+  "stylish-haskell_0_5_15_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
      , test-framework, test-framework-hunit, yaml
@@ -198432,6 +200029,36 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "stylish-haskell" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+     , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
+     , test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.5.16.0";
+       sha256 = "dc0c7f3fe9e61838374f60eb91b6f72e6b27d1a8a4971938aed7d48d313812bb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts mtl strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       homepage = "https://github.com/jaspervdj/stylish-haskell";
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "stylized" = callPackage
@@ -198901,6 +200528,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "supplemented" = callPackage
+    ({ mkDerivation, base-prelude, QuickCheck, quickcheck-instances
+     , rebase, tasty, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "supplemented";
+       version = "0.5.0.2";
+       sha256 = "cd0f5577da83984a63a950950bb820abcbcbbbd678e89b24a075ae1b29eae4ec";
+       libraryHaskellDepends = [ base-prelude transformers ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rebase tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/nikita-volkov/supplemented";
+       description = "Early termination for monads";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "suspend" = callPackage
     ({ mkDerivation, base, lifted-base, transformers-base }:
      mkDerivation {
@@ -199009,10 +200656,8 @@ self: {
      }:
      mkDerivation {
        pname = "svg-tree";
-       version = "0.4.2";
-       sha256 = "9564f33d166af1fa3d611fb0b04fe9cd729dfe23b81a124ab14514085f737b64";
-       revision = "1";
-       editedCabalFile = "44363aad52e09d592887852965cf0a07fb8f865d72c2832129dc9b39db9353b3";
+       version = "0.5.1";
+       sha256 = "47da3513c1f124bfef0a59ed84dbf0165c24282f5fda8a8efe03d88fb7dd15f0";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
@@ -199507,14 +201152,15 @@ self: {
      }) {};
 
   "sym" = callPackage
-    ({ mkDerivation, array, base, containers, hashable, QuickCheck }:
+    ({ mkDerivation, array, base, containers, hashable, QuickCheck
+     , vector
+     }:
      mkDerivation {
        pname = "sym";
-       version = "0.11.1";
-       sha256 = "7255fa58097cd3d3a057760a8e922b5fabdd8ad2e4070a1d383b1c2f68f01c90";
-       libraryHaskellDepends = [
-         array base containers hashable QuickCheck
-       ];
+       version = "0.12.0";
+       sha256 = "ebf057577a494ad1da24f2076f2ec553b0ad58dd60449922e4dbb2c82a4b0ad8";
+       libraryHaskellDepends = [ array base containers hashable vector ];
+       testHaskellDepends = [ base hashable QuickCheck ];
        homepage = "https://github.com/akc/sym";
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
@@ -200588,6 +202234,55 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "t3-client" = callPackage
+    ({ mkDerivation, base, t3-game, t3-server }:
+     mkDerivation {
+       pname = "t3-client";
+       version = "0.2.0.0";
+       sha256 = "534df19484e22696110cf90cb370d566a19b729dfd96e11ee9c7f3cf3c9bd1de";
+       libraryHaskellDepends = [ base t3-game t3-server ];
+       homepage = "http://github.com/jxv/t3#readme";
+       description = "tic-tac-toe Rexports for client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "t3-game" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec, mtl
+     , safe, text, vector
+     }:
+     mkDerivation {
+       pname = "t3-game";
+       version = "2.0.0";
+       sha256 = "ca57dbb1004d6ca6e00cb1847d91e5ee7c9e8271a4ac271945369444eded68b0";
+       libraryHaskellDepends = [
+         aeson base bytestring containers mtl safe text vector
+       ];
+       testHaskellDepends = [ aeson base hspec ];
+       homepage = "http://github.com/jxv/t3#readme";
+       description = "tic-tac-toe core";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "t3-server" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, case-insensitive
+     , containers, dejafu, either, hashable, hashmap, MonadRandom, mtl
+     , random, safe, stm, t3-game, text, time, transformers
+     , unordered-containers, vector, wai
+     }:
+     mkDerivation {
+       pname = "t3-server";
+       version = "0.2.0";
+       sha256 = "9c1301904e58f18dee1af954ce19215b08231ad894779f88d368b226af5f7788";
+       libraryHaskellDepends = [
+         aeson async base bytestring case-insensitive containers dejafu
+         either hashable hashmap MonadRandom mtl random safe stm t3-game
+         text time transformers unordered-containers vector wai
+       ];
+       jailbreak = true;
+       description = "tic-tac-toe server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ta" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, mtl, Takusen
      , template-haskell, time
@@ -201879,7 +203574,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tasty-hspec" = callPackage
+  "tasty-hspec_1_1_2" = callPackage
     ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
      , tagged, tasty, tasty-quickcheck, tasty-smallcheck
      }:
@@ -201894,6 +203589,24 @@ self: {
        homepage = "https://github.com/mitchellwrosen/tasty-hspec";
        description = "Hspec support for the Tasty test framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty-hspec" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, random
+     , tagged, tasty, tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-hspec";
+       version = "1.1.3";
+       sha256 = "3c597d948cad9c61355a56811533abbad130eb6e4068fd930ab5514c759bfe31";
+       libraryHaskellDepends = [
+         base hspec hspec-core QuickCheck random tagged tasty
+         tasty-quickcheck tasty-smallcheck
+       ];
+       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
+       description = "Hspec support for the Tasty test framework";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tasty-html" = callPackage
@@ -202495,6 +204208,7 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring data-default http-conduit url utf8-string
        ];
+       jailbreak = true;
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203958,7 +205672,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "texmath" = callPackage
+  "texmath_0_8_5" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, network-uri, pandoc-types, parsec, process, split, syb
      , temporary, text, utf8-string, xml
@@ -203980,6 +205694,56 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "texmath_0_8_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.8.5.1";
+       sha256 = "dc31828d57eefdc9292e8008c6b22543b2b75d3d51fefdeb29ba318fc8e2aac8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "texmath" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , mtl, network-uri, pandoc-types, parsec, process, split, syb
+     , temporary, text, utf8-string, xml
+     }:
+     mkDerivation {
+       pname = "texmath";
+       version = "0.8.6.1";
+       sha256 = "2c3b7650c43c6b43275abffb1769a1fd5948d1a77938b43702c54c2ac1a18de1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers mtl pandoc-types parsec syb xml
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         base bytestring directory filepath process split temporary text
+         utf8-string xml
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
      }) {};
 
   "texrunner" = callPackage
@@ -204610,7 +206374,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "text-show_3_0_1" = callPackage
+  "text-show_3_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, generic-deriving
      , ghc-prim, hspec, integer-gmp, nats, QuickCheck
@@ -204619,8 +206383,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.0.1";
-       sha256 = "39806d6d3098f099ede1a740f6fb55e84144a34442496145063b408262b899ca";
+       version = "3.2";
+       sha256 = "038073600759d0dafa7f2f2de31dae0df83254850a218e4db9def2e870a9887b";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers generic-deriving ghc-prim integer-gmp nats semigroups
@@ -204651,8 +206415,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "3.0.1";
-       sha256 = "9164fd2e5ad017923d9e5cdafae6d895a4014009e982346e1a13b3ef8ecb1045";
+       version = "3.2";
+       sha256 = "8362074b2e81eca771356f43dc01e5647a9518291987da76d75810346d0f1e1e";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
@@ -205150,7 +206914,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "th-expand-syns" = callPackage
+  "th-expand-syns_0_3_0_6" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "th-expand-syns";
@@ -205160,6 +206924,19 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "th-expand-syns" = callPackage
+    ({ mkDerivation, base, containers, syb, template-haskell }:
+     mkDerivation {
+       pname = "th-expand-syns";
+       version = "0.4.0.0";
+       sha256 = "59349f1999d72e4d0158de95c1ede5e8787d4c8c743ec4e6a2dbf37f823a5eea";
+       libraryHaskellDepends = [ base containers syb template-haskell ];
+       testHaskellDepends = [ base template-haskell ];
+       description = "Expands type synonyms in Template Haskell ASTs";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "th-extras" = callPackage
@@ -206154,6 +207931,28 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
+  "tidal_0_7_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, colour, containers
+     , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec
+     , PortMidi, process, serialport, text, time, transformers
+     , websockets
+     }:
+     mkDerivation {
+       pname = "tidal";
+       version = "0.7.1";
+       sha256 = "fce7b8e13e4fd0b520a68fa9733cf1a29dfaf6cbdeb37be463b3e6d4ed700314";
+       libraryHaskellDepends = [
+         base binary bytestring colour containers hashable hmt hosc
+         mersenne-random-pure64 mtl parsec PortMidi process serialport text
+         time transformers websockets
+       ];
+       jailbreak = true;
+       homepage = "http://tidal.lurk.org/";
+       description = "Pattern language for improvised music";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tidal-midi" = callPackage
     ({ mkDerivation, base, bytestring, containers, hashable, hosc
      , PortMidi, process, tidal, time
@@ -206686,14 +208485,27 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "timelike";
-       version = "0.2.0";
-       sha256 = "fd78d2242d1d515556f4dc4e2dccc995e2e05a10d543f04975b886d43bcd2b8c";
+       version = "0.2.1";
+       sha256 = "31eed7705c7cab996edcf5471fac216127c2289cb6e1948ff841a9a6886d0043";
        libraryHaskellDepends = [ base transformers ];
        homepage = "http://hub.darcs.net/esz/timelike";
        description = "Type classes for types representing time";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "timelike-clock" = callPackage
+    ({ mkDerivation, base, clock, timelike, transformers }:
+     mkDerivation {
+       pname = "timelike-clock";
+       version = "0.1.0";
+       sha256 = "dee2b3f214f36c6fb3f6d4d0a73954485404b7535965cb59ab1715fb17b9dcae";
+       libraryHaskellDepends = [ base clock timelike transformers ];
+       jailbreak = true;
+       homepage = "http://hub.darcs.net/esz/timelike-clock";
+       description = "Timelike interface for the clock library";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "timelike-time" = callPackage
     ({ mkDerivation, base, time, timelike, transformers }:
      mkDerivation {
@@ -207117,7 +208929,6 @@ self: {
          aeson attoparsec base errors text unordered-containers vector
        ];
        testHaskellDepends = [ aeson base hspec vector ];
-       jailbreak = true;
        homepage = "https://github.com/llhotka/tiphys";
        description = "Navigating and editing JSON data";
        license = stdenv.lib.licenses.bsd3;
@@ -208841,7 +210652,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "true-name" = callPackage
+  "true-name_0_1_0_0" = callPackage
     ({ mkDerivation, base, containers, template-haskell, time }:
      mkDerivation {
        pname = "true-name";
@@ -208852,6 +210663,20 @@ self: {
        homepage = "https://github.com/liyang/true-name";
        description = "Template Haskell hack to violate another module's abstractions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "true-name" = callPackage
+    ({ mkDerivation, base, containers, template-haskell, time }:
+     mkDerivation {
+       pname = "true-name";
+       version = "0.1.0.1";
+       sha256 = "8da46bdcf7f28e6c328bd962bd283658c548d514beab8b190d4f8e2de1799184";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base containers template-haskell time ];
+       homepage = "https://github.com/liyang/true-name";
+       description = "Template Haskell hack to violate module abstractions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "truelevel" = callPackage
@@ -209108,6 +210933,7 @@ self: {
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
@@ -209131,6 +210957,7 @@ self: {
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
@@ -209154,6 +210981,7 @@ self: {
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
@@ -209177,6 +211005,7 @@ self: {
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
@@ -209523,7 +211352,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "turtle" = callPackage
+  "turtle_1_2_5" = callPackage
     ({ mkDerivation, async, base, clock, directory, doctest, foldl
      , hostname, managed, optional-args, optparse-applicative, process
      , stm, system-fileio, system-filepath, temporary, text, time
@@ -209539,6 +211368,28 @@ self: {
          temporary text time transformers unix
        ];
        testHaskellDepends = [ base doctest ];
+       jailbreak = true;
+       description = "Shell programming, Haskell-style";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "turtle" = callPackage
+    ({ mkDerivation, async, base, clock, directory, doctest, foldl
+     , hostname, managed, optional-args, optparse-applicative, process
+     , stm, system-fileio, system-filepath, temporary, text, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "turtle";
+       version = "1.2.6";
+       sha256 = "947f73268b9b72585c0b6e8943a1eeb51d5683dec01cbdbe9a3f94ef00b91d92";
+       libraryHaskellDepends = [
+         async base clock directory foldl hostname managed optional-args
+         optparse-applicative process stm system-fileio system-filepath
+         temporary text time transformers unix
+       ];
+       testHaskellDepends = [ base doctest ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -209983,7 +211834,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "twitter-conduit" = callPackage
+  "twitter-conduit_0_1_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
      , bytestring, case-insensitive, conduit, conduit-extra, containers
      , data-default, doctest, hlint, hspec, http-client, http-conduit
@@ -210015,6 +211866,41 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "twitter-conduit" = callPackage
+    ({ mkDerivation, aeson, attoparsec, authenticate-oauth, base
+     , bytestring, case-insensitive, conduit, conduit-extra, containers
+     , data-default, doctest, hlint, hspec, http-client, http-conduit
+     , http-types, lens, lens-aeson, monad-control, network-uri
+     , resourcet, template-haskell, text, time, transformers
+     , transformers-base, twitter-types, twitter-types-lens
+     }:
+     mkDerivation {
+       pname = "twitter-conduit";
+       version = "0.1.3";
+       sha256 = "f880730c8e0219db7e24b58db4c21a1a12bd2f5a0cb28fbc72372cec4f139a02";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring conduit
+         conduit-extra containers data-default http-client http-conduit
+         http-types lens lens-aeson resourcet template-haskell text time
+         transformers twitter-types twitter-types-lens
+       ];
+       executableHaskellDepends = [ network-uri ];
+       testHaskellDepends = [
+         aeson attoparsec authenticate-oauth base bytestring
+         case-insensitive conduit conduit-extra containers data-default
+         doctest hlint hspec http-client http-conduit http-types lens
+         lens-aeson monad-control network-uri resourcet template-haskell
+         text time transformers transformers-base twitter-types
+         twitter-types-lens
+       ];
+       homepage = "https://github.com/himura/twitter-conduit";
+       description = "Twitter API package with conduit interface and Streaming API support";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -210075,6 +211961,7 @@ self: {
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
@@ -210096,6 +211983,7 @@ self: {
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
+       jailbreak = true;
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
@@ -210148,7 +212036,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "twitter-types" = callPackage
+  "twitter-types_0_7_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, derive
      , directory, filepath, HUnit, old-locale, QuickCheck
      , template-haskell, test-framework, test-framework-hunit
@@ -210171,6 +212059,32 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "twitter-types" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, derive
+     , directory, filepath, HUnit, old-locale, QuickCheck
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th-prime, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "twitter-types";
+       version = "0.7.2.1";
+       sha256 = "1b3f39c47749af7dac2fed9905c2c6db976577dfbacc68cc3d531da8f367675b";
+       libraryHaskellDepends = [
+         aeson base text time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring derive directory filepath HUnit
+         old-locale QuickCheck template-haskell test-framework
+         test-framework-hunit test-framework-quickcheck2
+         test-framework-th-prime text time unordered-containers
+       ];
+       homepage = "https://github.com/himura/twitter-types";
+       description = "Twitter JSON parser and types";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "twitter-types-lens_0_7_1" = callPackage
@@ -211936,20 +213850,19 @@ self: {
 
   "uniform-io" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, Cabal
-     , data-default-class, iproute, network, openssl, transformers
-     , word8
+     , data-default-class, interruptible, iproute, monad-control
+     , network, openssl, transformers, transformers-base, word8
      }:
      mkDerivation {
        pname = "uniform-io";
-       version = "1.1.1.0";
-       sha256 = "a731b2c38d988631519f7e7487ed2372337c834e56f827e41ec672a71dbfa5ed";
+       version = "1.2.0.0";
+       sha256 = "de961d40fd2478c6718f116e981430608fd3b56bfd1940b313cf2cfa6d126f97";
        libraryHaskellDepends = [
-         attoparsec base bytestring data-default-class iproute network
-         transformers word8
+         attoparsec base bytestring data-default-class interruptible iproute
+         monad-control network transformers transformers-base word8
        ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [ attoparsec base bytestring Cabal ];
-       jailbreak = true;
        homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
@@ -212738,6 +214651,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unsequential" = callPackage
+    ({ mkDerivation, attoparsec, base-prelude, dlist, interspersed
+     , QuickCheck, quickcheck-instances, rebase, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "unsequential";
+       version = "0.5.0.2";
+       sha256 = "dfa451ca1b6056c5c42a6581482dd21ceb0de65d8060dfe5119f7406ebc3a52b";
+       libraryHaskellDepends = [ base-prelude dlist transformers ];
+       testHaskellDepends = [
+         attoparsec interspersed QuickCheck quickcheck-instances rebase
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/nikita-volkov/unsequential";
+       description = "An extension removing the sequentiality from monads";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "unusable-pkg" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -213461,6 +215394,7 @@ self: {
        libraryHaskellDepends = [
          aeson base boomerang lens safecopy web-routes web-routes-th
        ];
+       jailbreak = true;
        homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
@@ -214212,7 +216146,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "uuid" = callPackage
+  "uuid_1_3_11" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptohash, HUnit
      , network-info, QuickCheck, random, tasty, tasty-hunit
      , tasty-quickcheck, text, time, uuid-types
@@ -214234,6 +216168,30 @@ self: {
        homepage = "https://github.com/aslatter/uuid";
        description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "uuid" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cryptonite, HUnit
+     , memory, network-info, QuickCheck, random, tasty, tasty-hunit
+     , tasty-quickcheck, text, time, uuid-types
+     }:
+     mkDerivation {
+       pname = "uuid";
+       version = "1.3.12";
+       sha256 = "ed62f1b3f0b19f0d548655ffef5aff066ad5c430fe11e909a1a7e8fc115a89ee";
+       libraryHaskellDepends = [
+         base binary bytestring cryptonite memory network-info random text
+         time uuid-types
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck random tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       doCheck = false;
+       homepage = "https://github.com/aslatter/uuid";
+       description = "For creating, comparing, parsing and printing Universally Unique Identifiers";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "uuid-aeson" = callPackage
@@ -214327,7 +216285,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "uuid-types" = callPackage
+  "uuid-types_1_0_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit
      , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
      }:
@@ -214346,6 +216304,27 @@ self: {
        homepage = "https://github.com/aslatter/uuid";
        description = "Type definitions for Universally Unique Identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "uuid-types" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, hashable, HUnit
+     , QuickCheck, random, tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "uuid-types";
+       version = "1.0.3";
+       sha256 = "9276517ab24a9b06f39d6e3c33c6c2b4ace1fc2126dbc1cd9806866a6551b3fd";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq hashable random text
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       doCheck = false;
+       homepage = "https://github.com/aslatter/uuid";
+       description = "Type definitions for Universally Unique Identifiers";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "uulib" = callPackage
@@ -214770,8 +216749,8 @@ self: {
     ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
      mkDerivation {
        pname = "varying";
-       version = "0.4.0.0";
-       sha256 = "9a9c6b0e6f89deb748f72c1b1cf58a291235a0989305be190ebf4ec50d566092";
+       version = "0.5.0.0";
+       sha256 = "e41ea4ffce851b55736bac29a3aefe505979eb5e7c9d5794e5db892cb39e1cba";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base time transformers ];
@@ -215510,8 +217489,8 @@ self: {
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
        pname = "vector-sized";
-       version = "0.3.0.0";
-       sha256 = "d564cd03d553684fe94c09cc076b9b4878886bc0e75e235bc273cb13ce97dbbf";
+       version = "0.3.2.0";
+       sha256 = "54b5978d92eae76278828476d059e8bb5170f30775380c606bd390eb53e06135";
        libraryHaskellDepends = [ base deepseq vector ];
        homepage = "http://github.com/expipiplus1/vector-sized#readme";
        description = "Size tagged vectors";
@@ -215704,7 +217683,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-th-unbox" = callPackage
+  "vector-th-unbox_0_2_1_4" = callPackage
     ({ mkDerivation, base, data-default, template-haskell, vector }:
      mkDerivation {
        pname = "vector-th-unbox";
@@ -215714,6 +217693,19 @@ self: {
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vector-th-unbox" = callPackage
+    ({ mkDerivation, base, data-default, template-haskell, vector }:
+     mkDerivation {
+       pname = "vector-th-unbox";
+       version = "0.2.1.5";
+       sha256 = "f5be54bc96d922bb48d3d1b5b127f88477ade064042f9ced4e5f9d74e75b68e0";
+       libraryHaskellDepends = [ base template-haskell vector ];
+       testHaskellDepends = [ base data-default vector ];
+       description = "Deriver for Data.Vector.Unboxed using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -215775,7 +217767,6 @@ self: {
        testHaskellDepends = [
          aeson base containers hspec unordered-containers vector verdict
        ];
-       jailbreak = true;
        description = "JSON instances and JSON Schema for verdict";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216499,8 +218490,8 @@ self: {
     ({ mkDerivation, base, vector-sized }:
      mkDerivation {
        pname = "vulkan";
-       version = "1.5.1.0";
-       sha256 = "64d795374e75e0db2d42ef58059869dcc33414fdcf9c0436d1f2a7c8b392edb1";
+       version = "1.6.0.0";
+       sha256 = "0c97af15d2367c02d669f1a5d5236968ed7c1dfe0fb733f0bcac139cb8778972";
        libraryHaskellDepends = [ base vector-sized ];
        jailbreak = true;
        homepage = "http://github.com/expipiplus1/vulkan#readme";
@@ -216693,7 +218684,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai" = callPackage
+  "wai_3_2_0" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , bytestring-builder, hspec, http-types, network, text
      , transformers, vault
@@ -216710,6 +218701,26 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , bytestring-builder, hspec, http-types, network, text
+     , transformers, vault
+     }:
+     mkDerivation {
+       pname = "wai";
+       version = "3.2.0.1";
+       sha256 = "d6f39b31383892f8e4f0d75e9ee4f87c6dcca547056be3653d80c49adb6c506f";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring bytestring-builder http-types network
+         text transformers vault
+       ];
+       testHaskellDepends = [ base blaze-builder bytestring hspec ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "Web Application Interface";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -217135,7 +219146,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-app-static" = callPackage
+  "wai-app-static_3_1_4_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, cryptohash
      , cryptohash-conduit, directory, file-embed, filepath, hspec
@@ -217169,6 +219180,41 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-app-static" = callPackage
+    ({ mkDerivation, base, blaze-builder, blaze-html, blaze-markup
+     , bytestring, containers, cryptonite, directory, file-embed
+     , filepath, hspec, http-date, http-types, memory, mime-types
+     , network, old-locale, optparse-applicative, template-haskell
+     , temporary, text, time, transformers, unix-compat
+     , unordered-containers, wai, wai-extra, warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.5";
+       sha256 = "28667193acfcc534752b715b5f5e16fc58edb550d03c0eb2b68e123e41030d4c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder blaze-html blaze-markup bytestring containers
+         cryptonite directory file-embed filepath http-date http-types
+         memory mime-types old-locale optparse-applicative template-haskell
+         text time transformers unix-compat unordered-containers wai
+         wai-extra warp zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         network old-locale temporary text time transformers unix-compat wai
+         wai-extra zlib
+       ];
+       homepage = "http://www.yesodweb.com/book/web-application-interface";
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-conduit_3_0_0_1" = callPackage
@@ -219211,6 +221257,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
+       jailbreak = true;
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
@@ -219237,6 +221284,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
+       jailbreak = true;
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
@@ -219263,6 +221311,7 @@ self: {
        testHaskellDepends = [
          aeson base hspec hspec-wai hspec-wai-json text wai
        ];
+       jailbreak = true;
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
@@ -221471,8 +223520,8 @@ self: {
        pname = "web-routing";
        version = "0.6.2";
        sha256 = "ee20a428110d631f4a0c3607e3e83aaca70cd42a5fc44ba643290d7cedabf1f4";
-       revision = "1";
-       editedCabalFile = "4aa263239149f8ef52999fdc29c8e90c552081672a4476adedce903248e15524";
+       revision = "2";
+       editedCabalFile = "3db4d187241069c6244c47a0f14a579800ccb6277409ae69caeb00a5f890b0cd";
        libraryHaskellDepends = [
          base bytestring primitive text types-compat unordered-containers
        ];
@@ -221786,6 +223835,7 @@ self: {
          network-uri scientific temporary text time transformers
          transformers-base unordered-containers vector zip-archive
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
@@ -221812,6 +223862,7 @@ self: {
          network-uri scientific temporary text time transformers
          transformers-base unordered-containers vector zip-archive
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol";
@@ -222007,8 +224058,8 @@ self: {
     ({ mkDerivation, base, glib, gtk, gtk2hs-buildtools, webkit }:
      mkDerivation {
        pname = "webkit-javascriptcore";
-       version = "0.13.1.1";
-       sha256 = "c54491817b539f2ae5ff75f082ff18efc68038146553e300462a3a8d808ff730";
+       version = "0.13.1.2";
+       sha256 = "9645b68c8c4af17002870367f9c3d902154dd56eca8d303b4bcaf3c0504df861";
        libraryHaskellDepends = [ base glib gtk webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
@@ -222041,8 +224092,8 @@ self: {
      }:
      mkDerivation {
        pname = "webkitgtk3-javascriptcore";
-       version = "0.13.1.1";
-       sha256 = "0a1583d61f20c8cf0f84443210711222a9f0dc1d8a99a85944c01f487aaa8b79";
+       version = "0.13.1.2";
+       sha256 = "974924ce394670a7b60126f78eaad2d9a023acab3dfc2472202f07998a95e1bd";
        libraryHaskellDepends = [ base glib gtk3 webkitgtk3 ];
        libraryPkgconfigDepends = [ webkit ];
        libraryToolDepends = [ gtk2hs-buildtools ];
@@ -222491,8 +224542,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.4.10.0";
-       sha256 = "b5bc8f8b2a52e41e175d9fb0683737d0a3b7f54c473e1227f7751ff56d065bb9";
+       version = "0.5.1.0";
+       sha256 = "54698d8333958d20dc19ae2c7f50a09e89776056a6574eee1bde24d9cc7bed0b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -222508,7 +224559,27 @@ self: {
          text
        ];
        homepage = "https://github.com/hjwylde/werewolf";
-       description = "A game engine for running werewolf in a chat client";
+       description = "A game engine for playing werewolf within a chat client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "werewolf-slack" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, extra, http-client
+     , http-client-tls, http-types, mtl, optparse-applicative, process
+     , text, wai, warp, werewolf
+     }:
+     mkDerivation {
+       pname = "werewolf-slack";
+       version = "0.3.0.2";
+       sha256 = "d086961fcb554c11174d8a40233ddc43ba5d4de92ead79bf238831e3f7f0e9da";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring extra http-client http-client-tls http-types
+         mtl optparse-applicative process text wai warp werewolf
+       ];
+       homepage = "https://github.com/hjwylde/werewolf-slack";
+       description = "A Slack chat client for playing werewolf";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -224568,6 +226639,28 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "xdcc" = callPackage
+    ({ mkDerivation, ascii-progress, base, bytestring, case-insensitive
+     , concurrent-extra, concurrent-output, errors, iproute, irc-ctcp
+     , irc-dcc, network, optparse-applicative, path, random, simpleirc
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "xdcc";
+       version = "1.0.1";
+       sha256 = "f0694a7de64886883dade774e23121a9b2f247cd9efa6d61d7fe0b08fe56ff9d";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ascii-progress base bytestring case-insensitive concurrent-extra
+         concurrent-output errors iproute irc-ctcp irc-dcc network
+         optparse-applicative path random simpleirc transformers unix
+       ];
+       homepage = "https://github.com/JanGe/xdcc";
+       description = "A wget-like utility for retrieving files from XDCC bots on IRC";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "xdg-basedir" = callPackage
     ({ mkDerivation, base, directory, filepath }:
      mkDerivation {
@@ -227513,8 +229606,8 @@ self: {
      }:
      mkDerivation {
        pname = "yate";
-       version = "0.1.0.0";
-       sha256 = "20275bafdb52ce74f3c3cecb6cbb8925c7d9f40bea74d6872145ff93df49d85d";
+       version = "0.1.0.1";
+       sha256 = "8fa4cfd9777a0768d804e7413c3c9f84d12142accdc7b071d70af214b7d33206";
        libraryHaskellDepends = [
          aeson attoparsec base mtl scientific template-haskell text
          unordered-containers vector
@@ -227522,7 +229615,6 @@ self: {
        testHaskellDepends = [
          attoparsec base hspec mtl unordered-containers vector
        ];
-       jailbreak = true;
        description = "Yet Another Template Engine";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -227771,7 +229863,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod" = callPackage
+  "yesod_1_4_2" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , conduit-extra, data-default, directory, fast-logger
      , monad-control, monad-logger, safe, semigroups, shakespeare
@@ -227793,6 +229885,31 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod" = callPackage
+    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
+     , conduit-extra, data-default, directory, fast-logger
+     , monad-control, monad-logger, safe, semigroups, shakespeare
+     , streaming-commons, template-haskell, text, transformers, unix
+     , unordered-containers, wai, wai-extra, wai-logger, warp, yaml
+     , yesod-auth, yesod-core, yesod-form, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod";
+       version = "1.4.2.1";
+       sha256 = "2d79da30ec62a18205fe95f685cc79eaf21454f84e757857983cc54714367723";
+       libraryHaskellDepends = [
+         aeson base blaze-html blaze-markup bytestring conduit-extra
+         data-default directory fast-logger monad-control monad-logger safe
+         semigroups shakespeare streaming-commons template-haskell text
+         transformers unix unordered-containers wai wai-extra wai-logger
+         warp yaml yesod-auth yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-angular" = callPackage
@@ -228289,7 +230406,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth" = callPackage
+  "yesod-auth_1_4_12" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -228316,6 +230433,36 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, mime-mail
+     , network-uri, nonce, persistent, persistent-template, random
+     , resourcet, safe, shakespeare, template-haskell, text, time
+     , transformers, unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.13";
+       sha256 = "708805d79ded7af86bafa1cd93f75a5a401edef378c0f019f294958cb3f50f56";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptohash data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -228831,6 +230978,7 @@ self: {
          yesod-auth yesod-core yesod-form
        ];
        testHaskellDepends = [ base hspec ];
+       jailbreak = true;
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -228858,6 +231006,7 @@ self: {
          base containers http-conduit load-env text warp yesod yesod-auth
        ];
        testHaskellDepends = [ base hspec ];
+       jailbreak = true;
        homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
        description = "OAuth 2.0 authentication plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -229967,7 +232116,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-bin" = callPackage
+  "yesod-bin_1_4_17_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, base64-bytestring
      , blaze-builder, bytestring, Cabal, conduit, conduit-extra
      , containers, data-default-class, deepseq, directory, file-embed
@@ -229998,6 +232147,40 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "The yesod helper executable";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-bin" = callPackage
+    ({ mkDerivation, async, attoparsec, base, base64-bytestring
+     , blaze-builder, bytestring, Cabal, conduit, conduit-extra
+     , containers, data-default-class, deepseq, directory, file-embed
+     , filepath, fsnotify, ghc, ghc-paths, http-client, http-conduit
+     , http-reverse-proxy, http-types, lifted-base, network
+     , optparse-applicative, parsec, process, project-template
+     , resourcet, shakespeare, split, streaming-commons, tar
+     , template-haskell, text, time, transformers, transformers-compat
+     , unix-compat, unordered-containers, wai, wai-extra, warp, warp-tls
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "yesod-bin";
+       version = "1.4.18";
+       sha256 = "ebcde32856b115cca44de55cfbf79e468f8587c1b8488bc29c32c38ef764086c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async attoparsec base base64-bytestring blaze-builder bytestring
+         Cabal conduit conduit-extra containers data-default-class deepseq
+         directory file-embed filepath fsnotify ghc ghc-paths http-client
+         http-conduit http-reverse-proxy http-types lifted-base network
+         optparse-applicative parsec process project-template resourcet
+         shakespeare split streaming-commons tar template-haskell text time
+         transformers transformers-compat unix-compat unordered-containers
+         wai wai-extra warp warp-tls yaml zlib
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "The yesod helper executable";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-bootstrap" = callPackage
@@ -230896,7 +233079,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core" = callPackage
+  "yesod-core_1_4_19" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -230933,6 +233116,46 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-core" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , data-default, deepseq, directory, exceptions, fast-logger, hspec
+     , hspec-expectations, http-types, HUnit, lifted-base, monad-control
+     , monad-logger, mtl, mwc-random, network, old-locale, parsec
+     , path-pieces, primitive, QuickCheck, random, resourcet, safe
+     , semigroups, shakespeare, streaming-commons, template-haskell
+     , text, time, transformers, transformers-base, unix-compat
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.20";
+       sha256 = "a47689a8d681e1083538ea9126601f70db3869a74170901de29250ce3d9c1bda";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq directory
+         exceptions fast-logger http-types lifted-base monad-control
+         monad-logger mtl mwc-random old-locale parsec path-pieces primitive
+         random resourcet safe semigroups shakespeare template-haskell text
+         time transformers transformers-base unix-compat
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-crud" = callPackage
@@ -231323,7 +233546,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-form" = callPackage
+  "yesod-form_1_4_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, data-default
      , email-validate, hspec, network-uri, persistent, resourcet
@@ -231345,6 +233568,31 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Form handling support for Yesod Web Framework";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-form" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, data-default
+     , email-validate, hspec, network-uri, persistent, resourcet
+     , semigroups, shakespeare, template-haskell, text, time
+     , transformers, wai, xss-sanitize, yesod-core, yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-form";
+       version = "1.4.7";
+       sha256 = "eecbec0755961a4914e8bb41313900ac144e3621fa6c0aa39df19611bf0ebff9";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html blaze-markup
+         byteable bytestring containers data-default email-validate
+         network-uri persistent resourcet semigroups shakespeare
+         template-haskell text time transformers wai xss-sanitize yesod-core
+         yesod-persistent
+       ];
+       testHaskellDepends = [ base hspec text time ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Form handling support for Yesod Web Framework";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-form-json" = callPackage
@@ -231606,6 +233854,7 @@ self: {
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
        testHaskellDepends = [ base blaze-html hspec text ];
+       jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
@@ -231796,7 +234045,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-persistent" = callPackage
+  "yesod-persistent_1_4_0_3" = callPackage
     ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
      , persistent-sqlite, persistent-template, resource-pool, resourcet
      , text, transformers, wai-extra, yesod-core
@@ -231816,6 +234065,29 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Some helpers for using Persistent from Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-persistent" = callPackage
+    ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent
+     , persistent-sqlite, persistent-template, resource-pool, resourcet
+     , text, transformers, wai-extra, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-persistent";
+       version = "1.4.0.4";
+       sha256 = "840dac8758176dd2b27bbff49a8cdd724b6f99cdf1b723a1eae5d2a18898d25d";
+       libraryHaskellDepends = [
+         base blaze-builder conduit persistent persistent-template
+         resource-pool resourcet transformers yesod-core
+       ];
+       testHaskellDepends = [
+         base blaze-builder conduit hspec persistent persistent-sqlite text
+         wai-extra yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Some helpers for using Persistent from Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-platform" = callPackage
@@ -231905,6 +234177,7 @@ self: {
        executableHaskellDepends = [
          aeson base shakespeare text transformers yesod yesod-form
        ];
+       jailbreak = true;
        homepage = "https://github.com/cutsea110/yesod-pnotify";
        description = "Yet another getMessage/setMessage using pnotify jquery plugins";
        license = stdenv.lib.licenses.bsd3;
@@ -232498,7 +234771,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-table" = callPackage
+  "yesod-table_2_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant, text
      , yesod-core
      }:
@@ -232512,6 +234785,23 @@ self: {
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-table" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant
+     , semigroups, text, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-table";
+       version = "2.0.3";
+       sha256 = "363a70fe6def770776e1e0e777651c66e4849e4d95e853956a2f2ae1be80189b";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant semigroups text yesod-core
+       ];
+       homepage = "https://github.com/andrewthad/yesod-table";
+       description = "HTML tables for Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-tableview" = callPackage
@@ -232688,7 +234978,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-test" = callPackage
+  "yesod-test_1_5_0_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, monad-control
@@ -232712,6 +235002,33 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-test" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, case-insensitive, containers, cookie
+     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
+     , monad-control, network, persistent, text, time, transformers, wai
+     , wai-extra, xml-conduit, xml-types, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-test";
+       version = "1.5.1.0";
+       sha256 = "798ae4db3d73e4307d7b44a6911a8165134f1a48828f0d706507a69ce44b3c16";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         case-insensitive containers cookie hspec-core html-conduit
+         http-types HUnit monad-control network persistent text time
+         transformers wai wai-extra xml-conduit xml-types yesod-core
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec html-conduit http-types HUnit
+         lifted-base text wai xml-conduit yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com";
+       description = "integration testing for WAI/Yesod Applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-test-json" = callPackage
@@ -232963,24 +235280,22 @@ self: {
   "yet-another-logger" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, base
      , base-unicode-symbols, bytestring, Cabal, case-insensitive, clock
-     , configuration-tools, deepseq, either, enclosed-exceptions, lens
-     , lifted-base, monad-control, mtl, optparse-applicative, stm
-     , stm-chans, tagged, tasty, tasty-hunit, text, time, trace
-     , transformers, transformers-base, void
+     , configuration-tools, deepseq, enclosed-exceptions, exceptions
+     , lens, lifted-base, monad-control, mtl, optparse-applicative, stm
+     , stm-chans, tagged, tasty, tasty-hunit, text, time, transformers
+     , transformers-base, void
      }:
      mkDerivation {
        pname = "yet-another-logger";
-       version = "0.2.3.1";
-       sha256 = "a0aa32135fa7e55f736a3dbca497edd035e284d6a6e9469a257937a827593ad5";
-       revision = "1";
-       editedCabalFile = "09206c65c7dfc32bff85a2f2f295561bfcb95067f74d460a0597ce448ed6fb27";
+       version = "0.3.0";
+       sha256 = "3183c7c38fac53e93a0b352709c57374463efdc5352968019dbbe763aba2a848";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal async base base-unicode-symbols bytestring
-         case-insensitive clock configuration-tools deepseq either
-         enclosed-exceptions lens lifted-base monad-control mtl
-         optparse-applicative stm stm-chans text time trace transformers
+         case-insensitive clock configuration-tools deepseq
+         enclosed-exceptions exceptions lens lifted-base monad-control mtl
+         optparse-applicative stm stm-chans text time transformers
          transformers-base void
        ];
        executableHaskellDepends = [ base Cabal ];
@@ -233484,6 +235799,7 @@ self: {
          HStringTemplate lucid old-locale old-time pandoc parsec scientific
          split text time unordered-containers yaml
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/yst";
        description = "Builds a static website from templates and data in YAML or CSV files";
        license = "GPL";
@@ -233752,7 +236068,6 @@ self: {
        executableHaskellDepends = [
          base bytestring docopt raw-strings-qq
        ];
-       jailbreak = true;
        description = "Post to 0bin services";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -234048,15 +236363,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zip;};
 
-  "zip-archive_0_3" = callPackage
+  "zip-archive_0_3_0_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , digest, directory, filepath, HUnit, mtl, old-time, pretty
      , process, text, time, unix, zip, zlib
      }:
      mkDerivation {
        pname = "zip-archive";
-       version = "0.3";
-       sha256 = "ecbfa2c983094242e17d4dfb7aaabe891345510dd3cfc37743bfc479c794fd8b";
+       version = "0.3.0.2";
+       sha256 = "c5367d9bc72d3ceace0508800bab08a120e308ea1f4f5c8d5843fcca36b15313";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -234508,10 +236823,10 @@ self: {
     ({ mkDerivation, base, monads-tf }:
      mkDerivation {
        pname = "zot";
-       version = "0.0.2";
-       sha256 = "03b7086b3a1d4ab4bed9a1781ee7bb59796448f75c3e3b8d7fc02fb8699e8f8b";
+       version = "0.0.3";
+       sha256 = "c8a9091b939e3f74aca6be3007a0066c8a1de69da4b62e22891bed543f8a2b32";
        revision = "1";
-       editedCabalFile = "325ccedb3426935b4a56f838f3d05fc914b72729a2b80d6c804bec5657593a40";
+       editedCabalFile = "b543a28082a9568e793d33c7ba5364fa3bdadb09323ce3c293f2f2ed8c5efa11";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base monads-tf ];
@@ -234536,18 +236851,18 @@ self: {
      }) {};
 
   "ztail" = callPackage
-    ({ mkDerivation, array, base, containers, filepath, hinotify
-     , old-locale, process, regex-compat, time, unix
+    ({ mkDerivation, array, base, bytestring, filepath, hinotify
+     , process, regex-posix, time, unix, unordered-containers
      }:
      mkDerivation {
        pname = "ztail";
-       version = "1.1";
-       sha256 = "d81e30a9b2039c9b008482542719eaf1db28c2049335b88a6aaf3de739e4a687";
+       version = "1.2";
+       sha256 = "13b314c992597118de1bfe0b866ef061237910f77bd35fb258e42d21182a3a4f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base containers filepath hinotify old-locale process
-         regex-compat time unix
+         array base bytestring filepath hinotify process regex-posix time
+         unix unordered-containers
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;

From 368324da128093dbc2454f81748877200629ab10 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Mar 2016 11:32:56 +0200
Subject: [PATCH 700/857] Add LTS Haskell 5.10.

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 45b5fa3140792..31a01e354b9f2 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -374,7 +374,10 @@ rec {
     lts-5_9 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.9.nix { };
     };
-    lts-5 = packages.lts-5_9;
+    lts-5_10 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.10.nix { };
+    };
+    lts-5 = packages.lts-5_10;
 
     lts = packages.lts-5;
   };

From a68e670346e592c91cf1dd4a60b5dd2ef4a8d16e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Apr 2016 11:01:39 +0200
Subject: [PATCH 701/857] Add LTS Haskell 5.11.

---
 pkgs/top-level/haskell-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 31a01e354b9f2..ce8e68b5b7704 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -377,7 +377,10 @@ rec {
     lts-5_10 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.10.nix { };
     };
-    lts-5 = packages.lts-5_10;
+    lts-5_11 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.11.nix { };
+    };
+    lts-5 = packages.lts-5_11;
 
     lts = packages.lts-5;
   };

From 574f63b956bbcbce3a4682abe2d34d851fb80639 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 29 Mar 2016 13:59:48 +0200
Subject: [PATCH 702/857] haskell-hspec: fix infinite recursion in version
 2.2.2

---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 20a338dd2cb81..2e555f664bd07 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -29,6 +29,7 @@ self: super: {
   hspec_2_1_7 = super.hspec_2_1_7.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_2_1 = super.hspec_2_2_1.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_2_2 = super.hspec_2_2_2.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec-expectations_0_6_1_1 = dontCheck super.hspec-expectations_0_6_1_1;
   hspec-expectations_0_6_1 = dontCheck super.hspec-expectations_0_6_1;
   hspec-expectations_0_7_1 = dontCheck super.hspec-expectations_0_7_1;

From de613e08dc5ef8dfc497bd3de59363dfccabfe42 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Mar 2016 12:06:50 +0200
Subject: [PATCH 703/857] haskell-doctest: use version 0.11.0 when compiling
 with GHC 8.0.x

Fixes https://github.com/sol/doctest/issues/125.
---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index f909336e669e6..e39002b8dec44 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -49,4 +49,7 @@ self: super: {
   # Deviate from Stackage here to fix lots of builds.
   transformers-compat = super.transformers-compat_0_5_1_4;
 
+  # https://github.com/sol/doctest/issues/125
+  doctest = self.doctest_0_11_0;
+
 }

From f5c95fc1b29721dbaa0edfa7a9322eb22f1e816d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 31 Mar 2016 20:52:16 +0200
Subject: [PATCH 704/857] configuration-hackage2nix.yaml: disable broken builds

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index ecfc08b1d3900..3d87f86f4ab25 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -625,7 +625,7 @@ dont-distribute-packages:
   clafer:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   claferIG:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   claferwiki:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
-  clang-pure:                                   [ x86_64-darwin ]
+  clang-pure:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   CLASE:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   clash-prelude-quickcheck:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   clash:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]

From 0d39f485f07f0e8583b7183583442021f65dfc32 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Apr 2016 11:31:54 +0200
Subject: [PATCH 705/857] haskell-hruby: remove obsolete override

Closes https://github.com/NixOS/nixpkgs/pull/13920.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2e555f664bd07..ba48becf5747c 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -44,9 +44,6 @@ self: super: {
   statistics = dontCheck super.statistics;
   c2hs = if pkgs.stdenv.isDarwin then dontCheck super.c2hs else super.c2hs;
 
-  # The package doesn't compile with ruby 1.9, which is our default at the moment.
-  hruby = super.hruby.override { ruby = pkgs.ruby_2_1; };
-
   # Use the default version of mysql to build this package (which is actually mariadb).
   mysql = super.mysql.override { mysql = pkgs.mysql.lib; };
 

From dd0994e91991ede9234b83d11f390f5eff0f23ee Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 4 Apr 2016 11:55:48 +0100
Subject: [PATCH 706/857] travis: init at 1.8.2

---
 pkgs/development/tools/misc/travis/Gemfile    |   3 +
 .../tools/misc/travis/Gemfile.lock            |  51 ++++++
 .../development/tools/misc/travis/default.nix |  29 ++++
 pkgs/development/tools/misc/travis/gemset.nix | 146 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 231 insertions(+)
 create mode 100644 pkgs/development/tools/misc/travis/Gemfile
 create mode 100644 pkgs/development/tools/misc/travis/Gemfile.lock
 create mode 100644 pkgs/development/tools/misc/travis/default.nix
 create mode 100644 pkgs/development/tools/misc/travis/gemset.nix

diff --git a/pkgs/development/tools/misc/travis/Gemfile b/pkgs/development/tools/misc/travis/Gemfile
new file mode 100644
index 0000000000000..d52f576be243a
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "travis"
diff --git a/pkgs/development/tools/misc/travis/Gemfile.lock b/pkgs/development/tools/misc/travis/Gemfile.lock
new file mode 100644
index 0000000000000..e84e87fb5232b
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/Gemfile.lock
@@ -0,0 +1,51 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.4.0)
+    backports (3.6.8)
+    ethon (0.8.1)
+      ffi (>= 1.3.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    ffi (1.9.10)
+    gh (0.14.0)
+      addressable
+      backports
+      faraday (~> 0.8)
+      multi_json (~> 1.0)
+      net-http-persistent (>= 2.7)
+      net-http-pipeline
+    highline (1.7.8)
+    json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
+    multi_json (1.11.2)
+    multipart-post (2.0.0)
+    net-http-persistent (2.9.4)
+    net-http-pipeline (1.0.1)
+    pusher-client (0.6.2)
+      json
+      websocket (~> 1.0)
+    travis (1.8.2)
+      backports
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9, >= 0.9.1)
+      gh (~> 0.13)
+      highline (~> 1.6)
+      launchy (~> 2.1)
+      pusher-client (~> 0.4)
+      typhoeus (~> 0.6, >= 0.6.8)
+    typhoeus (0.8.0)
+      ethon (>= 0.8.0)
+    websocket (1.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  travis
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/development/tools/misc/travis/default.nix b/pkgs/development/tools/misc/travis/default.nix
new file mode 100644
index 0000000000000..adc63ce7c43f8
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, lib, bundlerEnv, ruby }:
+
+stdenv.mkDerivation rec {
+  name = "travis-${version}";
+  version = env.gems.travis.version;
+
+  env = bundlerEnv {
+    inherit ruby;
+    name = "${name}-gems";
+    gemset = ./gemset.nix;
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+  };
+
+  phases = ["installPhase"];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    ln -s ${env}/bin/travis $out/bin/travis
+  '';
+
+  meta = with lib; {
+    description = "CLI and Ruby client library for Travis CI";
+    homepage    = https://github.com/travis-ci/travis.rb;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+    platforms   = ruby.meta.platforms;
+  };
+}
diff --git a/pkgs/development/tools/misc/travis/gemset.nix b/pkgs/development/tools/misc/travis/gemset.nix
new file mode 100644
index 0000000000000..abfd352e90ece
--- /dev/null
+++ b/pkgs/development/tools/misc/travis/gemset.nix
@@ -0,0 +1,146 @@
+{
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mpn7sbjl477h56gmxsjqb89r5s3w7vx5af994ssgc3iamvgzgvs";
+      type = "gem";
+    };
+    version = "2.4.0";
+  };
+  backports = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zcgqw7m7jb8n7b2jwla5cq0nw9wsgddxfmn0a9v89ihzd4i1a5k";
+      type = "gem";
+    };
+    version = "3.6.8";
+  };
+  ethon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0afvvv4sxs330jhk4xz9kj6qgj70yvd4zsjnb9yvxhmaq49k8yij";
+      type = "gem";
+    };
+    version = "0.8.1";
+  };
+  faraday = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  faraday_middleware = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
+      type = "gem";
+    };
+    version = "1.9.10";
+  };
+  gh = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0j7m6jmxzkxvnqgnhmci33a89qpaxxcrm55kk5vz4bcpply04hx2";
+      type = "gem";
+    };
+    version = "0.14.0";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      type = "gem";
+    };
+    version = "1.7.8";
+  };
+  json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+  launchy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
+      type = "gem";
+    };
+    version = "2.4.3";
+  };
+  multi_json = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
+      type = "gem";
+    };
+    version = "1.11.2";
+  };
+  multipart-post = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  net-http-persistent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y9fhaax0d9kkslyiqi1zys6cvpaqx9a0y0cywp24rpygwh4s9r4";
+      type = "gem";
+    };
+    version = "2.9.4";
+  };
+  net-http-pipeline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  pusher-client = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18ymxz34gmg7jff3h0nyzp5vdg5i06dbdxlrdl2nq4hf14qwj1f4";
+      type = "gem";
+    };
+    version = "0.6.2";
+  };
+  travis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ph83whzw5hjkp1kgbkjd2g0vi6kdr9sif6vxvxgjf186id43q0s";
+      type = "gem";
+    };
+    version = "1.8.2";
+  };
+  typhoeus = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03x3fxjsnhgayl4s96h0a9975awlvx2v9nmx2ba0cnliglyczdr8";
+      type = "gem";
+    };
+    version = "0.8.0";
+  };
+  websocket = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frcsgj4f984db920xwapflqwgrwncw86c1rv94pp5gs2q1iaap4";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae800662444a1..777914af49867 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6248,6 +6248,8 @@ in
 
   texi2html = callPackage ../development/tools/misc/texi2html { };
 
+  travis = callPackage ../development/tools/misc/travis { };
+
   tweak = callPackage ../applications/editors/tweak { };
 
   uhd = callPackage ../development/tools/misc/uhd { };

From 3a75ed446410f84829aab648d38fda55f514e523 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Mon, 4 Apr 2016 15:41:01 +0100
Subject: [PATCH 707/857] citrix-receiver: fix patchelf error during
 installPhase

Due to recent change in patchelf, it's now necessary to run chmod u+w
prior to running patchelf itself. Fixes #14440 for citrix-receiver
---
 .../networking/remote/citrix-receiver/default.nix     | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 056d28eb3cd8d..6d14761356a80 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -121,9 +121,14 @@ stdenv.mkDerivation rec {
     find $ICAInstDir -type f -exec file {} \; |
       grep 'ELF.*executable' |
       cut -f 1 -d : |
-      xargs -t -n 1 patchelf \
-        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath "$ICAInstDir:$libPath"
+      while read f
+      do
+        echo "Patching ELF intrepreter and rpath for $f"
+        chmod u+w "$f"
+        patchelf \
+          --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+          --set-rpath "$ICAInstDir:$libPath" "$f"
+      done
 
     echo "Wrapping wfica..."
     mkdir "$out/bin"

From d076a13c1d94d8ce56e48afc2b3e622406678560 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Mon, 4 Apr 2016 11:09:00 -0400
Subject: [PATCH 708/857] openmpi: patch for legitimate zero size messages

This patch is required in order to make python-mpi4py tests pass.
It is also a bug in the openmpi implementation to see full discussion
see https://www.open-mpi.org/community/lists/users/2015/11/28030.php
---
 .../development/libraries/openmpi/default.nix |  7 ++++-
 .../libraries/openmpi/nbc_copy.patch          | 30 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/openmpi/nbc_copy.patch

diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix
index 18dc2251013ef..c1333ff61714b 100644
--- a/pkgs/development/libraries/openmpi/default.nix
+++ b/pkgs/development/libraries/openmpi/default.nix
@@ -20,6 +20,12 @@ in stdenv.mkDerivation rec {
     sha256 = "14p4px9a3qzjc22lnl6braxrcrmd9rgmy7fh4qpanawn2pgfq6br";
   };
 
+  # Bug in openmpi implementation for zero sized messages
+  # Patch required to make mpi4py pass. Will NOT
+  # be required when openmpi >= 2.0.0
+  # https://www.open-mpi.org/community/lists/users/2015/11/28030.php
+  patches = [ ./nbc_copy.patch ];
+
   buildInputs = [ gfortran libibverbs ];
 
   nativeBuildInputs = [ perl ];
@@ -42,4 +48,3 @@ in stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.mornfall ];
   };
 }
-
diff --git a/pkgs/development/libraries/openmpi/nbc_copy.patch b/pkgs/development/libraries/openmpi/nbc_copy.patch
new file mode 100644
index 0000000000000..d496c7cc2d763
--- /dev/null
+++ b/pkgs/development/libraries/openmpi/nbc_copy.patch
@@ -0,0 +1,30 @@
+commit 4ee20ba31dd64b8f899447cdad78ec2379acfce7
+Author: Gilles Gouaillardet <gilles@rist.or.jp>
+Date:   Tue Nov 10 08:59:03 2015 +0900
+
+    fix NBC_Copy for legitimate zero size messages
+    
+    (back ported from commit open-mpi/ompi@0bd765eddd33e3d4ac18ec644c60a5c160cb48dc)
+    (back ported from commit open-mpi/ompi@9a70765f27fdf17e70e1a115754fef7e5f16132a)
+
+diff --git a/ompi/mca/coll/libnbc/nbc_internal.h b/ompi/mca/coll/libnbc/nbc_internal.h
+index bf2f1cb..81be8cc 100644
+--- a/ompi/mca/coll/libnbc/nbc_internal.h
++++ b/ompi/mca/coll/libnbc/nbc_internal.h
+@@ -501,7 +501,14 @@ static inline int NBC_Copy(void *src, int srccount, MPI_Datatype srctype, void *
+   } else {
+     /* we have to pack and unpack */
+     res = MPI_Pack_size(srccount, srctype, comm, &size);
+-    if (MPI_SUCCESS != res || 0 == size) { printf("MPI Error in MPI_Pack_size() (%i:%i)\n", res, size); return (MPI_SUCCESS == res) ? MPI_ERR_SIZE : res;}
++    if (MPI_SUCCESS != res) {
++      printf ("MPI Error in MPI_Pack_size() (%i:%i)", res, size);
++      return res;
++    }
++
++    if (0 == size) {
++        return OMPI_SUCCESS;
++    }
+     packbuf = malloc(size);
+     if (NULL == packbuf) { printf("Error in malloc()\n"); return res; }
+     pos=0;
+

From c5741f5f52247e871e9615ecbd024dd3aafd2548 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 4 Apr 2016 18:05:01 +0200
Subject: [PATCH 709/857] fbida: 2.10 -> 2.11

---
 pkgs/applications/graphics/fbida/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/fbida/default.nix b/pkgs/applications/graphics/fbida/default.nix
index b0ad5be937175..cdb5afaac31c5 100644
--- a/pkgs/applications/graphics/fbida/default.nix
+++ b/pkgs/applications/graphics/fbida/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp
+{ stdenv, fetchurl, libjpeg, libexif, libungif, libtiff, libpng, libwebp, libdrm
 , pkgconfig, freetype, fontconfig, which, imagemagick, curl, sane-backends
 }:
 
 stdenv.mkDerivation rec {
-  name = "fbida-2.10";
+  name = "fbida-2.11";
   
   src = fetchurl {
     url = "http://dl.bytesex.org/releases/fbida/${name}.tar.gz";
-    sha256 = "1dkc1d6qlfa1gn94wcbyr7ayiy728q52fvbipwmnl2mlc6n3lnks";
+    sha256 = "00x1lppb66b0gvp6sqs7zjgnlfh80lnkwvsm15ifzvlss3b67akw";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
   buildInputs =
     [ libexif libjpeg libpng libungif freetype fontconfig libtiff libwebp
-      imagemagick curl sane-backends
+      imagemagick curl sane-backends libdrm
     ];
   
   makeFlags = [ "prefix=$(out)" "verbose=yes" ];

From 74eee1f306358780dd8f3050a5ebfbc172fed525 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Mon, 4 Apr 2016 14:24:44 -0400
Subject: [PATCH 710/857] libfastjson: init at v0.99.2

---
 .../libraries/fastjson/default.nix            | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 +++++----
 2 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/fastjson/default.nix

diff --git a/pkgs/development/libraries/fastjson/default.nix b/pkgs/development/libraries/fastjson/default.nix
new file mode 100644
index 0000000000000..4c32519854702
--- /dev/null
+++ b/pkgs/development/libraries/fastjson/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, libtool, autoconf, automake }:
+
+stdenv.mkDerivation rec {
+  version = "v0.99.2";
+  name = "fastjson-${version}";
+  src = fetchFromGitHub {
+    repo = "libfastjson";
+    owner = "rsyslog";
+    rev = "eabae907c9d991143e17da278a239819f2e8ae1c";
+    sha256 = "17fhaqdn0spc4p0848ahcy68swm6l5yd3bx6bdzxmmwj1jdrmvzk";
+  };
+
+  buildInputs = [ autoconf automake libtool ];
+
+  preConfigure = ''
+    sh autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A fast json library for C";
+    homepage = "https://github.com/rsyslog/libfastjson";
+    license = licenses.mit;
+    maintainers = with maintainers; [ nequissimus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae800662444a1..01b76785acb51 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -755,6 +755,8 @@ in
 
   fasd = callPackage ../tools/misc/fasd { };
 
+  fastJson = callPackage ../development/libraries/fastjson { };
+
   fop = callPackage ../tools/typesetting/fop { };
 
   fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
@@ -1590,11 +1592,11 @@ in
     gazebo6-headless = callPackage ../applications/science/robotics/gazebo/6.nix { withHeadless = true;  };
 
     gazebo7 = callPackage ../applications/science/robotics/gazebo { };
-  
+
     gazebo7-headless = callPackage ../applications/science/robotics/gazebo { withHeadless = true; };
 
   };
-  
+
   # at present, Gazebo 7.0.0 does not match Gazebo 6.5.1 for compatibility
   gazebo = gazeboSimulator.gazebo6;
 
@@ -1936,12 +1938,12 @@ in
 
   ifuse = callPackage ../tools/filesystems/ifuse/default.nix { };
 
-  ignition = recurseIntoAttrs { 
+  ignition = recurseIntoAttrs {
 
     math = callPackage ../development/libraries/ignition-math { };
-  
+
     math2 = ignition.math;
-  
+
     transport0 = callPackage ../development/libraries/ignition-transport/0.9.0.nix { };
 
     transport1 = callPackage ../development/libraries/ignition-transport/1.0.1.nix { };

From 925d546d49a26780e41eaaa953c6b4da43a57a04 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Mon, 4 Apr 2016 14:30:31 -0400
Subject: [PATCH 711/857] libksi: 3.2.2.0 -> 3.4.0.5

---
 pkgs/development/libraries/libksi/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libksi/default.nix b/pkgs/development/libraries/libksi/default.nix
index 1f6bd05b5b3be..1dd7102468187 100644
--- a/pkgs/development/libraries/libksi/default.nix
+++ b/pkgs/development/libraries/libksi/default.nix
@@ -4,12 +4,12 @@ stdenv.mkDerivation rec {
   name = "libksi-2015-07-03";
 
   src = fetchFromGitHub {
-    owner = "rgerhards";
+    owner = "Guardtime";
     repo = "libksi";
-    rev = "b1ac0346395b4f52ec42a050bf33ac223f194443";
-    sha256 = "0gg0fl56flwqmsph7j92lgybaa39i715w0nwgkcr58njm0c02wlw";
+    rev = "b82dd65bd693722db92397cbe0920170e0d2ae1c";
+    sha256 = "1sqd31l55kx6knl0sg26ail1k5rgmamq8760p6aj7bpb4jwb8r1n";
   };
-  
+
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs = [ openssl curl ];
 
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    homepage = "https://github.com/rgerhards/libksi";
+    homepage = "https://github.com/GuardTime/libksi";
     description = "Keyless Signature Infrastructure API library";
     license = licenses.asl20;
     platforms = platforms.all;

From 158558e09170d66fd05b0615a310d5d5ac94028f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Mon, 4 Apr 2016 14:31:01 -0400
Subject: [PATCH 712/857] rsyslog: 8.14.0 -> 8.17.0

---
 pkgs/tools/system/rsyslog/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 5d3dbd861aa14..2f38c9b374afc 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, libestr, json_c, zlib, pythonPackages, fastJson
 , libkrb5 ? null, systemd ? null, jemalloc ? null, libmysql ? null, postgresql ? null
 , libdbi ? null, net_snmp ? null, libuuid ? null, curl ? null, gnutls ? null
 , libgcrypt ? null, liblognorm ? null, openssl ? null, librelp ? null, libksi ? null
@@ -11,18 +11,18 @@ let
   mkFlag = cond: name: if cond then "--enable-${name}" else "--disable-${name}";
 in
 stdenv.mkDerivation rec {
-  name = "rsyslog-8.14.0";
+  name = "rsyslog-8.17.0";
 
   src = fetchurl {
     url = "http://www.rsyslog.com/files/download/rsyslog/${name}.tar.gz";
-    sha256 = "1hp7ga543m6vhijcnjb4z8v26ddjgypk1lh6km1cvxc45cfmnfs4";
+    sha256 = "1fazpbllr3wk8aw41zk7b6iirds4h8j3im080nf8my2cjssij7pc";
   };
 
   #patches = [ ./fix-gnutls-detection.patch ];
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
-    libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql
+    fastJson libestr json_c zlib pythonPackages.docutils libkrb5 jemalloc libmysql
     postgresql libdbi net_snmp libuuid curl gnutls libgcrypt liblognorm openssl
     librelp libgt libksi liblogging libnet hadoop rdkafka libmongo-client czmq
     rabbitmq-c hiredis

From bb125c7936c76cf3a3525bf8c99aee3a0cb0849f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Mon, 4 Apr 2016 14:42:07 -0400
Subject: [PATCH 713/857] README: 15.09 -> 16.03

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 9bd2e9b95c9f2..c3187f204624c 100644
--- a/README.md
+++ b/README.md
@@ -14,12 +14,12 @@ build daemon as so-called channels. To get channel information via git, add
 ```
 
 For stability and maximum binary package support, it is recommended to maintain
-custom changes on top of one of the channels, e.g. `nixos-15.09` for the latest
+custom changes on top of one of the channels, e.g. `nixos-16.03` for the latest
 release and `nixos-unstable` for the latest successful build of master:
 
 ```
 % git remote update channels
-% git rebase channels/nixos-15.09
+% git rebase channels/nixos-16.03
 ```
 
 For pull-requests, please rebase onto nixpkgs `master`.
@@ -33,9 +33,9 @@ For pull-requests, please rebase onto nixpkgs `master`.
 * [Manual (NixOS)](https://nixos.org/nixos/manual/)
 * [Nix Wiki](https://nixos.org/wiki/)
 * [Continuous package builds for unstable/master](https://hydra.nixos.org/jobset/nixos/trunk-combined)
-* [Continuous package builds for 15.09 release](https://hydra.nixos.org/jobset/nixos/release-15.09)
+* [Continuous package builds for 16.03 release](https://hydra.nixos.org/jobset/nixos/release-16.03)
 * [Tests for unstable/master](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents)
-* [Tests for 15.09 release](https://hydra.nixos.org/job/nixos/release-15.09/tested#tabs-constituents)
+* [Tests for 16.03 release](https://hydra.nixos.org/job/nixos/release-16.03/tested#tabs-constituents)
 
 Communication:
 

From 9b26566daa10f8321c6642b6646071099a3bfc68 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Mon, 4 Apr 2016 22:11:17 +0200
Subject: [PATCH 714/857] drumgizmo: 0.9.9 -> 0.9.10

---
 pkgs/applications/audio/drumgizmo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/drumgizmo/default.nix b/pkgs/applications/audio/drumgizmo/default.nix
index 08d0afcd3f2b2..e6287af497add 100644
--- a/pkgs/applications/audio/drumgizmo/default.nix
+++ b/pkgs/applications/audio/drumgizmo/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.9";
+  version = "0.9.10";
   name = "drumgizmo-${version}";
 
   src = fetchurl {
     url = "http://www.drumgizmo.org/releases/${name}/${name}.tar.gz";
-    sha256 = "03dnh2p4s6n107n0r86h9j1jwy85a8qwjkh0288k60qpdqy1c7vp";
+    sha256 = "142si734lsyywxhn7msiz053ir96kl5im3h1jql3vhcb4807f3d1";
   };
 
   configureFlags = [ "--enable-lv2" ];

From 08cf0dcb5c9fb3f51a26f7f4912625b017fabd78 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 4 Apr 2016 22:11:21 +0200
Subject: [PATCH 715/857] sbcl: 1.3.3 -> 1.3.4

---
 pkgs/development/compilers/sbcl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index ab8e8e08b1a5e..b88c7f5c8e2c2 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0kzvwzz196ws9z20l8fm15m5gckhmkkc6lxvdib12mfvy80gcf6v";
+    sha256 = "0zx6z43xfnw1b6v5d3bpjrwgqs14wxlji22nl0lr4wmzbfbzvqli";
   };
 
   patchPhase = ''

From 621218c3c119c5673c94a85eb2890076480fed02 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 2 Apr 2016 20:52:11 +0200
Subject: [PATCH 716/857] cpp-netlib: 0.11.2 -> 0.12.0

---
 pkgs/development/libraries/cpp-netlib/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 64b223d4ebb12..c477b4b1f39f5 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -2,21 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "cpp-netlib-${version}";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchurl {
     url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2";
-    sha256 = "0vwnp1jpvsdjaz7f7w55p7gw6hj7694nklmljcvphvkrhbw1g1q5";
+    sha256 = "0h7gyrbr3madycnj8rl8k1jzk2hd8np2k5ad9mijlh0fizzzk3h8";
   };
 
   buildInputs = [ cmake boost openssl ];
 
-  cmakeFlags = [ "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON" "-DCMAKE_BUILD_TYPE=RELEASE" ];
+  cmakeFlags = [
+    "-DCPP-NETLIB_BUILD_SHARED_LIBS=ON"
+    "-DCMAKE_BUILD_TYPE=RELEASE"
+  ];
 
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    description = "A collection of open-source libraries for high level network programming";
+    description =
+      "Collection of open-source libraries for high level network programming";
     homepage    = http://cpp-netlib.org;
     license     = licenses.boost;
     platforms   = platforms.all;

From d54bc765b5662ebe4529a8d8754a9bf5d00a256b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 1 Apr 2016 21:07:40 +0200
Subject: [PATCH 717/857] hplip: canonicalise 56-hpmud.rules' paths if
 installed

Fixes #14338.
---
 pkgs/misc/drivers/hplip/3.15.9.nix  | 12 ++++++++++--
 pkgs/misc/drivers/hplip/default.nix | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix
index 9cd5a78946461..1162cc4f00d2c 100644
--- a/pkgs/misc/drivers/hplip/3.15.9.nix
+++ b/pkgs/misc/drivers/hplip/3.15.9.nix
@@ -2,6 +2,7 @@
 , pkgconfig
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
 , net_snmp, polkit
+, bash, coreutils, utillinux
 , qtSupport ? true, qt4, pyqt4
 , withPlugin ? false
 }:
@@ -112,8 +113,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall = stdenv.lib.optionalString withPlugin
-    ''
+  postInstall = stdenv.lib.optionalString withPlugin ''
     sh ${plugin} --noexec --keep
     cd plugin_tmp
 
@@ -175,6 +175,14 @@ stdenv.mkDerivation {
     wrapPythonProgramsIn $out/lib "$out $pythonPath"
 
     substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
+  '' + stdenv.lib.optionalString (!withPlugin) ''
+    # A udev rule to notify users that they need the binary plugin.
+    # Needs a lot of patching but might save someone a bit of confusion:
+    substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
+      --replace {,${bash}}/bin/sh \
+      --replace {/usr,${coreutils}}/bin/nohup \
+      --replace {,${utillinux}/bin/}logger \
+      --replace {/usr,$out}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index ebe8a4d19abfd..cd8e906c81716 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -2,6 +2,7 @@
 , pkgconfig
 , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
 , net_snmp, polkit
+, bash, coreutils, utillinux
 , qtSupport ? true, qt4, pyqt4
 , withPlugin ? false
 }:
@@ -112,8 +113,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall = stdenv.lib.optionalString withPlugin
-    ''
+  postInstall = stdenv.lib.optionalString withPlugin ''
     sh ${plugin} --noexec --keep
     cd plugin_tmp
 
@@ -175,6 +175,14 @@ stdenv.mkDerivation {
     wrapPythonProgramsIn $out/lib "$out $pythonPath"
 
     substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
+  '' + stdenv.lib.optionalString (!withPlugin) ''
+    # A udev rule to notify users that they need the binary plugin.
+    # Needs a lot of patching but might save someone a bit of confusion:
+    substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
+      --replace {,${bash}}/bin/sh \
+      --replace {/usr,${coreutils}}/bin/nohup \
+      --replace {,${utillinux}/bin/}logger \
+      --replace {/usr,$out}/bin
   '';
 
   meta = with stdenv.lib; {

From f6807dba6054e59c11fcd02da33273e2a6497c41 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 4 Apr 2016 22:16:21 +0200
Subject: [PATCH 718/857] sbcl: better thread support and arm detection

---
 pkgs/development/compilers/sbcl/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index b88c7f5c8e2c2..946205011f2b7 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, writeText, sbclBootstrap
 , sbclBootstrapHost ? "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
+, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
   # Meant for sbcl used for creating binaries portable to non-NixOS via save-lisp-and-die.
   # Note that the created binaries still need `patchelf --set-interpreter ...`
   # to get rid of ${glibc} dependency.
@@ -23,10 +24,11 @@ stdenv.mkDerivation rec {
                (pushnew x features))
              (disable (x)
                (setf features (remove x features))))
-        #-arm
-        (enable :sb-thread)
-        #+arm
-        (enable :arm))) " > customize-target-features.lisp
+    ''
+    + stdenv.lib.optionalString threadSupport "(enable :sb-thread)"
+    + stdenv.lib.optionalString stdenv.isArm "(enable :arm)"
+    + ''
+      )) " > customize-target-features.lisp
 
     pwd
 

From 106d0f6b513b4e54f94d347bf3b103f1433dcb56 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 4 Apr 2016 22:22:30 +0200
Subject: [PATCH 719/857] clisp: control build options and fix non x86*
 architectures

---
 .../interpreters/clisp/default.nix            | 65 +++++++++++++------
 1 file changed, 45 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 919c3771bc5db..c3d289d2a8d48 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -1,6 +1,27 @@
+# there are the following linking sets:
+# - boot (not installed): without modules, only used when building clisp
+# - base (default): contains readline and i18n, regexp and syscalls modules
+#   by default
+# - full: contains base plus modules in withModules
 { stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
 , libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
-, libffi, libffcall, coreutils}:
+, libffi, libffcall, coreutils
+# build options
+, threadSupport ? (stdenv.isi686 || stdenv.isx86_64)
+, x11Support ? (stdenv.isi686 || stdenv.isx86_64)
+, dllSupport ? true
+, withModules ? [
+    "bindings/glibc"
+    "pcre"
+    "rawsock"
+    "wildcard"
+    "zlib"
+  ]
+  ++ stdenv.lib.optional x11Support "clx/new-clx"
+}:
+
+assert x11Support -> (libX11 != null && libXau != null && libXt != null
+  && libXpm != null && xproto != null && libXext != null && xextproto != null);
 
 stdenv.mkDerivation rec {
   v = "2.49";
@@ -13,11 +34,17 @@ stdenv.mkDerivation rec {
 
   inherit libsigsegv gettext coreutils;
   
-  buildInputs =
-    [ libsigsegv gettext ncurses readline libX11 libXau
-      libXt pcre zlib libXpm xproto libXext xextproto libffi
-      libffcall
-    ];
+  buildInputs = [libsigsegv]
+  ++ stdenv.lib.optional (gettext != null) gettext
+  ++ stdenv.lib.optional (ncurses != null) ncurses
+  ++ stdenv.lib.optional (pcre != null) pcre
+  ++ stdenv.lib.optional (zlib != null) zlib
+  ++ stdenv.lib.optional (readline != null) readline
+  ++ stdenv.lib.optional (libffi != null) libffi
+  ++ stdenv.lib.optional (libffcall != null) libffcall
+  ++ stdenv.lib.optionals x11Support [
+    libX11 libXau libXt libXpm xproto libXext xextproto
+  ];
 
   patches = [ ./bits_ipctypes_to_sys_ipc.patch ]; # from Gentoo
 
@@ -34,24 +61,23 @@ stdenv.mkDerivation rec {
     substituteInPlace modules/bindings/glibc/linux.lisp --replace "(def-c-type __swblk_t)" ""
   '';
 
-  configureFlags =
-    ''
-      --with-readline builddir --with-dynamic-ffi --with-ffcall 
-      --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
-      --with-module=pcre --with-module=rawsock --with-module=readline
-      --with-module=syscalls --with-module=wildcard --with-module=zlib
-      --with-threads=POSIX_THREADS
-    '';
+  configureFlags = "builddir"
+  + stdenv.lib.optionalString (!dllSupport) " --without-dynamic-modules"
+  + stdenv.lib.optionalString (readline != null) " --with-readline"
+  + stdenv.lib.optionalString (libffi != null) " --with-dynamic-ffi"
+  + stdenv.lib.optionalString (libffcall != null) " --with-ffcall"
+  + stdenv.lib.concatMapStrings (x: " --with-module=" + x) withModules
+  + stdenv.lib.optionalString threadSupport " --with-threads=POSIX_THREADS";
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d
     cd builddir
   '';
 
-  postInstall = ''
-    ./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full \
-        clx/new-clx bindings/glibc pcre rawsock wildcard zlib
-  '';
+  postInstall =
+    stdenv.lib.optionalString (withModules != [])
+      (''./clisp-link add "$out"/lib/clisp*/base "$(dirname "$out"/lib/clisp*/base)"/full''
+      + stdenv.lib.concatMapStrings (x: " " + x) withModules);
 
   NIX_CFLAGS_COMPILE = "-O0 ${stdenv.lib.optionalString (!stdenv.is64bit) "-falign-functions=4"}";
 
@@ -61,8 +87,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "ANSI Common Lisp Implementation";
     homepage = http://clisp.cons.org;
-    maintainers = [stdenv.lib.maintainers.raskin];
+    maintainers = with stdenv.lib.maintainers; [raskin tohl];
     platforms = stdenv.lib.platforms.linux;
   };
 }
-

From b39fd4f97bd529f69604b1610256594b48b1de04 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Tue, 5 Apr 2016 10:02:42 +1000
Subject: [PATCH 720/857] hipchat: fix links being broken

---
 .../networking/instant-messengers/hipchat/default.nix           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
index 3ff93c35dcd13..6449c9d3d1a52 100644
--- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix
+++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix
@@ -70,6 +70,8 @@ stdenv.mkDerivation {
         patchelf --set-rpath ${rpath}:$out/libexec/hipchat/lib:\$ORIGIN $file || true
     done
 
+    patchShebangs $d/linuxbrowserlaunch.sh
+
     substituteInPlace $out/share/applications/hipchat4.desktop \
       --replace /opt/HipChat4/bin/HipChat4 $out/bin/hipchat
 

From 0c059b49735e2ffbce80c19059b36e9d9f8c70e9 Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Mon, 4 Apr 2016 17:47:35 -0700
Subject: [PATCH 721/857] playerctl: 0.4.2 -> 0.5.0

---
 pkgs/tools/audio/playerctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
index 0e2b11a1f06d6..bd5a6b1d592f1 100644
--- a/pkgs/tools/audio/playerctl/default.nix
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -2,14 +2,14 @@
   pkgconfig, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  name = "playerctl";
-  version = "0.4.2";
+  name = "playerctl-${version}";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "acrisci";
     repo = "playerctl";
     rev = "v${version}";
-    sha256 = "0dy6wc7qr00p53hlhpbg9x40w4ag95r2i7r1nsyb4ym3wzrvskzh";
+    sha256 = "0b4pg5pwblgbf6kvvynzh9dshfikxy5c2ks7733n7wza5wkpgmng";
   };
 
   buildInputs = [

From 56ff116f2a9e1be08596bf72baac4bdec5851692 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 5 Apr 2016 03:23:59 +0200
Subject: [PATCH 722/857] zpaq: 7.07 -> 7.08

Changes:
- Removes multi-part archive support, -nodelete, add -test, and
  -key prompt.
- Updated to libzpaq v7.08 (smaller decoder buffer).
- Updated Makefile to link libzpaq.o statically.
---
 pkgs/tools/archivers/zpaq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index 011793248cd73..ed0cd80863419 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="707";
+    version="708";
     name="${baseName}-${version}";
-    hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
-    url="http://mattmahoney.net/dc/zpaq707.zip";
-    sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
+    hash="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
+    url="http://mattmahoney.net/dc/zpaq708.zip";
+    sha256="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
   };
 in
 stdenv.mkDerivation {

From bfc979c8a0bb355b40495d69bbd56b8b8404d0ec Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Tue, 5 Apr 2016 05:06:52 +0800
Subject: [PATCH 723/857] pell: init at 0.0.1

---
 pkgs/applications/misc/pell/default.nix | 39 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/misc/pell/default.nix

diff --git a/pkgs/applications/misc/pell/default.nix b/pkgs/applications/misc/pell/default.nix
new file mode 100644
index 0000000000000..f79d71ca25058
--- /dev/null
+++ b/pkgs/applications/misc/pell/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, scsh, sox, libnotify }:
+
+stdenv.mkDerivation rec {
+  pname = "pell";
+  version = "0.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "ebzzry";
+    repo = pname;
+    rev = "3f95341eb9439c7a6be1f3c6366c0552ab8208f0";
+    sha256 = "183aj3ys080g2kahl8x8rkhzlsb6h5ls9xm1v2kasfbn1pi5i6nn";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share
+    cp pell $out/bin
+    cp resources/notification.mp3 $out/share
+    chmod +x $out/bin/pell
+  '';
+
+  postFixup = ''
+    substituteInPlace $out/bin/pell --replace "/usr/bin/env scsh" "${scsh}/bin/scsh"
+    substituteInPlace $out/bin/pell --replace "(play " "(${sox}/bin/play "
+    substituteInPlace $out/bin/pell --replace "(notify-send " "(${libnotify}/bin/notify-send "
+    substituteInPlace $out/bin/pell --replace "/usr/share/pell/notification.mp3" "$out/share/notification.mp3"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/ebzzry/pell;
+    description = "A simple periodic host monitor using ping";
+    license = licenses.mit;
+    maintainers = [ maintainers.ebzzry ];
+    platforms = platforms.unix;
+  };
+
+  dontBuild = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 304a698df67df..504c2e6cda22b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2718,6 +2718,8 @@ in
 
   parted = callPackage ../tools/misc/parted { hurd = null; };
 
+  pell = callPackage ../applications/misc/pell { };
+
   pitivi = callPackage ../applications/video/pitivi {
     gst = gst_all_1 //
       { gst-plugins-bad = gst_all_1.gst-plugins-bad.overrideDerivation

From 9dfa26d2cee4c5309f24e5cc4a5b5185cccbd08a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Apr 2016 08:09:00 +0200
Subject: [PATCH 724/857] why3: 0.86.3 -> 0.87.0

---
 pkgs/applications/science/logic/why3/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 0eb51ff1620bb..7825fc2761edf 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "why3-${version}";
-  version = "0.86.3";
+  version = "0.87.0";
 
   src = fetchurl {
-    url    = https://gforge.inria.fr/frs/download.php/file/35537/why3-0.86.3.tar.gz;
-    sha256 = "0sph6i4ga9450bk60wpm5cq3psw3g8xprnac7yjfq64iqz1dyz03";
+    url    = https://gforge.inria.fr/frs/download.php/file/35643/why3-0.87.0.tar.gz;
+    sha256 = "0c3vhcb70ay7iwvmq0m25fqh38y40c5x7mki4r9pxf13vgbs3xb0";
   };
 
   buildInputs = (with ocamlPackages; [

From 9b52caaa0c57a24a403c436d9e0b7f154af1a097 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 5 Apr 2016 09:32:58 +0200
Subject: [PATCH 725/857] emacs25pre: 25.0.50-1b5630e -> 25.0.92

---
 .../applications/editors/emacs-25/default.nix | 29 +++++++------------
 pkgs/top-level/all-packages.nix               |  3 +-
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/editors/emacs-25/default.nix b/pkgs/applications/editors/emacs-25/default.nix
index 472a686b964be..93baa43abc32c 100644
--- a/pkgs/applications/editors/emacs-25/default.nix
+++ b/pkgs/applications/editors/emacs-25/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchgit, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
+{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
-, alsaLib, cairo, acl, gpm, AppKit, Foundation, libobjc
+, alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
 , autoconf, automake
 , withX ? !stdenv.isDarwin
 , withGTK3 ? false, gtk3 ? null
@@ -23,17 +23,16 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "emacs-25.0.50-1b5630e";
+  name = "emacs-25.0.92";
 
   builder = ./builder.sh;
 
-  src = fetchgit {
-    url = "git://git.savannah.gnu.org/emacs.git";
-    rev = "1b5630eb47d3f4bade09708c958ab006b83b3fc0";
-    sha256 = "0n3qbri84akmy7ad1pbv89j4jn4x9pnkz0p4nbhh6m1c37cbz58l";
+  src = fetchurl {
+    url = "ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-25.0.92.tar.xz";
+    sha256 = "13jnj1js2l90k4yk219r3z67fff90r6mniprsp0sgip2kaak75y2";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     ./at-fdcwd.patch
   ];
 
@@ -52,11 +51,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (withX && withGTK3) gtk3
     ++ stdenv.lib.optional (stdenv.isDarwin && withX) cairo;
 
-  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit Foundation libobjc
-  ];
-
-  NIX_LDFLAGS = stdenv.lib.optional stdenv.isDarwin
-    "/System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation";
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
 
   configureFlags =
     if stdenv.isDarwin
@@ -81,18 +76,16 @@ stdenv.mkDerivation rec {
     mv nextstep/Emacs.app $out/Applications
   '';
 
-  doCheck = !stdenv.isDarwin;
+  # https://github.com/NixOS/nixpkgs/issues/13573
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "GNU Emacs 25 (pre), the extensible, customizable text editor";
     homepage    = http://www.gnu.org/software/emacs/;
     license     = licenses.gpl3Plus;
-    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny ];
+    maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
     platforms   = platforms.all;
 
-    # So that Exuberant ctags is preferred
-    priority = 1;
-
     longDescription = ''
       GNU Emacs is an extensible, customizable text editor—and more.  At its
       core is an interpreter for Emacs Lisp, a dialect of the Lisp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f0ab25e92e94..7e006a848d0d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11892,8 +11892,7 @@ in
     imagemagick = null;
     acl = null;
     gpm = null;
-    inherit (darwin.apple_sdk.frameworks) AppKit Foundation;
-    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) AppKit CoreWLAN GSS Kerberos ImageIO;
   });
 
   emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {

From 2bbae9696afac559506a2589ec3ea67ca982b8bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 Apr 2016 09:56:32 +0200
Subject: [PATCH 726/857] nixpkgs manual introduction: improve

- make line wrapping more consistent (overlong lines)
- don't stress the manual is *only* for contributors,
  as it does contain some user-guide parts, including the intro itself
- since March our Hydra publishes binaries immediately,
  not waiting for channel update
---
 doc/introduction.md | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/doc/introduction.md b/doc/introduction.md
index 618251a6e1562..96a5571b42663 100644
--- a/doc/introduction.md
+++ b/doc/introduction.md
@@ -6,13 +6,14 @@ date: 2015-11-25
 
 # Introduction
 
-The Nix Packages collection (Nixpkgs) is a set of over 30,000 packages for the
-[Nix package manager](http://nixos.org/nix/), released under a [permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
-Packages are available for several architectures, and can be used with the Nix package manager
-on most GNU/Linux distributions as well as NixOS.
-
-This manual describes how to write packages for the Nix Packages collection
-(Nixpkgs). Thus it’s for packagers and developers who want to add packages to
+The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the
+[Nix package manager](http://nixos.org/nix/), released under a
+[permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
+Packages are available for several platforms, and can be used with the Nix
+package manager on most GNU/Linux distributions as well as NixOS.
+
+This manual primarily describes how to write packages for the Nix Packages collection
+(Nixpkgs). Thus it’s mainly for packagers and developers who want to add packages to
 Nixpkgs. If you like to learn more about the Nix package manager and the Nix
 expression language, then you are kindly referred to the [Nix manual](http://nixos.org/nix/manual/).
 
@@ -20,29 +21,33 @@ expression language, then you are kindly referred to the [Nix manual](http://nix
 
 Nix expressions describe how to build packages from source and are collected in
 the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
-collection are Nix expressions for [NixOS modules](http://nixos.org/nixos/manual/index.html#sec-writing-modules). With
-these expressions the Nix package manager can build binary packages.
+collection are Nix expressions for
+[NixOS modules](http://nixos.org/nixos/manual/index.html#sec-writing-modules).
+With these expressions the Nix package manager can build binary packages.
 
 Packages, including the Nix packages collection, are distributed through
 [channels](http://nixos.org/nix/manual/#sec-channels). The collection is
 distributed for users of Nix on non-NixOS distributions through the channel
 `nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g.
-`nixos-15.09`, which includes all packages and modules for the stable NixOS
-15.09. The channels of the stable NixOS releases are generally only given
+`nixos-16.03`, which includes all packages and modules for the stable NixOS
+16.03. The purpose of stable NixOS releases are generally only given
 security updates. More up to date packages and modules are available via the
 `nixos-unstable` channel.
 
 Both `nixos-unstable` and `nixpkgs` follow the `master` branch of the Nixpkgs
-repository, although both do lag the `master` branch by generally [a couple of days](http://howoldis.herokuapp.com/). Updates to a channel are distributed as
-soon as all tests for that channel pass, e.g. [this table](http://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
+repository, although both do lag the `master` branch by generally
+[a couple of days](http://howoldis.herokuapp.com/). Updates to a channel are
+distributed as soon as all tests for that channel pass, e.g.
+[this table](http://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
 shows the status of tests for the `nixpkgs` channel.
 
 The tests are conducted by a cluster called [Hydra](http://nixos.org/hydra/),
-which also builds binary packages from the Nix expressions in Nixpkgs. As soon
-as a channel is updated, the binaries are made available via a [binary cache](https://cache.nixos.org). Until the channel updates, binaries that have
-already been built, are available via [Hydra's binary cache](https://hydra.nixos.org).
+which also builds binary packages from the Nix expressions in Nixpkgs for
+`x86_64-linux`, `i686-linux` and `x86_64-darwin`.
+The binaries are made available via a [binary cache](https://cache.nixos.org).
 
 The current Nix expressions of the channels are available in the
 [`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
 which has branches corresponding to the available channels. There is also the
-Nixpkgs Monitor which keeps track of updates and security vulnerabilities.
+[Nixpkgs Monitor](http://monitor.nixos.org) which keeps track of updates
+and security vulnerabilities.

From 69c746d06bd98cbf2b413aec9064d075f5d82638 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Apr 2016 11:18:18 +0200
Subject: [PATCH 727/857] Update AMI creation script

---
 nixos/maintainers/scripts/ec2/create-amis.sh | 22 +++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/nixos/maintainers/scripts/ec2/create-amis.sh b/nixos/maintainers/scripts/ec2/create-amis.sh
index 8604091dbcdb9..1bf2a9c5830b8 100755
--- a/nixos/maintainers/scripts/ec2/create-amis.sh
+++ b/nixos/maintainers/scripts/ec2/create-amis.sh
@@ -8,14 +8,15 @@ echo "keeping state in $stateDir"
 mkdir -p $stateDir
 
 version=$(nix-instantiate --eval --strict '<nixpkgs>' -A lib.nixpkgsVersion | sed s/'"'//g)
-echo "NixOS version is $version"
+major=${version:0:5}
+echo "NixOS version is $version ($major)"
 
 rm -f ec2-amis.nix
 
 
 for type in hvm pv; do
     link=$stateDir/$type
-    imageFile=$link/nixos.img
+    imageFile=$link/nixos.qcow2
     system=x86_64-linux
     arch=x86_64
 
@@ -61,12 +62,19 @@ for type in hvm pv; do
                         # Bundle the image.
                         imageDir=$stateDir/$type-bundled
 
+                        # Convert the image to raw format.
+                        rawFile=$stateDir/$type.raw
+                        if ! [ -e $rawFile ]; then
+                            qemu-img convert -f qcow2 -O raw $imageFile $rawFile.tmp
+                            mv $rawFile.tmp $rawFile
+                        fi
+
                         if ! [ -d $imageDir ]; then
                             rm -rf $imageDir.tmp
                             mkdir -p $imageDir.tmp
                             ec2-bundle-image \
                                 -d $imageDir.tmp \
-                                -i $imageFile --arch $arch \
+                                -i $rawFile --arch $arch \
                                 --user "$AWS_ACCOUNT" -c "$EC2_CERT" -k "$EC2_PRIVATE_KEY"
                             mv $imageDir.tmp $imageDir
                         fi
@@ -75,14 +83,14 @@ for type in hvm pv; do
                         if ! [ -e $imageDir/uploaded ]; then
                             echo "uploading bundle to S3..."
                             ec2-upload-bundle \
-                                -m $imageDir/nixos.img.manifest.xml \
+                                -m $imageDir/$type.raw.manifest.xml \
                                 -b "$bucket/$bucketDir" \
                                 -a "$EC2_ACCESS_KEY" -s "$EC2_SECRET_KEY" \
                                 --location EU
                             touch $imageDir/uploaded
                         fi
 
-                        extraFlags="$bucket/$bucketDir/nixos.img.manifest.xml"
+                        extraFlags="$bucket/$bucketDir/$type.raw.manifest.xml"
 
                     else
 
@@ -90,7 +98,7 @@ for type in hvm pv; do
                         # to upload a huge raw image.
                         vhdFile=$stateDir/$type.vhd
                         if ! [ -e $vhdFile ]; then
-                            qemu-img convert -O vpc $imageFile $vhdFile.tmp
+                            qemu-img convert -f qcow2 -O vpc $imageFile $vhdFile.tmp
                             mv $vhdFile.tmp $vhdFile
                         fi
 
@@ -209,7 +217,7 @@ for type in hvm pv; do
                 prevRegion="$region"
             fi
 
-            echo "  \"15.09\".$region.$type-$store = \"$ami\";" >> ec2-amis.nix
+            echo "  \"$major\".$region.$type-$store = \"$ami\";" >> ec2-amis.nix
         done
 
     done

From ab2855b97556051aac466547fbe56bd66c041f50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Apr 2016 11:25:04 +0200
Subject: [PATCH 728/857] Add 16.03 AMIs

---
 nixos/modules/virtualisation/ec2-amis.nix | 37 +++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/nixos/modules/virtualisation/ec2-amis.nix b/nixos/modules/virtualisation/ec2-amis.nix
index 15ea7bb194487..e0aad5e42f206 100644
--- a/nixos/modules/virtualisation/ec2-amis.nix
+++ b/nixos/modules/virtualisation/ec2-amis.nix
@@ -89,4 +89,41 @@
   "15.09".us-west-2.hvm-s3 = "ami-2956b849";
   "15.09".us-west-2.pv-ebs = "ami-005fb160";
   "15.09".us-west-2.pv-s3 = "ami-cd55bbad";
+
+  "16.03".ap-northeast-1.hvm-ebs = "ami-885040e6";
+  "16.03".ap-northeast-1.hvm-s3 = "ami-d15a4abf";
+  "16.03".ap-northeast-1.pv-ebs = "ami-7f455511";
+  "16.03".ap-northeast-1.pv-s3 = "ami-6d7d6d03";
+  "16.03".ap-southeast-1.hvm-ebs = "ami-478a5f24";
+  "16.03".ap-southeast-1.hvm-s3 = "ami-b2885dd1";
+  "16.03".ap-southeast-1.pv-ebs = "ami-55b46136";
+  "16.03".ap-southeast-1.pv-s3 = "ami-92b762f1";
+  "16.03".ap-southeast-2.hvm-ebs = "ami-26b09345";
+  "16.03".ap-southeast-2.hvm-s3 = "ami-52ac8f31";
+  "16.03".ap-southeast-2.pv-ebs = "ami-1fb3907c";
+  "16.03".ap-southeast-2.pv-s3 = "ami-49b1922a";
+  "16.03".eu-central-1.hvm-ebs = "ami-2bd63744";
+  "16.03".eu-central-1.hvm-s3 = "ami-82d435ed";
+  "16.03".eu-central-1.pv-ebs = "ami-b729c8d8";
+  "16.03".eu-central-1.pv-s3 = "ami-a12dccce";
+  "16.03".eu-west-1.hvm-ebs = "ami-87c242f4";
+  "16.03".eu-west-1.hvm-s3 = "ami-b6c343c5";
+  "16.03".eu-west-1.pv-ebs = "ami-6bc94918";
+  "16.03".eu-west-1.pv-s3 = "ami-00cb4b73";
+  "16.03".sa-east-1.hvm-ebs = "ami-845cd3e8";
+  "16.03".sa-east-1.hvm-s3 = "ami-8142cded";
+  "16.03".sa-east-1.pv-ebs = "ami-1643cc7a";
+  "16.03".sa-east-1.pv-s3 = "ami-1646c97a";
+  "16.03".us-east-1.hvm-ebs = "ami-2cc4d046";
+  "16.03".us-east-1.hvm-s3 = "ami-9bc9ddf1";
+  "16.03".us-east-1.pv-ebs = "ami-7df4e017";
+  "16.03".us-east-1.pv-s3 = "ami-90f2e6fa";
+  "16.03".us-west-1.hvm-ebs = "ami-d8116db8";
+  "16.03".us-west-1.hvm-s3 = "ami-a7166ac7";
+  "16.03".us-west-1.pv-ebs = "ami-e90c7089";
+  "16.03".us-west-1.pv-s3 = "ami-5b0c703b";
+  "16.03".us-west-2.hvm-ebs = "ami-b339ccd3";
+  "16.03".us-west-2.hvm-s3 = "ami-2c3bce4c";
+  "16.03".us-west-2.pv-ebs = "ami-0625d066";
+  "16.03".us-west-2.pv-s3 = "ami-7414e114";
 }

From f2a88f89c62944ccf3560cb55bfb3c3bfc22ad12 Mon Sep 17 00:00:00 2001
From: ldesgoui <ldesgoui@gmail.com>
Date: Sat, 2 Apr 2016 18:58:48 +0200
Subject: [PATCH 729/857] discord: init at 0.0.1

---
 lib/maintainers.nix                           |  1 +
 .../instant-messengers/discord/default.nix    | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 50 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/discord/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index ae97005c6550b..d00e84140a8eb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -186,6 +186,7 @@
   ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
   lassulus = "Lassulus <lassulus@gmail.com>";
   layus = "Guillaume Maudoux <layus.on@gmail.com>";
+  ldesgoui = "Lucas Desgouilles <ldesgoui@gmail.com>";
   lebastr = "Alexander Lebedev <lebastr@gmail.com>";
   leenaars = "Michiel Leenaars <ml.software@leenaa.rs>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix
new file mode 100644
index 0000000000000..a072c4a5d767b
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl
+, alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf
+, glib, gnome, gtk, libnotify, libX11, libXcomposite, libXcursor, libXdamage
+, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, pango
+, udev }:
+
+let version = "0.0.1"; in
+
+stdenv.mkDerivation {
+
+    name = "discord-${version}";
+
+    src = fetchurl {
+        url = "https://storage.googleapis.com/discord-developer/test/discord-canary-${version}.tar.gz";
+        sha256 = "1skmwc84s4xqyc167qrplhy5ah06kwfa3d3rxiwi4c8rc55vdd0g";
+    };
+
+    libPath = stdenv.lib.makeLibraryPath [
+        stdenv.cc.cc alsaLib atk cairo cups dbus expat fontconfig freetype
+        gdk_pixbuf glib gnome.GConf gtk libnotify libX11 libXcomposite
+        libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
+        libXtst nspr nss pango udev
+     ];
+
+    installPhase = ''
+        mkdir -p $out/bin
+        mv * $out
+
+        # Copying how adobe-reader does it,
+        # see pkgs/applications/misc/adobe-reader/builder.sh
+        patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                 --set-rpath "$out:$libPath"                                   \
+                 $out/DiscordCanary
+
+        ln -s $out/DiscordCanary $out/bin/
+
+        # Putting udev in the path won't work :(
+        ln -s ${udev}/lib/libudev.so.1 $out
+        '';
+
+    meta = with stdenv.lib; {
+        description = "All-in-one voice and text chat for gamers that’s free, secure, and works on both your desktop and phone";
+        homepage = "https://discordapp.com/";
+        license = licenses.unfree;
+        maintainers = [ maintainers.ldesgoui ];
+        platforms = [ "x86_64-linux" ];
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b336c9f1a879..2977f1bc07b85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16471,4 +16471,5 @@ in
 
   togglesg-download = callPackage ../tools/misc/togglesg-download { };
 
+  discord = callPackage ../applications/networking/instant-messengers/discord { };
 }

From aa670eb503a24f64b1c6f5f1c532129809dffeae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 Apr 2016 14:30:43 +0200
Subject: [PATCH 730/857] vmTools: update debian jessie 8.3 -> 8.4

Their in-place updates break download hashes...
---
 pkgs/build-support/vm/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 56a13d6787a7d..774c1b700c695 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1781,22 +1781,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.3-jessie-i386";
-      fullName = "Debian 8.3 Jessie (i386)";
+      name = "debian-8.4-jessie-i386";
+      fullName = "Debian 8.4 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "1240d404bd99afbeec042c08fdab049f0b5a984a393cac7c221553ab08f637f5";
+        sha256 = "1j8swc1nzsi20vbcmya2sv0fzcnz7lhwb32lxabgcwm3xlkzlg58";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.3-jessie-amd64";
-      fullName = "Debian 8.3 Jessie (amd64)";
+      name = "debian-8.4-jessie-amd64";
+      fullName = "Debian 8.4 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "ec937c1b3bbfe4803f0fa43681b19d089eb6b355455ac7caa17ec8e9ff604e56";
+        sha256 = "0kipisyjkhczghzqj4a8y1n4az9c4c8lsj8sw7js13b053lpj6ga";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From 90624dcf891809bfafed2f35e5977d66f002d958 Mon Sep 17 00:00:00 2001
From: Markus Wotringer <markus@wotringer.de>
Date: Tue, 5 Apr 2016 14:34:42 +0200
Subject: [PATCH 731/857] conkeror: 1.0pre-20150730 -> 1.0pre-20160130

---
 .../networking/browsers/conkeror/default.nix         | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix
index 8ade601d48407..3221463744686 100644
--- a/pkgs/applications/networking/browsers/conkeror/default.nix
+++ b/pkgs/applications/networking/browsers/conkeror/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchgit, unzip, firefox, makeWrapper }:
 
-stdenv.mkDerivation {
-  name = "conkeror-1.0pre-20150730";
-
+stdenv.mkDerivation rec {
+  pkgname = "conkeror";
+  version = "1.0pre-20160130";
+  name = "${pkgname}-${version}";
+ 
   src = fetchgit {
     url = git://repo.or.cz/conkeror.git;
-    rev = "a1f7e879b129df5cf14ea4ce80a9c1407380ed58";
-    sha256 = "12d8949a81a670037664dd930f7efe3d54b321aad48deea68343eba9aaea8785";
+    rev = "3e4732cd0d15aa70121fe0a0403103b777c964bf";
+    sha256 = "1c4ri6011wqnkkz1gcn4l6dkvz693mycwqgncbanhydmy8pcb7jk";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 53e8e9393904d8f585cfd39d6843f51ef0b49efe Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polycademy.com>
Date: Wed, 6 Apr 2016 00:06:53 +1000
Subject: [PATCH 732/857] nixos/stage-1: Removed logCommands conditional for
 resetting the file descriptors after completion of logging

---
 nixos/modules/system/boot/stage-1-init.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index c0c2b6a941649..1f8779abf0c31 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -434,11 +434,8 @@ udevadm control --exit
 
 # Reset the logging file descriptors.
 # Do this just before pkill, which will kill the tee process.
-if test -n "@logCommands@"
-then
-    exec 1>&$logOutFd 2>&$logErrFd
-    eval "exec $logOutFd>&- $logErrFd>&-"
-fi
+exec 1>&$logOutFd 2>&$logErrFd
+eval "exec $logOutFd>&- $logErrFd>&-"
 
 # Kill any remaining processes, just to be sure we're not taking any
 # with us into stage 2. But keep storage daemons like unionfs-fuse.

From 14cb8a7a5888238ab918cc7dbb9660f54e8d93ac Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Mon, 4 Apr 2016 23:58:45 +0100
Subject: [PATCH 733/857] mutt: 1.5.24 -> 1.6.0

---
 pkgs/applications/networking/mailreaders/mutt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix
index a1bfb9f854c45..1964faf2f5c84 100644
--- a/pkgs/applications/networking/mailreaders/mutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/mutt/default.nix
@@ -17,14 +17,14 @@ assert saslSupport -> cyrus_sasl != null;
 assert gpgmeSupport -> gpgme != null;
 
 let
-  version = "1.5.24";
+  version = "1.6.0";
 in
 stdenv.mkDerivation rec {
   name = "mutt${stdenv.lib.optionalString withSidebar "-with-sidebar"}-${version}";
 
   src = fetchurl {
     url = "http://ftp.mutt.org/pub/mutt/mutt-${version}.tar.gz";
-    sha256 = "0012njrgxf1barjksqkx7ccid2l0xyikhna9mjs9vcfpbrvcm4m2";
+    sha256 = "06bc2drbgalkk68rzg7hq2v5m5qgjxff5357wg0419dpi8ivdbr9";
   };
 
   buildInputs = with stdenv.lib;

From 81e23c5ab1c492ea1732919abb9a8a2b77d9f9c1 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Tue, 5 Apr 2016 00:24:11 +0100
Subject: [PATCH 734/857] mutt: update sidebar patch

---
 pkgs/applications/networking/mailreaders/mutt/sidebar.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/mutt/sidebar.patch b/pkgs/applications/networking/mailreaders/mutt/sidebar.patch
index 262e8f98a65a0..bac1b4ab83b2c 100644
--- a/pkgs/applications/networking/mailreaders/mutt/sidebar.patch
+++ b/pkgs/applications/networking/mailreaders/mutt/sidebar.patch
@@ -78,7 +78,7 @@ index 5dfeff6..cf1ac98 100644
  	score.c send.c sendlib.c signal.c sort.c \
  	status.c system.c thread.c charset.c history.c lib.c \
 +	sidebar.c \
- 	muttlib.c editmsg.c mbyte.c \
+ 	muttlib.c editmsg.c mbyte.c mutt_idna.c \
  	url.c ascii.c crypt-mod.c crypt-mod.h safe_asprintf.c
  
 diff --git a/OPS b/OPS

From 2a36723f0990504df66335f5676c396b8debbcc9 Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Tue, 5 Apr 2016 16:29:59 +0200
Subject: [PATCH 735/857] Remove broken node packages

* Remove broken upstream packages and packages that do not exist
  anymore.
* Add eslint.

Building node-packages-generated.nix with the latest npm2nix did not
work, I had to update a dependency in npm2nix to resolve the issue, see
https://github.com/NixOS/npm2nix/pull/37
---
 pkgs/top-level/node-packages-generated.nix | 40205 ++++++++++---------
 pkgs/top-level/node-packages.json          |    10 +-
 2 files changed, 21097 insertions(+), 19118 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 7cd7245edd8b7..b8f0e66dd5329 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1,4 +1,4 @@
-{ self, fetchurl, fetchgit ? null, fetchFromGitHub, lib }:
+{ self, fetchurl, fetchgit ? null, lib }:
 
 {
   by-spec."Base64"."~0.2.0" =
@@ -8,7 +8,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
+      url = "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz";
       name = "Base64-0.2.1.tgz";
       sha1 = "ba3a4230708e186705065e66babdd4c35cf60028";
     };
@@ -27,7 +27,7 @@
     version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
+      url = "https://registry.npmjs.org/CSSselect/-/CSSselect-0.4.1.tgz";
       name = "CSSselect-0.4.1.tgz";
       sha1 = "f8ab7e1f8418ce63cda6eb7bd778a85d7ec492b2";
     };
@@ -48,7 +48,7 @@
     version = "0.4.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
+      url = "https://registry.npmjs.org/CSSwhat/-/CSSwhat-0.4.7.tgz";
       name = "CSSwhat-0.4.7.tgz";
       sha1 = "867da0ff39f778613242c44cfea83f0aa4ebdf9b";
     };
@@ -60,6 +60,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."JSON2"."^0.1.0" =
+    self.by-version."JSON2"."0.1.0";
+  by-version."JSON2"."0.1.0" = self.buildNodePackage {
+    name = "JSON2-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/JSON2/-/JSON2-0.1.0.tgz";
+      name = "JSON2-0.1.0.tgz";
+      sha1 = "8d7493040a63d5835af75f47decb83ab6c8c0790";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."JSONPath"."^0.10.0" =
     self.by-version."JSONPath"."0.10.0";
   by-version."JSONPath"."0.10.0" = self.buildNodePackage {
@@ -67,7 +86,7 @@
     version = "0.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/JSONPath/-/JSONPath-0.10.0.tgz";
+      url = "https://registry.npmjs.org/JSONPath/-/JSONPath-0.10.0.tgz";
       name = "JSONPath-0.10.0.tgz";
       sha1 = "44959bdd94e3641858e7f2147d93c732f3505b1c";
     };
@@ -80,6 +99,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."JSONStream"."1.x" =
+    self.by-version."JSONStream"."1.1.1";
+  by-version."JSONStream"."1.1.1" = self.buildNodePackage {
+    name = "JSONStream-1.1.1";
+    version = "1.1.1";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/JSONStream/-/JSONStream-1.1.1.tgz";
+      name = "JSONStream-1.1.1.tgz";
+      sha1 = "c98bfd88c8f1e1e8694e53c5baa6c8691553e59a";
+    };
+    deps = {
+      "jsonparse-1.2.0" = self.by-version."jsonparse"."1.2.0";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."JSONStream"."^0.8.4" =
     self.by-version."JSONStream"."0.8.4";
   by-version."JSONStream"."0.8.4" = self.buildNodePackage {
@@ -87,13 +127,13 @@
     version = "0.8.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
+      url = "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz";
       name = "JSONStream-0.8.4.tgz";
       sha1 = "91657dfe6ff857483066132b4618b62e8f4887bd";
     };
     deps = {
       "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
     };
     optionalDependencies = {
     };
@@ -101,20 +141,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."JSONStream"."~0.10.0" =
-    self.by-version."JSONStream"."0.10.0";
-  by-version."JSONStream"."0.10.0" = self.buildNodePackage {
-    name = "JSONStream-0.10.0";
-    version = "0.10.0";
-    bin = true;
+  by-spec."JSONStream"."^1.0.3" =
+    self.by-version."JSONStream"."1.1.1";
+  by-spec."abbrev"."1" =
+    self.by-version."abbrev"."1.0.7";
+  by-version."abbrev"."1.0.7" = self.buildNodePackage {
+    name = "abbrev-1.0.7";
+    version = "1.0.7";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.10.0.tgz";
-      name = "JSONStream-0.10.0.tgz";
-      sha1 = "74349d0d89522b71f30f0a03ff9bd20ca6f12ac0";
+      url = "https://registry.npmjs.org/abbrev/-/abbrev-1.0.7.tgz";
+      name = "abbrev-1.0.7.tgz";
+      sha1 = "5b6035b2ee9d4fb5cf859f08a9be81b208491843";
     };
     deps = {
-      "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -122,20 +162,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."JSONStream"."~0.6.4" =
-    self.by-version."JSONStream"."0.6.4";
-  by-version."JSONStream"."0.6.4" = self.buildNodePackage {
-    name = "JSONStream-0.6.4";
-    version = "0.6.4";
+  by-spec."abbrev"."1.0.x" =
+    self.by-version."abbrev"."1.0.7";
+  by-spec."abbrev"."~1.0.7" =
+    self.by-version."abbrev"."1.0.7";
+  by-spec."abstract-leveldown"."~0.12.1" =
+    self.by-version."abstract-leveldown"."0.12.4";
+  by-version."abstract-leveldown"."0.12.4" = self.buildNodePackage {
+    name = "abstract-leveldown-0.12.4";
+    version = "0.12.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.6.4.tgz";
-      name = "JSONStream-0.6.4.tgz";
-      sha1 = "4b2c8063f8f512787b2375f7ee9db69208fa2dcb";
+      url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz";
+      name = "abstract-leveldown-0.12.4.tgz";
+      sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
     };
     deps = {
-      "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
-      "through-2.2.7" = self.by-version."through"."2.2.7";
+      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -143,20 +186,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."JSONStream"."~0.7.1" =
-    self.by-version."JSONStream"."0.7.4";
-  by-version."JSONStream"."0.7.4" = self.buildNodePackage {
-    name = "JSONStream-0.7.4";
-    version = "0.7.4";
+  by-spec."abstract-leveldown"."~0.12.2" =
+    self.by-version."abstract-leveldown"."0.12.4";
+  by-spec."accepts"."1.1.4" =
+    self.by-version."accepts"."1.1.4";
+  by-version."accepts"."1.1.4" = self.buildNodePackage {
+    name = "accepts-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/JSONStream/-/JSONStream-0.7.4.tgz";
-      name = "JSONStream-0.7.4.tgz";
-      sha1 = "734290e41511eea7c2cfe151fbf9a563a97b9786";
+      url = "https://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
+      name = "accepts-1.1.4.tgz";
+      sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
     };
     deps = {
-      "jsonparse-0.0.5" = self.by-version."jsonparse"."0.0.5";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
     };
     optionalDependencies = {
     };
@@ -164,22 +209,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."JSONStream"."~0.8.3" =
-    self.by-version."JSONStream"."0.8.4";
-  by-spec."JSONStream"."~0.8.4" =
-    self.by-version."JSONStream"."0.8.4";
-  by-spec."abbrev"."1" =
-    self.by-version."abbrev"."1.0.5";
-  by-version."abbrev"."1.0.5" = self.buildNodePackage {
-    name = "abbrev-1.0.5";
-    version = "1.0.5";
+  by-spec."accepts"."~1.0.4" =
+    self.by-version."accepts"."1.0.7";
+  by-version."accepts"."1.0.7" = self.buildNodePackage {
+    name = "accepts-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/abbrev/-/abbrev-1.0.5.tgz";
-      name = "abbrev-1.0.5.tgz";
-      sha1 = "5d8257bd9ebe435e698b2fa431afde4fe7b10b03";
+      url = "https://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
+      name = "accepts-1.0.7.tgz";
+      sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
     };
     deps = {
+      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
+      "negotiator-0.4.7" = self.by-version."negotiator"."0.4.7";
     };
     optionalDependencies = {
     };
@@ -187,27 +230,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."abbrev"."1.0.x" =
-    self.by-version."abbrev"."1.0.5";
-  by-spec."abbrev"."^1.0.5" =
-    self.by-version."abbrev"."1.0.5";
-  by-spec."abbrev"."~1.0.4" =
-    self.by-version."abbrev"."1.0.5";
-  by-spec."abbrev"."~1.0.5" =
-    self.by-version."abbrev"."1.0.5";
-  by-spec."abstract-leveldown"."~0.12.1" =
-    self.by-version."abstract-leveldown"."0.12.4";
-  by-version."abstract-leveldown"."0.12.4" = self.buildNodePackage {
-    name = "abstract-leveldown-0.12.4";
-    version = "0.12.4";
+  by-spec."accepts"."~1.0.7" =
+    self.by-version."accepts"."1.0.7";
+  by-spec."accepts"."~1.2.10" =
+    self.by-version."accepts"."1.2.13";
+  by-version."accepts"."1.2.13" = self.buildNodePackage {
+    name = "accepts-1.2.13";
+    version = "1.2.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz";
-      name = "abstract-leveldown-0.12.4.tgz";
-      sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410";
+      url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz";
+      name = "accepts-1.2.13.tgz";
+      sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea";
     };
     deps = {
-      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
     };
     optionalDependencies = {
     };
@@ -215,22 +253,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."abstract-leveldown"."~0.12.2" =
-    self.by-version."abstract-leveldown"."0.12.4";
-  by-spec."accepts"."~1.0.4" =
-    self.by-version."accepts"."1.0.7";
-  by-version."accepts"."1.0.7" = self.buildNodePackage {
-    name = "accepts-1.0.7";
-    version = "1.0.7";
+  by-spec."accepts"."~1.2.12" =
+    self.by-version."accepts"."1.2.13";
+  by-spec."accepts"."~1.2.13" =
+    self.by-version."accepts"."1.2.13";
+  by-spec."accepts"."~1.3.0" =
+    self.by-version."accepts"."1.3.2";
+  by-version."accepts"."1.3.2" = self.buildNodePackage {
+    name = "accepts-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.0.7.tgz";
-      name = "accepts-1.0.7.tgz";
-      sha1 = "5b501fb4f0704309964ccdb048172541208dab1a";
+      url = "https://registry.npmjs.org/accepts/-/accepts-1.3.2.tgz";
+      name = "accepts-1.3.2.tgz";
+      sha1 = "9bfd7ddc497fdc1dad73a97b3f7cdc133929fac1";
     };
     deps = {
-      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "negotiator-0.4.7" = self.by-version."negotiator"."0.4.7";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "negotiator-0.6.0" = self.by-version."negotiator"."0.6.0";
     };
     optionalDependencies = {
     };
@@ -238,22 +278,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."accepts"."~1.0.7" =
-    self.by-version."accepts"."1.0.7";
-  by-spec."accepts"."~1.1.0" =
-    self.by-version."accepts"."1.1.4";
-  by-version."accepts"."1.1.4" = self.buildNodePackage {
-    name = "accepts-1.1.4";
-    version = "1.1.4";
-    bin = false;
+  by-spec."accepts"."~1.3.1" =
+    self.by-version."accepts"."1.3.2";
+  by-spec."acorn"."0.11.0" =
+    self.by-version."acorn"."0.11.0";
+  by-version."acorn"."0.11.0" = self.buildNodePackage {
+    name = "acorn-0.11.0";
+    version = "0.11.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
-      name = "accepts-1.1.4.tgz";
-      sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
+      url = "https://registry.npmjs.org/acorn/-/acorn-0.11.0.tgz";
+      name = "acorn-0.11.0.tgz";
+      sha1 = "6e95f0253ad161ff0127db32983e5e2e5352d59a";
     };
     deps = {
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
     };
     optionalDependencies = {
     };
@@ -261,24 +299,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."accepts"."~1.1.2" =
-    self.by-version."accepts"."1.1.4";
-  by-spec."accepts"."~1.1.3" =
-    self.by-version."accepts"."1.1.4";
-  by-spec."accepts"."~1.2.5" =
-    self.by-version."accepts"."1.2.5";
-  by-version."accepts"."1.2.5" = self.buildNodePackage {
-    name = "accepts-1.2.5";
-    version = "1.2.5";
-    bin = false;
+  by-spec."acorn"."^1.0.1" =
+    self.by-version."acorn"."1.2.2";
+  by-version."acorn"."1.2.2" = self.buildNodePackage {
+    name = "acorn-1.2.2";
+    version = "1.2.2";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/accepts/-/accepts-1.2.5.tgz";
-      name = "accepts-1.2.5.tgz";
-      sha1 = "bb07dc52c141ae562611a836ff433bcec8871ce9";
+      url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz";
+      name = "acorn-1.2.2.tgz";
+      sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014";
     };
     deps = {
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "negotiator-0.5.1" = self.by-version."negotiator"."0.5.1";
     };
     optionalDependencies = {
     };
@@ -286,16 +318,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."acorn"."^1.0.1" =
-    self.by-version."acorn"."1.0.3";
-  by-version."acorn"."1.0.3" = self.buildNodePackage {
-    name = "acorn-1.0.3";
-    version = "1.0.3";
+  by-spec."acorn"."^1.0.3" =
+    self.by-version."acorn"."1.2.2";
+  by-spec."acorn"."^2.0.1" =
+    self.by-version."acorn"."2.7.0";
+  by-version."acorn"."2.7.0" = self.buildNodePackage {
+    name = "acorn-2.7.0";
+    version = "2.7.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/acorn/-/acorn-1.0.3.tgz";
-      name = "acorn-1.0.3.tgz";
-      sha1 = "6f4cd7c4de8f43a92708ecd8180fe4aca36baff0";
+      url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz";
+      name = "acorn-2.7.0.tgz";
+      sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7";
     };
     deps = {
     };
@@ -305,16 +339,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."acorn"."~0.9.0" =
-    self.by-version."acorn"."0.9.0";
-  by-version."acorn"."0.9.0" = self.buildNodePackage {
-    name = "acorn-0.9.0";
-    version = "0.9.0";
+  by-spec."acorn"."^2.1.0" =
+    self.by-version."acorn"."2.7.0";
+  by-spec."acorn"."^2.7.0" =
+    self.by-version."acorn"."2.7.0";
+  by-spec."acorn"."^3.0.0" =
+    self.by-version."acorn"."3.0.4";
+  by-version."acorn"."3.0.4" = self.buildNodePackage {
+    name = "acorn-3.0.4";
+    version = "3.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/acorn/-/acorn-0.9.0.tgz";
-      name = "acorn-0.9.0.tgz";
-      sha1 = "67728e0acad6cc61dfb901c121837694db5b926b";
+      url = "https://registry.npmjs.org/acorn/-/acorn-3.0.4.tgz";
+      name = "acorn-3.0.4.tgz";
+      sha1 = "04f244950fdb8faf85507ad481c2edee7aecdeec";
     };
     deps = {
     };
@@ -324,19 +362,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."acorn-globals"."^1.0.0" =
-    self.by-version."acorn-globals"."1.0.4";
-  by-version."acorn-globals"."1.0.4" = self.buildNodePackage {
-    name = "acorn-globals-1.0.4";
-    version = "1.0.4";
+  by-spec."acorn"."^3.0.4" =
+    self.by-version."acorn"."3.0.4";
+  by-spec."acorn-globals"."^1.0.2" =
+    self.by-version."acorn-globals"."1.0.9";
+  by-version."acorn-globals"."1.0.9" = self.buildNodePackage {
+    name = "acorn-globals-1.0.9";
+    version = "1.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.4.tgz";
-      name = "acorn-globals-1.0.4.tgz";
-      sha1 = "4e8528e724b4fa24ba553ad479c4c78589afbfcf";
+      url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz";
+      name = "acorn-globals-1.0.9.tgz";
+      sha1 = "55bb5e98691507b74579d0513413217c380c54cf";
     };
     deps = {
-      "acorn-1.0.3" = self.by-version."acorn"."1.0.3";
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
     };
     optionalDependencies = {
     };
@@ -345,7 +385,27 @@
     cpu = [ ];
   };
   by-spec."acorn-globals"."^1.0.3" =
-    self.by-version."acorn-globals"."1.0.4";
+    self.by-version."acorn-globals"."1.0.9";
+  by-spec."acorn-jsx"."^2.0.1" =
+    self.by-version."acorn-jsx"."2.0.1";
+  by-version."acorn-jsx"."2.0.1" = self.buildNodePackage {
+    name = "acorn-jsx-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-2.0.1.tgz";
+      name = "acorn-jsx-2.0.1.tgz";
+      sha1 = "0edf9878a5866bca625f52955a1ed9e7d8c5117e";
+    };
+    deps = {
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."active-x-obfuscator"."0.0.1" =
     self.by-version."active-x-obfuscator"."0.0.1";
   by-version."active-x-obfuscator"."0.0.1" = self.buildNodePackage {
@@ -353,7 +413,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
+      url = "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz";
       name = "active-x-obfuscator-0.0.1.tgz";
       sha1 = "089b89b37145ff1d9ec74af6530be5526cae1f1a";
     };
@@ -367,15 +427,15 @@
     cpu = [ ];
   };
   by-spec."addr-to-ip-port"."^1.0.0" =
-    self.by-version."addr-to-ip-port"."1.4.1";
-  by-version."addr-to-ip-port"."1.4.1" = self.buildNodePackage {
-    name = "addr-to-ip-port-1.4.1";
-    version = "1.4.1";
+    self.by-version."addr-to-ip-port"."1.4.2";
+  by-version."addr-to-ip-port"."1.4.2" = self.buildNodePackage {
+    name = "addr-to-ip-port-1.4.2";
+    version = "1.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.1.tgz";
-      name = "addr-to-ip-port-1.4.1.tgz";
-      sha1 = "19d0d3c813ac44c352b5df2f096c6d8f44117a86";
+      url = "https://registry.npmjs.org/addr-to-ip-port/-/addr-to-ip-port-1.4.2.tgz";
+      name = "addr-to-ip-port-1.4.2.tgz";
+      sha1 = "7e46ff1f26b7a9f5e33fd839d57aef6303b4c692";
     };
     deps = {
     };
@@ -386,7 +446,26 @@
     cpu = [ ];
   };
   by-spec."addr-to-ip-port"."^1.0.1" =
-    self.by-version."addr-to-ip-port"."1.4.1";
+    self.by-version."addr-to-ip-port"."1.4.2";
+  by-spec."addressparser"."1.0.1" =
+    self.by-version."addressparser"."1.0.1";
+  by-version."addressparser"."1.0.1" = self.buildNodePackage {
+    name = "addressparser-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz";
+      name = "addressparser-1.0.1.tgz";
+      sha1 = "47afbe1a2a9262191db6838e4fd1d39b40821746";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."addressparser"."^0.3.2" =
     self.by-version."addressparser"."0.3.2";
   by-version."addressparser"."0.3.2" = self.buildNodePackage {
@@ -394,7 +473,7 @@
     version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz";
+      url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz";
       name = "addressparser-0.3.2.tgz";
       sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2";
     };
@@ -413,7 +492,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
+      url = "https://registry.npmjs.org/addressparser/-/addressparser-0.1.3.tgz";
       name = "addressparser-0.1.3.tgz";
       sha1 = "9e9ab43d257e1ae784e1df5f580c9f5240f58874";
     };
@@ -427,6 +506,25 @@
   };
   by-spec."addressparser"."~0.3.2" =
     self.by-version."addressparser"."0.3.2";
+  by-spec."adm-zip"."0.2.1" =
+    self.by-version."adm-zip"."0.2.1";
+  by-version."adm-zip"."0.2.1" = self.buildNodePackage {
+    name = "adm-zip-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.2.1.tgz";
+      name = "adm-zip-0.2.1.tgz";
+      sha1 = "e801cedeb5bd9a4e98d699c5c0f4239e2731dcbf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."adm-zip"."0.4.4" =
     self.by-version."adm-zip"."0.4.4";
   by-version."adm-zip"."0.4.4" = self.buildNodePackage {
@@ -434,7 +532,7 @@
     version = "0.4.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz";
+      url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.4.tgz";
       name = "adm-zip-0.4.4.tgz";
       sha1 = "a61ed5ae6905c3aea58b3a657d25033091052736";
     };
@@ -446,14 +544,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."adm-zip"."~0.4.3" =
+  by-spec."adm-zip"."0.4.7" =
     self.by-version."adm-zip"."0.4.7";
   by-version."adm-zip"."0.4.7" = self.buildNodePackage {
     name = "adm-zip-0.4.7";
     version = "0.4.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
+      url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.7.tgz";
       name = "adm-zip-0.4.7.tgz";
       sha1 = "8606c2cbf1c426ce8c8ec00174447fd49b6eafc1";
     };
@@ -465,7 +563,9 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."adm-zip"."~0.4.4" =
+  by-spec."adm-zip"."~0.4.3" =
+    self.by-version."adm-zip"."0.4.7";
+  by-spec."adm-zip"."~0.4.7" =
     self.by-version."adm-zip"."0.4.7";
   by-spec."after"."0.8.1" =
     self.by-version."after"."0.8.1";
@@ -474,7 +574,7 @@
     version = "0.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
+      url = "https://registry.npmjs.org/after/-/after-0.8.1.tgz";
       name = "after-0.8.1.tgz";
       sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
     };
@@ -488,16 +588,37 @@
   };
   by-spec."after"."^0.8.1" =
     self.by-version."after"."0.8.1";
+  by-spec."agent-base"."2" =
+    self.by-version."agent-base"."2.0.1";
+  by-version."agent-base"."2.0.1" = self.buildNodePackage {
+    name = "agent-base-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/agent-base/-/agent-base-2.0.1.tgz";
+      name = "agent-base-2.0.1.tgz";
+      sha1 = "bd8f9e86a8eb221fffa07bd14befd55df142815e";
+    };
+    deps = {
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "semver-5.0.3" = self.by-version."semver"."5.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."agent-base"."~1.0.1" =
-    self.by-version."agent-base"."1.0.1";
-  by-version."agent-base"."1.0.1" = self.buildNodePackage {
-    name = "agent-base-1.0.1";
-    version = "1.0.1";
+    self.by-version."agent-base"."1.0.2";
+  by-version."agent-base"."1.0.2" = self.buildNodePackage {
+    name = "agent-base-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/agent-base/-/agent-base-1.0.1.tgz";
-      name = "agent-base-1.0.1.tgz";
-      sha1 = "806dbee16f2f27506730e2eb78f537192706ccc3";
+      url = "https://registry.npmjs.org/agent-base/-/agent-base-1.0.2.tgz";
+      name = "agent-base-1.0.2.tgz";
+      sha1 = "6890d3fb217004b62b70f8928e0fae5f8952a706";
     };
     deps = {
     };
@@ -508,19 +629,19 @@
     cpu = [ ];
   };
   by-spec."airplay-js"."^0.2.5" =
-    self.by-version."airplay-js"."0.2.13";
-  by-version."airplay-js"."0.2.13" = self.buildNodePackage {
-    name = "airplay-js-0.2.13";
-    version = "0.2.13";
+    self.by-version."airplay-js"."0.2.16";
+  by-version."airplay-js"."0.2.16" = self.buildNodePackage {
+    name = "airplay-js-0.2.16";
+    version = "0.2.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/airplay-js/-/airplay-js-0.2.13.tgz";
-      name = "airplay-js-0.2.13.tgz";
-      sha1 = "301837c6e1c40fe8f6657d3205da148a48261885";
+      url = "https://registry.npmjs.org/airplay-js/-/airplay-js-0.2.16.tgz";
+      name = "airplay-js-0.2.16.tgz";
+      sha1 = "48566d5fa55a921d80187ad946f7e8f7555902a1";
     };
     deps = {
-      "mdns-js-0.3.1" = self.by-version."mdns-js"."0.3.1";
-      "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1";
+      "mdns-js-0.5.0" = self.by-version."mdns-js"."0.5.0";
+      "plist-1.2.0" = self.by-version."plist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -535,7 +656,7 @@
     version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/alea/-/alea-0.0.9.tgz";
+      url = "https://registry.npmjs.org/alea/-/alea-0.0.9.tgz";
       name = "alea-0.0.9.tgz";
       sha1 = "f738cb45f83430069f45cf69ccbf312dd57a9e1a";
     };
@@ -547,16 +668,60 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aliasify"."^1.7.2" =
+    self.by-version."aliasify"."1.9.0";
+  by-version."aliasify"."1.9.0" = self.buildNodePackage {
+    name = "aliasify-1.9.0";
+    version = "1.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/aliasify/-/aliasify-1.9.0.tgz";
+      name = "aliasify-1.9.0.tgz";
+      sha1 = "03aa1a5fe5b4cac604e3b967bc4c7ceacf957030";
+    };
+    deps = {
+      "browserify-transform-tools-1.5.3" = self.by-version."browserify-transform-tools"."1.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."align-text"."^0.1.1" =
+    self.by-version."align-text"."0.1.4";
+  by-version."align-text"."0.1.4" = self.buildNodePackage {
+    name = "align-text-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz";
+      name = "align-text-0.1.4.tgz";
+      sha1 = "0cd90a561093f35d0a99256c22b7069433fad117";
+    };
+    deps = {
+      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
+      "longest-1.0.1" = self.by-version."longest"."1.0.1";
+      "repeat-string-1.5.4" = self.by-version."repeat-string"."1.5.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."align-text"."^0.1.3" =
+    self.by-version."align-text"."0.1.4";
   by-spec."almond"."*" =
-    self.by-version."almond"."0.3.1";
-  by-version."almond"."0.3.1" = self.buildNodePackage {
-    name = "almond-0.3.1";
-    version = "0.3.1";
+    self.by-version."almond"."0.3.2";
+  by-version."almond"."0.3.2" = self.buildNodePackage {
+    name = "almond-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/almond/-/almond-0.3.1.tgz";
-      name = "almond-0.3.1.tgz";
-      sha1 = "ea2440ab1e2157f73e0e42a9a888ec8d148e7e15";
+      url = "https://registry.npmjs.org/almond/-/almond-0.3.2.tgz";
+      name = "almond-0.3.2.tgz";
+      sha1 = "e481c9f3446265e4056610dd6695fc26445f6be7";
     };
     deps = {
     };
@@ -566,7 +731,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "almond" = self.by-version."almond"."0.3.1";
+  "almond" = self.by-version."almond"."0.3.2";
   by-spec."alter"."~0.2.0" =
     self.by-version."alter"."0.2.0";
   by-version."alter"."0.2.0" = self.buildNodePackage {
@@ -574,7 +739,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/alter/-/alter-0.2.0.tgz";
+      url = "https://registry.npmjs.org/alter/-/alter-0.2.0.tgz";
       name = "alter-0.2.0.tgz";
       sha1 = "c7588808617572034aae62480af26b1d4d1cb3cd";
     };
@@ -588,15 +753,15 @@
     cpu = [ ];
   };
   by-spec."amdefine"."*" =
-    self.by-version."amdefine"."0.1.0";
-  by-version."amdefine"."0.1.0" = self.buildNodePackage {
-    name = "amdefine-0.1.0";
-    version = "0.1.0";
+    self.by-version."amdefine"."1.0.0";
+  by-version."amdefine"."1.0.0" = self.buildNodePackage {
+    name = "amdefine-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/amdefine/-/amdefine-0.1.0.tgz";
-      name = "amdefine-0.1.0.tgz";
-      sha1 = "3ca9735cf1dde0edf7a4bf6641709c8024f9b227";
+      url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.0.tgz";
+      name = "amdefine-1.0.0.tgz";
+      sha1 = "fd17474700cb5cc9c2b709f0be9d23ce3c198c33";
     };
     deps = {
     };
@@ -606,9 +771,9 @@
     os = [ ];
     cpu = [ ];
   };
-  "amdefine" = self.by-version."amdefine"."0.1.0";
+  "amdefine" = self.by-version."amdefine"."1.0.0";
   by-spec."amdefine".">=0.0.4" =
-    self.by-version."amdefine"."0.1.0";
+    self.by-version."amdefine"."1.0.0";
   by-spec."amqp".">=0.1.3" =
     self.by-version."amqp"."0.2.4";
   by-version."amqp"."0.2.4" = self.buildNodePackage {
@@ -616,7 +781,7 @@
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/amqp/-/amqp-0.2.4.tgz";
+      url = "https://registry.npmjs.org/amqp/-/amqp-0.2.4.tgz";
       name = "amqp-0.2.4.tgz";
       sha1 = "b47e9f5b01f292ab18a8097ff0e72a54b4d03a89";
     };
@@ -630,15 +795,15 @@
     cpu = [ ];
   };
   by-spec."ansi"."^0.3.0" =
-    self.by-version."ansi"."0.3.0";
-  by-version."ansi"."0.3.0" = self.buildNodePackage {
-    name = "ansi-0.3.0";
-    version = "0.3.0";
+    self.by-version."ansi"."0.3.1";
+  by-version."ansi"."0.3.1" = self.buildNodePackage {
+    name = "ansi-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi/-/ansi-0.3.0.tgz";
-      name = "ansi-0.3.0.tgz";
-      sha1 = "74b2f1f187c8553c7f95015bcb76009fb43d38e0";
+      url = "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz";
+      name = "ansi-0.3.1.tgz";
+      sha1 = "0c42d4fb17160d5a9af1e484bace1c66922c1b21";
     };
     deps = {
     };
@@ -648,16 +813,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi"."~0.1.2" =
-    self.by-version."ansi"."0.1.2";
-  by-version."ansi"."0.1.2" = self.buildNodePackage {
-    name = "ansi-0.1.2";
-    version = "0.1.2";
-    bin = true;
+  by-spec."ansi"."^0.3.1" =
+    self.by-version."ansi"."0.3.1";
+  by-spec."ansi"."~0.3.1" =
+    self.by-version."ansi"."0.3.1";
+  by-spec."ansi-escapes"."^1.1.0" =
+    self.by-version."ansi-escapes"."1.3.0";
+  by-version."ansi-escapes"."1.3.0" = self.buildNodePackage {
+    name = "ansi-escapes-1.3.0";
+    version = "1.3.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi/-/ansi-0.1.2.tgz";
-      name = "ansi-0.1.2.tgz";
-      sha1 = "2627e29498f06e2a1c2ece9c21e28fd494430827";
+      url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.3.0.tgz";
+      name = "ansi-escapes-1.3.0.tgz";
+      sha1 = "070883c337d5e4ce9e124fce2639267f2a14d554";
     };
     deps = {
     };
@@ -667,18 +836,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi"."~0.3.0" =
-    self.by-version."ansi"."0.3.0";
-  by-spec."ansi-color"."0.2.1" =
-    self.by-version."ansi-color"."0.2.1";
-  by-version."ansi-color"."0.2.1" = self.buildNodePackage {
-    name = "ansi-color-0.2.1";
-    version = "0.2.1";
+  by-spec."ansi-regex"."*" =
+    self.by-version."ansi-regex"."2.0.0";
+  by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
+    name = "ansi-regex-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-color/-/ansi-color-0.2.1.tgz";
-      name = "ansi-color-0.2.1.tgz";
-      sha1 = "3e75c037475217544ed763a8db5709fa9ae5bf9a";
+      url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+      name = "ansi-regex-2.0.0.tgz";
+      sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
     };
     deps = {
     };
@@ -695,7 +862,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
+      url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz";
       name = "ansi-regex-0.2.1.tgz";
       sha1 = "0d8e946967a3d8143f93e24e298525fc1b2235f9";
     };
@@ -716,7 +883,7 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
+      url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
       name = "ansi-regex-1.1.1.tgz";
       sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
     };
@@ -732,8 +899,8 @@
     self.by-version."ansi-regex"."1.1.1";
   by-spec."ansi-regex"."^1.1.1" =
     self.by-version."ansi-regex"."1.1.1";
-  by-spec."ansi-regex"."~1.1.1" =
-    self.by-version."ansi-regex"."1.1.1";
+  by-spec."ansi-regex"."^2.0.0" =
+    self.by-version."ansi-regex"."2.0.0";
   by-spec."ansi-remover"."*" =
     self.by-version."ansi-remover"."0.0.2";
   by-version."ansi-remover"."0.0.2" = self.buildNodePackage {
@@ -741,7 +908,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
+      url = "https://registry.npmjs.org/ansi-remover/-/ansi-remover-0.0.2.tgz";
       name = "ansi-remover-0.0.2.tgz";
       sha1 = "7020086289f10e195d85d828de065ccdd50e6e66";
     };
@@ -761,7 +928,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
+      url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz";
       name = "ansi-styles-1.1.0.tgz";
       sha1 = "eaecbf66cd706882760b2f4691582b8f55d7a7de";
     };
@@ -774,34 +941,15 @@
     cpu = [ ];
   };
   by-spec."ansi-styles"."^2.0.1" =
-    self.by-version."ansi-styles"."2.0.1";
-  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
-    name = "ansi-styles-2.0.1";
-    version = "2.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
-      name = "ansi-styles-2.0.1.tgz";
-      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ansicolors"."~0.2.1" =
-    self.by-version."ansicolors"."0.2.1";
-  by-version."ansicolors"."0.2.1" = self.buildNodePackage {
-    name = "ansicolors-0.2.1";
-    version = "0.2.1";
+    self.by-version."ansi-styles"."2.2.1";
+  by-version."ansi-styles"."2.2.1" = self.buildNodePackage {
+    name = "ansi-styles-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.2.1.tgz";
-      name = "ansicolors-0.2.1.tgz";
-      sha1 = "be089599097b74a5c9c4a84a0cdbcdb62bd87aef";
+      url = "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz";
+      name = "ansi-styles-2.2.1.tgz";
+      sha1 = "b432dd3358b634cf75e1e4664368240533c1ddbe";
     };
     deps = {
     };
@@ -811,6 +959,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ansi-styles"."^2.2.1" =
+    self.by-version."ansi-styles"."2.2.1";
   by-spec."ansicolors"."~0.3.2" =
     self.by-version."ansicolors"."0.3.2";
   by-version."ansicolors"."0.3.2" = self.buildNodePackage {
@@ -818,7 +968,7 @@
     version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
+      url = "https://registry.npmjs.org/ansicolors/-/ansicolors-0.3.2.tgz";
       name = "ansicolors-0.3.2.tgz";
       sha1 = "665597de86a9ffe3aa9bfbe6cae5c6ea426b4979";
     };
@@ -837,7 +987,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
+      url = "https://registry.npmjs.org/ansistyles/-/ansistyles-0.1.3.tgz";
       name = "ansistyles-0.1.3.tgz";
       sha1 = "5de60415bda071bb37127854c864f41b23254539";
     };
@@ -849,20 +999,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."anymatch"."^1.1.0" =
-    self.by-version."anymatch"."1.2.1";
-  by-version."anymatch"."1.2.1" = self.buildNodePackage {
-    name = "anymatch-1.2.1";
-    version = "1.2.1";
+  by-spec."anymatch"."^1.3.0" =
+    self.by-version."anymatch"."1.3.0";
+  by-version."anymatch"."1.3.0" = self.buildNodePackage {
+    name = "anymatch-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/anymatch/-/anymatch-1.2.1.tgz";
-      name = "anymatch-1.2.1.tgz";
-      sha1 = "a7d77e8b62bc27cb5309d5ed905915b8da3f210f";
+      url = "https://registry.npmjs.org/anymatch/-/anymatch-1.3.0.tgz";
+      name = "anymatch-1.3.0.tgz";
+      sha1 = "a3e52fa39168c825ff57b0248126ce5a8ff95507";
     };
     deps = {
-      "arrify-1.0.0" = self.by-version."arrify"."1.0.0";
-      "micromatch-2.1.6" = self.by-version."micromatch"."2.1.6";
+      "arrify-1.0.1" = self.by-version."arrify"."1.0.1";
+      "micromatch-2.3.7" = self.by-version."micromatch"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -877,7 +1027,7 @@
     version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/apparatus/-/apparatus-0.0.9.tgz";
+      url = "https://registry.npmjs.org/apparatus/-/apparatus-0.0.9.tgz";
       name = "apparatus-0.0.9.tgz";
       sha1 = "37dcd25834ad0b651076596291db823eeb1908bd";
     };
@@ -890,26 +1040,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."archiver"."~0.12.0" =
-    self.by-version."archiver"."0.12.0";
-  by-version."archiver"."0.12.0" = self.buildNodePackage {
-    name = "archiver-0.12.0";
-    version = "0.12.0";
+  by-spec."append-transform"."^0.3.0" =
+    self.by-version."append-transform"."0.3.0";
+  by-version."append-transform"."0.3.0" = self.buildNodePackage {
+    name = "append-transform-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/archiver/-/archiver-0.12.0.tgz";
-      name = "archiver-0.12.0.tgz";
-      sha1 = "b8ccde2508cab9092bb7106630139c0f39a280cc";
+      url = "https://registry.npmjs.org/append-transform/-/append-transform-0.3.0.tgz";
+      name = "append-transform-0.3.0.tgz";
+      sha1 = "d6933ce4a85f09445d9ccc4cc119051b7381a813";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
-      "glob-4.0.6" = self.by-version."glob"."4.0.6";
-      "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "tar-stream-1.0.2" = self.by-version."tar-stream"."1.0.2";
-      "zip-stream-0.4.1" = self.by-version."zip-stream"."0.4.1";
     };
     optionalDependencies = {
     };
@@ -917,16 +1059,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."archy"."0" =
-    self.by-version."archy"."0.0.2";
-  by-version."archy"."0.0.2" = self.buildNodePackage {
-    name = "archy-0.0.2";
-    version = "0.0.2";
+  by-spec."aproba"."~1.0.1" =
+    self.by-version."aproba"."1.0.1";
+  by-version."aproba"."1.0.1" = self.buildNodePackage {
+    name = "aproba-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/archy/-/archy-0.0.2.tgz";
-      name = "archy-0.0.2.tgz";
-      sha1 = "910f43bf66141fc335564597abc189df44b3d35e";
+      url = "https://registry.npmjs.org/aproba/-/aproba-1.0.1.tgz";
+      name = "aproba-1.0.1.tgz";
+      sha1 = "c4ac2cc5becfb8b099de7ef9f02790e7d32d99ef";
     };
     deps = {
     };
@@ -936,14 +1078,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."archy"."1.0.0" =
+  by-spec."archiver"."~0.14.0" =
+    self.by-version."archiver"."0.14.4";
+  by-version."archiver"."0.14.4" = self.buildNodePackage {
+    name = "archiver-0.14.4";
+    version = "0.14.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/archiver/-/archiver-0.14.4.tgz";
+      name = "archiver-0.14.4.tgz";
+      sha1 = "5b9ddb9f5ee1ceef21cb8f3b020e6240ecb4315c";
+    };
+    deps = {
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
+      "glob-4.3.5" = self.by-version."glob"."4.3.5";
+      "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0";
+      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "tar-stream-1.1.5" = self.by-version."tar-stream"."1.1.5";
+      "zip-stream-0.5.2" = self.by-version."zip-stream"."0.5.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."archy"."^1.0.0" =
     self.by-version."archy"."1.0.0";
   by-version."archy"."1.0.0" = self.buildNodePackage {
     name = "archy-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
+      url = "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz";
       name = "archy-1.0.0.tgz";
       sha1 = "f9c8c13757cc1dd7bc379ac77b2c62a5c2868c40";
     };
@@ -955,24 +1124,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."archy"."^1.0.0" =
-    self.by-version."archy"."1.0.0";
   by-spec."archy"."~1.0.0" =
     self.by-version."archy"."1.0.0";
-  by-spec."are-we-there-yet"."~1.0.0" =
-    self.by-version."are-we-there-yet"."1.0.4";
-  by-version."are-we-there-yet"."1.0.4" = self.buildNodePackage {
-    name = "are-we-there-yet-1.0.4";
-    version = "1.0.4";
+  by-spec."are-we-there-yet"."~1.1.2" =
+    self.by-version."are-we-there-yet"."1.1.2";
+  by-version."are-we-there-yet"."1.1.2" = self.buildNodePackage {
+    name = "are-we-there-yet-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.0.4.tgz";
-      name = "are-we-there-yet-1.0.4.tgz";
-      sha1 = "527fe389f7bcba90806106b99244eaa07e886f85";
+      url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.2.tgz";
+      name = "are-we-there-yet-1.1.2.tgz";
+      sha1 = "80e470e95a084794fe1899262c5667c6e88de1b3";
     };
     deps = {
-      "delegates-0.1.0" = self.by-version."delegates"."0.1.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "delegates-1.0.0" = self.by-version."delegates"."1.0.0";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -987,7 +1154,7 @@
     version = "0.1.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
+      url = "https://registry.npmjs.org/argparse/-/argparse-0.1.15.tgz";
       name = "argparse-0.1.15.tgz";
       sha1 = "28a1f72c43113e763220e5708414301c8840f0a1";
     };
@@ -1001,6 +1168,47 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."argparse"."1.0.4" =
+    self.by-version."argparse"."1.0.4";
+  by-version."argparse"."1.0.4" = self.buildNodePackage {
+    name = "argparse-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz";
+      name = "argparse-1.0.4.tgz";
+      sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
+    };
+    deps = {
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "sprintf-js-1.0.3" = self.by-version."sprintf-js"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."argparse"."^1.0.2" =
+    self.by-version."argparse"."1.0.7";
+  by-version."argparse"."1.0.7" = self.buildNodePackage {
+    name = "argparse-1.0.7";
+    version = "1.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz";
+      name = "argparse-1.0.7.tgz";
+      sha1 = "c289506480557810f14a8bc62d7a06f63ed7f951";
+    };
+    deps = {
+      "sprintf-js-1.0.3" = self.by-version."sprintf-js"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."argparse"."~ 0.1.11" =
     self.by-version."argparse"."0.1.16";
   by-version."argparse"."0.1.16" = self.buildNodePackage {
@@ -1008,7 +1216,7 @@
     version = "0.1.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
+      url = "https://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz";
       name = "argparse-0.1.16.tgz";
       sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c";
     };
@@ -1022,20 +1230,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."argparse"."~ 1.0.0" =
-    self.by-version."argparse"."1.0.2";
-  by-version."argparse"."1.0.2" = self.buildNodePackage {
-    name = "argparse-1.0.2";
-    version = "1.0.2";
+  by-spec."argparse"."~1.0.2" =
+    self.by-version."argparse"."1.0.7";
+  by-spec."arr-diff"."^2.0.0" =
+    self.by-version."arr-diff"."2.0.0";
+  by-version."arr-diff"."2.0.0" = self.buildNodePackage {
+    name = "arr-diff-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/argparse/-/argparse-1.0.2.tgz";
-      name = "argparse-1.0.2.tgz";
-      sha1 = "bcfae39059656d1973d0b9e6a1a74154b5a9a136";
+      url = "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz";
+      name = "arr-diff-2.0.0.tgz";
+      sha1 = "8f3b827f955a8bd669697e4a4256ac3ceae356cf";
     };
     deps = {
-      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
-      "sprintf-js-1.0.2" = self.by-version."sprintf-js"."1.0.2";
+      "arr-flatten-1.0.1" = self.by-version."arr-flatten"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -1043,21 +1252,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."argparse"."~1.0.0" =
-    self.by-version."argparse"."1.0.2";
-  by-spec."arr-diff"."^1.0.1" =
-    self.by-version."arr-diff"."1.0.1";
-  by-version."arr-diff"."1.0.1" = self.buildNodePackage {
-    name = "arr-diff-1.0.1";
+  by-spec."arr-flatten"."^1.0.1" =
+    self.by-version."arr-flatten"."1.0.1";
+  by-version."arr-flatten"."1.0.1" = self.buildNodePackage {
+    name = "arr-flatten-1.0.1";
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/arr-diff/-/arr-diff-1.0.1.tgz";
-      name = "arr-diff-1.0.1.tgz";
-      sha1 = "0b766ed5b26b242212febe9cbf2024a8d0349f6d";
+      url = "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.0.1.tgz";
+      name = "arr-flatten-1.0.1.tgz";
+      sha1 = "e5ffe54d45e19f32f216e91eb99c8ce892bb604b";
     };
     deps = {
-      "array-slice-0.2.3" = self.by-version."array-slice"."0.2.3";
     };
     optionalDependencies = {
     };
@@ -1072,7 +1278,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
+      url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
       name = "array-differ-1.0.0.tgz";
       sha1 = "eff52e3758249d33be402b8bb8e564bb2b5d4031";
     };
@@ -1091,7 +1297,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
+      url = "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz";
       name = "array-filter-0.0.1.tgz";
       sha1 = "7da8cf2e26628ed732803581fd21f67cacd2eeec";
     };
@@ -1110,7 +1316,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz";
+      url = "https://registry.npmjs.org/array-find/-/array-find-0.1.1.tgz";
       name = "array-find-0.1.1.tgz";
       sha1 = "dc813845ad5a9afc35cb92b786c878d81b5b82ce";
     };
@@ -1122,6 +1328,103 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."array-find-index"."^1.0.0" =
+    self.by-version."array-find-index"."1.0.1";
+  by-version."array-find-index"."1.0.1" = self.buildNodePackage {
+    name = "array-find-index-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz";
+      name = "array-find-index-1.0.1.tgz";
+      sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-flatten"."1.1.0" =
+    self.by-version."array-flatten"."1.1.0";
+  by-version."array-flatten"."1.1.0" = self.buildNodePackage {
+    name = "array-flatten-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.0.tgz";
+      name = "array-flatten-1.1.0.tgz";
+      sha1 = "ac3efac717b0e7bbdc778ce0bde7381ac6604393";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-flatten"."1.1.1" =
+    self.by-version."array-flatten"."1.1.1";
+  by-version."array-flatten"."1.1.1" = self.buildNodePackage {
+    name = "array-flatten-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz";
+      name = "array-flatten-1.1.1.tgz";
+      sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-flatten"."2.0.0" =
+    self.by-version."array-flatten"."2.0.0";
+  by-version."array-flatten"."2.0.0" = self.buildNodePackage {
+    name = "array-flatten-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-flatten/-/array-flatten-2.0.0.tgz";
+      name = "array-flatten-2.0.0.tgz";
+      sha1 = "24dd98b38b9194b59b2087ba40c21384d6b8a8dc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."array-index"."^1.0.0" =
+    self.by-version."array-index"."1.0.0";
+  by-version."array-index"."1.0.0" = self.buildNodePackage {
+    name = "array-index-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-index/-/array-index-1.0.0.tgz";
+      name = "array-index-1.0.0.tgz";
+      sha1 = "ec56a749ee103e4e08c790b9c353df16055b97f9";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."array-indexofobject"."~0.0.1" =
     self.by-version."array-indexofobject"."0.0.1";
   by-version."array-indexofobject"."0.0.1" = self.buildNodePackage {
@@ -1129,7 +1432,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
+      url = "https://registry.npmjs.org/array-indexofobject/-/array-indexofobject-0.0.1.tgz";
       name = "array-indexofobject-0.0.1.tgz";
       sha1 = "aaa128e62c9b3c358094568c219ff64fe489d42a";
     };
@@ -1148,7 +1451,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz";
+      url = "https://registry.npmjs.org/array-loop/-/array-loop-1.0.0.tgz";
       name = "array-loop-1.0.0.tgz";
       sha1 = "c033d086cf0d12af73aed5a99c0cedb37367b395";
     };
@@ -1167,7 +1470,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
+      url = "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz";
       name = "array-map-0.0.0.tgz";
       sha1 = "88a2bab73d1cf7bcd5c1b118a003f66f665fa662";
     };
@@ -1186,7 +1489,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
+      url = "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz";
       name = "array-reduce-0.0.0.tgz";
       sha1 = "173899d3ffd1c7d9383e4479525dbe278cab5f2b";
     };
@@ -1198,14 +1501,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."array-slice"."^0.2.2" =
+  by-spec."array-slice"."^0.2.3" =
     self.by-version."array-slice"."0.2.3";
   by-version."array-slice"."0.2.3" = self.buildNodePackage {
     name = "array-slice-0.2.3";
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz";
+      url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz";
       name = "array-slice-0.2.3.tgz";
       sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5";
     };
@@ -1217,6 +1520,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."array-union"."^1.0.1" =
+    self.by-version."array-union"."1.0.1";
+  by-version."array-union"."1.0.1" = self.buildNodePackage {
+    name = "array-union-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-union/-/array-union-1.0.1.tgz";
+      name = "array-union-1.0.1.tgz";
+      sha1 = "4d410fc8395cb247637124bade9e3f547d5d55f2";
+    };
+    deps = {
+      "array-uniq-1.0.2" = self.by-version."array-uniq"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."array-uniq"."^1.0.1" =
     self.by-version."array-uniq"."1.0.2";
   by-version."array-uniq"."1.0.2" = self.buildNodePackage {
@@ -1224,7 +1547,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz";
+      url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz";
       name = "array-uniq-1.0.2.tgz";
       sha1 = "5fcc373920775723cfd64d65c64bef53bf9eba6d";
     };
@@ -1238,6 +1561,25 @@
   };
   by-spec."array-uniq"."^1.0.2" =
     self.by-version."array-uniq"."1.0.2";
+  by-spec."array-unique"."^0.2.1" =
+    self.by-version."array-unique"."0.2.1";
+  by-version."array-unique"."0.2.1" = self.buildNodePackage {
+    name = "array-unique-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz";
+      name = "array-unique-0.2.1.tgz";
+      sha1 = "a1d97ccafcbc2625cc70fadceb36a50c58b01a53";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."arraybuffer.slice"."0.0.6" =
     self.by-version."arraybuffer.slice"."0.0.6";
   by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
@@ -1245,7 +1587,7 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
+      url = "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
       name = "arraybuffer.slice-0.0.6.tgz";
       sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
     };
@@ -1258,15 +1600,15 @@
     cpu = [ ];
   };
   by-spec."arrify"."^1.0.0" =
-    self.by-version."arrify"."1.0.0";
-  by-version."arrify"."1.0.0" = self.buildNodePackage {
-    name = "arrify-1.0.0";
-    version = "1.0.0";
+    self.by-version."arrify"."1.0.1";
+  by-version."arrify"."1.0.1" = self.buildNodePackage {
+    name = "arrify-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/arrify/-/arrify-1.0.0.tgz";
-      name = "arrify-1.0.0.tgz";
-      sha1 = "d6c361518250802fa2147ea7fb67597128cb8c81";
+      url = "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz";
+      name = "arrify-1.0.1.tgz";
+      sha1 = "898508da2226f380df904728456849c1501a4b0d";
     };
     deps = {
     };
@@ -1276,16 +1618,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asap"."^1.0.0" =
-    self.by-version."asap"."1.0.0";
-  by-version."asap"."1.0.0" = self.buildNodePackage {
-    name = "asap-1.0.0";
-    version = "1.0.0";
+  by-spec."asap"."^2.0.0" =
+    self.by-version."asap"."2.0.3";
+  by-version."asap"."2.0.3" = self.buildNodePackage {
+    name = "asap-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
-      name = "asap-1.0.0.tgz";
-      sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
+      url = "https://registry.npmjs.org/asap/-/asap-2.0.3.tgz";
+      name = "asap-2.0.3.tgz";
+      sha1 = "1fc1d1564ee11620dfca6d67029850913f9f4679";
     };
     deps = {
     };
@@ -1295,16 +1637,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asap"."^2.0.0" =
-    self.by-version."asap"."2.0.2";
-  by-version."asap"."2.0.2" = self.buildNodePackage {
-    name = "asap-2.0.2";
-    version = "2.0.2";
+  by-spec."asap"."~1.0.0" =
+    self.by-version."asap"."1.0.0";
+  by-version."asap"."1.0.0" = self.buildNodePackage {
+    name = "asap-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asap/-/asap-2.0.2.tgz";
-      name = "asap-2.0.2.tgz";
-      sha1 = "4a028b746c1a0720151c2650c166c17ca032a2ef";
+      url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz";
+      name = "asap-1.0.0.tgz";
+      sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d";
     };
     deps = {
     };
@@ -1314,8 +1656,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asap"."~1.0.0" =
-    self.by-version."asap"."1.0.0";
+  by-spec."asap"."~2.0.3" =
+    self.by-version."asap"."2.0.3";
   by-spec."ascii-json"."~0.2" =
     self.by-version."ascii-json"."0.2.0";
   by-version."ascii-json"."0.2.0" = self.buildNodePackage {
@@ -1323,7 +1665,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz";
+      url = "https://registry.npmjs.org/ascii-json/-/ascii-json-0.2.0.tgz";
       name = "ascii-json-0.2.0.tgz";
       sha1 = "10ddb361fd48f72595309fd10a6ea2e7bf2c9218";
     };
@@ -1342,13 +1684,13 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
+      url = "https://registry.npmjs.org/ascli/-/ascli-0.3.0.tgz";
       name = "ascli-0.3.0.tgz";
       sha1 = "5e66230e5219fe3e8952a4efb4f20fae596a813a";
     };
     deps = {
       "colour-0.7.1" = self.by-version."colour"."0.7.1";
-      "optjs-3.2.1-boom" = self.by-version."optjs"."3.2.1-boom";
+      "optjs-3.2.2" = self.by-version."optjs"."3.2.2";
     };
     optionalDependencies = {
     };
@@ -1363,7 +1705,7 @@
     version = "0.1.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
+      url = "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
       name = "asn1-0.1.11.tgz";
       sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
     };
@@ -1382,7 +1724,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1/-/asn1-0.2.1.tgz";
+      url = "https://registry.npmjs.org/asn1/-/asn1-0.2.1.tgz";
       name = "asn1-0.2.1.tgz";
       sha1 = "ecc73f75d31ea3c6ed9d47428db35fecc7b2c6dc";
     };
@@ -1394,41 +1736,40 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asn1.js"."^1.0.0" =
-    self.by-version."asn1.js"."1.0.4";
-  by-version."asn1.js"."1.0.4" = self.buildNodePackage {
-    name = "asn1.js-1.0.4";
-    version = "1.0.4";
+  by-spec."asn1".">=0.2.3 <0.3.0" =
+    self.by-version."asn1"."0.2.3";
+  by-version."asn1"."0.2.3" = self.buildNodePackage {
+    name = "asn1-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1.js/-/asn1.js-1.0.4.tgz";
-      name = "asn1.js-1.0.4.tgz";
-      sha1 = "adc547dc24775be40db2ae921d6c990c387b32a8";
+      url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+      name = "asn1-0.2.3.tgz";
+      sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
     };
     deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
     };
     optionalDependencies = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert"."*" =
-    self.by-version."assert"."1.3.0";
-  by-version."assert"."1.3.0" = self.buildNodePackage {
-    name = "assert-1.3.0";
-    version = "1.3.0";
+  by-spec."asn1.js"."^4.0.0" =
+    self.by-version."asn1.js"."4.5.2";
+  by-version."asn1.js"."4.5.2" = self.buildNodePackage {
+    name = "asn1.js-4.5.2";
+    version = "4.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
-      name = "assert-1.3.0.tgz";
-      sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
+      url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.5.2.tgz";
+      name = "asn1.js-4.5.2.tgz";
+      sha1 = "17492bdfd4bb5f1d7e56ab6b085297fee9e640e9";
     };
     deps = {
-      "util-0.10.3" = self.by-version."util"."0.10.3";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -1436,19 +1777,16 @@
     os = [ ];
     cpu = [ ];
   };
-  "assert" = self.by-version."assert"."1.3.0";
-  by-spec."assert"."^1.1.1" =
+  by-spec."assert"."*" =
     self.by-version."assert"."1.3.0";
-  by-spec."assert"."~1.1.0" =
-    self.by-version."assert"."1.1.2";
-  by-version."assert"."1.1.2" = self.buildNodePackage {
-    name = "assert-1.1.2";
-    version = "1.1.2";
+  by-version."assert"."1.3.0" = self.buildNodePackage {
+    name = "assert-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert/-/assert-1.1.2.tgz";
-      name = "assert-1.1.2.tgz";
-      sha1 = "adaa04c46bb58c6dd1f294da3eb26e6228eb6e44";
+      url = "https://registry.npmjs.org/assert/-/assert-1.3.0.tgz";
+      name = "assert-1.3.0.tgz";
+      sha1 = "03939a622582a812cc202320a0b9a56c9b815849";
     };
     deps = {
       "util-0.10.3" = self.by-version."util"."0.10.3";
@@ -1459,6 +1797,9 @@
     os = [ ];
     cpu = [ ];
   };
+  "assert" = self.by-version."assert"."1.3.0";
+  by-spec."assert"."^1.1.1" =
+    self.by-version."assert"."1.3.0";
   by-spec."assert"."~1.3.0" =
     self.by-version."assert"."1.3.0";
   by-spec."assert-plus"."0.1.2" =
@@ -1468,7 +1809,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
+      url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.2.tgz";
       name = "assert-plus-0.1.2.tgz";
       sha1 = "d93ffdbb67ac5507779be316a7d65146417beef8";
     };
@@ -1480,25 +1821,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus"."0.1.3" =
-    self.by-version."assert-plus"."0.1.3";
-  by-version."assert-plus"."0.1.3" = self.buildNodePackage {
-    name = "assert-plus-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.3.tgz";
-      name = "assert-plus-0.1.3.tgz";
-      sha1 = "32eba8ac83e50ae4f4b5babab1ae9aa0edec9fef";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."assert-plus"."0.1.5" =
     self.by-version."assert-plus"."0.1.5";
   by-version."assert-plus"."0.1.5" = self.buildNodePackage {
@@ -1506,7 +1828,7 @@
     version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+      url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
       name = "assert-plus-0.1.5.tgz";
       sha1 = "ee74009413002d84cec7219c6ac811812e723160";
     };
@@ -1518,18 +1840,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus"."^0.1.5" =
+  by-spec."assert-plus"."0.1.x" =
     self.by-version."assert-plus"."0.1.5";
-  by-spec."assertion-error"."1.0.0" =
-    self.by-version."assertion-error"."1.0.0";
-  by-version."assertion-error"."1.0.0" = self.buildNodePackage {
-    name = "assertion-error-1.0.0";
-    version = "1.0.0";
+  by-spec."assert-plus".">=0.1.5 <0.2.0" =
+    self.by-version."assert-plus"."0.1.5";
+  by-spec."assert-plus".">=0.2.0 <0.3.0" =
+    self.by-version."assert-plus"."0.2.0";
+  by-version."assert-plus"."0.2.0" = self.buildNodePackage {
+    name = "assert-plus-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.0.tgz";
-      name = "assertion-error-1.0.0.tgz";
-      sha1 = "c7f85438fdd466bc7ca16ab90c81513797a5d23b";
+      url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+      name = "assert-plus-0.2.0.tgz";
+      sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
     };
     deps = {
     };
@@ -1539,16 +1863,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ast-traverse"."~0.1.1" =
-    self.by-version."ast-traverse"."0.1.1";
-  by-version."ast-traverse"."0.1.1" = self.buildNodePackage {
-    name = "ast-traverse-0.1.1";
-    version = "0.1.1";
+  by-spec."assert-plus"."^0.1.5" =
+    self.by-version."assert-plus"."0.1.5";
+  by-spec."assert-plus"."^0.2.0" =
+    self.by-version."assert-plus"."0.2.0";
+  by-spec."assert-plus"."^1.0.0" =
+    self.by-version."assert-plus"."1.0.0";
+  by-version."assert-plus"."1.0.0" = self.buildNodePackage {
+    name = "assert-plus-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz";
-      name = "ast-traverse-0.1.1.tgz";
-      sha1 = "69cf2b8386f19dcda1bb1e05d68fe359d8897de6";
+      url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
+      name = "assert-plus-1.0.0.tgz";
+      sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
     };
     deps = {
     };
@@ -1558,19 +1886,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ast-types"."~0.3.22" =
-    self.by-version."ast-types"."0.3.38";
-  by-version."ast-types"."0.3.38" = self.buildNodePackage {
-    name = "ast-types-0.3.38";
-    version = "0.3.38";
+  by-spec."assertion-error"."^1.0.1" =
+    self.by-version."assertion-error"."1.0.1";
+  by-version."assertion-error"."1.0.1" = self.buildNodePackage {
+    name = "assertion-error-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.3.38.tgz";
-      name = "ast-types-0.3.38.tgz";
-      sha1 = "afe430e60b4db3ce2ed22ceea0f16f1c31763ef7";
+      url = "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.1.tgz";
+      name = "assertion-error-1.0.1.tgz";
+      sha1 = "35aaeec33097f11f42399ecadf33faccd27f5c4c";
     };
     deps = {
-      "private-0.1.6" = self.by-version."private"."0.1.6";
     };
     optionalDependencies = {
     };
@@ -1578,16 +1905,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ast-types"."~0.6.1" =
-    self.by-version."ast-types"."0.6.16";
-  by-version."ast-types"."0.6.16" = self.buildNodePackage {
-    name = "ast-types-0.6.16";
-    version = "0.6.16";
+  by-spec."ast-traverse"."~0.1.1" =
+    self.by-version."ast-traverse"."0.1.1";
+  by-version."ast-traverse"."0.1.1" = self.buildNodePackage {
+    name = "ast-traverse-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.6.16.tgz";
-      name = "ast-types-0.6.16.tgz";
-      sha1 = "04205b72eddd195a8feaa081f11d0294a24ded93";
+      url = "https://registry.npmjs.org/ast-traverse/-/ast-traverse-0.1.1.tgz";
+      name = "ast-traverse-0.1.1.tgz";
+      sha1 = "69cf2b8386f19dcda1bb1e05d68fe359d8897de6";
     };
     deps = {
     };
@@ -1597,16 +1924,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ast-types"."~0.7.0" =
-    self.by-version."ast-types"."0.7.6";
-  by-version."ast-types"."0.7.6" = self.buildNodePackage {
-    name = "ast-types-0.7.6";
-    version = "0.7.6";
+  by-spec."ast-types"."0.8.12" =
+    self.by-version."ast-types"."0.8.12";
+  by-version."ast-types"."0.8.12" = self.buildNodePackage {
+    name = "ast-types-0.8.12";
+    version = "0.8.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ast-types/-/ast-types-0.7.6.tgz";
-      name = "ast-types-0.7.6.tgz";
-      sha1 = "e37945547f5d4ea954abf9400bc1b01ce79e47a5";
+      url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.12.tgz";
+      name = "ast-types-0.8.12.tgz";
+      sha1 = "a0d90e4351bb887716c83fd637ebf818af4adfcc";
     };
     deps = {
     };
@@ -1616,19 +1943,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."astw"."~0.0.0" =
-    self.by-version."astw"."0.0.0";
-  by-version."astw"."0.0.0" = self.buildNodePackage {
-    name = "astw-0.0.0";
-    version = "0.0.0";
+  by-spec."ast-types"."0.8.15" =
+    self.by-version."ast-types"."0.8.15";
+  by-version."ast-types"."0.8.15" = self.buildNodePackage {
+    name = "ast-types-0.8.15";
+    version = "0.8.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/astw/-/astw-0.0.0.tgz";
-      name = "astw-0.0.0.tgz";
-      sha1 = "4490866a3ef116aaf91adba63ca7ddf70b6d59bd";
+      url = "https://registry.npmjs.org/ast-types/-/ast-types-0.8.15.tgz";
+      name = "ast-types-0.8.15.tgz";
+      sha1 = "8eef0827f04dff0ec8857ba925abe3fea6194e52";
     };
     deps = {
-      "esprima-1.0.2" = self.by-version."esprima"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -1636,19 +1962,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."astw"."~0.1.0" =
-    self.by-version."astw"."0.1.0";
-  by-version."astw"."0.1.0" = self.buildNodePackage {
-    name = "astw-0.1.0";
-    version = "0.1.0";
+  by-spec."ast-types"."~0.3.22" =
+    self.by-version."ast-types"."0.3.38";
+  by-version."ast-types"."0.3.38" = self.buildNodePackage {
+    name = "ast-types-0.3.38";
+    version = "0.3.38";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/astw/-/astw-0.1.0.tgz";
-      name = "astw-0.1.0.tgz";
-      sha1 = "098be2758a6e9e9e15465d4fc4ba36265de11085";
+      url = "https://registry.npmjs.org/ast-types/-/ast-types-0.3.38.tgz";
+      name = "ast-types-0.3.38.tgz";
+      sha1 = "afe430e60b4db3ce2ed22ceea0f16f1c31763ef7";
     };
     deps = {
-      "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
+      "private-0.1.6" = self.by-version."private"."0.1.6";
     };
     optionalDependencies = {
     };
@@ -1656,19 +1982,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."astw"."~1.1.0" =
-    self.by-version."astw"."1.1.0";
-  by-version."astw"."1.1.0" = self.buildNodePackage {
-    name = "astw-1.1.0";
-    version = "1.1.0";
+  by-spec."astw"."^2.0.0" =
+    self.by-version."astw"."2.0.0";
+  by-version."astw"."2.0.0" = self.buildNodePackage {
+    name = "astw-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/astw/-/astw-1.1.0.tgz";
-      name = "astw-1.1.0.tgz";
-      sha1 = "f394778ab01c4ea467e64a614ed896ace0321a34";
+      url = "https://registry.npmjs.org/astw/-/astw-2.0.0.tgz";
+      name = "astw-2.0.0.tgz";
+      sha1 = "08121ac8288d35611c0ceec663f6cd545604897d";
     };
     deps = {
-      "esprima-fb-3001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
+      "acorn-1.2.2" = self.by-version."acorn"."1.2.2";
     };
     optionalDependencies = {
     };
@@ -1677,17 +2003,18 @@
     cpu = [ ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."0.9.0";
-  by-version."async"."0.9.0" = self.buildNodePackage {
-    name = "async-0.9.0";
-    version = "0.9.0";
+    self.by-version."async"."2.0.0-rc.2";
+  by-version."async"."2.0.0-rc.2" = self.buildNodePackage {
+    name = "async-2.0.0-rc.2";
+    version = "2.0.0-rc.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
-      name = "async-0.9.0.tgz";
-      sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.2.tgz";
+      name = "async-2.0.0-rc.2.tgz";
+      sha1 = "6fc56eec72574ebfe43ad30aefef6206f1ad2494";
     };
     deps = {
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
     };
     optionalDependencies = {
     };
@@ -1695,7 +2022,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "async" = self.by-version."async"."0.9.0";
+  "async" = self.by-version."async"."2.0.0-rc.2";
   by-spec."async"."0.1.18" =
     self.by-version."async"."0.1.18";
   by-version."async"."0.1.18" = self.buildNodePackage {
@@ -1703,7 +2030,7 @@
     version = "0.1.18";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.1.18.tgz";
+      url = "https://registry.npmjs.org/async/-/async-0.1.18.tgz";
       name = "async-0.1.18.tgz";
       sha1 = "c59c923920b76d5bf23248c04433920c4d45086a";
     };
@@ -1722,7 +2049,7 @@
     version = "0.1.22";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.1.22.tgz";
+      url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
       name = "async-0.1.22.tgz";
       sha1 = "0fc1aaa088a0e3ef0ebe2d8831bab0dcf8845061";
     };
@@ -1743,7 +2070,7 @@
     version = "0.2.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.2.9.tgz";
+      url = "https://registry.npmjs.org/async/-/async-0.2.9.tgz";
       name = "async-0.2.9.tgz";
       sha1 = "df63060fbf3d33286a76aaf6d55a2986d9ff8619";
     };
@@ -1762,7 +2089,7 @@
     version = "0.2.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.2.10.tgz";
+      url = "https://registry.npmjs.org/async/-/async-0.2.10.tgz";
       name = "async-0.2.10.tgz";
       sha1 = "b6bbe0b0674b9d719708ca38de8c237cb526c3d1";
     };
@@ -1776,42 +2103,141 @@
   };
   by-spec."async"."0.9.0" =
     self.by-version."async"."0.9.0";
+  by-version."async"."0.9.0" = self.buildNodePackage {
+    name = "async-0.9.0";
+    version = "0.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async/-/async-0.9.0.tgz";
+      name = "async-0.9.0.tgz";
+      sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."async"."0.9.x" =
-    self.by-version."async"."0.9.0";
+    self.by-version."async"."0.9.2";
+  by-version."async"."0.9.2" = self.buildNodePackage {
+    name = "async-0.9.2";
+    version = "0.9.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz";
+      name = "async-0.9.2.tgz";
+      sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."1.4.0" =
+    self.by-version."async"."1.4.0";
+  by-version."async"."1.4.0" = self.buildNodePackage {
+    name = "async-1.4.0";
+    version = "1.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async/-/async-1.4.0.tgz";
+      name = "async-1.4.0.tgz";
+      sha1 = "35f86f83c59e0421d099cd9a91d8278fb578c00d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."1.4.2" =
+    self.by-version."async"."1.4.2";
+  by-version."async"."1.4.2" = self.buildNodePackage {
+    name = "async-1.4.2";
+    version = "1.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async/-/async-1.4.2.tgz";
+      name = "async-1.4.2.tgz";
+      sha1 = "6c9edcb11ced4f0dd2f2d40db0d49a109c088aab";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."1.5.2" =
+    self.by-version."async"."1.5.2";
+  by-version."async"."1.5.2" = self.buildNodePackage {
+    name = "async-1.5.2";
+    version = "1.5.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz";
+      name = "async-1.5.2.tgz";
+      sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."1.x" =
+    self.by-version."async"."1.5.2";
   by-spec."async".">=0.2.9" =
-    self.by-version."async"."0.9.0";
+    self.by-version."async"."1.5.2";
   by-spec."async".">=0.9.0 <1.0.0-0" =
-    self.by-version."async"."0.9.0";
+    self.by-version."async"."0.9.2";
   by-spec."async"."^0.9.0" =
-    self.by-version."async"."0.9.0";
+    self.by-version."async"."0.9.2";
+  by-spec."async"."^1.3.0" =
+    self.by-version."async"."1.5.2";
+  by-spec."async"."^1.4.0" =
+    self.by-version."async"."1.5.2";
+  by-spec."async"."^1.4.2" =
+    self.by-version."async"."1.5.2";
+  by-spec."async"."^1.5.0" =
+    self.by-version."async"."1.5.2";
+  by-spec."async"."^1.5.2" =
+    self.by-version."async"."1.5.2";
   by-spec."async"."~0.1.22" =
     self.by-version."async"."0.1.22";
-  by-spec."async"."~0.2.0" =
-    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.10" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.6" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.7" =
     self.by-version."async"."0.2.10";
-  by-spec."async"."~0.2.8" =
-    self.by-version."async"."0.2.10";
   by-spec."async"."~0.2.9" =
     self.by-version."async"."0.2.10";
   by-spec."async"."~0.9" =
-    self.by-version."async"."0.9.0";
+    self.by-version."async"."0.9.2";
   by-spec."async"."~0.9.0" =
-    self.by-version."async"."0.9.0";
-  by-spec."async-each"."^0.1.5" =
-    self.by-version."async-each"."0.1.6";
-  by-version."async-each"."0.1.6" = self.buildNodePackage {
-    name = "async-each-0.1.6";
-    version = "0.1.6";
+    self.by-version."async"."0.9.2";
+  by-spec."async"."~1.0.0" =
+    self.by-version."async"."1.0.0";
+  by-version."async"."1.0.0" = self.buildNodePackage {
+    name = "async-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async-each/-/async-each-0.1.6.tgz";
-      name = "async-each-0.1.6.tgz";
-      sha1 = "b67e99edcddf96541e44af56290cd7d5c6e70439";
+      url = "https://registry.npmjs.org/async/-/async-1.0.0.tgz";
+      name = "async-1.0.0.tgz";
+      sha1 = "f8fc04ca3a13784ade9e1641af98578cfbd647a9";
     };
     deps = {
     };
@@ -1821,19 +2247,61 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."async-some"."~1.0.1" =
-    self.by-version."async-some"."1.0.1";
-  by-version."async-some"."1.0.1" = self.buildNodePackage {
-    name = "async-some-1.0.1";
-    version = "1.0.1";
+  by-spec."async"."~1.2.1" =
+    self.by-version."async"."1.2.1";
+  by-version."async"."1.2.1" = self.buildNodePackage {
+    name = "async-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async-some/-/async-some-1.0.1.tgz";
-      name = "async-some-1.0.1.tgz";
-      sha1 = "8b54f08d46f0f9babc72ea9d646c245d23a4d9e5";
+      url = "https://registry.npmjs.org/async/-/async-1.2.1.tgz";
+      name = "async-1.2.1.tgz";
+      sha1 = "a4816a17cd5ff516dfa2c7698a453369b9790de0";
     };
     deps = {
-      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async"."~1.4.2" =
+    self.by-version."async"."1.4.2";
+  by-spec."async"."~1.5.2" =
+    self.by-version."async"."1.5.2";
+  by-spec."async-each"."^1.0.0" =
+    self.by-version."async-each"."1.0.0";
+  by-version."async-each"."1.0.0" = self.buildNodePackage {
+    name = "async-each-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async-each/-/async-each-1.0.0.tgz";
+      name = "async-each-1.0.0.tgz";
+      sha1 = "b5319226c29d99277df63c8aee04093aa5f1d39f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."async-some"."~1.0.2" =
+    self.by-version."async-some"."1.0.2";
+  by-version."async-some"."1.0.2" = self.buildNodePackage {
+    name = "async-some-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/async-some/-/async-some-1.0.2.tgz";
+      name = "async-some-1.0.2.tgz";
+      sha1 = "4d8a81620d5958791b5b98f802d3207776e95509";
+    };
+    deps = {
+      "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -1842,20 +2310,21 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.1.24";
-  by-version."aws-sdk"."2.1.24" = self.buildNodePackage {
-    name = "aws-sdk-2.1.24";
-    version = "2.1.24";
+    self.by-version."aws-sdk"."2.3.0";
+  by-version."aws-sdk"."2.3.0" = self.buildNodePackage {
+    name = "aws-sdk-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.24.tgz";
-      name = "aws-sdk-2.1.24.tgz";
-      sha1 = "06b7ae2fe05c7a862666af2fe86bb611d959770e";
+      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.0.tgz";
+      name = "aws-sdk-2.3.0.tgz";
+      sha1 = "96c653063863e2b7df34f6ab160f89f9c90b6a7b";
     };
     deps = {
-      "sax-0.5.3" = self.by-version."sax"."0.5.3";
-      "xml2js-0.2.8" = self.by-version."xml2js"."0.2.8";
-      "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
+      "sax-1.1.5" = self.by-version."sax"."1.1.5";
+      "xml2js-0.4.15" = self.by-version."xml2js"."0.4.15";
+      "xmlbuilder-2.6.2" = self.by-version."xmlbuilder"."2.6.2";
+      "jmespath-0.15.0" = self.by-version."jmespath"."0.15.0";
     };
     optionalDependencies = {
     };
@@ -1863,7 +2332,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.1.24";
+  "aws-sdk" = self.by-version."aws-sdk"."2.3.0";
   by-spec."aws-sdk"."2.0.5" =
     self.by-version."aws-sdk"."2.0.5";
   by-version."aws-sdk"."2.0.5" = self.buildNodePackage {
@@ -1871,7 +2340,7 @@
     version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.5.tgz";
+      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.5.tgz";
       name = "aws-sdk-2.0.5.tgz";
       sha1 = "f3ebb1898d0632b7b6672e8d77728cbbb69f98c6";
     };
@@ -1887,7 +2356,7 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."2.x" =
-    self.by-version."aws-sdk"."2.1.24";
+    self.by-version."aws-sdk"."2.3.0";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = self.buildNodePackage {
@@ -1895,7 +2364,7 @@
     version = "1.18.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
+      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-1.18.0.tgz";
       name = "aws-sdk-1.18.0.tgz";
       sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3";
     };
@@ -1909,29 +2378,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."aws-sdk".">=2.0.0 >=2.0.17 <2.1.0" =
-    self.by-version."aws-sdk"."2.0.31";
-  by-version."aws-sdk"."2.0.31" = self.buildNodePackage {
-    name = "aws-sdk-2.0.31";
-    version = "2.0.31";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.31.tgz";
-      name = "aws-sdk-2.0.31.tgz";
-      sha1 = "e72cf1fdc69015bd9fd2bdf3d3b88c16507d268e";
-    };
-    deps = {
-      "xml2js-0.2.6" = self.by-version."xml2js"."0.2.6";
-      "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."aws-sdk"."~2.0.17" =
-    self.by-version."aws-sdk"."2.0.31";
+  by-spec."aws-sdk".">=2.0.0 >=2.2.43 <3.0.0" =
+    self.by-version."aws-sdk"."2.3.0";
+  by-spec."aws-sdk"."^2.2.43" =
+    self.by-version."aws-sdk"."2.3.0";
   by-spec."aws-sdk-apis"."3.x" =
     self.by-version."aws-sdk-apis"."3.1.10";
   by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage {
@@ -1939,7 +2389,7 @@
     version = "3.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.10.tgz";
+      url = "https://registry.npmjs.org/aws-sdk-apis/-/aws-sdk-apis-3.1.10.tgz";
       name = "aws-sdk-apis-3.1.10.tgz";
       sha1 = "4eed97f590a16cf080fd1b8d8cfdf2472de8ab0e";
     };
@@ -1958,7 +2408,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
+      url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.2.0.tgz";
       name = "aws-sign-0.2.0.tgz";
       sha1 = "c55013856c8194ec854a0cbec90aab5a04ce3ac5";
     };
@@ -1977,7 +2427,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
+      url = "https://registry.npmjs.org/aws-sign/-/aws-sign-0.3.0.tgz";
       name = "aws-sign-0.3.0.tgz";
       sha1 = "3d81ca69b474b1e16518728b51c24ff0bbedc6e9";
     };
@@ -1996,7 +2446,7 @@
     version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
+      url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
       name = "aws-sign2-0.5.0.tgz";
       sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
     };
@@ -2008,16 +2458,95 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aws-sign2"."~0.6.0" =
+    self.by-version."aws-sign2"."0.6.0";
+  by-version."aws-sign2"."0.6.0" = self.buildNodePackage {
+    name = "aws-sign2-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+      name = "aws-sign2-0.6.0.tgz";
+      sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."aws4"."^1.2.1" =
+    self.by-version."aws4"."1.3.2";
+  by-version."aws4"."1.3.2" = self.buildNodePackage {
+    name = "aws4-1.3.2";
+    version = "1.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz";
+      name = "aws4-1.3.2.tgz";
+      sha1 = "d39e0bee412ced0e8ed94a23e314f313a95b9fd1";
+    };
+    deps = {
+      "lru-cache-4.0.1" = self.by-version."lru-cache"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."babel-plugin-syntax-flow"."^6.5.0" =
+    self.by-version."babel-plugin-syntax-flow"."6.5.0";
+  by-version."babel-plugin-syntax-flow"."6.5.0" = self.buildNodePackage {
+    name = "babel-plugin-syntax-flow-6.5.0";
+    version = "6.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.5.0.tgz";
+      name = "babel-plugin-syntax-flow-6.5.0.tgz";
+      sha1 = "07dfe735b45fce8905296296a40072afce82b215";
+    };
+    deps = {
+      "babel-runtime-5.8.38" = self.by-version."babel-runtime"."5.8.38";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."babel-runtime"."^5.0.0" =
+    self.by-version."babel-runtime"."5.8.38";
+  by-version."babel-runtime"."5.8.38" = self.buildNodePackage {
+    name = "babel-runtime-5.8.38";
+    version = "5.8.38";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/babel-runtime/-/babel-runtime-5.8.38.tgz";
+      name = "babel-runtime-5.8.38.tgz";
+      sha1 = "1c0b02eb63312f5f087ff20450827b425c9d4c19";
+    };
+    deps = {
+      "core-js-1.2.6" = self.by-version."core-js"."1.2.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."backbone"."*" =
-    self.by-version."backbone"."1.1.2";
-  by-version."backbone"."1.1.2" = self.buildNodePackage {
-    name = "backbone-1.1.2";
-    version = "1.1.2";
+    self.by-version."backbone"."1.3.2";
+  by-version."backbone"."1.3.2" = self.buildNodePackage {
+    name = "backbone-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/backbone/-/backbone-1.1.2.tgz";
-      name = "backbone-1.1.2.tgz";
-      sha1 = "c2c04c66bf87268fb82c177acebeff7d37ba6f2d";
+      url = "https://registry.npmjs.org/backbone/-/backbone-1.3.2.tgz";
+      name = "backbone-1.3.2.tgz";
+      sha1 = "43cdf6b25af3f54a7deb314129e1397ff42d6b83";
     };
     deps = {
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
@@ -2028,7 +2557,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "backbone" = self.by-version."backbone"."1.1.2";
+  "backbone" = self.by-version."backbone"."1.3.2";
   by-spec."backo2"."1.0.2" =
     self.by-version."backo2"."1.0.2";
   by-version."backo2"."1.0.2" = self.buildNodePackage {
@@ -2036,7 +2565,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+      url = "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
       name = "backo2-1.0.2.tgz";
       sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
     };
@@ -2049,15 +2578,15 @@
     cpu = [ ];
   };
   by-spec."backoff"."^2.4.0" =
-    self.by-version."backoff"."2.4.1";
-  by-version."backoff"."2.4.1" = self.buildNodePackage {
-    name = "backoff-2.4.1";
-    version = "2.4.1";
+    self.by-version."backoff"."2.5.0";
+  by-version."backoff"."2.5.0" = self.buildNodePackage {
+    name = "backoff-2.5.0";
+    version = "2.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/backoff/-/backoff-2.4.1.tgz";
-      name = "backoff-2.4.1.tgz";
-      sha1 = "2f68c50e0dd789dbefe24200a62efb04d2456d68";
+      url = "https://registry.npmjs.org/backoff/-/backoff-2.5.0.tgz";
+      name = "backoff-2.5.0.tgz";
+      sha1 = "f616eda9d3e4b66b8ca7fca79f695722c5f8e26f";
     };
     deps = {
       "precond-0.2.3" = self.by-version."precond"."0.2.3";
@@ -2075,7 +2604,7 @@
     version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz";
+      url = "https://registry.npmjs.org/backoff/-/backoff-2.3.0.tgz";
       name = "backoff-2.3.0.tgz";
       sha1 = "ee7c7e38093f92e472859db635e7652454fc21ea";
     };
@@ -2087,16 +2616,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."balanced-match"."^0.2.0" =
-    self.by-version."balanced-match"."0.2.0";
-  by-version."balanced-match"."0.2.0" = self.buildNodePackage {
-    name = "balanced-match-0.2.0";
-    version = "0.2.0";
+  by-spec."balanced-match"."^0.3.0" =
+    self.by-version."balanced-match"."0.3.0";
+  by-version."balanced-match"."0.3.0" = self.buildNodePackage {
+    name = "balanced-match-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
-      name = "balanced-match-0.2.0.tgz";
-      sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
+      url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz";
+      name = "balanced-match-0.3.0.tgz";
+      sha1 = "a91cdd1ebef1a86659e70ff4def01625fc2d6756";
     };
     deps = {
     };
@@ -2113,7 +2642,7 @@
     version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base-converter/-/base-converter-1.1.2.tgz";
+      url = "https://registry.npmjs.org/base-converter/-/base-converter-1.1.2.tgz";
       name = "base-converter-1.1.2.tgz";
       sha1 = "3abd417c6277c28bc3dedb6ac1af16d4b720615a";
     };
@@ -2132,7 +2661,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
+      url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
       name = "base62-0.1.1.tgz";
       sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
     };
@@ -2144,6 +2673,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."base62"."^1.1.0" =
+    self.by-version."base62"."1.1.0";
+  by-version."base62"."1.1.0" = self.buildNodePackage {
+    name = "base62-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/base62/-/base62-1.1.0.tgz";
+      name = "base62-1.1.0.tgz";
+      sha1 = "4659de866558906d43fec61e07abd4397da74c19";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."base64-arraybuffer"."0.1.2" =
     self.by-version."base64-arraybuffer"."0.1.2";
   by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage {
@@ -2151,7 +2699,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
+      url = "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
       name = "base64-arraybuffer-0.1.2.tgz";
       sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
     };
@@ -2163,16 +2711,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-js"."0.0.2" =
-    self.by-version."base64-js"."0.0.2";
-  by-version."base64-js"."0.0.2" = self.buildNodePackage {
-    name = "base64-js-0.0.2";
-    version = "0.0.2";
+  by-spec."base64-js"."0.0.8" =
+    self.by-version."base64-js"."0.0.8";
+  by-version."base64-js"."0.0.8" = self.buildNodePackage {
+    name = "base64-js-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.2.tgz";
-      name = "base64-js-0.0.2.tgz";
-      sha1 = "024f0f72afa25b75f9c0ee73cd4f55ec1bed9784";
+      url = "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
+      name = "base64-js-0.0.8.tgz";
+      sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
     };
     deps = {
     };
@@ -2182,16 +2730,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-js"."0.0.6" =
-    self.by-version."base64-js"."0.0.6";
-  by-version."base64-js"."0.0.6" = self.buildNodePackage {
-    name = "base64-js-0.0.6";
-    version = "0.0.6";
+  by-spec."base64-js"."^1.0.2" =
+    self.by-version."base64-js"."1.1.2";
+  by-version."base64-js"."1.1.2" = self.buildNodePackage {
+    name = "base64-js-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.6.tgz";
-      name = "base64-js-0.0.6.tgz";
-      sha1 = "7b859f79f0bbbd55867ba67a7fab397e24a20947";
+      url = "https://registry.npmjs.org/base64-js/-/base64-js-1.1.2.tgz";
+      name = "base64-js-1.1.2.tgz";
+      sha1 = "d6400cac1c4c660976d90d07a04351d89395f5e8";
     };
     deps = {
     };
@@ -2201,16 +2749,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-js"."0.0.8" =
-    self.by-version."base64-js"."0.0.8";
-  by-version."base64-js"."0.0.8" = self.buildNodePackage {
-    name = "base64-js-0.0.8";
-    version = "0.0.8";
+  by-spec."base64-url"."1.2.1" =
+    self.by-version."base64-url"."1.2.1";
+  by-version."base64-url"."1.2.1" = self.buildNodePackage {
+    name = "base64-url-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz";
-      name = "base64-js-0.0.8.tgz";
-      sha1 = "1101e9544f4a76b1bc3b26d452ca96d7a35e7978";
+      url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
+      name = "base64-url-1.2.1.tgz";
+      sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
     };
     deps = {
     };
@@ -2220,18 +2768,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-js"."~0.0.4" =
-    self.by-version."base64-js"."0.0.8";
-  by-spec."base64-url"."1" =
-    self.by-version."base64-url"."1.2.1";
-  by-version."base64-url"."1.2.1" = self.buildNodePackage {
-    name = "base64-url-1.2.1";
-    version = "1.2.1";
+  by-spec."base64-url"."^1.2.1" =
+    self.by-version."base64-url"."1.2.2";
+  by-version."base64-url"."1.2.2" = self.buildNodePackage {
+    name = "base64-url-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz";
-      name = "base64-url-1.2.1.tgz";
-      sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78";
+      url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.2.tgz";
+      name = "base64-url-1.2.2.tgz";
+      sha1 = "90af26ef8b0b67bc801b05eccf943345649008b3";
     };
     deps = {
     };
@@ -2241,8 +2787,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64-url"."1.2.1" =
-    self.by-version."base64-url"."1.2.1";
   by-spec."base64id"."0.1.0" =
     self.by-version."base64id"."0.1.0";
   by-version."base64id"."0.1.0" = self.buildNodePackage {
@@ -2250,7 +2794,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+      url = "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
       name = "base64id-0.1.0.tgz";
       sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
     };
@@ -2262,19 +2806,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64url"."0.0.3" =
-    self.by-version."base64url"."0.0.3";
-  by-version."base64url"."0.0.3" = self.buildNodePackage {
-    name = "base64url-0.0.3";
-    version = "0.0.3";
+  by-spec."base64url"."~0.0.4" =
+    self.by-version."base64url"."0.0.6";
+  by-version."base64url"."0.0.6" = self.buildNodePackage {
+    name = "base64url-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.3.tgz";
-      name = "base64url-0.0.3.tgz";
-      sha1 = "50c20edac277dde1a0b15059954ced7a2d102d57";
+      url = "https://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
+      name = "base64url-0.0.6.tgz";
+      sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
     };
     deps = {
-      "tap-0.3.3" = self.by-version."tap"."0.3.3";
     };
     optionalDependencies = {
     };
@@ -2282,18 +2825,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64url"."0.0.6" =
-    self.by-version."base64url"."0.0.6";
-  by-version."base64url"."0.0.6" = self.buildNodePackage {
-    name = "base64url-0.0.6";
-    version = "0.0.6";
-    bin = false;
+  by-spec."base64url"."~1.0.4" =
+    self.by-version."base64url"."1.0.6";
+  by-version."base64url"."1.0.6" = self.buildNodePackage {
+    name = "base64url-1.0.6";
+    version = "1.0.6";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/base64url/-/base64url-0.0.6.tgz";
-      name = "base64url-0.0.6.tgz";
-      sha1 = "9597b36b330db1c42477322ea87ea8027499b82b";
+      url = "https://registry.npmjs.org/base64url/-/base64url-1.0.6.tgz";
+      name = "base64url-1.0.6.tgz";
+      sha1 = "d64d375d68a7c640d912e2358d170dca5bb54681";
     };
     deps = {
+      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
+      "meow-2.0.0" = self.by-version."meow"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -2301,8 +2846,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base64url"."~0.0.3" =
-    self.by-version."base64url"."0.0.6";
   by-spec."basic-auth"."1.0.0" =
     self.by-version."basic-auth"."1.0.0";
   by-version."basic-auth"."1.0.0" = self.buildNodePackage {
@@ -2310,7 +2853,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
+      url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.0.tgz";
       name = "basic-auth-1.0.0.tgz";
       sha1 = "111b2d9ff8e4e6d136b8c84ea5e096cb87351637";
     };
@@ -2322,8 +2865,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."basic-auth"."1.0.3" =
+    self.by-version."basic-auth"."1.0.3";
+  by-version."basic-auth"."1.0.3" = self.buildNodePackage {
+    name = "basic-auth-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.3.tgz";
+      name = "basic-auth-1.0.3.tgz";
+      sha1 = "41f55523e589405038ee3567958c62a5ed70551a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."basic-auth"."^1.0.0" =
-    self.by-version."basic-auth"."1.0.0";
+    self.by-version."basic-auth"."1.0.3";
+  by-spec."basic-auth"."~1.0.3" =
+    self.by-version."basic-auth"."1.0.3";
   by-spec."basic-auth-connect"."1.0.0" =
     self.by-version."basic-auth-connect"."1.0.0";
   by-version."basic-auth-connect"."1.0.0" = self.buildNodePackage {
@@ -2331,7 +2895,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
+      url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz";
       name = "basic-auth-connect-1.0.0.tgz";
       sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122";
     };
@@ -2350,7 +2914,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/batbelt/-/batbelt-0.0.2.tgz";
+      url = "https://registry.npmjs.org/batbelt/-/batbelt-0.0.2.tgz";
       name = "batbelt-0.0.2.tgz";
       sha1 = "2285bf5438b03502e5c5a3cdaf3ad68bf0ad4a65";
     };
@@ -2370,7 +2934,7 @@
     version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
+      url = "https://registry.npmjs.org/batch/-/batch-0.5.0.tgz";
       name = "batch-0.5.0.tgz";
       sha1 = "fd2e05a7a5d696b4db9314013e285d8ff3557ec3";
     };
@@ -2382,35 +2946,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."batch"."0.5.1" =
-    self.by-version."batch"."0.5.1";
-  by-version."batch"."0.5.1" = self.buildNodePackage {
-    name = "batch-0.5.1";
-    version = "0.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/batch/-/batch-0.5.1.tgz";
-      name = "batch-0.5.1.tgz";
-      sha1 = "36a4bab594c050fd7b507bca0db30c2d92af4ff2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."batch"."0.5.2" =
-    self.by-version."batch"."0.5.2";
-  by-version."batch"."0.5.2" = self.buildNodePackage {
-    name = "batch-0.5.2";
-    version = "0.5.2";
+  by-spec."batch"."0.5.3" =
+    self.by-version."batch"."0.5.3";
+  by-version."batch"."0.5.3" = self.buildNodePackage {
+    name = "batch-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/batch/-/batch-0.5.2.tgz";
-      name = "batch-0.5.2.tgz";
-      sha1 = "546543dbe32118c83c7c7ca33a1f5c5d5ea963e9";
+      url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz";
+      name = "batch-0.5.3.tgz";
+      sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464";
     };
     deps = {
     };
@@ -2420,42 +2965,22 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."batch"."^0.5.3" =
+    self.by-version."batch"."0.5.3";
   by-spec."bcrypt"."*" =
-    self.by-version."bcrypt"."0.8.2";
-  by-version."bcrypt"."0.8.2" = self.buildNodePackage {
-    name = "bcrypt-0.8.2";
-    version = "0.8.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.2.tgz";
-      name = "bcrypt-0.8.2.tgz";
-      sha1 = "4732f0ddd1e0fb066dcd8ad9472d3d300fd96824";
-    };
-    deps = {
-      "bindings-1.2.0" = self.by-version."bindings"."1.2.0";
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "bcrypt" = self.by-version."bcrypt"."0.8.2";
-  by-spec."bcrypt"."0.8.1" =
-    self.by-version."bcrypt"."0.8.1";
-  by-version."bcrypt"."0.8.1" = self.buildNodePackage {
-    name = "bcrypt-0.8.1";
-    version = "0.8.1";
+    self.by-version."bcrypt"."0.8.5";
+  by-version."bcrypt"."0.8.5" = self.buildNodePackage {
+    name = "bcrypt-0.8.5";
+    version = "0.8.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bcrypt/-/bcrypt-0.8.1.tgz";
-      name = "bcrypt-0.8.1.tgz";
-      sha1 = "384fa4fbc106ec87ccf8ee3d1e7e12d0ef8eeaaf";
+      url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.5.tgz";
+      name = "bcrypt-0.8.5.tgz";
+      sha1 = "8e5b81b4db80e944f440005979ca8d58a961861d";
     };
     deps = {
-      "bindings-1.0.0" = self.by-version."bindings"."1.0.0";
-      "nan-1.5.0" = self.by-version."nan"."1.5.0";
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-2.0.5" = self.by-version."nan"."2.0.5";
     };
     optionalDependencies = {
     };
@@ -2463,18 +2988,21 @@
     os = [ ];
     cpu = [ ];
   };
+  "bcrypt" = self.by-version."bcrypt"."0.8.5";
+  by-spec."bcrypt"."0.8.5" =
+    self.by-version."bcrypt"."0.8.5";
   by-spec."bcrypt".">=0.5.0" =
-    self.by-version."bcrypt"."0.8.2";
-  by-spec."bcryptjs"."2.1.0" =
-    self.by-version."bcryptjs"."2.1.0";
-  by-version."bcryptjs"."2.1.0" = self.buildNodePackage {
-    name = "bcryptjs-2.1.0";
-    version = "2.1.0";
+    self.by-version."bcrypt"."0.8.5";
+  by-spec."bcryptjs"."2.3.0" =
+    self.by-version."bcryptjs"."2.3.0";
+  by-version."bcryptjs"."2.3.0" = self.buildNodePackage {
+    name = "bcryptjs-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bcryptjs/-/bcryptjs-2.1.0.tgz";
-      name = "bcryptjs-2.1.0.tgz";
-      sha1 = "5e6076196f6e3e957820aceb004410a7cf367042";
+      url = "https://registry.npmjs.org/bcryptjs/-/bcryptjs-2.3.0.tgz";
+      name = "bcryptjs-2.3.0.tgz";
+      sha1 = "5826900cfef7abaf3425c72e4d464de509b8c2ec";
     };
     deps = {
     };
@@ -2485,15 +3013,15 @@
     cpu = [ ];
   };
   by-spec."beeper"."^1.0.0" =
-    self.by-version."beeper"."1.0.0";
-  by-version."beeper"."1.0.0" = self.buildNodePackage {
-    name = "beeper-1.0.0";
-    version = "1.0.0";
+    self.by-version."beeper"."1.1.0";
+  by-version."beeper"."1.1.0" = self.buildNodePackage {
+    name = "beeper-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/beeper/-/beeper-1.0.0.tgz";
-      name = "beeper-1.0.0.tgz";
-      sha1 = "1ad2a27a9c7e545234119180afed61f80daaf02c";
+      url = "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz";
+      name = "beeper-1.1.0.tgz";
+      sha1 = "9ee6fc1ce7f54feaace7ce73588b056037866a2c";
     };
     deps = {
     };
@@ -2510,7 +3038,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
+      url = "https://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
       name = "benchmark-1.0.0.tgz";
       sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
     };
@@ -2529,7 +3057,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz";
+      url = "https://registry.npmjs.org/bencode/-/bencode-0.6.0.tgz";
       name = "bencode-0.6.0.tgz";
       sha1 = "04d6190e1d7467c56a969e1a94d1668076eac050";
     };
@@ -2548,7 +3076,7 @@
     version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz";
+      url = "https://registry.npmjs.org/bencode/-/bencode-0.7.0.tgz";
       name = "bencode-0.7.0.tgz";
       sha1 = "811ed647c0118945e41bb4bbbdea9a2c78a17083";
     };
@@ -2560,19 +3088,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."better-assert"."~1.0.0" =
-    self.by-version."better-assert"."1.0.2";
-  by-version."better-assert"."1.0.2" = self.buildNodePackage {
-    name = "better-assert-1.0.2";
-    version = "1.0.2";
+  by-spec."bencode"."^0.8.0" =
+    self.by-version."bencode"."0.8.0";
+  by-version."bencode"."0.8.0" = self.buildNodePackage {
+    name = "bencode-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
-      name = "better-assert-1.0.2.tgz";
-      sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
+      url = "https://registry.npmjs.org/bencode/-/bencode-0.8.0.tgz";
+      name = "bencode-0.8.0.tgz";
+      sha1 = "3143448e82b0fadc745633ecc2a5f8fa87932f19";
     };
     deps = {
-      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -2580,22 +3107,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."biased-opener"."~0.2.2" =
-    self.by-version."biased-opener"."0.2.5";
-  by-version."biased-opener"."0.2.5" = self.buildNodePackage {
-    name = "biased-opener-0.2.5";
-    version = "0.2.5";
-    bin = true;
+  by-spec."bencode"."^0.9.0" =
+    self.by-version."bencode"."0.9.0";
+  by-version."bencode"."0.9.0" = self.buildNodePackage {
+    name = "bencode-0.9.0";
+    version = "0.9.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/biased-opener/-/biased-opener-0.2.5.tgz";
-      name = "biased-opener-0.2.5.tgz";
-      sha1 = "2a57fe55c6209ea5e178e13ba64bddac72c8f7c0";
+      url = "https://registry.npmjs.org/bencode/-/bencode-0.9.0.tgz";
+      name = "bencode-0.9.0.tgz";
+      sha1 = "6bd263e8e7b5362212e0541c2dbf75b330592bfe";
     };
     deps = {
-      "browser-launcher2-0.4.5" = self.by-version."browser-launcher2"."0.4.5";
-      "minimist-1.1.0" = self.by-version."minimist"."1.1.0";
-      "opener-1.4.1" = self.by-version."opener"."1.4.1";
-      "x-default-browser-0.3.0" = self.by-version."x-default-browser"."0.3.0";
     };
     optionalDependencies = {
     };
@@ -2603,18 +3126,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bigi"."^1.1.0" =
-    self.by-version."bigi"."1.4.0";
-  by-version."bigi"."1.4.0" = self.buildNodePackage {
-    name = "bigi-1.4.0";
-    version = "1.4.0";
+  by-spec."better-assert"."~1.0.0" =
+    self.by-version."better-assert"."1.0.2";
+  by-version."better-assert"."1.0.2" = self.buildNodePackage {
+    name = "better-assert-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bigi/-/bigi-1.4.0.tgz";
-      name = "bigi-1.4.0.tgz";
-      sha1 = "90ac1aeac0a531216463bdb58f42c1e05c8407ac";
+      url = "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
+      name = "better-assert-1.0.2.tgz";
+      sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
     };
     deps = {
+      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -2622,18 +3146,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bignumber.js"."^1.3.0" =
-    self.by-version."bignumber.js"."1.5.0";
-  by-version."bignumber.js"."1.5.0" = self.buildNodePackage {
-    name = "bignumber.js-1.5.0";
-    version = "1.5.0";
-    bin = false;
+  by-spec."biased-opener"."~0.2.2" =
+    self.by-version."biased-opener"."0.2.8";
+  by-version."biased-opener"."0.2.8" = self.buildNodePackage {
+    name = "biased-opener-0.2.8";
+    version = "0.2.8";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz";
-      name = "bignumber.js-1.5.0.tgz";
-      sha1 = "ff41453ac7b19ee15cda7977e179ff1b0d11956d";
+      url = "https://registry.npmjs.org/biased-opener/-/biased-opener-0.2.8.tgz";
+      name = "biased-opener-0.2.8.tgz";
+      sha1 = "159a49b9a9714c1fb102f2e0ed1906fab6a450f4";
     };
     deps = {
+      "browser-launcher2-0.4.6" = self.by-version."browser-launcher2"."0.4.6";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "x-default-browser-0.3.1" = self.by-version."x-default-browser"."0.3.1";
     };
     optionalDependencies = {
     };
@@ -2641,20 +3168,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."binary"."^0.3.0" =
-    self.by-version."binary"."0.3.0";
-  by-version."binary"."0.3.0" = self.buildNodePackage {
-    name = "binary-0.3.0";
-    version = "0.3.0";
-    bin = false;
+  by-spec."big-integer"."^1.6.7" =
+    self.by-version."big-integer"."1.6.14";
+  by-version."big-integer"."1.6.14" = self.buildNodePackage {
+    name = "big-integer-1.6.14";
+    version = "1.6.14";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/binary/-/binary-0.3.0.tgz";
-      name = "binary-0.3.0.tgz";
-      sha1 = "9f60553bc5ce8c3386f3b553cff47462adecaa79";
+      url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.14.tgz";
+      name = "big-integer-1.6.14.tgz";
+      sha1 = "8f6f03d7d6cce2917d8d5d81420f41fbaaeecd06";
     };
     deps = {
-      "chainsaw-0.1.0" = self.by-version."chainsaw"."0.1.0";
-      "buffers-0.1.1" = self.by-version."buffers"."0.1.1";
     };
     optionalDependencies = {
     };
@@ -2662,16 +3187,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."binary-extensions"."^1.0.0" =
-    self.by-version."binary-extensions"."1.3.0";
-  by-version."binary-extensions"."1.3.0" = self.buildNodePackage {
-    name = "binary-extensions-1.3.0";
-    version = "1.3.0";
+  by-spec."big.js"."^3.0.2" =
+    self.by-version."big.js"."3.1.3";
+  by-version."big.js"."3.1.3" = self.buildNodePackage {
+    name = "big.js-3.1.3";
+    version = "3.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/binary-extensions/-/binary-extensions-1.3.0.tgz";
-      name = "binary-extensions-1.3.0.tgz";
-      sha1 = "8c0fd7fa1bd27cfe1e6f2a1d38721647c80b2029";
+      url = "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz";
+      name = "big.js-3.1.3.tgz";
+      sha1 = "4cada2193652eb3ca9ec8e55c9015669c9806978";
     };
     deps = {
     };
@@ -2681,16 +3206,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."binaryheap".">= 0.0.3" =
-    self.by-version."binaryheap"."0.0.3";
-  by-version."binaryheap"."0.0.3" = self.buildNodePackage {
-    name = "binaryheap-0.0.3";
-    version = "0.0.3";
+  by-spec."bigi"."^1.1.0" =
+    self.by-version."bigi"."1.4.1";
+  by-version."bigi"."1.4.1" = self.buildNodePackage {
+    name = "bigi-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
-      name = "binaryheap-0.0.3.tgz";
-      sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6";
+      url = "https://registry.npmjs.org/bigi/-/bigi-1.4.1.tgz";
+      name = "bigi-1.4.1.tgz";
+      sha1 = "726e8ab08d1fe1dfb8aa6bb6309bffecf93a21b7";
     };
     deps = {
     };
@@ -2700,16 +3225,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bindings"."*" =
-    self.by-version."bindings"."1.2.1";
-  by-version."bindings"."1.2.1" = self.buildNodePackage {
-    name = "bindings-1.2.1";
-    version = "1.2.1";
+  by-spec."bignumber.js"."^1.3.0" =
+    self.by-version."bignumber.js"."1.5.0";
+  by-version."bignumber.js"."1.5.0" = self.buildNodePackage {
+    name = "bignumber.js-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
-      name = "bindings-1.2.1.tgz";
-      sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
+      url = "https://registry.npmjs.org/bignumber.js/-/bignumber.js-1.5.0.tgz";
+      name = "bignumber.js-1.5.0.tgz";
+      sha1 = "ff41453ac7b19ee15cda7977e179ff1b0d11956d";
     };
     deps = {
     };
@@ -2719,16 +3244,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bindings"."1.0.0" =
-    self.by-version."bindings"."1.0.0";
-  by-version."bindings"."1.0.0" = self.buildNodePackage {
-    name = "bindings-1.0.0";
-    version = "1.0.0";
+  by-spec."binary-extensions"."^1.0.0" =
+    self.by-version."binary-extensions"."1.4.0";
+  by-version."binary-extensions"."1.4.0" = self.buildNodePackage {
+    name = "binary-extensions-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bindings/-/bindings-1.0.0.tgz";
-      name = "bindings-1.0.0.tgz";
-      sha1 = "c3ccde60e9de6807c6f1aa4ef4843af29191c828";
+      url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.4.0.tgz";
+      name = "binary-extensions-1.4.0.tgz";
+      sha1 = "d733ccb628986d7b326d88656e0ddbd3aac351b7";
     };
     deps = {
     };
@@ -2738,16 +3263,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bindings"."1.1.1" =
-    self.by-version."bindings"."1.1.1";
-  by-version."bindings"."1.1.1" = self.buildNodePackage {
-    name = "bindings-1.1.1";
-    version = "1.1.1";
+  by-spec."binaryheap".">= 0.0.3" =
+    self.by-version."binaryheap"."0.0.3";
+  by-version."binaryheap"."0.0.3" = self.buildNodePackage {
+    name = "binaryheap-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bindings/-/bindings-1.1.1.tgz";
-      name = "bindings-1.1.1.tgz";
-      sha1 = "951f7ae010302ffc50b265b124032017ed2bf6f3";
+      url = "https://registry.npmjs.org/binaryheap/-/binaryheap-0.0.3.tgz";
+      name = "binaryheap-0.0.3.tgz";
+      sha1 = "0d6136c84e9f1a5a90c0b97178c3e00df59820d6";
     };
     deps = {
     };
@@ -2757,16 +3282,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bindings"."1.2.0" =
-    self.by-version."bindings"."1.2.0";
-  by-version."bindings"."1.2.0" = self.buildNodePackage {
-    name = "bindings-1.2.0";
-    version = "1.2.0";
+  by-spec."bindings"."*" =
+    self.by-version."bindings"."1.2.1";
+  by-version."bindings"."1.2.1" = self.buildNodePackage {
+    name = "bindings-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bindings/-/bindings-1.2.0.tgz";
-      name = "bindings-1.2.0.tgz";
-      sha1 = "c224fc5b349a84043779f97a6271d9d70da7636f";
+      url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz";
+      name = "bindings-1.2.1.tgz";
+      sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11";
     };
     deps = {
     };
@@ -2780,37 +3305,35 @@
     self.by-version."bindings"."1.2.1";
   by-spec."bindings"."1.2.x" =
     self.by-version."bindings"."1.2.1";
-  by-spec."bindings".">=1.2.1" =
-    self.by-version."bindings"."1.2.1";
   by-spec."bindings"."^1.2.1" =
     self.by-version."bindings"."1.2.1";
-  by-spec."bindings"."~1.1.1" =
-    self.by-version."bindings"."1.1.1";
+  by-spec."bindings"."~1.2.0" =
+    self.by-version."bindings"."1.2.1";
   by-spec."bindings"."~1.2.1" =
     self.by-version."bindings"."1.2.1";
-  by-spec."bip-pod".">=0.0.1" =
-    self.by-version."bip-pod"."0.3.16";
-  by-version."bip-pod"."0.3.16" = self.buildNodePackage {
-    name = "bip-pod-0.3.16";
-    version = "0.3.16";
+  by-spec."bip-pod".">=0.4.14" =
+    self.by-version."bip-pod"."0.4.21";
+  by-version."bip-pod"."0.4.21" = self.buildNodePackage {
+    name = "bip-pod-0.4.21";
+    version = "0.4.21";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod/-/bip-pod-0.3.16.tgz";
-      name = "bip-pod-0.3.16.tgz";
-      sha1 = "eb7ba65721db3feeb57d9974960f55820cf5a6f7";
+      url = "https://registry.npmjs.org/bip-pod/-/bip-pod-0.4.21.tgz";
+      name = "bip-pod-0.4.21.tgz";
+      sha1 = "a7ff8f243fea3d7265756b7ea99f795fe8eb364e";
     };
     deps = {
       "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
-      "cron-1.0.9" = self.by-version."cron"."1.0.9";
+      "cron-1.1.0" = self.by-version."cron"."1.1.0";
       "dns-0.2.2" = self.by-version."dns"."0.2.2";
-      "extend-2.0.0" = self.by-version."extend"."2.0.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
       "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "moment-2.10.2" = self.by-version."moment"."2.10.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "passport-0.3.2" = self.by-version."passport"."0.3.2";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
       "tldtools-0.0.24" = self.by-version."tldtools"."0.0.24";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
@@ -2828,12 +3351,12 @@
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-alchemy/-/bip-pod-alchemy-0.3.3.tgz";
+      url = "https://registry.npmjs.org/bip-pod-alchemy/-/bip-pod-alchemy-0.3.3.tgz";
       name = "bip-pod-alchemy-0.3.3.tgz";
       sha1 = "408ab1d2e776790528e3d8de52ae0375610067aa";
     };
     deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -2842,29 +3365,6 @@
     cpu = [ ];
   };
   "bip-pod-alchemy" = self.by-version."bip-pod-alchemy"."0.3.3";
-  by-spec."bip-pod-bitly"."*" =
-    self.by-version."bip-pod-bitly"."0.3.4";
-  by-version."bip-pod-bitly"."0.3.4" = self.buildNodePackage {
-    name = "bip-pod-bitly-0.3.4";
-    version = "0.3.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-bitly/-/bip-pod-bitly-0.3.4.tgz";
-      name = "bip-pod-bitly-0.3.4.tgz";
-      sha1 = "15690871c9349e549d77656205bf7906ef6a5ec7";
-    };
-    deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-bitly-0.1.0" = self.by-version."passport-bitly"."0.1.0";
-      "request-2.29.0" = self.by-version."request"."2.29.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "bip-pod-bitly" = self.by-version."bip-pod-bitly"."0.3.4";
   by-spec."bip-pod-chain"."*" =
     self.by-version."bip-pod-chain"."0.3.3";
   by-version."bip-pod-chain"."0.3.3" = self.buildNodePackage {
@@ -2872,12 +3372,12 @@
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-chain/-/bip-pod-chain-0.3.3.tgz";
+      url = "https://registry.npmjs.org/bip-pod-chain/-/bip-pod-chain-0.3.3.tgz";
       name = "bip-pod-chain-0.3.3.tgz";
       sha1 = "91c707e90af87bee3cbeed7376fc2aa5f13a6e92";
     };
     deps = {
-      "chain-node-3.1.0" = self.by-version."chain-node"."3.1.0";
+      "chain-node-3.1.2" = self.by-version."chain-node"."3.1.2";
     };
     optionalDependencies = {
     };
@@ -2893,7 +3393,7 @@
     version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-circonus/-/bip-pod-circonus-0.3.2.tgz";
+      url = "https://registry.npmjs.org/bip-pod-circonus/-/bip-pod-circonus-0.3.2.tgz";
       name = "bip-pod-circonus-0.3.2.tgz";
       sha1 = "5c14d13f73a184323d7209558caba794e2e6ca46";
     };
@@ -2907,15 +3407,15 @@
   };
   "bip-pod-circonus" = self.by-version."bip-pod-circonus"."0.3.2";
   by-spec."bip-pod-coindesk"."*" =
-    self.by-version."bip-pod-coindesk"."0.3.2";
-  by-version."bip-pod-coindesk"."0.3.2" = self.buildNodePackage {
-    name = "bip-pod-coindesk-0.3.2";
-    version = "0.3.2";
+    self.by-version."bip-pod-coindesk"."0.3.3";
+  by-version."bip-pod-coindesk"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-coindesk-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-coindesk/-/bip-pod-coindesk-0.3.2.tgz";
-      name = "bip-pod-coindesk-0.3.2.tgz";
-      sha1 = "de1073a7521cd70f33648c3ed89f2e1f14226f89";
+      url = "https://registry.npmjs.org/bip-pod-coindesk/-/bip-pod-coindesk-0.3.3.tgz";
+      name = "bip-pod-coindesk-0.3.3.tgz";
+      sha1 = "ec03674c79bbb84cbeec940af91aff28aa1505e2";
     };
     deps = {
     };
@@ -2925,7 +3425,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-coindesk" = self.by-version."bip-pod-coindesk"."0.3.2";
+  "bip-pod-coindesk" = self.by-version."bip-pod-coindesk"."0.3.3";
   by-spec."bip-pod-craigslist"."*" =
     self.by-version."bip-pod-craigslist"."0.3.3";
   by-version."bip-pod-craigslist"."0.3.3" = self.buildNodePackage {
@@ -2933,12 +3433,12 @@
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-craigslist/-/bip-pod-craigslist-0.3.3.tgz";
+      url = "https://registry.npmjs.org/bip-pod-craigslist/-/bip-pod-craigslist-0.3.3.tgz";
       name = "bip-pod-craigslist-0.3.3.tgz";
       sha1 = "e92becd2ad4ba05cd4895a2734ca270b7a850b4f";
     };
     deps = {
-      "node-craigslist-0.1.8" = self.by-version."node-craigslist"."0.1.8";
+      "node-craigslist-0.1.9" = self.by-version."node-craigslist"."0.1.9";
     };
     optionalDependencies = {
     };
@@ -2954,7 +3454,7 @@
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-crypto/-/bip-pod-crypto-0.3.3.tgz";
+      url = "https://registry.npmjs.org/bip-pod-crypto/-/bip-pod-crypto-0.3.3.tgz";
       name = "bip-pod-crypto-0.3.3.tgz";
       sha1 = "b2e7e41af687ab4b4100c669039c816bc1ba887e";
     };
@@ -2970,20 +3470,20 @@
   by-spec."bip-pod-crypto".">=0.0.1" =
     self.by-version."bip-pod-crypto"."0.3.3";
   by-spec."bip-pod-dropbox"."*" =
-    self.by-version."bip-pod-dropbox"."0.3.4";
-  by-version."bip-pod-dropbox"."0.3.4" = self.buildNodePackage {
-    name = "bip-pod-dropbox-0.3.4";
-    version = "0.3.4";
+    self.by-version."bip-pod-dropbox"."0.3.10";
+  by-version."bip-pod-dropbox"."0.3.10" = self.buildNodePackage {
+    name = "bip-pod-dropbox-0.3.10";
+    version = "0.3.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-dropbox/-/bip-pod-dropbox-0.3.4.tgz";
-      name = "bip-pod-dropbox-0.3.4.tgz";
-      sha1 = "953528362ba46d42268fefc923c51624b78c0a0e";
+      url = "https://registry.npmjs.org/bip-pod-dropbox/-/bip-pod-dropbox-0.3.10.tgz";
+      name = "bip-pod-dropbox-0.3.10.tgz";
+      sha1 = "d8b907772d28635b426958bc72d1e45d2d483760";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "passport-dropbox-0.1.2" = self.by-version."passport-dropbox"."0.1.2";
+      "passport-dropbox-2.0.0" = self.by-version."passport-dropbox"."2.0.0";
       "dropbox-0.9.2" = self.by-version."dropbox"."0.9.2";
     };
     optionalDependencies = {
@@ -2992,17 +3492,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-dropbox" = self.by-version."bip-pod-dropbox"."0.3.4";
+  "bip-pod-dropbox" = self.by-version."bip-pod-dropbox"."0.3.10";
   by-spec."bip-pod-email".">=0.0.1" =
-    self.by-version."bip-pod-email"."0.3.9";
-  by-version."bip-pod-email"."0.3.9" = self.buildNodePackage {
-    name = "bip-pod-email-0.3.9";
-    version = "0.3.9";
+    self.by-version."bip-pod-email"."0.3.13";
+  by-version."bip-pod-email"."0.3.13" = self.buildNodePackage {
+    name = "bip-pod-email-0.3.13";
+    version = "0.3.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-email/-/bip-pod-email-0.3.9.tgz";
-      name = "bip-pod-email-0.3.9.tgz";
-      sha1 = "1d53e66b87873cedca5e0813de4ef5ce413df67e";
+      url = "https://registry.npmjs.org/bip-pod-email/-/bip-pod-email-0.3.13.tgz";
+      name = "bip-pod-email-0.3.13.tgz";
+      sha1 = "aa7dde292d2d967ccfc41d337d18c6422adfbcf3";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
@@ -3023,7 +3523,7 @@
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-embedly/-/bip-pod-embedly-0.3.3.tgz";
+      url = "https://registry.npmjs.org/bip-pod-embedly/-/bip-pod-embedly-0.3.3.tgz";
       name = "bip-pod-embedly-0.3.3.tgz";
       sha1 = "b28dbec6f95a3ce868476f8ace7129b5675e84bb";
     };
@@ -3045,14 +3545,14 @@
     version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-evernote/-/bip-pod-evernote-0.3.5.tgz";
+      url = "https://registry.npmjs.org/bip-pod-evernote/-/bip-pod-evernote-0.3.5.tgz";
       name = "bip-pod-evernote-0.3.5.tgz";
       sha1 = "81cc6d8d9c339410f97cb3eff8d82036b8f8d3ab";
     };
     deps = {
-      "evernote-1.25.4" = self.by-version."evernote"."1.25.4";
+      "evernote-1.25.82" = self.by-version."evernote"."1.25.82";
       "passport-evernote-0.1.1" = self.by-version."passport-evernote"."0.1.1";
-      "q-1.2.0" = self.by-version."q"."1.2.0";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
       "xml2json-0.5.1" = self.by-version."xml2json"."0.5.1";
     };
     optionalDependencies = {
@@ -3063,22 +3563,22 @@
   };
   "bip-pod-evernote" = self.by-version."bip-pod-evernote"."0.3.5";
   by-spec."bip-pod-facebook"."*" =
-    self.by-version."bip-pod-facebook"."0.3.6";
-  by-version."bip-pod-facebook"."0.3.6" = self.buildNodePackage {
-    name = "bip-pod-facebook-0.3.6";
-    version = "0.3.6";
+    self.by-version."bip-pod-facebook"."0.3.10";
+  by-version."bip-pod-facebook"."0.3.10" = self.buildNodePackage {
+    name = "bip-pod-facebook-0.3.10";
+    version = "0.3.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-facebook/-/bip-pod-facebook-0.3.6.tgz";
-      name = "bip-pod-facebook-0.3.6.tgz";
-      sha1 = "3958520db3c94f4e5ac21c66f90c572b3354e125";
+      url = "https://registry.npmjs.org/bip-pod-facebook/-/bip-pod-facebook-0.3.10.tgz";
+      name = "bip-pod-facebook-0.3.10.tgz";
+      sha1 = "688fa22e8a20c4d2a884f62d2f08a802a658c56c";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "async-0.1.18" = self.by-version."async"."0.1.18";
-      "fb-0.7.0" = self.by-version."fb"."0.7.0";
-      "passport-facebook-2.0.0" = self.by-version."passport-facebook"."2.0.0";
+      "fb-1.0.2" = self.by-version."fb"."1.0.2";
+      "passport-facebook-2.1.0" = self.by-version."passport-facebook"."2.1.0";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
     };
     optionalDependencies = {
@@ -3087,21 +3587,22 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-facebook" = self.by-version."bip-pod-facebook"."0.3.6";
+  "bip-pod-facebook" = self.by-version."bip-pod-facebook"."0.3.10";
   by-spec."bip-pod-flickr"."*" =
-    self.by-version."bip-pod-flickr"."0.3.4";
-  by-version."bip-pod-flickr"."0.3.4" = self.buildNodePackage {
-    name = "bip-pod-flickr-0.3.4";
-    version = "0.3.4";
+    self.by-version."bip-pod-flickr"."0.3.6";
+  by-version."bip-pod-flickr"."0.3.6" = self.buildNodePackage {
+    name = "bip-pod-flickr-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-flickr/-/bip-pod-flickr-0.3.4.tgz";
-      name = "bip-pod-flickr-0.3.4.tgz";
-      sha1 = "9e4aaa7ff3ef3a0d1cf78c1821342dd0d2168403";
+      url = "https://registry.npmjs.org/bip-pod-flickr/-/bip-pod-flickr-0.3.6.tgz";
+      name = "bip-pod-flickr-0.3.6.tgz";
+      sha1 = "32978fb94d7bb06be3714cb682f4461631308243";
     };
     deps = {
+      "flickrapi-0.4.2" = self.by-version."flickrapi"."0.4.2";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
       "passport-flickr-0.2.0" = self.by-version."passport-flickr"."0.2.0";
-      "flickrapi-0.3.28" = self.by-version."flickrapi"."0.3.28";
     };
     optionalDependencies = {
     };
@@ -3109,24 +3610,25 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.4";
+  "bip-pod-flickr" = self.by-version."bip-pod-flickr"."0.3.6";
   by-spec."bip-pod-flow".">=0.0.1" =
-    self.by-version."bip-pod-flow"."0.3.8";
-  by-version."bip-pod-flow"."0.3.8" = self.buildNodePackage {
-    name = "bip-pod-flow-0.3.8";
-    version = "0.3.8";
+    self.by-version."bip-pod-flow"."0.3.21";
+  by-version."bip-pod-flow"."0.3.21" = self.buildNodePackage {
+    name = "bip-pod-flow-0.3.21";
+    version = "0.3.21";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.8.tgz";
-      name = "bip-pod-flow-0.3.8.tgz";
-      sha1 = "cb935479cfcf2e8e3bd486258ee1499b04b32d41";
+      url = "https://registry.npmjs.org/bip-pod-flow/-/bip-pod-flow-0.3.21.tgz";
+      name = "bip-pod-flow-0.3.21.tgz";
+      sha1 = "38a7a60dabd27b2b90dd177317a84329b9a7676f";
     };
     deps = {
+      "generate-schema-2.1.1" = self.by-version."generate-schema"."2.1.1";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "safe-regex-0.0.1" = self.by-version."safe-regex"."0.0.1";
-      "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1";
+      "xml2json-0.9.0" = self.by-version."xml2json"."0.9.0";
     };
     optionalDependencies = {
     };
@@ -3135,18 +3637,18 @@
     cpu = [ ];
   };
   by-spec."bip-pod-github"."*" =
-    self.by-version."bip-pod-github"."0.3.2";
-  by-version."bip-pod-github"."0.3.2" = self.buildNodePackage {
-    name = "bip-pod-github-0.3.2";
-    version = "0.3.2";
+    self.by-version."bip-pod-github"."0.3.6";
+  by-version."bip-pod-github"."0.3.6" = self.buildNodePackage {
+    name = "bip-pod-github-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-github/-/bip-pod-github-0.3.2.tgz";
-      name = "bip-pod-github-0.3.2.tgz";
-      sha1 = "b949895d120bf57a6af77bb02a177eb94dc55a15";
+      url = "https://registry.npmjs.org/bip-pod-github/-/bip-pod-github-0.3.6.tgz";
+      name = "bip-pod-github-0.3.6.tgz";
+      sha1 = "2b61c3adfd4fb98b11c22c4d1c9e562813725c2f";
     };
     deps = {
-      "passport-github-0.1.5" = self.by-version."passport-github"."0.1.5";
+      "passport-github-1.1.0" = self.by-version."passport-github"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -3154,22 +3656,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-github" = self.by-version."bip-pod-github"."0.3.2";
+  "bip-pod-github" = self.by-version."bip-pod-github"."0.3.6";
   by-spec."bip-pod-gmail"."*" =
-    self.by-version."bip-pod-gmail"."0.3.4";
-  by-version."bip-pod-gmail"."0.3.4" = self.buildNodePackage {
-    name = "bip-pod-gmail-0.3.4";
-    version = "0.3.4";
+    self.by-version."bip-pod-gmail"."0.3.11";
+  by-version."bip-pod-gmail"."0.3.11" = self.buildNodePackage {
+    name = "bip-pod-gmail-0.3.11";
+    version = "0.3.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.4.tgz";
-      name = "bip-pod-gmail-0.3.4.tgz";
-      sha1 = "55aa29401865b048ed7864bff3e7cfdaabfd8e9e";
+      url = "https://registry.npmjs.org/bip-pod-gmail/-/bip-pod-gmail-0.3.11.tgz";
+      name = "bip-pod-gmail-0.3.11.tgz";
+      sha1 = "8fe14274ce632805cb4dd2f5a10d5ef718a1e77c";
     };
     deps = {
       "googleapis-1.1.5" = self.by-version."googleapis"."1.1.5";
-      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
+      "passport-google-oauth-1.0.0" = self.by-version."passport-google-oauth"."1.0.0";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -3177,21 +3680,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.4";
+  "bip-pod-gmail" = self.by-version."bip-pod-gmail"."0.3.11";
   by-spec."bip-pod-google"."*" =
-    self.by-version."bip-pod-google"."0.3.1";
-  by-version."bip-pod-google"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-google-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-google"."0.3.3";
+  by-version."bip-pod-google"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-google-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-google/-/bip-pod-google-0.3.1.tgz";
-      name = "bip-pod-google-0.3.1.tgz";
-      sha1 = "f9b8b3265944614e6187aa66338930def55340c5";
+      url = "https://registry.npmjs.org/bip-pod-google/-/bip-pod-google-0.3.3.tgz";
+      name = "bip-pod-google-0.3.3.tgz";
+      sha1 = "3551cf86b53101a05865f7b104f8b79bd18840a4";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
+      "passport-google-oauth-1.0.0" = self.by-version."passport-google-oauth"."1.0.0";
       "googleapis-0.8.0" = self.by-version."googleapis"."0.8.0";
     };
     optionalDependencies = {
@@ -3200,22 +3703,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-google" = self.by-version."bip-pod-google"."0.3.1";
+  "bip-pod-google" = self.by-version."bip-pod-google"."0.3.3";
   by-spec."bip-pod-google-drive"."*" =
-    self.by-version."bip-pod-google-drive"."0.3.1";
-  by-version."bip-pod-google-drive"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-google-drive-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-google-drive"."0.3.7";
+  by-version."bip-pod-google-drive"."0.3.7" = self.buildNodePackage {
+    name = "bip-pod-google-drive-0.3.7";
+    version = "0.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-google-drive/-/bip-pod-google-drive-0.3.1.tgz";
-      name = "bip-pod-google-drive-0.3.1.tgz";
-      sha1 = "337d723a780d76472d4e93e16a333a731611515b";
+      url = "https://registry.npmjs.org/bip-pod-google-drive/-/bip-pod-google-drive-0.3.7.tgz";
+      name = "bip-pod-google-drive-0.3.7.tgz";
+      sha1 = "9d5ff3c5cd9d95995e5ce63e6a1519121c2085ce";
     };
     deps = {
       "googleapis-1.1.5" = self.by-version."googleapis"."1.1.5";
-      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
+      "passport-google-oauth-1.0.0" = self.by-version."passport-google-oauth"."1.0.0";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "edit-google-spreadsheet-0.2.21" = self.by-version."edit-google-spreadsheet"."0.2.21";
     };
     optionalDependencies = {
     };
@@ -3223,21 +3727,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.1";
+  "bip-pod-google-drive" = self.by-version."bip-pod-google-drive"."0.3.7";
   by-spec."bip-pod-html".">=0.0.1" =
-    self.by-version."bip-pod-html"."0.3.3";
-  by-version."bip-pod-html"."0.3.3" = self.buildNodePackage {
-    name = "bip-pod-html-0.3.3";
-    version = "0.3.3";
+    self.by-version."bip-pod-html"."0.3.7";
+  by-version."bip-pod-html"."0.3.7" = self.buildNodePackage {
+    name = "bip-pod-html-0.3.7";
+    version = "0.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.3.tgz";
-      name = "bip-pod-html-0.3.3.tgz";
-      sha1 = "2f1c6c8ac4ab8fa954e8321948d22e5967cc78cd";
+      url = "https://registry.npmjs.org/bip-pod-html/-/bip-pod-html-0.3.7.tgz";
+      name = "bip-pod-html-0.3.7.tgz";
+      sha1 = "3e22e5c87a85e3204f94f9d859bdecf5484e2716";
     };
     deps = {
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
-      "jsdom-0.10.6" = self.by-version."jsdom"."0.10.6";
+      "jsdom-3.1.2" = self.by-version."jsdom"."3.1.2";
     };
     optionalDependencies = {
     };
@@ -3246,18 +3750,18 @@
     cpu = [ ];
   };
   by-spec."bip-pod-http".">=0.0.1" =
-    self.by-version."bip-pod-http"."0.3.3";
-  by-version."bip-pod-http"."0.3.3" = self.buildNodePackage {
-    name = "bip-pod-http-0.3.3";
-    version = "0.3.3";
+    self.by-version."bip-pod-http"."0.3.10";
+  by-version."bip-pod-http"."0.3.10" = self.buildNodePackage {
+    name = "bip-pod-http-0.3.10";
+    version = "0.3.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-http/-/bip-pod-http-0.3.3.tgz";
-      name = "bip-pod-http-0.3.3.tgz";
-      sha1 = "f1a6ada9c882407c7a370bf0ec5b6c5f2780fadb";
+      url = "https://registry.npmjs.org/bip-pod-http/-/bip-pod-http-0.3.10.tgz";
+      name = "bip-pod-http-0.3.10.tgz";
+      sha1 = "c679c5192847db6cb6d93ed38b0800db819cc3be";
     };
     deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -3272,15 +3776,15 @@
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-imgur/-/bip-pod-imgur-0.3.1.tgz";
+      url = "https://registry.npmjs.org/bip-pod-imgur/-/bip-pod-imgur-0.3.1.tgz";
       name = "bip-pod-imgur-0.3.1.tgz";
       sha1 = "b5d297900e46eb331d7af1c5608b82db65be243d";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "passport-imgur-0.0.2" = self.by-version."passport-imgur"."0.0.2";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "passport-imgur-0.0.3" = self.by-version."passport-imgur"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -3290,20 +3794,20 @@
   };
   "bip-pod-imgur" = self.by-version."bip-pod-imgur"."0.3.1";
   by-spec."bip-pod-instagram"."*" =
-    self.by-version."bip-pod-instagram"."0.3.1";
-  by-version."bip-pod-instagram"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-instagram-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-instagram"."0.3.4";
+  by-version."bip-pod-instagram"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-instagram-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-instagram/-/bip-pod-instagram-0.3.1.tgz";
-      name = "bip-pod-instagram-0.3.1.tgz";
-      sha1 = "558cc28fe3bc54d0e4f02746fe0b5c55f392576b";
+      url = "https://registry.npmjs.org/bip-pod-instagram/-/bip-pod-instagram-0.3.4.tgz";
+      name = "bip-pod-instagram-0.3.4.tgz";
+      sha1 = "5211db13706f69d4bfafd1a8aa8aed16dacb4470";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-instagram-0.1.2" = self.by-version."passport-instagram"."0.1.2";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "passport-instagram-1.0.0" = self.by-version."passport-instagram"."1.0.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -3311,17 +3815,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-instagram" = self.by-version."bip-pod-instagram"."0.3.1";
+  "bip-pod-instagram" = self.by-version."bip-pod-instagram"."0.3.4";
   by-spec."bip-pod-kato"."*" =
-    self.by-version."bip-pod-kato"."0.3.1";
-  by-version."bip-pod-kato"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-kato-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-kato"."0.3.2";
+  by-version."bip-pod-kato"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-kato-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-kato/-/bip-pod-kato-0.3.1.tgz";
-      name = "bip-pod-kato-0.3.1.tgz";
-      sha1 = "e98c12e71ee00c8ff5dd6ed3919371474e67134a";
+      url = "https://registry.npmjs.org/bip-pod-kato/-/bip-pod-kato-0.3.2.tgz";
+      name = "bip-pod-kato-0.3.2.tgz";
+      sha1 = "1805eabaa437a2e99c5b6a5e224da89dc9c506e6";
     };
     deps = {
     };
@@ -3331,20 +3835,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-kato" = self.by-version."bip-pod-kato"."0.3.1";
+  "bip-pod-kato" = self.by-version."bip-pod-kato"."0.3.2";
   by-spec."bip-pod-keenio"."*" =
-    self.by-version."bip-pod-keenio"."0.3.2";
-  by-version."bip-pod-keenio"."0.3.2" = self.buildNodePackage {
-    name = "bip-pod-keenio-0.3.2";
-    version = "0.3.2";
+    self.by-version."bip-pod-keenio"."0.3.5";
+  by-version."bip-pod-keenio"."0.3.5" = self.buildNodePackage {
+    name = "bip-pod-keenio-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-keenio/-/bip-pod-keenio-0.3.2.tgz";
-      name = "bip-pod-keenio-0.3.2.tgz";
-      sha1 = "61d54edd0e181c35d29285d6677feec60250d277";
+      url = "https://registry.npmjs.org/bip-pod-keenio/-/bip-pod-keenio-0.3.5.tgz";
+      name = "bip-pod-keenio-0.3.5.tgz";
+      sha1 = "762ea8d08d6d662af6e6978741dac4cfd762b24c";
     };
     deps = {
-      "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3";
+      "keen-js-3.4.0" = self.by-version."keen-js"."3.4.0";
     };
     optionalDependencies = {
     };
@@ -3352,21 +3856,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.2";
+  "bip-pod-keenio" = self.by-version."bip-pod-keenio"."0.3.5";
   by-spec."bip-pod-mailchimp"."*" =
-    self.by-version."bip-pod-mailchimp"."0.3.3";
-  by-version."bip-pod-mailchimp"."0.3.3" = self.buildNodePackage {
-    name = "bip-pod-mailchimp-0.3.3";
-    version = "0.3.3";
+    self.by-version."bip-pod-mailchimp"."0.3.7";
+  by-version."bip-pod-mailchimp"."0.3.7" = self.buildNodePackage {
+    name = "bip-pod-mailchimp-0.3.7";
+    version = "0.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.3.tgz";
-      name = "bip-pod-mailchimp-0.3.3.tgz";
-      sha1 = "a6f74c075983882bec25d8a72a85193bbaaf5001";
+      url = "https://registry.npmjs.org/bip-pod-mailchimp/-/bip-pod-mailchimp-0.3.7.tgz";
+      name = "bip-pod-mailchimp-0.3.7.tgz";
+      sha1 = "5d477e491c289301f198138e444859259a953194";
     };
     deps = {
-      "passport-mailchimp-0.0.1" = self.by-version."passport-mailchimp"."0.0.1";
-      "mailchimp-1.1.0" = self.by-version."mailchimp"."1.1.0";
+      "passport-mailchimp-1.0.0" = self.by-version."passport-mailchimp"."1.0.0";
+      "mailchimp-1.1.5" = self.by-version."mailchimp"."1.1.5";
     };
     optionalDependencies = {
     };
@@ -3374,17 +3878,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.3";
+  "bip-pod-mailchimp" = self.by-version."bip-pod-mailchimp"."0.3.7";
   by-spec."bip-pod-mailgun"."*" =
-    self.by-version."bip-pod-mailgun"."0.3.1";
-  by-version."bip-pod-mailgun"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-mailgun-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-mailgun"."0.3.3";
+  by-version."bip-pod-mailgun"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-mailgun-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mailgun/-/bip-pod-mailgun-0.3.1.tgz";
-      name = "bip-pod-mailgun-0.3.1.tgz";
-      sha1 = "5621de6a5f6824e00f9c7d7c2052bdfb3065afcb";
+      url = "https://registry.npmjs.org/bip-pod-mailgun/-/bip-pod-mailgun-0.3.3.tgz";
+      name = "bip-pod-mailgun-0.3.3.tgz";
+      sha1 = "0ceac6a71c2b805771338e505451b526951f39a9";
     };
     deps = {
       "mailgun-js-0.6.9" = self.by-version."mailgun-js"."0.6.9";
@@ -3395,17 +3899,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-mailgun" = self.by-version."bip-pod-mailgun"."0.3.1";
+  "bip-pod-mailgun" = self.by-version."bip-pod-mailgun"."0.3.3";
   by-spec."bip-pod-math".">=0.0.1" =
-    self.by-version."bip-pod-math"."0.3.6";
-  by-version."bip-pod-math"."0.3.6" = self.buildNodePackage {
-    name = "bip-pod-math-0.3.6";
-    version = "0.3.6";
+    self.by-version."bip-pod-math"."0.3.9";
+  by-version."bip-pod-math"."0.3.9" = self.buildNodePackage {
+    name = "bip-pod-math-0.3.9";
+    version = "0.3.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-math/-/bip-pod-math-0.3.6.tgz";
-      name = "bip-pod-math-0.3.6.tgz";
-      sha1 = "542fe249c8be8c22de09109a2a1f11484e5710e0";
+      url = "https://registry.npmjs.org/bip-pod-math/-/bip-pod-math-0.3.9.tgz";
+      name = "bip-pod-math-0.3.9.tgz";
+      sha1 = "d8be80cf29e6c134786b114ba403ca89c1f22f5c";
     };
     deps = {
       "mathjs-0.19.0" = self.by-version."mathjs"."0.19.0";
@@ -3423,14 +3927,14 @@
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mixcloud/-/bip-pod-mixcloud-0.3.1.tgz";
+      url = "https://registry.npmjs.org/bip-pod-mixcloud/-/bip-pod-mixcloud-0.3.1.tgz";
       name = "bip-pod-mixcloud-0.3.1.tgz";
       sha1 = "becc444edef870491704a6865ff26b8f476bfcfe";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -3446,12 +3950,12 @@
     version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.4.tgz";
+      url = "https://registry.npmjs.org/bip-pod-mongodb/-/bip-pod-mongodb-0.3.4.tgz";
       name = "bip-pod-mongodb-0.3.4.tgz";
       sha1 = "4df550d5d461b77796f17f0c5feadb6eb3c46e66";
     };
     deps = {
-      "mongodb-2.0.27" = self.by-version."mongodb"."2.0.27";
+      "mongodb-2.0.55" = self.by-version."mongodb"."2.0.55";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
     };
     optionalDependencies = {
@@ -3468,7 +3972,7 @@
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-numerous/-/bip-pod-numerous-0.3.1.tgz";
+      url = "https://registry.npmjs.org/bip-pod-numerous/-/bip-pod-numerous-0.3.1.tgz";
       name = "bip-pod-numerous-0.3.1.tgz";
       sha1 = "c4ab3790cc1ec424bd16dd0826c3239be34b049c";
     };
@@ -3483,15 +3987,15 @@
   };
   "bip-pod-numerous" = self.by-version."bip-pod-numerous"."0.3.1";
   by-spec."bip-pod-pushbullet"."*" =
-    self.by-version."bip-pod-pushbullet"."0.3.1";
-  by-version."bip-pod-pushbullet"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-pushbullet-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-pushbullet"."0.3.4";
+  by-version."bip-pod-pushbullet"."0.3.4" = self.buildNodePackage {
+    name = "bip-pod-pushbullet-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-pushbullet/-/bip-pod-pushbullet-0.3.1.tgz";
-      name = "bip-pod-pushbullet-0.3.1.tgz";
-      sha1 = "fb5770dc678c4d5e9d04079f7b589ab258472223";
+      url = "https://registry.npmjs.org/bip-pod-pushbullet/-/bip-pod-pushbullet-0.3.4.tgz";
+      name = "bip-pod-pushbullet-0.3.4.tgz";
+      sha1 = "e0cd03c6029b346768987c769a28a86f23a9379f";
     };
     deps = {
     };
@@ -3501,7 +4005,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-pushbullet" = self.by-version."bip-pod-pushbullet"."0.3.1";
+  "bip-pod-pushbullet" = self.by-version."bip-pod-pushbullet"."0.3.4";
   by-spec."bip-pod-pusher"."*" =
     self.by-version."bip-pod-pusher"."0.3.2";
   by-version."bip-pod-pusher"."0.3.2" = self.buildNodePackage {
@@ -3509,12 +4013,12 @@
     version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-pusher/-/bip-pod-pusher-0.3.2.tgz";
+      url = "https://registry.npmjs.org/bip-pod-pusher/-/bip-pod-pusher-0.3.2.tgz";
       name = "bip-pod-pusher-0.3.2.tgz";
       sha1 = "8cc71c54d9b0f9bd0c39069f8007020be1fdf26f";
     };
     deps = {
-      "pusher-1.0.4" = self.by-version."pusher"."1.0.4";
+      "pusher-1.2.1" = self.by-version."pusher"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -3524,20 +4028,20 @@
   };
   "bip-pod-pusher" = self.by-version."bip-pod-pusher"."0.3.2";
   by-spec."bip-pod-soundcloud"."*" =
-    self.by-version."bip-pod-soundcloud"."0.3.1";
-  by-version."bip-pod-soundcloud"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-soundcloud-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-soundcloud"."0.3.3";
+  by-version."bip-pod-soundcloud"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-soundcloud-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-soundcloud/-/bip-pod-soundcloud-0.3.1.tgz";
-      name = "bip-pod-soundcloud-0.3.1.tgz";
-      sha1 = "71c28498ea2872dd8b8d2dabd8ee2e741cb0001e";
+      url = "https://registry.npmjs.org/bip-pod-soundcloud/-/bip-pod-soundcloud-0.3.3.tgz";
+      name = "bip-pod-soundcloud-0.3.3.tgz";
+      sha1 = "ab75df5bac1588d185957075422bfae24d9a4a13";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-soundcloud-0.1.2" = self.by-version."passport-soundcloud"."0.1.2";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -3545,17 +4049,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-soundcloud" = self.by-version."bip-pod-soundcloud"."0.3.1";
+  "bip-pod-soundcloud" = self.by-version."bip-pod-soundcloud"."0.3.3";
   by-spec."bip-pod-statuscake"."*" =
-    self.by-version."bip-pod-statuscake"."0.3.1";
-  by-version."bip-pod-statuscake"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-statuscake-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-statuscake"."0.3.2";
+  by-version."bip-pod-statuscake"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-statuscake-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-statuscake/-/bip-pod-statuscake-0.3.1.tgz";
-      name = "bip-pod-statuscake-0.3.1.tgz";
-      sha1 = "1cd5df2002c80f19acc54f473fd92dfe53b31e66";
+      url = "https://registry.npmjs.org/bip-pod-statuscake/-/bip-pod-statuscake-0.3.2.tgz";
+      name = "bip-pod-statuscake-0.3.2.tgz";
+      sha1 = "728b05d5ea6d4a16d60cfba0caae6a6b5b2b5851";
     };
     deps = {
     };
@@ -3565,29 +4069,29 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.1";
-  by-spec."bip-pod-syndication".">=0.0.1" =
-    self.by-version."bip-pod-syndication"."0.3.11";
-  by-version."bip-pod-syndication"."0.3.11" = self.buildNodePackage {
-    name = "bip-pod-syndication-0.3.11";
-    version = "0.3.11";
+  "bip-pod-statuscake" = self.by-version."bip-pod-statuscake"."0.3.2";
+  by-spec."bip-pod-syndication".">=0.4.5" =
+    self.by-version."bip-pod-syndication"."0.4.7";
+  by-version."bip-pod-syndication"."0.4.7" = self.buildNodePackage {
+    name = "bip-pod-syndication-0.4.7";
+    version = "0.4.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.3.11.tgz";
-      name = "bip-pod-syndication-0.3.11.tgz";
-      sha1 = "bc0491a5791bb9bdf8a88f3694c904128c7482ec";
+      url = "https://registry.npmjs.org/bip-pod-syndication/-/bip-pod-syndication-0.4.7.tgz";
+      name = "bip-pod-syndication-0.4.7.tgz";
+      sha1 = "4c2ff80f808b74df8453c1213cbe8132d99f98e2";
     };
     deps = {
-      "ejs-2.3.1" = self.by-version."ejs"."2.3.1";
+      "ejs-2.4.1" = self.by-version."ejs"."2.4.1";
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
-      "feedparser-1.0.1" = self.by-version."feedparser"."1.0.1";
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "feedparser-1.1.4" = self.by-version."feedparser"."1.1.4";
+      "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
-      "moment-2.10.2" = self.by-version."moment"."2.10.2";
+      "moment-2.12.0" = self.by-version."moment"."2.12.0";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "rss-1.1.1" = self.by-version."rss"."1.1.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "rss-1.2.1" = self.by-version."rss"."1.2.1";
       "send-0.9.3" = self.by-version."send"."0.9.3";
     };
     optionalDependencies = {
@@ -3597,19 +4101,19 @@
     cpu = [ ];
   };
   by-spec."bip-pod-templater".">=0.0.1" =
-    self.by-version."bip-pod-templater"."0.3.2";
-  by-version."bip-pod-templater"."0.3.2" = self.buildNodePackage {
-    name = "bip-pod-templater-0.3.2";
-    version = "0.3.2";
+    self.by-version."bip-pod-templater"."0.3.3";
+  by-version."bip-pod-templater"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-templater-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-templater/-/bip-pod-templater-0.3.2.tgz";
-      name = "bip-pod-templater-0.3.2.tgz";
-      sha1 = "8ccd67dc61b6a42edf1285a3f0417a6b08f6528a";
+      url = "https://registry.npmjs.org/bip-pod-templater/-/bip-pod-templater-0.3.3.tgz";
+      name = "bip-pod-templater-0.3.3.tgz";
+      sha1 = "7a3f033867568c1513beaa4d525ebe1a29cbb479";
     };
     deps = {
       "html-md-3.0.2" = self.by-version."html-md"."3.0.2";
-      "marked-0.3.3" = self.by-version."marked"."0.3.3";
+      "marked-0.3.5" = self.by-version."marked"."0.3.5";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
     };
@@ -3620,20 +4124,19 @@
     cpu = [ ];
   };
   by-spec."bip-pod-time".">=0.0.1" =
-    self.by-version."bip-pod-time"."0.3.3";
-  by-version."bip-pod-time"."0.3.3" = self.buildNodePackage {
-    name = "bip-pod-time-0.3.3";
-    version = "0.3.3";
+    self.by-version."bip-pod-time"."0.3.6";
+  by-version."bip-pod-time"."0.3.6" = self.buildNodePackage {
+    name = "bip-pod-time-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.3.tgz";
-      name = "bip-pod-time-0.3.3.tgz";
-      sha1 = "bfb67d85c65e3c4bad66e98050ecbda99d3971ab";
+      url = "https://registry.npmjs.org/bip-pod-time/-/bip-pod-time-0.3.6.tgz";
+      name = "bip-pod-time-0.3.6.tgz";
+      sha1 = "3e5f0c8dc35fa60eec75d39e06e962aa1b2859bf";
     };
     deps = {
       "moment-2.5.1" = self.by-version."moment"."2.5.1";
-      "moment-timezone-0.0.3" = self.by-version."moment-timezone"."0.0.3";
-      "sugar-1.4.1" = self.by-version."sugar"."1.4.1";
+      "moment-timezone-0.5.3" = self.by-version."moment-timezone"."0.5.3";
     };
     optionalDependencies = {
     };
@@ -3642,15 +4145,15 @@
     cpu = [ ];
   };
   by-spec."bip-pod-todoist"."*" =
-    self.by-version."bip-pod-todoist"."0.3.2";
-  by-version."bip-pod-todoist"."0.3.2" = self.buildNodePackage {
-    name = "bip-pod-todoist-0.3.2";
-    version = "0.3.2";
+    self.by-version."bip-pod-todoist"."0.3.3";
+  by-version."bip-pod-todoist"."0.3.3" = self.buildNodePackage {
+    name = "bip-pod-todoist-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-todoist/-/bip-pod-todoist-0.3.2.tgz";
-      name = "bip-pod-todoist-0.3.2.tgz";
-      sha1 = "93878ef2a4360fa219dbab1367efe63caded66ce";
+      url = "https://registry.npmjs.org/bip-pod-todoist/-/bip-pod-todoist-0.3.3.tgz";
+      name = "bip-pod-todoist-0.3.3.tgz";
+      sha1 = "0ed1585f576dcaf302bbad22eb8ba6cb01db1631";
     };
     deps = {
     };
@@ -3660,21 +4163,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-todoist" = self.by-version."bip-pod-todoist"."0.3.2";
+  "bip-pod-todoist" = self.by-version."bip-pod-todoist"."0.3.3";
   by-spec."bip-pod-trello"."*" =
-    self.by-version."bip-pod-trello"."0.3.1";
-  by-version."bip-pod-trello"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-trello-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-trello"."0.3.5";
+  by-version."bip-pod-trello"."0.3.5" = self.buildNodePackage {
+    name = "bip-pod-trello-0.3.5";
+    version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-trello/-/bip-pod-trello-0.3.1.tgz";
-      name = "bip-pod-trello-0.3.1.tgz";
-      sha1 = "8e6f74c3c06cf1caeae94322a5a6033431f71b49";
+      url = "https://registry.npmjs.org/bip-pod-trello/-/bip-pod-trello-0.3.5.tgz";
+      name = "bip-pod-trello-0.3.5.tgz";
+      sha1 = "fa64d3454c7bcb840b8c10e97d5770eb8781fa51";
     };
     deps = {
-      "passport-trello-0.1.4" = self.by-version."passport-trello"."0.1.4";
-      "q-1.2.0" = self.by-version."q"."1.2.0";
+      "passport-trello-0.1.5" = self.by-version."passport-trello"."0.1.5";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -3682,22 +4185,22 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-trello" = self.by-version."bip-pod-trello"."0.3.1";
+  "bip-pod-trello" = self.by-version."bip-pod-trello"."0.3.5";
   by-spec."bip-pod-twilio"."*" =
-    self.by-version."bip-pod-twilio"."0.3.4";
-  by-version."bip-pod-twilio"."0.3.4" = self.buildNodePackage {
-    name = "bip-pod-twilio-0.3.4";
-    version = "0.3.4";
+    self.by-version."bip-pod-twilio"."0.3.6";
+  by-version."bip-pod-twilio"."0.3.6" = self.buildNodePackage {
+    name = "bip-pod-twilio-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-twilio/-/bip-pod-twilio-0.3.4.tgz";
-      name = "bip-pod-twilio-0.3.4.tgz";
-      sha1 = "25e272d6808df5d4ed4461a8a1c70cf563df92e3";
+      url = "https://registry.npmjs.org/bip-pod-twilio/-/bip-pod-twilio-0.3.6.tgz";
+      name = "bip-pod-twilio-0.3.6.tgz";
+      sha1 = "e1afd32ec11784157f33a1f45005ae152e07072c";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "twilio-2.0.0" = self.by-version."twilio"."2.0.0";
+      "twilio-2.9.1" = self.by-version."twilio"."2.9.1";
     };
     optionalDependencies = {
     };
@@ -3705,23 +4208,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.4";
+  "bip-pod-twilio" = self.by-version."bip-pod-twilio"."0.3.6";
   by-spec."bip-pod-twitter"."*" =
-    self.by-version."bip-pod-twitter"."0.3.7";
-  by-version."bip-pod-twitter"."0.3.7" = self.buildNodePackage {
-    name = "bip-pod-twitter-0.3.7";
-    version = "0.3.7";
+    self.by-version."bip-pod-twitter"."0.3.13";
+  by-version."bip-pod-twitter"."0.3.13" = self.buildNodePackage {
+    name = "bip-pod-twitter-0.3.13";
+    version = "0.3.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.7.tgz";
-      name = "bip-pod-twitter-0.3.7.tgz";
-      sha1 = "4573eb279cd371ecd34d98bfe79eba36523a224c";
+      url = "https://registry.npmjs.org/bip-pod-twitter/-/bip-pod-twitter-0.3.13.tgz";
+      name = "bip-pod-twitter-0.3.13.tgz";
+      sha1 = "5365851183d7353172d0ebf8dfb46c6d868fb003";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
       "ntwitter-0.5.0" = self.by-version."ntwitter"."0.5.0";
-      "passport-twitter-1.0.3" = self.by-version."passport-twitter"."1.0.3";
+      "passport-twitter-1.0.4" = self.by-version."passport-twitter"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -3729,7 +4232,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.7";
+  "bip-pod-twitter" = self.by-version."bip-pod-twitter"."0.3.13";
   by-spec."bip-pod-witai"."*" =
     self.by-version."bip-pod-witai"."0.3.1";
   by-version."bip-pod-witai"."0.3.1" = self.buildNodePackage {
@@ -3737,7 +4240,7 @@
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-witai/-/bip-pod-witai-0.3.1.tgz";
+      url = "https://registry.npmjs.org/bip-pod-witai/-/bip-pod-witai-0.3.1.tgz";
       name = "bip-pod-witai-0.3.1.tgz";
       sha1 = "e98cce9202b765c252424fac0c25982e0d57eb27";
     };
@@ -3757,7 +4260,7 @@
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-wordpress/-/bip-pod-wordpress-0.3.1.tgz";
+      url = "https://registry.npmjs.org/bip-pod-wordpress/-/bip-pod-wordpress-0.3.1.tgz";
       name = "bip-pod-wordpress-0.3.1.tgz";
       sha1 = "e5b2335a4459892d7aae4363456a946ca398bf4e";
     };
@@ -3774,20 +4277,20 @@
   };
   "bip-pod-wordpress" = self.by-version."bip-pod-wordpress"."0.3.1";
   by-spec."bip-pod-zoho"."*" =
-    self.by-version."bip-pod-zoho"."0.3.1";
-  by-version."bip-pod-zoho"."0.3.1" = self.buildNodePackage {
-    name = "bip-pod-zoho-0.3.1";
-    version = "0.3.1";
+    self.by-version."bip-pod-zoho"."0.3.2";
+  by-version."bip-pod-zoho"."0.3.2" = self.buildNodePackage {
+    name = "bip-pod-zoho-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bip-pod-zoho/-/bip-pod-zoho-0.3.1.tgz";
-      name = "bip-pod-zoho-0.3.1.tgz";
-      sha1 = "a7c4edd30388ef66798fb871bb67f793ea18a774";
+      url = "https://registry.npmjs.org/bip-pod-zoho/-/bip-pod-zoho-0.3.2.tgz";
+      name = "bip-pod-zoho-0.3.2.tgz";
+      sha1 = "1ddb2aebaec1d65674fce7263f3a2e2390de5cea";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "xml2json-0.6.1" = self.by-version."xml2json"."0.6.1";
+      "xml2json-0.9.0" = self.by-version."xml2json"."0.9.0";
     };
     optionalDependencies = {
     };
@@ -3795,89 +4298,87 @@
     os = [ ];
     cpu = [ ];
   };
-  "bip-pod-zoho" = self.by-version."bip-pod-zoho"."0.3.1";
+  "bip-pod-zoho" = self.by-version."bip-pod-zoho"."0.3.2";
   by-spec."bipio"."*" =
-    self.by-version."bipio"."0.3.41";
-  by-version."bipio"."0.3.41" = self.buildNodePackage {
-    name = "bipio-0.3.41";
-    version = "0.3.41";
+    self.by-version."bipio"."0.4.64";
+  by-version."bipio"."0.4.64" = self.buildNodePackage {
+    name = "bipio-0.4.64";
+    version = "0.4.64";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bipio/-/bipio-0.3.41.tgz";
-      name = "bipio-0.3.41.tgz";
-      sha1 = "8f2a1497f7ce8ce3d6b8bafa8bb6e2d2de27b5b3";
+      url = "https://registry.npmjs.org/bipio/-/bipio-0.4.64.tgz";
+      name = "bipio-0.4.64.tgz";
+      sha1 = "e9aac42865e1cb37c9fda18c059cab4961e9bf18";
     };
     deps = {
       "JSONPath-0.10.0" = self.by-version."JSONPath"."0.10.0";
       "amqp-0.2.4" = self.by-version."amqp"."0.2.4";
       "async-0.1.18" = self.by-version."async"."0.1.18";
       "base-converter-1.1.2" = self.by-version."base-converter"."1.1.2";
-      "bcrypt-0.8.2" = self.by-version."bcrypt"."0.8.2";
-      "bip-pod-0.3.16" = self.by-version."bip-pod"."0.3.16";
+      "bcrypt-0.8.5" = self.by-version."bcrypt"."0.8.5";
+      "bip-pod-0.4.21" = self.by-version."bip-pod"."0.4.21";
       "bip-pod-crypto-0.3.3" = self.by-version."bip-pod-crypto"."0.3.3";
-      "bip-pod-email-0.3.9" = self.by-version."bip-pod-email"."0.3.9";
-      "bip-pod-flow-0.3.8" = self.by-version."bip-pod-flow"."0.3.8";
-      "bip-pod-html-0.3.3" = self.by-version."bip-pod-html"."0.3.3";
-      "bip-pod-http-0.3.3" = self.by-version."bip-pod-http"."0.3.3";
-      "bip-pod-math-0.3.6" = self.by-version."bip-pod-math"."0.3.6";
-      "bip-pod-syndication-0.3.11" = self.by-version."bip-pod-syndication"."0.3.11";
-      "bip-pod-templater-0.3.2" = self.by-version."bip-pod-templater"."0.3.2";
-      "bip-pod-time-0.3.3" = self.by-version."bip-pod-time"."0.3.3";
-      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
+      "bip-pod-email-0.3.13" = self.by-version."bip-pod-email"."0.3.13";
+      "bip-pod-flow-0.3.21" = self.by-version."bip-pod-flow"."0.3.21";
+      "bip-pod-html-0.3.7" = self.by-version."bip-pod-html"."0.3.7";
+      "bip-pod-http-0.3.10" = self.by-version."bip-pod-http"."0.3.10";
+      "bip-pod-math-0.3.9" = self.by-version."bip-pod-math"."0.3.9";
+      "bip-pod-syndication-0.4.7" = self.by-version."bip-pod-syndication"."0.4.7";
+      "bip-pod-templater-0.3.3" = self.by-version."bip-pod-templater"."0.3.3";
+      "bip-pod-time-0.3.6" = self.by-version."bip-pod-time"."0.3.6";
+      "body-parser-1.13.3" = self.by-version."body-parser"."1.13.3";
       "clone-1.0.2" = self.by-version."clone"."1.0.2";
-      "commander-2.8.0" = self.by-version."commander"."2.8.0";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
       "config-0.4.36" = self.by-version."config"."0.4.36";
-      "connect-2.29.1" = self.by-version."connect"."2.29.1";
-      "connect-mongo-0.8.0" = self.by-version."connect-mongo"."0.8.0";
-      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "cron-1.0.9" = self.by-version."cron"."1.0.9";
+      "connect-2.30.2" = self.by-version."connect"."2.30.2";
+      "connect-mongo-0.8.2" = self.by-version."connect-mongo"."0.8.2";
+      "cookie-parser-1.4.1" = self.by-version."cookie-parser"."1.4.1";
+      "cron-1.1.0" = self.by-version."cron"."1.1.0";
       "dateformat-1.0.7-1.2.3" = self.by-version."dateformat"."1.0.7-1.2.3";
       "datejs-0.0.2" = self.by-version."datejs"."0.0.2";
-      "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5";
-      "execSync-1.0.2" = self.by-version."execSync"."1.0.2";
-      "express-4.12.3" = self.by-version."express"."4.12.3";
-      "express-session-1.11.1" = self.by-version."express-session"."1.11.1";
-      "extend-2.0.0" = self.by-version."extend"."2.0.0";
+      "errorhandler-1.4.3" = self.by-version."errorhandler"."1.4.3";
+      "express-4.13.4" = self.by-version."express"."4.13.4";
+      "express-session-1.13.0" = self.by-version."express-session"."1.13.0";
+      "extend-2.0.1" = self.by-version."extend"."2.0.1";
       "favitest-1.0.7" = self.by-version."favitest"."1.0.7";
-      "heapdump-0.2.10" = self.by-version."heapdump"."0.2.10";
       "html-md-3.0.2" = self.by-version."html-md"."3.0.2";
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "htmlencode-0.0.4" = self.by-version."htmlencode"."0.0.4";
+      "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "imagemagick-0.1.3" = self.by-version."imagemagick"."0.1.3";
-      "inquirer-0.8.2" = self.by-version."inquirer"."0.8.2";
-      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
+      "inquirer-0.12.0" = self.by-version."inquirer"."0.12.0";
+      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
       "json-middleware-1.0.2" = self.by-version."json-middleware"."1.0.2";
-      "jsonwebtoken-1.3.0" = self.by-version."jsonwebtoken"."1.3.0";
+      "jsonwebtoken-5.7.0" = self.by-version."jsonwebtoken"."5.7.0";
       "ldapjs-0.7.1" = self.by-version."ldapjs"."0.7.1";
-      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
-      "marked-0.3.3" = self.by-version."marked"."0.3.3";
-      "memwatch-0.2.2" = self.by-version."memwatch"."0.2.2";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "marked-0.3.5" = self.by-version."marked"."0.3.5";
       "method-override-1.0.2" = self.by-version."method-override"."1.0.2";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "moment-2.10.2" = self.by-version."moment"."2.10.2";
-      "moment-timezone-0.3.1" = self.by-version."moment-timezone"."0.3.1";
-      "mongoose-3.9.7" = self.by-version."mongoose"."3.9.7";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+      "moment-timezone-0.5.3" = self.by-version."moment-timezone"."0.5.3";
+      "mongoose-4.2.3" = self.by-version."mongoose"."4.2.3";
       "multer-0.1.8" = self.by-version."multer"."0.1.8";
       "node-fs-0.1.7" = self.by-version."node-fs"."0.1.7";
       "node-uuid-1.3.3" = self.by-version."node-uuid"."1.3.3";
-      "passport-0.2.1" = self.by-version."passport"."0.2.1";
-      "pkgcloud-1.1.0" = self.by-version."pkgcloud"."1.1.0";
+      "passport-0.3.2" = self.by-version."passport"."0.3.2";
+      "pkgcloud-1.3.0" = self.by-version."pkgcloud"."1.3.0";
       "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0";
-      "q-1.2.0" = self.by-version."q"."1.2.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "rrecur-2.0.0" = self.by-version."rrecur"."2.0.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "sleep-1.2.0" = self.by-version."sleep"."1.2.0";
+      "sleep-3.0.1" = self.by-version."sleep"."3.0.1";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
       "ssl-root-cas-1.1.10" = self.by-version."ssl-root-cas"."1.1.10";
       "sugar-1.4.1" = self.by-version."sugar"."1.4.1";
-      "temp-0.8.1" = self.by-version."temp"."0.8.1";
-      "time-0.11.2" = self.by-version."time"."0.11.2";
+      "sync-exec-0.6.2" = self.by-version."sync-exec"."0.6.2";
+      "temp-0.8.3" = self.by-version."temp"."0.8.3";
+      "time-0.11.4" = self.by-version."time"."0.11.4";
       "tldtools-0.0.24" = self.by-version."tldtools"."0.0.24";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
       "validator-1.5.1" = self.by-version."validator"."1.5.1";
-      "webkit-devtools-agent-0.2.5" = self.by-version."webkit-devtools-agent"."0.2.5";
-      "winston-0.5.1" = self.by-version."winston"."0.5.1";
+      "winston-1.0.0" = self.by-version."winston"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -3885,7 +4386,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "bipio" = self.by-version."bipio"."0.3.41";
+  "bipio" = self.by-version."bipio"."0.4.64";
   by-spec."bitcoinjs-lib"."1.2.0" =
     self.by-version."bitcoinjs-lib"."1.2.0";
   by-version."bitcoinjs-lib"."1.2.0" = self.buildNodePackage {
@@ -3893,14 +4394,14 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-1.2.0.tgz";
+      url = "https://registry.npmjs.org/bitcoinjs-lib/-/bitcoinjs-lib-1.2.0.tgz";
       name = "bitcoinjs-lib-1.2.0.tgz";
       sha1 = "731ce2f24b6065f8d9af18757516eed882ad1619";
     };
     deps = {
-      "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
+      "bigi-1.4.1" = self.by-version."bigi"."1.4.1";
       "bs58check-1.0.3" = self.by-version."bs58check"."1.0.3";
-      "crypto-browserify-3.9.14" = self.by-version."crypto-browserify"."3.9.14";
+      "crypto-browserify-3.11.0" = self.by-version."crypto-browserify"."3.11.0";
       "ecurve-1.0.0" = self.by-version."ecurve"."1.0.0";
     };
     optionalDependencies = {
@@ -3916,7 +4417,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz";
+      url = "https://registry.npmjs.org/bitfield/-/bitfield-0.1.0.tgz";
       name = "bitfield-0.1.0.tgz";
       sha1 = "b05d8b5f0d09f2df35a9db3b3a62d3808c46c457";
     };
@@ -3928,48 +4429,33 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bits"."~0.1.1" =
-    self.by-version."bits"."0.1.1";
-  by-version."bits"."0.1.1" = self.buildNodePackage {
-    name = "bits-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bits/-/bits-0.1.1.tgz";
-      name = "bits-0.1.1.tgz";
-      sha1 = "7082eb8b7bdf12e47b0a8cf8f7ad3af4e7053a96";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bittorrent-dht"."^1.0.0" =
-    self.by-version."bittorrent-dht"."1.5.0";
-  by-version."bittorrent-dht"."1.5.0" = self.buildNodePackage {
-    name = "bittorrent-dht-1.5.0";
-    version = "1.5.0";
+  by-spec."bittorrent-dht"."^3.0.0" =
+    self.by-version."bittorrent-dht"."3.2.6";
+  by-version."bittorrent-dht"."3.2.6" = self.buildNodePackage {
+    name = "bittorrent-dht-3.2.6";
+    version = "3.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-1.5.0.tgz";
-      name = "bittorrent-dht-1.5.0.tgz";
-      sha1 = "b14b34eace8f44e795a8bad69a44b08ca485c355";
+      url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-3.2.6.tgz";
+      name = "bittorrent-dht-3.2.6.tgz";
+      sha1 = "8d6f64f002525951536ca403ddd040c03009b7d5";
     };
     deps = {
-      "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
+      "addr-to-ip-port-1.4.2" = self.by-version."addr-to-ip-port"."1.4.2";
+      "bencode-0.7.0" = self.by-version."bencode"."0.7.0";
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1";
-      "run-parallel-1.1.0" = self.by-version."run-parallel"."1.1.0";
-      "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
+      "is-ip-1.0.0" = self.by-version."is-ip"."1.0.0";
+      "k-bucket-0.5.0" = self.by-version."k-bucket"."0.5.0";
+      "network-address-1.1.0" = self.by-version."network-address"."1.1.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "run-parallel-1.1.6" = self.by-version."run-parallel"."1.1.6";
+      "simple-get-1.4.3" = self.by-version."simple-get"."1.4.3";
+      "string2compact-1.2.2" = self.by-version."string2compact"."1.2.2";
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -3977,33 +4463,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bittorrent-dht"."^3.0.0" =
-    self.by-version."bittorrent-dht"."3.0.8";
-  by-version."bittorrent-dht"."3.0.8" = self.buildNodePackage {
-    name = "bittorrent-dht-3.0.8";
-    version = "3.0.8";
+  by-spec."bittorrent-dht"."^6.0.0" =
+    self.by-version."bittorrent-dht"."6.4.2";
+  by-version."bittorrent-dht"."6.4.2" = self.buildNodePackage {
+    name = "bittorrent-dht-6.4.2";
+    version = "6.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-3.0.8.tgz";
-      name = "bittorrent-dht-3.0.8.tgz";
-      sha1 = "73cb8cbf7b6a9be53fba0cf0dc689f8edf6c28dd";
+      url = "https://registry.npmjs.org/bittorrent-dht/-/bittorrent-dht-6.4.2.tgz";
+      name = "bittorrent-dht-6.4.2.tgz";
+      sha1 = "8b40f8cee6bea87f2b34fd2ae0bd367a8b1247a6";
     };
     deps = {
-      "addr-to-ip-port-1.4.1" = self.by-version."addr-to-ip-port"."1.4.1";
       "bencode-0.7.0" = self.by-version."bencode"."0.7.0";
-      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
-      "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "hat-0.0.3" = self.by-version."hat"."0.0.3";
+      "buffer-equals-1.0.3" = self.by-version."buffer-equals"."1.0.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "is-ip-1.0.0" = self.by-version."is-ip"."1.0.0";
-      "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2";
-      "network-address-1.0.0" = self.by-version."network-address"."1.0.0";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "run-parallel-1.1.0" = self.by-version."run-parallel"."1.1.0";
-      "simple-get-1.3.3" = self.by-version."simple-get"."1.3.3";
-      "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
-      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
+      "k-bucket-0.6.0" = self.by-version."k-bucket"."0.6.0";
+      "k-rpc-3.6.1" = self.by-version."k-rpc"."3.6.1";
+      "lru-2.0.1" = self.by-version."lru"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -4011,14 +4489,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bittorrent-tracker"."^2.0.0" =
+  by-spec."bittorrent-tracker"."^2.6.0" =
     self.by-version."bittorrent-tracker"."2.12.1";
   by-version."bittorrent-tracker"."2.12.1" = self.buildNodePackage {
     name = "bittorrent-tracker-2.12.1";
     version = "2.12.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz";
+      url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.12.1.tgz";
       name = "bittorrent-tracker-2.12.1.tgz";
       sha1 = "562f0e43c6340d003b08c5dad3d4bff0eb3fd64d";
     };
@@ -4027,16 +4505,54 @@
       "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "extend.js-0.0.2" = self.by-version."extend.js"."0.0.2";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ip-0.3.2" = self.by-version."ip"."0.3.2";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "ip-0.3.3" = self.by-version."ip"."0.3.3";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "portfinder-0.3.0" = self.by-version."portfinder"."0.3.0";
-      "run-series-1.1.0" = self.by-version."run-series"."1.1.0";
-      "simple-get-1.3.3" = self.by-version."simple-get"."1.3.3";
-      "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1";
+      "run-series-1.1.4" = self.by-version."run-series"."1.1.4";
+      "simple-get-1.4.3" = self.by-version."simple-get"."1.4.3";
+      "string2compact-1.2.2" = self.by-version."string2compact"."1.2.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bittorrent-tracker"."^7.0.0" =
+    self.by-version."bittorrent-tracker"."7.7.0";
+  by-version."bittorrent-tracker"."7.7.0" = self.buildNodePackage {
+    name = "bittorrent-tracker-7.7.0";
+    version = "7.7.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-7.7.0.tgz";
+      name = "bittorrent-tracker-7.7.0.tgz";
+      sha1 = "ffd2eabc141d36ed5c1817df7e992f91fd7fc65c";
+    };
+    deps = {
+      "bencode-0.8.0" = self.by-version."bencode"."0.8.0";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "hat-0.0.3" = self.by-version."hat"."0.0.3";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "ip-1.1.2" = self.by-version."ip"."1.1.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "random-iterate-1.0.1" = self.by-version."random-iterate"."1.0.1";
+      "run-parallel-1.1.6" = self.by-version."run-parallel"."1.1.6";
+      "run-series-1.1.4" = self.by-version."run-series"."1.1.4";
+      "simple-get-2.0.0" = self.by-version."simple-get"."2.0.0";
+      "simple-peer-6.0.3" = self.by-version."simple-peer"."6.0.3";
+      "simple-websocket-4.0.3" = self.by-version."simple-websocket"."4.0.3";
+      "string2compact-1.2.2" = self.by-version."string2compact"."1.2.2";
+      "uniq-1.0.1" = self.by-version."uniq"."1.0.1";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -4044,18 +4560,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bittorrent-tracker"."^2.6.0" =
-    self.by-version."bittorrent-tracker"."2.12.1";
   by-spec."bl"."^0.9.0" =
-    self.by-version."bl"."0.9.4";
-  by-version."bl"."0.9.4" = self.buildNodePackage {
-    name = "bl-0.9.4";
-    version = "0.9.4";
+    self.by-version."bl"."0.9.5";
+  by-version."bl"."0.9.5" = self.buildNodePackage {
+    name = "bl-0.9.5";
+    version = "0.9.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
-      name = "bl-0.9.4.tgz";
-      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+      url = "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz";
+      name = "bl-0.9.5.tgz";
+      sha1 = "c06b797af085ea00bc527afc8efcf11de2232054";
     };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
@@ -4066,6 +4580,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bl"."^0.9.1" =
+    self.by-version."bl"."0.9.5";
+  by-spec."bl"."^1.0.0" =
+    self.by-version."bl"."1.1.2";
+  by-version."bl"."1.1.2" = self.buildNodePackage {
+    name = "bl-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz";
+      name = "bl-1.1.2.tgz";
+      sha1 = "fdca871a99713aa00d19e3bbba41c44787a65398";
+    };
+    deps = {
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bl"."~0.8.1" =
     self.by-version."bl"."0.8.2";
   by-version."bl"."0.8.2" = self.buildNodePackage {
@@ -4073,7 +4609,7 @@
     version = "0.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
+      url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz";
       name = "bl-0.8.2.tgz";
       sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e";
     };
@@ -4087,7 +4623,29 @@
     cpu = [ ];
   };
   by-spec."bl"."~0.9.0" =
-    self.by-version."bl"."0.9.4";
+    self.by-version."bl"."0.9.5";
+  by-spec."bl"."~1.0.0" =
+    self.by-version."bl"."1.0.3";
+  by-version."bl"."1.0.3" = self.buildNodePackage {
+    name = "bl-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
+      name = "bl-1.0.3.tgz";
+      sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
+    };
+    deps = {
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bl"."~1.1.2" =
+    self.by-version."bl"."1.1.2";
   by-spec."blob"."0.0.2" =
     self.by-version."blob"."0.0.2";
   by-version."blob"."0.0.2" = self.buildNodePackage {
@@ -4095,7 +4653,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/blob/-/blob-0.0.2.tgz";
+      url = "https://registry.npmjs.org/blob/-/blob-0.0.2.tgz";
       name = "blob-0.0.2.tgz";
       sha1 = "b89562bd6994af95ba1e812155536333aa23cf24";
     };
@@ -4107,16 +4665,54 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."blob"."0.0.4" =
+    self.by-version."blob"."0.0.4";
+  by-version."blob"."0.0.4" = self.buildNodePackage {
+    name = "blob-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
+      name = "blob-0.0.4.tgz";
+      sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."blob-to-buffer"."^1.2.6" =
+    self.by-version."blob-to-buffer"."1.2.6";
+  by-version."blob-to-buffer"."1.2.6" = self.buildNodePackage {
+    name = "blob-to-buffer-1.2.6";
+    version = "1.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.6.tgz";
+      name = "blob-to-buffer-1.2.6.tgz";
+      sha1 = "089ac264c686b73ead6c539a484a8003bfbb2033";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."block-stream"."*" =
-    self.by-version."block-stream"."0.0.7";
-  by-version."block-stream"."0.0.7" = self.buildNodePackage {
-    name = "block-stream-0.0.7";
-    version = "0.0.7";
+    self.by-version."block-stream"."0.0.8";
+  by-version."block-stream"."0.0.8" = self.buildNodePackage {
+    name = "block-stream-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/block-stream/-/block-stream-0.0.7.tgz";
-      name = "block-stream-0.0.7.tgz";
-      sha1 = "9088ab5ae1e861f4d81b176b4a8046080703deed";
+      url = "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz";
+      name = "block-stream-0.0.8.tgz";
+      sha1 = "0688f46da2bbf9cff0c4f68225a0cb95cbe8a46b";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -4127,18 +4723,56 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."block-stream"."0.0.7" =
-    self.by-version."block-stream"."0.0.7";
-  by-spec."bluebird"."2.3.2" =
-    self.by-version."bluebird"."2.3.2";
-  by-version."bluebird"."2.3.2" = self.buildNodePackage {
-    name = "bluebird-2.3.2";
-    version = "2.3.2";
+  by-spec."block-stream"."0.0.8" =
+    self.by-version."block-stream"."0.0.8";
+  by-spec."bluebird"."2.10.2" =
+    self.by-version."bluebird"."2.10.2";
+  by-version."bluebird"."2.10.2" = self.buildNodePackage {
+    name = "bluebird-2.10.2";
+    version = "2.10.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.2.tgz";
-      name = "bluebird-2.3.2.tgz";
-      sha1 = "7475ac7ca0c1674077ac3dd4092ddb80233cf26b";
+      url = "https://registry.npmjs.org/bluebird/-/bluebird-2.10.2.tgz";
+      name = "bluebird-2.10.2.tgz";
+      sha1 = "024a5517295308857f14f91f1106fc3b555f446b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird"."2.9.26" =
+    self.by-version."bluebird"."2.9.26";
+  by-version."bluebird"."2.9.26" = self.buildNodePackage {
+    name = "bluebird-2.9.26";
+    version = "2.9.26";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bluebird/-/bluebird-2.9.26.tgz";
+      name = "bluebird-2.9.26.tgz";
+      sha1 = "362772ea4d09f556a4b9f3b64c2fd136e87e3a55";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bluebird".">= 2.0" =
+    self.by-version."bluebird"."3.3.4";
+  by-version."bluebird"."3.3.4" = self.buildNodePackage {
+    name = "bluebird-3.3.4";
+    version = "3.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bluebird/-/bluebird-3.3.4.tgz";
+      name = "bluebird-3.3.4.tgz";
+      sha1 = "f780fe43e1a7a6510f67abd7d0d79533a40ddde6";
     };
     deps = {
     };
@@ -4149,15 +4783,25 @@
     cpu = [ ];
   };
   by-spec."bluebird".">= 2.3.2 < 3" =
-    self.by-version."bluebird"."2.9.24";
-  by-version."bluebird"."2.9.24" = self.buildNodePackage {
-    name = "bluebird-2.9.24";
-    version = "2.9.24";
+    self.by-version."bluebird"."2.10.2";
+  by-spec."bluebird"."^2.9.27" =
+    self.by-version."bluebird"."2.10.2";
+  by-spec."bluebird"."^2.9.30" =
+    self.by-version."bluebird"."2.10.2";
+  by-spec."bluebird"."^3.0.5" =
+    self.by-version."bluebird"."3.3.4";
+  by-spec."bluebird"."^3.1.1" =
+    self.by-version."bluebird"."3.3.4";
+  by-spec."bluebird"."~3.2.2" =
+    self.by-version."bluebird"."3.2.2";
+  by-version."bluebird"."3.2.2" = self.buildNodePackage {
+    name = "bluebird-3.2.2";
+    version = "3.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz";
-      name = "bluebird-2.9.24.tgz";
-      sha1 = "14a2e75f0548323dc35aa440d92007ca154e967c";
+      url = "https://registry.npmjs.org/bluebird/-/bluebird-3.2.2.tgz";
+      name = "bluebird-3.2.2.tgz";
+      sha1 = "164347d3fcab21eca9db849b4b856bec96041051";
     };
     deps = {
     };
@@ -4167,18 +4811,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bluebird"."^2.9.21" =
-    self.by-version."bluebird"."2.9.24";
-  by-spec."blueimp-md5"."~1.1.0" =
-    self.by-version."blueimp-md5"."1.1.0";
-  by-version."blueimp-md5"."1.1.0" = self.buildNodePackage {
-    name = "blueimp-md5-1.1.0";
-    version = "1.1.0";
+  by-spec."blueimp-md5"."~2.1.0" =
+    self.by-version."blueimp-md5"."2.1.0";
+  by-version."blueimp-md5"."2.1.0" = self.buildNodePackage {
+    name = "blueimp-md5-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/blueimp-md5/-/blueimp-md5-1.1.0.tgz";
-      name = "blueimp-md5-1.1.0.tgz";
-      sha1 = "041ed794862f3c5f2847282a7481329f1d2352cd";
+      url = "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.1.0.tgz";
+      name = "blueimp-md5-2.1.0.tgz";
+      sha1 = "88f76137be7f374cfc83b0db60891f57a5bb91d0";
     };
     deps = {
     };
@@ -4195,7 +4837,7 @@
     version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz";
+      url = "https://registry.npmjs.org/bn.js/-/bn.js-1.3.0.tgz";
       name = "bn.js-1.3.0.tgz";
       sha1 = "0db4cbf96f8f23b742f5bcb9d1aa7a9994a05e83";
     };
@@ -4207,6 +4849,31 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."bn.js"."^4.0.0" =
+    self.by-version."bn.js"."4.11.1";
+  by-version."bn.js"."4.11.1" = self.buildNodePackage {
+    name = "bn.js-4.11.1";
+    version = "4.11.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.1.tgz";
+      name = "bn.js-4.11.1.tgz";
+      sha1 = "ff1c52c52fd371e9d91419439bac5cfba2b41798";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bn.js"."^4.1.0" =
+    self.by-version."bn.js"."4.11.1";
+  by-spec."bn.js"."^4.1.1" =
+    self.by-version."bn.js"."4.11.1";
+  by-spec."bn.js"."^4.4.0" =
+    self.by-version."bn.js"."4.11.1";
   by-spec."bncode"."^0.2.3" =
     self.by-version."bncode"."0.2.3";
   by-version."bncode"."0.2.3" = self.buildNodePackage {
@@ -4214,7 +4881,7 @@
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz";
+      url = "https://registry.npmjs.org/bncode/-/bncode-0.2.3.tgz";
       name = "bncode-0.2.3.tgz";
       sha1 = "37f851dc8e47188a83fbc0f6fa4775cacc9a3296";
     };
@@ -4233,7 +4900,7 @@
     version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz";
+      url = "https://registry.npmjs.org/bncode/-/bncode-0.5.3.tgz";
       name = "bncode-0.5.3.tgz";
       sha1 = "e16661697452d436bf9886238cc791b08d66a61a";
     };
@@ -4245,6 +4912,35 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."body-parser"."1.15.0" =
+    self.by-version."body-parser"."1.15.0";
+  by-version."body-parser"."1.15.0" = self.buildNodePackage {
+    name = "body-parser-1.15.0";
+    version = "1.15.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.15.0.tgz";
+      name = "body-parser-1.15.0.tgz";
+      sha1 = "8168abaeaf9e77e300f7b3aef4df4b46e9b21b35";
+    };
+    deps = {
+      "bytes-2.2.0" = self.by-version."bytes"."2.2.0";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "http-errors-1.4.0" = self.by-version."http-errors"."1.4.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "qs-6.1.0" = self.by-version."qs"."6.1.0";
+      "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
+      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."body-parser"."1.5.0" =
     self.by-version."body-parser"."1.5.0";
   by-version."body-parser"."1.5.0" = self.buildNodePackage {
@@ -4252,7 +4948,7 @@
     version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.5.0.tgz";
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.5.0.tgz";
       name = "body-parser-1.5.0.tgz";
       sha1 = "c6fce2483c9eeb49ab349ff25a92d336d91055b9";
     };
@@ -4272,26 +4968,33 @@
     cpu = [ ];
   };
   by-spec."body-parser".">=1.9.2 <2.0.0-0" =
-    self.by-version."body-parser"."1.12.3";
-  by-version."body-parser"."1.12.3" = self.buildNodePackage {
-    name = "body-parser-1.12.3";
-    version = "1.12.3";
+    self.by-version."body-parser"."1.15.0";
+  by-spec."body-parser"."^1.12.2" =
+    self.by-version."body-parser"."1.15.0";
+  by-spec."body-parser"."^1.12.4" =
+    self.by-version."body-parser"."1.15.0";
+  by-spec."body-parser"."~1.13.2" =
+    self.by-version."body-parser"."1.13.3";
+  by-version."body-parser"."1.13.3" = self.buildNodePackage {
+    name = "body-parser-1.13.3";
+    version = "1.13.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.12.3.tgz";
-      name = "body-parser-1.12.3.tgz";
-      sha1 = "5f40bf17e7823be6895d4d35582752e36cf97f71";
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz";
+      name = "body-parser-1.13.3.tgz";
+      sha1 = "c08cf330c3358e151016a05746f13f029c97fa97";
     };
     deps = {
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
+      "bytes-2.1.0" = self.by-version."bytes"."2.1.0";
       "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "raw-body-1.3.4" = self.by-version."raw-body"."1.3.4";
-      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "iconv-lite-0.4.11" = self.by-version."iconv-lite"."0.4.11";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
+      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
     };
     optionalDependencies = {
     };
@@ -4299,32 +5002,49 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."body-parser"."^1.0.2" =
-    self.by-version."body-parser"."1.12.3";
-  by-spec."body-parser"."^1.12.2" =
-    self.by-version."body-parser"."1.12.3";
-  by-spec."body-parser"."~1.12.2" =
-    self.by-version."body-parser"."1.12.3";
-  by-spec."body-parser"."~1.8.2" =
-    self.by-version."body-parser"."1.8.4";
-  by-version."body-parser"."1.8.4" = self.buildNodePackage {
-    name = "body-parser-1.8.4";
-    version = "1.8.4";
+  by-spec."body-parser"."~1.13.3" =
+    self.by-version."body-parser"."1.13.3";
+  by-spec."body-parser"."~1.14.2" =
+    self.by-version."body-parser"."1.14.2";
+  by-version."body-parser"."1.14.2" = self.buildNodePackage {
+    name = "body-parser-1.14.2";
+    version = "1.14.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz";
-      name = "body-parser-1.8.4.tgz";
-      sha1 = "d497e04bc13b3f9a8bd8c70bb0cdc16f2e028898";
+      url = "https://registry.npmjs.org/body-parser/-/body-parser-1.14.2.tgz";
+      name = "body-parser-1.14.2.tgz";
+      sha1 = "1015cb1fe2c443858259581db53332f8d0cf50f9";
+    };
+    deps = {
+      "bytes-2.2.0" = self.by-version."bytes"."2.2.0";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "qs-5.2.0" = self.by-version."qs"."5.2.0";
+      "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
+      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."boolbase"."~1.0.0" =
+    self.by-version."boolbase"."1.0.0";
+  by-version."boolbase"."1.0.0" = self.buildNodePackage {
+    name = "boolbase-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
+      name = "boolbase-1.0.0.tgz";
+      sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e";
     };
     deps = {
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
-      "iconv-lite-0.4.4" = self.by-version."iconv-lite"."0.4.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
-      "qs-2.2.4" = self.by-version."qs"."2.2.4";
-      "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
     };
     optionalDependencies = {
     };
@@ -4332,8 +5052,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."body-parser"."~1.8.4" =
-    self.by-version."body-parser"."1.8.4";
   by-spec."boom"."0.3.x" =
     self.by-version."boom"."0.3.8";
   by-version."boom"."0.3.8" = self.buildNodePackage {
@@ -4341,7 +5059,7 @@
     version = "0.3.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
+      url = "https://registry.npmjs.org/boom/-/boom-0.3.8.tgz";
       name = "boom-0.3.8.tgz";
       sha1 = "c8cdb041435912741628c044ecc732d1d17c09ea";
     };
@@ -4361,7 +5079,7 @@
     version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
+      url = "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz";
       name = "boom-0.4.2.tgz";
       sha1 = "7a636e9ded4efcefb19cef4947a3c67dfaee911b";
     };
@@ -4375,39 +5093,18 @@
     cpu = [ ];
   };
   by-spec."boom"."2.x.x" =
-    self.by-version."boom"."2.7.1";
-  by-version."boom"."2.7.1" = self.buildNodePackage {
-    name = "boom-2.7.1";
-    version = "2.7.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz";
-      name = "boom-2.7.1.tgz";
-      sha1 = "fb165c348d337977c61d4363c21e9e1abf526705";
-    };
-    deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bops"."~0.1.0" =
-    self.by-version."bops"."0.1.1";
-  by-version."bops"."0.1.1" = self.buildNodePackage {
-    name = "bops-0.1.1";
-    version = "0.1.1";
+    self.by-version."boom"."2.10.1";
+  by-version."boom"."2.10.1" = self.buildNodePackage {
+    name = "boom-2.10.1";
+    version = "2.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bops/-/bops-0.1.1.tgz";
-      name = "bops-0.1.1.tgz";
-      sha1 = "062e02a8daa801fa10f2e5dbe6740cff801fe17e";
+      url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+      name = "boom-2.10.1.tgz";
+      sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
     };
     deps = {
-      "base64-js-0.0.2" = self.by-version."base64-js"."0.0.2";
-      "to-utf8-0.0.1" = self.by-version."to-utf8"."0.0.1";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
     };
     optionalDependencies = {
     };
@@ -4416,75 +5113,15 @@
     cpu = [ ];
   };
   by-spec."bower"."*" =
-    self.by-version."bower"."1.4.1";
-  by-version."bower"."1.4.1" = self.buildNodePackage {
-    name = "bower-1.4.1";
-    version = "1.4.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bower/-/bower-1.4.1.tgz";
-      name = "bower-1.4.1.tgz";
-      sha1 = "a18be39d030792754f30f1c5b32d37b0156ba8dd";
-    };
-    deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
-      "archy-1.0.0" = self.by-version."archy"."1.0.0";
-      "bower-config-0.6.1" = self.by-version."bower-config"."0.6.1";
-      "bower-endpoint-parser-0.2.2" = self.by-version."bower-endpoint-parser"."0.2.2";
-      "bower-json-0.4.0" = self.by-version."bower-json"."0.4.0";
-      "bower-logger-0.2.2" = self.by-version."bower-logger"."0.2.2";
-      "bower-registry-client-0.3.0" = self.by-version."bower-registry-client"."0.3.0";
-      "cardinal-0.4.4" = self.by-version."cardinal"."0.4.4";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
-      "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
-      "decompress-zip-0.1.0" = self.by-version."decompress-zip"."0.1.0";
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
-      "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
-      "github-0.2.4" = self.by-version."github"."0.2.4";
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0";
-      "inquirer-0.8.0" = self.by-version."inquirer"."0.8.0";
-      "insight-0.5.3" = self.by-version."insight"."0.5.3";
-      "is-root-1.0.0" = self.by-version."is-root"."1.0.0";
-      "junk-1.0.1" = self.by-version."junk"."1.0.1";
-      "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "mout-0.11.0" = self.by-version."mout"."0.11.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "opn-1.0.1" = self.by-version."opn"."1.0.1";
-      "p-throttler-0.1.1" = self.by-version."p-throttler"."0.1.1";
-      "promptly-0.2.0" = self.by-version."promptly"."0.2.0";
-      "q-1.2.0" = self.by-version."q"."1.2.0";
-      "request-2.53.0" = self.by-version."request"."2.53.0";
-      "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1";
-      "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
-      "shell-quote-1.4.3" = self.by-version."shell-quote"."1.4.3";
-      "stringify-object-1.0.1" = self.by-version."stringify-object"."1.0.1";
-      "tar-fs-1.5.0" = self.by-version."tar-fs"."1.5.0";
-      "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
-      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
-      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."bower"."1.7.7" = self.buildNodePackage {
-    name = "bower-1.7.7";
-    version = "1.7.7";
+    self.by-version."bower"."1.7.9";
+  by-version."bower"."1.7.9" = self.buildNodePackage {
+    name = "bower-1.7.9";
+    version = "1.7.9";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower/-/bower-1.7.7.tgz";
-      name = "bower-1.7.7.tgz";
-      sha1 = "2fd7ff3ebdcba5a8ffcd84c397c8fdfe9f825f92";
+      url = "https://registry.npmjs.org/bower/-/bower-1.7.9.tgz";
+      name = "bower-1.7.9.tgz";
+      sha1 = "b7296c2393e0d75edaa6ca39648132dd255812b0";
     };
     deps = {
     };
@@ -4494,34 +5131,9 @@
     os = [ ];
     cpu = [ ];
   };
-  "bower" = self.by-version."bower"."1.7.7";
+  "bower" = self.by-version."bower"."1.7.9";
   by-spec."bower".">=1.2.8 <2" =
-    self.by-version."bower"."1.4.1";
-  by-spec."bower-config"."^0.6.1" =
-    self.by-version."bower-config"."0.6.1";
-  by-version."bower-config"."0.6.1" = self.buildNodePackage {
-    name = "bower-config-0.6.1";
-    version = "0.6.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bower-config/-/bower-config-0.6.1.tgz";
-      name = "bower-config-0.6.1.tgz";
-      sha1 = "7093155688bef44079bf4cb32d189312c87ded60";
-    };
-    deps = {
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "mout-0.9.1" = self.by-version."mout"."0.9.1";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bower-config"."~0.6.1" =
-    self.by-version."bower-config"."0.6.1";
+    self.by-version."bower"."1.7.9";
   by-spec."bower-endpoint-parser"."0.2.1" =
     self.by-version."bower-endpoint-parser"."0.2.1";
   by-version."bower-endpoint-parser"."0.2.1" = self.buildNodePackage {
@@ -4529,7 +5141,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
+      url = "https://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.1.tgz";
       name = "bower-endpoint-parser-0.2.1.tgz";
       sha1 = "8c4010a2900cdab07ea5d38f0bd03e9bbccef90f";
     };
@@ -4541,40 +5153,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-endpoint-parser"."^0.2.2" =
-    self.by-version."bower-endpoint-parser"."0.2.2";
-  by-version."bower-endpoint-parser"."0.2.2" = self.buildNodePackage {
-    name = "bower-endpoint-parser-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz";
-      name = "bower-endpoint-parser-0.2.2.tgz";
-      sha1 = "00b565adbfab6f2d35addde977e97962acbcb3f6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bower-json"."0.4.0" =
-    self.by-version."bower-json"."0.4.0";
-  by-version."bower-json"."0.4.0" = self.buildNodePackage {
-    name = "bower-json-0.4.0";
-    version = "0.4.0";
+  by-spec."bower-json"."0.6.0" =
+    self.by-version."bower-json"."0.6.0";
+  by-version."bower-json"."0.6.0" = self.buildNodePackage {
+    name = "bower-json-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz";
-      name = "bower-json-0.4.0.tgz";
-      sha1 = "a99c3ccf416ef0590ed0ded252c760f1c6d93766";
+      url = "https://registry.npmjs.org/bower-json/-/bower-json-0.6.0.tgz";
+      name = "bower-json-0.6.0.tgz";
+      sha1 = "326579b23c33e4ea828e4763c55cd81fd7650329";
     };
     deps = {
-      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "intersect-0.0.3" = self.by-version."intersect"."0.0.3";
+      "deep-extend-0.4.1" = self.by-version."deep-extend"."0.4.1";
+      "ext-name-3.0.0" = self.by-version."ext-name"."3.0.0";
+      "graceful-fs-3.0.8" = self.by-version."graceful-fs"."3.0.8";
+      "intersect-1.0.1" = self.by-version."intersect"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -4582,8 +5176,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-json"."^0.4.0" =
-    self.by-version."bower-json"."0.4.0";
   by-spec."bower-logger"."0.2.1" =
     self.by-version."bower-logger"."0.2.1";
   by-version."bower-logger"."0.2.1" = self.buildNodePackage {
@@ -4591,7 +5183,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
+      url = "https://registry.npmjs.org/bower-logger/-/bower-logger-0.2.1.tgz";
       name = "bower-logger-0.2.1.tgz";
       sha1 = "0c1817c48063a88d96cc3d516c55e57fff5d9ecb";
     };
@@ -4603,65 +5195,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bower-logger"."^0.2.2" =
-    self.by-version."bower-logger"."0.2.2";
-  by-version."bower-logger"."0.2.2" = self.buildNodePackage {
-    name = "bower-logger-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz";
-      name = "bower-logger-0.2.2.tgz";
-      sha1 = "39be07e979b2fc8e03a94634205ed9422373d381";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bower-registry-client"."^0.3.0" =
-    self.by-version."bower-registry-client"."0.3.0";
-  by-version."bower-registry-client"."0.3.0" = self.buildNodePackage {
-    name = "bower-registry-client-0.3.0";
-    version = "0.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.3.0.tgz";
-      name = "bower-registry-client-0.3.0.tgz";
-      sha1 = "f5adcfdeda771a84be088ef1310d9756e58ebe74";
-    };
-    deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "bower-config-0.6.1" = self.by-version."bower-config"."0.6.1";
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1";
-      "request-2.51.0" = self.by-version."request"."2.51.0";
-      "request-replay-0.2.0" = self.by-version."request-replay"."0.2.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."bower2nix"."*" =
     self.by-version."bower2nix"."3.0.1";
   by-version."bower2nix"."3.0.1" = self.buildNodePackage {
     name = "bower2nix-3.0.1";
     version = "3.0.1";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz";
+      url = "https://registry.npmjs.org/bower2nix/-/bower2nix-3.0.1.tgz";
       name = "bower2nix-3.0.1.tgz";
-      sha256 = "0jfrz2mvnx3fp2p76dcnw18c1vajladbqcrzapf93jh8h6715msi";
+      sha1 = "06a52c033a66a890fb0c7c45a43074f3bc2e4a44";
     };
     deps = {
       "argparse-1.0.4" = self.by-version."argparse"."1.0.4";
-      "bower-1.7.7" = self.by-version."bower"."1.7.7";
+      "bower-1.7.9" = self.by-version."bower"."1.7.9";
       "bower-endpoint-parser-0.2.1" = self.by-version."bower-endpoint-parser"."0.2.1";
       "bower-json-0.6.0" = self.by-version."bower-json"."0.6.0";
       "bower-logger-0.2.1" = self.by-version."bower-logger"."0.2.1";
@@ -4672,20 +5219,26 @@
       "temp-0.8.3" = self.by-version."temp"."0.8.3";
       "glob-6.0.4" = self.by-version."glob"."6.0.4";
     };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
   };
   "bower2nix" = self.by-version."bower2nix"."3.0.1";
-  by-spec."bplist-parser"."0.0.6" =
-    self.by-version."bplist-parser"."0.0.6";
-  by-version."bplist-parser"."0.0.6" = self.buildNodePackage {
-    name = "bplist-parser-0.0.6";
-    version = "0.0.6";
+  by-spec."bplist-parser"."^0.1.0" =
+    self.by-version."bplist-parser"."0.1.1";
+  by-version."bplist-parser"."0.1.1" = self.buildNodePackage {
+    name = "bplist-parser-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.0.6.tgz";
-      name = "bplist-parser-0.0.6.tgz";
-      sha1 = "38da3471817df9d44ab3892e27707bbbd75a11b9";
+      url = "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz";
+      name = "bplist-parser-0.1.1.tgz";
+      sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6";
     };
     deps = {
+      "big-integer-1.6.14" = self.by-version."big-integer"."1.6.14";
     };
     optionalDependencies = {
     };
@@ -4694,18 +5247,18 @@
     cpu = [ ];
   };
   by-spec."brace-expansion"."^1.0.0" =
-    self.by-version."brace-expansion"."1.1.0";
-  by-version."brace-expansion"."1.1.0" = self.buildNodePackage {
-    name = "brace-expansion-1.1.0";
-    version = "1.1.0";
+    self.by-version."brace-expansion"."1.1.3";
+  by-version."brace-expansion"."1.1.3" = self.buildNodePackage {
+    name = "brace-expansion-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
-      name = "brace-expansion-1.1.0.tgz";
-      sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
+      url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz";
+      name = "brace-expansion-1.1.3.tgz";
+      sha1 = "46bff50115d47fc9ab89854abb87d98078a10991";
     };
     deps = {
-      "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
+      "balanced-match-0.3.0" = self.by-version."balanced-match"."0.3.0";
       "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
     optionalDependencies = {
@@ -4721,7 +5274,7 @@
     version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/braces/-/braces-0.1.5.tgz";
+      url = "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz";
       name = "braces-0.1.5.tgz";
       sha1 = "c085711085291d8b75fdd74eab0f8597280711e6";
     };
@@ -4734,21 +5287,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."braces"."^1.8.0" =
-    self.by-version."braces"."1.8.0";
-  by-version."braces"."1.8.0" = self.buildNodePackage {
-    name = "braces-1.8.0";
-    version = "1.8.0";
+  by-spec."braces"."^1.8.2" =
+    self.by-version."braces"."1.8.3";
+  by-version."braces"."1.8.3" = self.buildNodePackage {
+    name = "braces-1.8.3";
+    version = "1.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/braces/-/braces-1.8.0.tgz";
-      name = "braces-1.8.0.tgz";
-      sha1 = "3a4a005aae0391817c17b074dca8f08e6fc9e4c4";
+      url = "https://registry.npmjs.org/braces/-/braces-1.8.3.tgz";
+      name = "braces-1.8.3.tgz";
+      sha1 = "35d4e7dda632b33e215d38a8a9cf4329c9c75d2c";
     };
     deps = {
       "expand-range-1.8.1" = self.by-version."expand-range"."1.8.1";
       "preserve-0.2.0" = self.by-version."preserve"."0.2.0";
-      "repeat-element-1.1.0" = self.by-version."repeat-element"."1.1.0";
+      "repeat-element-1.1.2" = self.by-version."repeat-element"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -4763,7 +5316,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz";
+      url = "https://registry.npmjs.org/breakable/-/breakable-1.0.0.tgz";
       name = "breakable-1.0.0.tgz";
       sha1 = "784a797915a38ead27bad456b5572cb4bbaa78c1";
     };
@@ -4775,21 +5328,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."brfs"."0.0.8" =
-    self.by-version."brfs"."0.0.8";
-  by-version."brfs"."0.0.8" = self.buildNodePackage {
-    name = "brfs-0.0.8";
-    version = "0.0.8";
-    bin = true;
+  by-spec."broadway"."0.2.x" =
+    self.by-version."broadway"."0.2.10";
+  by-version."broadway"."0.2.10" = self.buildNodePackage {
+    name = "broadway-0.2.10";
+    version = "0.2.10";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/brfs/-/brfs-0.0.8.tgz";
-      name = "brfs-0.0.8.tgz";
-      sha1 = "e4377a177638a4b0520901bb134491dd7e38a386";
+      url = "https://registry.npmjs.org/broadway/-/broadway-0.2.10.tgz";
+      name = "broadway-0.2.10.tgz";
+      sha1 = "0f58532be140426e9000e49a93e242a0d1263238";
     };
     deps = {
-      "through-2.2.7" = self.by-version."through"."2.2.7";
-      "falafel-0.1.6" = self.by-version."falafel"."0.1.6";
-      "escodegen-0.0.17" = self.by-version."escodegen"."0.0.17";
+      "cliff-0.1.8" = self.by-version."cliff"."0.1.8";
+      "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+      "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
+      "winston-0.7.2" = self.by-version."winston"."0.7.2";
+      "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
     optionalDependencies = {
     };
@@ -4804,7 +5359,7 @@
     version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz";
+      url = "https://registry.npmjs.org/broadway/-/broadway-0.3.6.tgz";
       name = "broadway-0.3.6.tgz";
       sha1 = "7dbef068b954b7907925fd544963b578a902ba7a";
     };
@@ -4830,7 +5385,7 @@
     version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz";
+      url = "https://registry.npmjs.org/brorand/-/brorand-1.0.5.tgz";
       name = "brorand-1.0.5.tgz";
       sha1 = "07b54ca30286abd1718a0e2a830803efdc9bfa04";
     };
@@ -4842,24 +5397,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browser-launcher2"."0.4.5" =
-    self.by-version."browser-launcher2"."0.4.5";
-  by-version."browser-launcher2"."0.4.5" = self.buildNodePackage {
-    name = "browser-launcher2-0.4.5";
-    version = "0.4.5";
+  by-spec."browser-launcher2"."~0.4.6" =
+    self.by-version."browser-launcher2"."0.4.6";
+  by-version."browser-launcher2"."0.4.6" = self.buildNodePackage {
+    name = "browser-launcher2-0.4.6";
+    version = "0.4.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.5.tgz";
-      name = "browser-launcher2-0.4.5.tgz";
-      sha1 = "9b05fd5ead86a8931d20d5517e253d420882975a";
+      url = "https://registry.npmjs.org/browser-launcher2/-/browser-launcher2-0.4.6.tgz";
+      name = "browser-launcher2-0.4.6.tgz";
+      sha1 = "51598408a13f4c9c5b20eba44554b2c0b0ae4074";
     };
     deps = {
       "headless-0.1.7" = self.by-version."headless"."0.1.7";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "plist-1.1.0" = self.by-version."plist"."1.1.0";
-      "win-detect-browsers-1.0.1" = self.by-version."win-detect-browsers"."1.0.1";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
+      "plist-1.2.0" = self.by-version."plist"."1.2.0";
+      "win-detect-browsers-1.0.2" = self.by-version."win-detect-browsers"."1.0.2";
       "uid-0.0.2" = self.by-version."uid"."0.0.2";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
@@ -4869,24 +5424,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browser-pack"."^3.2.0" =
-    self.by-version."browser-pack"."3.2.0";
-  by-version."browser-pack"."3.2.0" = self.buildNodePackage {
-    name = "browser-pack-3.2.0";
-    version = "3.2.0";
+  by-spec."browser-pack"."^4.0.3" =
+    self.by-version."browser-pack"."4.0.4";
+  by-version."browser-pack"."4.0.4" = self.buildNodePackage {
+    name = "browser-pack-4.0.4";
+    version = "4.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-3.2.0.tgz";
-      name = "browser-pack-3.2.0.tgz";
-      sha1 = "faa1cbc41487b1acc4747e373e1148adffd0e2d9";
+      url = "https://registry.npmjs.org/browser-pack/-/browser-pack-4.0.4.tgz";
+      name = "browser-pack-4.0.4.tgz";
+      sha1 = "8dae95a20ca43b3fea201faa6cfaa84ff4a0d484";
     };
     deps = {
-      "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
       "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
+      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
+      "defined-1.0.0" = self.by-version."defined"."1.0.0";
       "through2-0.5.1" = self.by-version."through2"."0.5.1";
-      "umd-2.1.0" = self.by-version."umd"."2.1.0";
+      "umd-3.0.1" = self.by-version."umd"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -4894,46 +5449,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browser-pack"."^4.0.0" =
-    self.by-version."browser-pack"."4.0.1";
-  by-version."browser-pack"."4.0.1" = self.buildNodePackage {
-    name = "browser-pack-4.0.1";
-    version = "4.0.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-4.0.1.tgz";
-      name = "browser-pack-4.0.1.tgz";
-      sha1 = "7f4ab2b3a11c36a9274141fb7912122fc974e5f6";
-    };
-    deps = {
-      "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
-      "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "through2-0.5.1" = self.by-version."through2"."0.5.1";
-      "umd-3.0.0" = self.by-version."umd"."3.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."browser-pack"."~2.0.0" =
-    self.by-version."browser-pack"."2.0.1";
-  by-version."browser-pack"."2.0.1" = self.buildNodePackage {
-    name = "browser-pack-2.0.1";
-    version = "2.0.1";
+  by-spec."browser-pack"."^6.0.1" =
+    self.by-version."browser-pack"."6.0.1";
+  by-version."browser-pack"."6.0.1" = self.buildNodePackage {
+    name = "browser-pack-6.0.1";
+    version = "6.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-pack/-/browser-pack-2.0.1.tgz";
-      name = "browser-pack-2.0.1.tgz";
-      sha1 = "5d1c527f56c582677411c4db2a128648ff6bf150";
+      url = "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz";
+      name = "browser-pack-6.0.1.tgz";
+      sha1 = "779887c792eaa1f64a46a22c8f1051cdcd96755f";
     };
     deps = {
-      "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "combine-source-map-0.7.1" = self.by-version."combine-source-map"."0.7.1";
+      "defined-1.0.0" = self.by-version."defined"."1.0.0";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "umd-3.0.1" = self.by-version."umd"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -4941,14 +5473,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browser-request".">= 0.2.0" =
+  by-spec."browser-request".">= 0.3.1 < 0.4.0" =
     self.by-version."browser-request"."0.3.3";
   by-version."browser-request"."0.3.3" = self.buildNodePackage {
     name = "browser-request-0.3.3";
     version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
+      url = "https://registry.npmjs.org/browser-request/-/browser-request-0.3.3.tgz";
       name = "browser-request-0.3.3.tgz";
       sha1 = "9ece5b5aca89a29932242e18bf933def9876cc17";
     };
@@ -4960,21 +5492,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browser-request"."~0.3.1" =
+  by-spec."browser-request"."^0.3.3" =
     self.by-version."browser-request"."0.3.3";
-  by-spec."browser-resolve"."^1.3.0" =
-    self.by-version."browser-resolve"."1.8.2";
-  by-version."browser-resolve"."1.8.2" = self.buildNodePackage {
-    name = "browser-resolve-1.8.2";
-    version = "1.8.2";
+  by-spec."browser-resolve"."^1.11.0" =
+    self.by-version."browser-resolve"."1.11.1";
+  by-version."browser-resolve"."1.11.1" = self.buildNodePackage {
+    name = "browser-resolve-1.11.1";
+    version = "1.11.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.8.2.tgz";
-      name = "browser-resolve-1.8.2.tgz";
-      sha1 = "a00b06c871bee21b50d450ff94c2a423bc787729";
+      url = "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.1.tgz";
+      name = "browser-resolve-1.11.1.tgz";
+      sha1 = "73c3c2a1d3a68a6e17d88f0cadb13ea24632d496";
     };
     deps = {
-      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
     };
     optionalDependencies = {
     };
@@ -4983,31 +5515,9 @@
     cpu = [ ];
   };
   by-spec."browser-resolve"."^1.7.0" =
-    self.by-version."browser-resolve"."1.8.2";
+    self.by-version."browser-resolve"."1.11.1";
   by-spec."browser-resolve"."^1.7.1" =
-    self.by-version."browser-resolve"."1.8.2";
-  by-spec."browser-resolve"."~1.2.1" =
-    self.by-version."browser-resolve"."1.2.4";
-  by-version."browser-resolve"."1.2.4" = self.buildNodePackage {
-    name = "browser-resolve-1.2.4";
-    version = "1.2.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.2.4.tgz";
-      name = "browser-resolve-1.2.4.tgz";
-      sha1 = "59ae7820a82955ecd32f5fb7c468ac21c4723806";
-    };
-    deps = {
-      "resolve-0.6.3" = self.by-version."resolve"."0.6.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."browser-resolve"."~1.2.2" =
-    self.by-version."browser-resolve"."1.2.4";
+    self.by-version."browser-resolve"."1.11.1";
   by-spec."browserchannel"."*" =
     self.by-version."browserchannel"."2.0.0";
   by-version."browserchannel"."2.0.0" = self.buildNodePackage {
@@ -5015,14 +5525,14 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
+      url = "https://registry.npmjs.org/browserchannel/-/browserchannel-2.0.0.tgz";
       name = "browserchannel-2.0.0.tgz";
       sha1 = "0f211b3cad9995e8729b2bacd46b53c027c0ea63";
     };
     deps = {
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "connect-2.29.1" = self.by-version."connect"."2.29.1";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "connect-2.30.2" = self.by-version."connect"."2.30.2";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
       "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0";
     };
     optionalDependencies = {
@@ -5033,67 +5543,64 @@
   };
   "browserchannel" = self.by-version."browserchannel"."2.0.0";
   by-spec."browserify"."*" =
-    self.by-version."browserify"."9.0.8";
-  by-version."browserify"."9.0.8" = self.buildNodePackage {
-    name = "browserify-9.0.8";
-    version = "9.0.8";
+    self.by-version."browserify"."13.0.0";
+  by-version."browserify"."13.0.0" = self.buildNodePackage {
+    name = "browserify-13.0.0";
+    version = "13.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify/-/browserify-9.0.8.tgz";
-      name = "browserify-9.0.8.tgz";
-      sha1 = "91859e9f60384459ead554df89cff03c734f159b";
+      url = "https://registry.npmjs.org/browserify/-/browserify-13.0.0.tgz";
+      name = "browserify-13.0.0.tgz";
+      sha1 = "8f223bb24ff4ee4335e6bea9671de294e43ba6a3";
     };
     deps = {
-      "JSONStream-0.10.0" = self.by-version."JSONStream"."0.10.0";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
-      "browser-pack-4.0.1" = self.by-version."browser-pack"."4.0.1";
-      "browser-resolve-1.8.2" = self.by-version."browser-resolve"."1.8.2";
+      "browser-pack-6.0.1" = self.by-version."browser-pack"."6.0.1";
+      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.1.2" = self.by-version."buffer"."3.1.2";
-      "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
-      "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "buffer-4.5.1" = self.by-version."buffer"."4.5.1";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
-      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.9.14" = self.by-version."crypto-browserify"."3.9.14";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
-      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
-      "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
-      "events-1.0.2" = self.by-version."events"."1.0.2";
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "has-1.0.0" = self.by-version."has"."1.0.0";
-      "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
-      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
+      "constants-browserify-1.0.0" = self.by-version."constants-browserify"."1.0.0";
+      "crypto-browserify-3.11.0" = self.by-version."crypto-browserify"."3.11.0";
+      "defined-1.0.0" = self.by-version."defined"."1.0.0";
+      "deps-sort-2.0.0" = self.by-version."deps-sort"."2.0.0";
+      "domain-browser-1.1.7" = self.by-version."domain-browser"."1.1.7";
+      "duplexer2-0.1.4" = self.by-version."duplexer2"."0.1.4";
+      "events-1.1.0" = self.by-version."events"."1.1.0";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "has-1.0.1" = self.by-version."has"."1.0.1";
+      "htmlescape-1.1.1" = self.by-version."htmlescape"."1.1.1";
+      "stream-http-2.2.1" = self.by-version."stream-http"."2.2.1";
+      "https-browserify-0.0.1" = self.by-version."https-browserify"."0.0.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "insert-module-globals-6.2.1" = self.by-version."insert-module-globals"."6.2.1";
+      "insert-module-globals-7.0.1" = self.by-version."insert-module-globals"."7.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2";
-      "module-deps-3.7.6" = self.by-version."module-deps"."3.7.6";
+      "labeled-stream-splicer-2.0.0" = self.by-version."labeled-stream-splicer"."2.0.0";
+      "module-deps-4.0.5" = self.by-version."module-deps"."4.0.5";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.10.1" = self.by-version."process"."0.10.1";
-      "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
+      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
-      "read-only-stream-1.1.1" = self.by-version."read-only-stream"."1.1.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
-      "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
-      "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
-      "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
-      "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
+      "read-only-stream-2.0.0" = self.by-version."read-only-stream"."2.0.0";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
+      "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
+      "shell-quote-1.5.0" = self.by-version."shell-quote"."1.5.0";
+      "stream-browserify-2.0.1" = self.by-version."stream-browserify"."2.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
-      "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2";
-      "through2-1.1.1" = self.by-version."through2"."1.1.1";
-      "timers-browserify-1.4.0" = self.by-version."timers-browserify"."1.4.0";
+      "syntax-error-1.1.6" = self.by-version."syntax-error"."1.1.6";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "timers-browserify-1.4.2" = self.by-version."timers-browserify"."1.4.2";
       "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "url-0.10.3" = self.by-version."url"."0.10.3";
+      "url-0.11.0" = self.by-version."url"."0.11.0";
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
-      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -5101,68 +5608,70 @@
     os = [ ];
     cpu = [ ];
   };
-  "browserify" = self.by-version."browserify"."9.0.8";
-  by-spec."browserify"."7.1.0" =
-    self.by-version."browserify"."7.1.0";
-  by-version."browserify"."7.1.0" = self.buildNodePackage {
-    name = "browserify-7.1.0";
-    version = "7.1.0";
+  "browserify" = self.by-version."browserify"."13.0.0";
+  by-spec."browserify"."10.1.3" =
+    self.by-version."browserify"."10.1.3";
+  by-version."browserify"."10.1.3" = self.buildNodePackage {
+    name = "browserify-10.1.3";
+    version = "10.1.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify/-/browserify-7.1.0.tgz";
-      name = "browserify-7.1.0.tgz";
-      sha1 = "1660775c93c3efeaeb42f3c6638a6c4c2b414f14";
+      url = "https://registry.npmjs.org/browserify/-/browserify-10.1.3.tgz";
+      name = "browserify-10.1.3.tgz";
+      sha1 = "6605dcffbb918c6a69d9c60201d2397ef7ce20ff";
     };
     deps = {
-      "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
-      "assert-1.1.2" = self.by-version."assert"."1.1.2";
-      "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0";
-      "browser-resolve-1.8.2" = self.by-version."browser-resolve"."1.8.2";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "assert-1.3.0" = self.by-version."assert"."1.3.0";
+      "browser-pack-4.0.4" = self.by-version."browser-pack"."4.0.4";
+      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.1.2" = self.by-version."buffer"."3.1.2";
+      "buffer-3.6.0" = self.by-version."buffer"."3.6.0";
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
       "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.9.14" = self.by-version."crypto-browserify"."3.9.14";
-      "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5";
-      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
+      "crypto-browserify-3.11.0" = self.by-version."crypto-browserify"."3.11.0";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
+      "defined-1.0.0" = self.by-version."defined"."1.0.0";
+      "deps-sort-1.3.9" = self.by-version."deps-sort"."1.3.9";
+      "domain-browser-1.1.7" = self.by-version."domain-browser"."1.1.7";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "events-1.0.2" = self.by-version."events"."1.0.2";
       "glob-4.5.3" = self.by-version."glob"."4.5.3";
+      "has-1.0.1" = self.by-version."has"."1.0.1";
+      "htmlescape-1.1.1" = self.by-version."htmlescape"."1.1.1";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
-      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
+      "https-browserify-0.0.1" = self.by-version."https-browserify"."0.0.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "insert-module-globals-6.2.1" = self.by-version."insert-module-globals"."6.2.1";
+      "insert-module-globals-6.6.3" = self.by-version."insert-module-globals"."6.6.3";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2";
-      "module-deps-3.7.6" = self.by-version."module-deps"."3.7.6";
+      "module-deps-3.9.1" = self.by-version."module-deps"."3.9.1";
       "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
-      "parents-0.0.3" = self.by-version."parents"."0.0.3";
+      "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.8.0" = self.by-version."process"."0.8.0";
-      "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
+      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
+      "read-only-stream-1.1.1" = self.by-version."read-only-stream"."1.1.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "resolve-0.7.4" = self.by-version."resolve"."0.7.4";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
       "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
-      "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
+      "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
       "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
       "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
-      "syntax-error-1.1.2" = self.by-version."syntax-error"."1.1.2";
+      "syntax-error-1.1.6" = self.by-version."syntax-error"."1.1.6";
       "through2-1.1.1" = self.by-version."through2"."1.1.1";
-      "timers-browserify-1.4.0" = self.by-version."timers-browserify"."1.4.0";
+      "timers-browserify-1.4.2" = self.by-version."timers-browserify"."1.4.2";
       "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "umd-2.1.0" = self.by-version."umd"."2.1.0";
       "url-0.10.3" = self.by-version."url"."0.10.3";
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
-      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -5170,57 +5679,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify"."~3.19.1" =
-    self.by-version."browserify"."3.19.1";
-  by-version."browserify"."3.19.1" = self.buildNodePackage {
-    name = "browserify-3.19.1";
-    version = "3.19.1";
-    bin = true;
+  by-spec."browserify-aes"."^1.0.0" =
+    self.by-version."browserify-aes"."1.0.6";
+  by-version."browserify-aes"."1.0.6" = self.buildNodePackage {
+    name = "browserify-aes-1.0.6";
+    version = "1.0.6";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify/-/browserify-3.19.1.tgz";
-      name = "browserify-3.19.1.tgz";
-      sha1 = "e4e994f7c8313432df46b1a2b029d8bab13a456b";
+      url = "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz";
+      name = "browserify-aes-1.0.6.tgz";
+      sha1 = "5e7725dbdef1fd5930d4ebab48567ce451c48a0a";
     };
     deps = {
-      "module-deps-1.2.2" = self.by-version."module-deps"."1.2.2";
-      "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1";
-      "deps-sort-0.1.2" = self.by-version."deps-sort"."0.1.2";
-      "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
-      "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "insert-module-globals-2.3.4" = self.by-version."insert-module-globals"."2.3.4";
-      "syntax-error-0.0.1" = self.by-version."syntax-error"."0.0.1";
-      "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
+      "buffer-xor-1.0.3" = self.by-version."buffer-xor"."1.0.3";
+      "cipher-base-1.0.2" = self.by-version."cipher-base"."1.0.2";
+      "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
+      "evp_bytestokey-1.0.0" = self.by-version."evp_bytestokey"."1.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "umd-2.0.0" = self.by-version."umd"."2.0.0";
-      "parents-0.0.3" = self.by-version."parents"."0.0.3";
-      "deep-equal-0.1.2" = self.by-version."deep-equal"."0.1.2";
-      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
-      "console-browserify-1.0.3" = self.by-version."console-browserify"."1.0.3";
-      "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
-      "zlib-browserify-0.0.3" = self.by-version."zlib-browserify"."0.0.3";
-      "assert-1.1.2" = self.by-version."assert"."1.1.2";
-      "http-browserify-1.1.0" = self.by-version."http-browserify"."1.1.0";
-      "crypto-browserify-1.0.9" = self.by-version."crypto-browserify"."1.0.9";
-      "util-0.10.3" = self.by-version."util"."0.10.3";
-      "events-1.0.2" = self.by-version."events"."1.0.2";
-      "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17";
-      "url-0.7.9" = self.by-version."url"."0.7.9";
-      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
-      "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "querystring-0.2.0" = self.by-version."querystring"."0.2.0";
-      "stream-browserify-0.1.3" = self.by-version."stream-browserify"."0.1.3";
-      "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1";
-      "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "timers-browserify-1.0.3" = self.by-version."timers-browserify"."1.0.3";
-      "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
     optionalDependencies = {
     };
@@ -5228,60 +5703,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify"."~3.24.1" =
-    self.by-version."browserify"."3.24.13";
-  by-version."browserify"."3.24.13" = self.buildNodePackage {
-    name = "browserify-3.24.13";
-    version = "3.24.13";
-    bin = true;
+  by-spec."browserify-aes"."^1.0.4" =
+    self.by-version."browserify-aes"."1.0.6";
+  by-spec."browserify-cipher"."^1.0.0" =
+    self.by-version."browserify-cipher"."1.0.0";
+  by-version."browserify-cipher"."1.0.0" = self.buildNodePackage {
+    name = "browserify-cipher-1.0.0";
+    version = "1.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify/-/browserify-3.24.13.tgz";
-      name = "browserify-3.24.13.tgz";
-      sha1 = "d82012886791c4b1edd36612ad508a614e9ad86e";
+      url = "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz";
+      name = "browserify-cipher-1.0.0.tgz";
+      sha1 = "9988244874bf5ed4e28da95666dcd66ac8fc363a";
     };
     deps = {
-      "module-deps-1.4.2" = self.by-version."module-deps"."1.4.2";
-      "browser-pack-2.0.1" = self.by-version."browser-pack"."2.0.1";
-      "deps-sort-0.1.2" = self.by-version."deps-sort"."0.1.2";
-      "shell-quote-0.0.1" = self.by-version."shell-quote"."0.0.1";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
-      "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "insert-module-globals-3.1.3" = self.by-version."insert-module-globals"."3.1.3";
-      "syntax-error-0.1.0" = self.by-version."syntax-error"."0.1.0";
-      "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "umd-2.0.0" = self.by-version."umd"."2.0.0";
-      "parents-0.0.3" = self.by-version."parents"."0.0.3";
-      "deep-equal-0.1.2" = self.by-version."deep-equal"."0.1.2";
-      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
-      "console-browserify-1.0.3" = self.by-version."console-browserify"."1.0.3";
-      "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
-      "zlib-browserify-0.0.3" = self.by-version."zlib-browserify"."0.0.3";
-      "assert-1.1.2" = self.by-version."assert"."1.1.2";
-      "http-browserify-1.1.0" = self.by-version."http-browserify"."1.1.0";
-      "crypto-browserify-1.0.9" = self.by-version."crypto-browserify"."1.0.9";
-      "util-0.10.3" = self.by-version."util"."0.10.3";
-      "events-1.0.2" = self.by-version."events"."1.0.2";
-      "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17";
-      "url-0.7.9" = self.by-version."url"."0.7.9";
-      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
-      "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "querystring-0.2.0" = self.by-version."querystring"."0.2.0";
-      "stream-browserify-0.1.3" = self.by-version."stream-browserify"."0.1.3";
-      "string_decoder-0.0.1" = self.by-version."string_decoder"."0.0.1";
-      "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "timers-browserify-1.0.3" = self.by-version."timers-browserify"."1.0.3";
-      "punycode-1.2.4" = self.by-version."punycode"."1.2.4";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "derequire-0.6.1" = self.by-version."derequire"."0.6.1";
-      "commondir-0.0.1" = self.by-version."commondir"."0.0.1";
-      "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
+      "browserify-aes-1.0.6" = self.by-version."browserify-aes"."1.0.6";
+      "browserify-des-1.0.0" = self.by-version."browserify-des"."1.0.0";
+      "evp_bytestokey-1.0.0" = self.by-version."evp_bytestokey"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -5289,19 +5727,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify-aes"."^1.0.0" =
-    self.by-version."browserify-aes"."1.0.0";
-  by-version."browserify-aes"."1.0.0" = self.buildNodePackage {
-    name = "browserify-aes-1.0.0";
+  by-spec."browserify-des"."^1.0.0" =
+    self.by-version."browserify-des"."1.0.0";
+  by-version."browserify-des"."1.0.0" = self.buildNodePackage {
+    name = "browserify-des-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.0.tgz";
-      name = "browserify-aes-1.0.0.tgz";
-      sha1 = "582efc30561166f89855fcdc945b686919848b62";
+      url = "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz";
+      name = "browserify-des-1.0.0.tgz";
+      sha1 = "daa277717470922ed2fe18594118a175439721dd";
     };
     deps = {
-      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
+      "cipher-base-1.0.2" = self.by-version."cipher-base"."1.0.2";
+      "des.js-1.0.0" = self.by-version."des.js"."1.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -5310,20 +5749,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify-rsa"."^2.0.0" =
-    self.by-version."browserify-rsa"."2.0.0";
-  by-version."browserify-rsa"."2.0.0" = self.buildNodePackage {
-    name = "browserify-rsa-2.0.0";
-    version = "2.0.0";
+  by-spec."browserify-rsa"."^4.0.0" =
+    self.by-version."browserify-rsa"."4.0.1";
+  by-version."browserify-rsa"."4.0.1" = self.buildNodePackage {
+    name = "browserify-rsa-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-2.0.0.tgz";
-      name = "browserify-rsa-2.0.0.tgz";
-      sha1 = "b3e4f6d03a07db4408bfd9dbc0fef323bfe1bdcb";
+      url = "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz";
+      name = "browserify-rsa-4.0.1.tgz";
+      sha1 = "21e0abfaf6f2029cf2fafb133567a701d4135524";
     };
     deps = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
-      "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "randombytes-2.0.3" = self.by-version."randombytes"."2.0.3";
     };
     optionalDependencies = {
     };
@@ -5331,25 +5770,67 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."browserify-sign"."^3.0.1" =
-    self.by-version."browserify-sign"."3.0.1";
-  by-version."browserify-sign"."3.0.1" = self.buildNodePackage {
-    name = "browserify-sign-3.0.1";
-    version = "3.0.1";
+  by-spec."browserify-sign"."^4.0.0" =
+    self.by-version."browserify-sign"."4.0.0";
+  by-version."browserify-sign"."4.0.0" = self.buildNodePackage {
+    name = "browserify-sign-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-3.0.1.tgz";
-      name = "browserify-sign-3.0.1.tgz";
-      sha1 = "e1bdf7ca50d575d22e57705c60b3033846dc96bf";
+      url = "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.0.tgz";
+      name = "browserify-sign-4.0.0.tgz";
+      sha1 = "10773910c3c206d5420a46aad8694f820b85968f";
     };
     deps = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
-      "browserify-rsa-2.0.0" = self.by-version."browserify-rsa"."2.0.0";
-      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
-      "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
-      "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "browserify-rsa-4.0.1" = self.by-version."browserify-rsa"."4.0.1";
+      "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
+      "create-hmac-1.1.4" = self.by-version."create-hmac"."1.1.4";
+      "elliptic-6.2.3" = self.by-version."elliptic"."6.2.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "parse-asn1-3.0.0" = self.by-version."parse-asn1"."3.0.0";
+      "parse-asn1-5.0.0" = self.by-version."parse-asn1"."5.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."browserify-transform-tools"."~1.5.1" =
+    self.by-version."browserify-transform-tools"."1.5.3";
+  by-version."browserify-transform-tools"."1.5.3" = self.buildNodePackage {
+    name = "browserify-transform-tools-1.5.3";
+    version = "1.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/browserify-transform-tools/-/browserify-transform-tools-1.5.3.tgz";
+      name = "browserify-transform-tools-1.5.3.tgz";
+      sha1 = "509c9c652fb6b07bf0d21efceebb1d826f80754b";
+    };
+    deps = {
+      "falafel-1.2.0" = self.by-version."falafel"."1.2.0";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."browserify-versionify"."1.0.3" =
+    self.by-version."browserify-versionify"."1.0.3";
+  by-version."browserify-versionify"."1.0.3" = self.buildNodePackage {
+    name = "browserify-versionify-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/browserify-versionify/-/browserify-versionify-1.0.3.tgz";
+      name = "browserify-versionify-1.0.3.tgz";
+      sha1 = "927eaaf85f16fe8d8d59eb1c6da76b488c01406c";
+    };
+    deps = {
+      "find-root-0.1.2" = self.by-version."find-root"."0.1.2";
+      "through2-0.6.3" = self.by-version."through2"."0.6.3";
     };
     optionalDependencies = {
     };
@@ -5364,12 +5845,12 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
+      url = "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz";
       name = "browserify-zlib-0.1.4.tgz";
       sha1 = "bb35f8a519f600e0fa6b8485241c979d0141fb2d";
     };
     deps = {
-      "pako-0.2.6" = self.by-version."pako"."0.2.6";
+      "pako-0.2.8" = self.by-version."pako"."0.2.8";
     };
     optionalDependencies = {
     };
@@ -5388,7 +5869,7 @@
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bs58/-/bs58-2.0.1.tgz";
+      url = "https://registry.npmjs.org/bs58/-/bs58-2.0.1.tgz";
       name = "bs58-2.0.1.tgz";
       sha1 = "55908d58f1982aba2008fa1bed8f91998a29bf8d";
     };
@@ -5407,7 +5888,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bs58check/-/bs58check-1.0.3.tgz";
+      url = "https://registry.npmjs.org/bs58check/-/bs58check-1.0.3.tgz";
       name = "bs58check-1.0.3.tgz";
       sha1 = "3e4dc6dde96e60b9db321ea7372fd4fd0523559e";
     };
@@ -5427,7 +5908,7 @@
     version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
+      url = "https://registry.npmjs.org/bson/-/bson-0.1.8.tgz";
       name = "bson-0.1.8.tgz";
       sha1 = "cf34fdcff081a189b589b4b3e5e9309cd6506c81";
     };
@@ -5446,7 +5927,7 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
+      url = "https://registry.npmjs.org/bson/-/bson-0.2.2.tgz";
       name = "bson-0.2.2.tgz";
       sha1 = "3dbf984acb9d33a6878b46e6fb7afbd611856a60";
     };
@@ -5458,60 +5939,46 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bson"."~0.2" =
-    self.by-version."bson"."0.2.21";
-  by-version."bson"."0.2.21" = self.buildNodePackage {
-    name = "bson-0.2.21";
-    version = "0.2.21";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bson/-/bson-0.2.21.tgz";
-      name = "bson-0.2.21.tgz";
-      sha1 = "3755a5de71ac43f0e9a85f699c84d1ab73b0fcb3";
-    };
-    deps = {
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bson"."~0.3" =
-    self.by-version."bson"."0.3.1";
-  by-version."bson"."0.3.1" = self.buildNodePackage {
-    name = "bson-0.3.1";
-    version = "0.3.1";
+  by-spec."bson"."~0.4.18" =
+    self.by-version."bson"."0.4.22";
+  by-version."bson"."0.4.22" = self.buildNodePackage {
+    name = "bson-0.4.22";
+    version = "0.4.22";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bson/-/bson-0.3.1.tgz";
-      name = "bson-0.3.1.tgz";
-      sha1 = "08882fb3a29ee41738a2bcbff8af7081ad9f35bb";
+      url = "https://registry.npmjs.org/bson/-/bson-0.4.22.tgz";
+      name = "bson-0.4.22.tgz";
+      sha1 = "3dee54807286363bdf921c22de54e8d920a052d1";
     };
     deps = {
     };
     optionalDependencies = {
-      "bson-ext-0.1.1" = self.by-version."bson-ext"."0.1.1";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bson-ext"."~0.1" =
-    self.by-version."bson-ext"."0.1.1";
-  by-version."bson-ext"."0.1.1" = self.buildNodePackage {
-    name = "bson-ext-0.1.1";
-    version = "0.1.1";
+  by-spec."bson"."~0.4.19" =
+    self.by-version."bson"."0.4.22";
+  by-spec."bson"."~0.4.20" =
+    self.by-version."bson"."0.4.22";
+  by-spec."bson"."~0.4.21" =
+    self.by-version."bson"."0.4.22";
+  by-spec."buffer"."^3.0.0" =
+    self.by-version."buffer"."3.6.0";
+  by-version."buffer"."3.6.0" = self.buildNodePackage {
+    name = "buffer-3.6.0";
+    version = "3.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bson-ext/-/bson-ext-0.1.1.tgz";
-      name = "bson-ext-0.1.1.tgz";
-      sha1 = "b0406d05097e50d6e0df77bd6127cfee8f7f4e0a";
+      url = "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz";
+      name = "buffer-3.6.0.tgz";
+      sha1 = "a72c936f77b96bf52f5f7e7b467180628551defb";
     };
     deps = {
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
-      "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4";
+      "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
+      "ieee754-1.1.6" = self.by-version."ieee754"."1.1.6";
+      "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -5519,21 +5986,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buffer"."^3.0.0" =
-    self.by-version."buffer"."3.1.2";
-  by-version."buffer"."3.1.2" = self.buildNodePackage {
-    name = "buffer-3.1.2";
-    version = "3.1.2";
+  by-spec."buffer"."^3.0.3" =
+    self.by-version."buffer"."3.6.0";
+  by-spec."buffer"."^4.1.0" =
+    self.by-version."buffer"."4.5.1";
+  by-version."buffer"."4.5.1" = self.buildNodePackage {
+    name = "buffer-4.5.1";
+    version = "4.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer/-/buffer-3.1.2.tgz";
-      name = "buffer-3.1.2.tgz";
-      sha1 = "1c679611b961edf16b9c4daf44fb66beb9daa9f0";
+      url = "https://registry.npmjs.org/buffer/-/buffer-4.5.1.tgz";
+      name = "buffer-4.5.1.tgz";
+      sha1 = "237b5bdef693c4c332385c1ded4ef4646e232d73";
     };
     deps = {
-      "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
-      "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
-      "is-array-1.0.1" = self.by-version."is-array"."1.0.1";
+      "base64-js-1.1.2" = self.by-version."base64-js"."1.1.2";
+      "ieee754-1.1.6" = self.by-version."ieee754"."1.1.6";
+      "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -5541,8 +6010,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buffer"."^3.0.3" =
-    self.by-version."buffer"."3.1.2";
+  by-spec."buffer"."^4.3.0" =
+    self.by-version."buffer"."4.5.1";
   by-spec."buffer-crc32"."0.1.1" =
     self.by-version."buffer-crc32"."0.1.1";
   by-version."buffer-crc32"."0.1.1" = self.buildNodePackage {
@@ -5550,7 +6019,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
+      url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.1.1.tgz";
       name = "buffer-crc32-0.1.1.tgz";
       sha1 = "7e110dc9953908ab7c32acdc70c9f945b1cbc526";
     };
@@ -5569,7 +6038,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
+      url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.1.tgz";
       name = "buffer-crc32-0.2.1.tgz";
       sha1 = "be3e5382fc02b6d6324956ac1af98aa98b08534c";
     };
@@ -5588,7 +6057,7 @@
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
+      url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz";
       name = "buffer-crc32-0.2.3.tgz";
       sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921";
     };
@@ -5607,7 +6076,7 @@
     version = "0.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
+      url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz";
       name = "buffer-crc32-0.2.5.tgz";
       sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91";
     };
@@ -5626,7 +6095,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
+      url = "https://registry.npmjs.org/buffer-equal/-/buffer-equal-0.0.1.tgz";
       name = "buffer-equal-0.0.1.tgz";
       sha1 = "91bc74b11ea405bc916bc6aa908faafa5b4aac4b";
     };
@@ -5638,23 +6107,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buffer-equal"."^0.0.1" =
-    self.by-version."buffer-equal"."0.0.1";
-  by-spec."buffer-equal"."~0.0.0" =
-    self.by-version."buffer-equal"."0.0.1";
-  by-spec."buffercursor".">= 0.0.12" =
-    self.by-version."buffercursor"."0.0.12";
-  by-version."buffercursor"."0.0.12" = self.buildNodePackage {
-    name = "buffercursor-0.0.12";
-    version = "0.0.12";
+  by-spec."buffer-equal-constant-time"."^1.0.1" =
+    self.by-version."buffer-equal-constant-time"."1.0.1";
+  by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
+    name = "buffer-equal-constant-time-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
-      name = "buffercursor-0.0.12.tgz";
-      sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
+      url = "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz";
+      name = "buffer-equal-constant-time-1.0.1.tgz";
+      sha1 = "f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819";
     };
     deps = {
-      "verror-1.6.0" = self.by-version."verror"."1.6.0";
     };
     optionalDependencies = {
     };
@@ -5662,18 +6126,57 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buffers"."~0.1.1" =
-    self.by-version."buffers"."0.1.1";
-  by-version."buffers"."0.1.1" = self.buildNodePackage {
-    name = "buffers-0.1.1";
-    version = "0.1.1";
+  by-spec."buffer-equals"."^1.0.3" =
+    self.by-version."buffer-equals"."1.0.3";
+  by-version."buffer-equals"."1.0.3" = self.buildNodePackage {
+    name = "buffer-equals-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/buffer-equals/-/buffer-equals-1.0.3.tgz";
+      name = "buffer-equals-1.0.3.tgz";
+      sha1 = "9e9b8c160a5ceaf68f12ee5a8d2f4ba91c5453e0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffer-xor"."^1.0.2" =
+    self.by-version."buffer-xor"."1.0.3";
+  by-version."buffer-xor"."1.0.3" = self.buildNodePackage {
+    name = "buffer-xor-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz";
+      name = "buffer-xor-1.0.3.tgz";
+      sha1 = "26e61ed1422fb70dd42e6e36729ed51d855fe8d9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buffercursor".">= 0.0.12" =
+    self.by-version."buffercursor"."0.0.12";
+  by-version."buffercursor"."0.0.12" = self.buildNodePackage {
+    name = "buffercursor-0.0.12";
+    version = "0.0.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz";
-      name = "buffers-0.1.1.tgz";
-      sha1 = "b24579c3bed4d6d396aeee6d9a8ae7f5482ab7bb";
+      url = "https://registry.npmjs.org/buffercursor/-/buffercursor-0.0.12.tgz";
+      name = "buffercursor-0.0.12.tgz";
+      sha1 = "78a9a7f4343ae7d820a8999acc80de591e25a779";
     };
     deps = {
+      "verror-1.6.1" = self.by-version."verror"."1.6.1";
     };
     optionalDependencies = {
     };
@@ -5682,15 +6185,15 @@
     cpu = [ ];
   };
   by-spec."buffertools"."*" =
-    self.by-version."buffertools"."2.1.2";
-  by-version."buffertools"."2.1.2" = self.buildNodePackage {
-    name = "buffertools-2.1.2";
-    version = "2.1.2";
+    self.by-version."buffertools"."2.1.3";
+  by-version."buffertools"."2.1.3" = self.buildNodePackage {
+    name = "buffertools-2.1.3";
+    version = "2.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buffertools/-/buffertools-2.1.2.tgz";
-      name = "buffertools-2.1.2.tgz";
-      sha1 = "d667afc1ef8b9932e90a25f2e3a66a929d42daab";
+      url = "https://registry.npmjs.org/buffertools/-/buffertools-2.1.3.tgz";
+      name = "buffertools-2.1.3.tgz";
+      sha1 = "34d3bf0565ed79e29877c2a6217ccfce9a3b3423";
     };
     deps = {
     };
@@ -5700,21 +6203,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "buffertools" = self.by-version."buffertools"."2.1.2";
-  by-spec."bufferutil"."1.0.x" =
-    self.by-version."bufferutil"."1.0.1";
-  by-version."bufferutil"."1.0.1" = self.buildNodePackage {
-    name = "bufferutil-1.0.1";
-    version = "1.0.1";
+  "buffertools" = self.by-version."buffertools"."2.1.3";
+  by-spec."bufferutil"."1.2.x" =
+    self.by-version."bufferutil"."1.2.1";
+  by-version."bufferutil"."1.2.1" = self.buildNodePackage {
+    name = "bufferutil-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bufferutil/-/bufferutil-1.0.1.tgz";
-      name = "bufferutil-1.0.1.tgz";
-      sha1 = "0c53a9ffe8d616c4e2df27d00b808f7a25501e3b";
+      url = "https://registry.npmjs.org/bufferutil/-/bufferutil-1.2.1.tgz";
+      name = "bufferutil-1.2.1.tgz";
+      sha1 = "37be5d36e1e06492221e68d474b1ac58e510cbd7";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -5729,7 +6232,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz";
+      url = "https://registry.npmjs.org/bufferview/-/bufferview-1.0.1.tgz";
       name = "bufferview-1.0.1.tgz";
       sha1 = "7afd74a45f937fa422a1d338c08bbfdc76cd725d";
     };
@@ -5741,23 +6244,48 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."buildmail"."^1.2.0" =
-    self.by-version."buildmail"."1.2.4";
-  by-version."buildmail"."1.2.4" = self.buildNodePackage {
-    name = "buildmail-1.2.4";
-    version = "1.2.4";
+  by-spec."buildmail"."3.6.0" =
+    self.by-version."buildmail"."3.6.0";
+  by-version."buildmail"."3.6.0" = self.buildNodePackage {
+    name = "buildmail-3.6.0";
+    version = "3.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/buildmail/-/buildmail-3.6.0.tgz";
+      name = "buildmail-3.6.0.tgz";
+      sha1 = "460088de78b4ad6b5475cdc88370212b77081617";
+    };
+    deps = {
+      "addressparser-1.0.1" = self.by-version."addressparser"."1.0.1";
+      "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
+      "libmime-2.0.3" = self.by-version."libmime"."2.0.3";
+      "libqp-1.1.0" = self.by-version."libqp"."1.1.0";
+      "nodemailer-fetch-1.3.0" = self.by-version."nodemailer-fetch"."1.3.0";
+      "nodemailer-shared-1.0.4" = self.by-version."nodemailer-shared"."1.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."buildmail"."^1.2.4" =
+    self.by-version."buildmail"."1.3.0";
+  by-version."buildmail"."1.3.0" = self.buildNodePackage {
+    name = "buildmail-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/buildmail/-/buildmail-1.2.4.tgz";
-      name = "buildmail-1.2.4.tgz";
-      sha1 = "b59ce7e5e2a5b4d79e397740f8aa66307b758b91";
+      url = "https://registry.npmjs.org/buildmail/-/buildmail-1.3.0.tgz";
+      name = "buildmail-1.3.0.tgz";
+      sha1 = "f5e4b75026147d5ebe1a24dc61312a3cff4df725";
     };
     deps = {
       "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2";
-      "hyperquest-1.2.0" = self.by-version."hyperquest"."1.2.0";
+      "hyperquest-1.3.0" = self.by-version."hyperquest"."1.3.0";
       "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
-      "libmime-1.0.0" = self.by-version."libmime"."1.0.0";
-      "libqp-1.0.0" = self.by-version."libqp"."1.0.0";
+      "libmime-1.2.0" = self.by-version."libmime"."1.2.0";
+      "libqp-1.1.0" = self.by-version."libqp"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -5765,16 +6293,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."builtins"."0.0.7" =
-    self.by-version."builtins"."0.0.7";
-  by-version."builtins"."0.0.7" = self.buildNodePackage {
-    name = "builtins-0.0.7";
-    version = "0.0.7";
+  by-spec."builtin-modules"."^1.0.0" =
+    self.by-version."builtin-modules"."1.1.1";
+  by-version."builtin-modules"."1.1.1" = self.buildNodePackage {
+    name = "builtin-modules-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
-      name = "builtins-0.0.7.tgz";
-      sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
+      url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
+      name = "builtin-modules-1.1.1.tgz";
+      sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
     };
     deps = {
     };
@@ -5784,21 +6312,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."builtins"."~0.0.3" =
+  by-spec."builtin-status-codes"."^2.0.0" =
+    self.by-version."builtin-status-codes"."2.0.0";
+  by-version."builtin-status-codes"."2.0.0" = self.buildNodePackage {
+    name = "builtin-status-codes-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-2.0.0.tgz";
+      name = "builtin-status-codes-2.0.0.tgz";
+      sha1 = "6f22003baacf003ccd287afe6872151fddc58579";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."builtins"."0.0.7" =
     self.by-version."builtins"."0.0.7";
-  by-spec."bunker"."0.1.X" =
-    self.by-version."bunker"."0.1.2";
-  by-version."bunker"."0.1.2" = self.buildNodePackage {
-    name = "bunker-0.1.2";
-    version = "0.1.2";
+  by-version."builtins"."0.0.7" = self.buildNodePackage {
+    name = "builtins-0.0.7";
+    version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bunker/-/bunker-0.1.2.tgz";
-      name = "bunker-0.1.2.tgz";
-      sha1 = "c88992464a8e2a6ede86930375f92b58077ef97c";
+      url = "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz";
+      name = "builtins-0.0.7.tgz";
+      sha1 = "355219cd6cf18dbe7c01cc7fd2dce765cfdc549a";
     };
     deps = {
-      "burrito-0.2.12" = self.by-version."burrito"."0.2.12";
     };
     optionalDependencies = {
     };
@@ -5806,6 +6350,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."builtins"."~0.0.3" =
+    self.by-version."builtins"."0.0.7";
   by-spec."bunyan"."0.22.1" =
     self.by-version."bunyan"."0.22.1";
   by-version."bunyan"."0.22.1" = self.buildNodePackage {
@@ -5813,7 +6359,7 @@
     version = "0.22.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz";
+      url = "https://registry.npmjs.org/bunyan/-/bunyan-0.22.1.tgz";
       name = "bunyan-0.22.1.tgz";
       sha1 = "020c383bed625af5c6c8834dd8c4aca0dd0f765c";
     };
@@ -5827,22 +6373,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bunyan"."1.3.4" =
-    self.by-version."bunyan"."1.3.4";
-  by-version."bunyan"."1.3.4" = self.buildNodePackage {
-    name = "bunyan-1.3.4";
-    version = "1.3.4";
+  by-spec."bunyan"."1.5.1" =
+    self.by-version."bunyan"."1.5.1";
+  by-version."bunyan"."1.5.1" = self.buildNodePackage {
+    name = "bunyan-1.5.1";
+    version = "1.5.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan/-/bunyan-1.3.4.tgz";
-      name = "bunyan-1.3.4.tgz";
-      sha1 = "0ef916d497912896ca4080e0f8764bd408735c8c";
+      url = "https://registry.npmjs.org/bunyan/-/bunyan-1.5.1.tgz";
+      name = "bunyan-1.5.1.tgz";
+      sha1 = "5f6e7d44c43b952f56b0f41309e3ab12391b4e2d";
     };
     deps = {
     };
     optionalDependencies = {
-      "dtrace-provider-0.4.0" = self.by-version."dtrace-provider"."0.4.0";
-      "mv-2.0.3" = self.by-version."mv"."2.0.3";
+      "dtrace-provider-0.6.0" = self.by-version."dtrace-provider"."0.6.0";
+      "mv-2.1.1" = self.by-version."mv"."2.1.1";
       "safe-json-stringify-1.0.3" = self.by-version."safe-json-stringify"."1.0.3";
     };
     peerDependencies = [];
@@ -5850,29 +6396,30 @@
     cpu = [ ];
   };
   by-spec."bunyan".">=0.22.1 <2.0.0-0" =
-    self.by-version."bunyan"."1.3.5";
-  by-version."bunyan"."1.3.5" = self.buildNodePackage {
-    name = "bunyan-1.3.5";
-    version = "1.3.5";
+    self.by-version."bunyan"."1.8.0";
+  by-version."bunyan"."1.8.0" = self.buildNodePackage {
+    name = "bunyan-1.8.0";
+    version = "1.8.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan/-/bunyan-1.3.5.tgz";
-      name = "bunyan-1.3.5.tgz";
-      sha1 = "49803cee624667132484b535e1831e7a777791b0";
+      url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.0.tgz";
+      name = "bunyan-1.8.0.tgz";
+      sha1 = "8a4d4cc1dbb144f5298eb86c10431a934f8df053";
     };
     deps = {
     };
     optionalDependencies = {
-      "dtrace-provider-0.4.0" = self.by-version."dtrace-provider"."0.4.0";
-      "mv-2.0.3" = self.by-version."mv"."2.0.3";
+      "dtrace-provider-0.6.0" = self.by-version."dtrace-provider"."0.6.0";
+      "mv-2.1.1" = self.by-version."mv"."2.1.1";
       "safe-json-stringify-1.0.3" = self.by-version."safe-json-stringify"."1.0.3";
+      "moment-2.12.0" = self.by-version."moment"."2.12.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bunyan"."^1.2.3" =
-    self.by-version."bunyan"."1.3.5";
+  by-spec."bunyan"."^1.4.0" =
+    self.by-version."bunyan"."1.8.0";
   by-spec."bunyan"."~1.0.0" =
     self.by-version."bunyan"."1.0.1";
   by-version."bunyan"."1.0.1" = self.buildNodePackage {
@@ -5880,53 +6427,32 @@
     version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bunyan/-/bunyan-1.0.1.tgz";
+      url = "https://registry.npmjs.org/bunyan/-/bunyan-1.0.1.tgz";
       name = "bunyan-1.0.1.tgz";
       sha1 = "9916a8c1832020c2d095656d923da5963db05466";
     };
     deps = {
     };
     optionalDependencies = {
-      "mv-2.0.3" = self.by-version."mv"."2.0.3";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."burrito".">=0.2.5 <0.3" =
-    self.by-version."burrito"."0.2.12";
-  by-version."burrito"."0.2.12" = self.buildNodePackage {
-    name = "burrito-0.2.12";
-    version = "0.2.12";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/burrito/-/burrito-0.2.12.tgz";
-      name = "burrito-0.2.12.tgz";
-      sha1 = "d0d6e6ac81d5e99789c6fa4accb0b0031ea54f6b";
-    };
-    deps = {
-      "traverse-0.5.2" = self.by-version."traverse"."0.5.2";
-      "uglify-js-1.1.1" = self.by-version."uglify-js"."1.1.1";
-    };
-    optionalDependencies = {
+      "mv-2.1.1" = self.by-version."mv"."2.1.1";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."busboy"."~0.2.9" =
-    self.by-version."busboy"."0.2.9";
-  by-version."busboy"."0.2.9" = self.buildNodePackage {
-    name = "busboy-0.2.9";
-    version = "0.2.9";
+  by-spec."busboy"."*" =
+    self.by-version."busboy"."0.2.13";
+  by-version."busboy"."0.2.13" = self.buildNodePackage {
+    name = "busboy-0.2.13";
+    version = "0.2.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/busboy/-/busboy-0.2.9.tgz";
-      name = "busboy-0.2.9.tgz";
-      sha1 = "a0a181e78b19dee76974560f55843b09eaea7376";
+      url = "https://registry.npmjs.org/busboy/-/busboy-0.2.13.tgz";
+      name = "busboy-0.2.13.tgz";
+      sha1 = "90fc4f6a3967d815616fc976bfa8e56aed0c58b6";
     };
     deps = {
-      "dicer-0.2.3" = self.by-version."dicer"."0.2.3";
+      "dicer-0.2.5" = self.by-version."dicer"."0.2.5";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     optionalDependencies = {
@@ -5935,19 +6461,21 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."busboy"."~0.2.9" =
+    self.by-version."busboy"."0.2.13";
   by-spec."bytebuffer"."~3 >=3.5" =
-    self.by-version."bytebuffer"."3.5.4";
-  by-version."bytebuffer"."3.5.4" = self.buildNodePackage {
-    name = "bytebuffer-3.5.4";
-    version = "3.5.4";
+    self.by-version."bytebuffer"."3.5.5";
+  by-version."bytebuffer"."3.5.5" = self.buildNodePackage {
+    name = "bytebuffer-3.5.5";
+    version = "3.5.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.4.tgz";
-      name = "bytebuffer-3.5.4.tgz";
-      sha1 = "436e2733174f96aaa978b0926749e83fa162e786";
+      url = "https://registry.npmjs.org/bytebuffer/-/bytebuffer-3.5.5.tgz";
+      name = "bytebuffer-3.5.5.tgz";
+      sha1 = "7a6faf1a13514b083f1fcf9541c4c9bfbe7e7fd3";
     };
     deps = {
-      "long-2.2.3" = self.by-version."long"."2.2.3";
+      "long-2.4.0" = self.by-version."long"."2.4.0";
       "bufferview-1.0.1" = self.by-version."bufferview"."1.0.1";
     };
     optionalDependencies = {
@@ -5963,7 +6491,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
+      url = "https://registry.npmjs.org/bytes/-/bytes-0.1.0.tgz";
       name = "bytes-0.1.0.tgz";
       sha1 = "c574812228126d6369d1576925a8579db3f8e5a2";
     };
@@ -5982,7 +6510,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
+      url = "https://registry.npmjs.org/bytes/-/bytes-0.2.0.tgz";
       name = "bytes-0.2.0.tgz";
       sha1 = "aad33ec14e3dc2ca74e8e7d451f9ba053ad4f7a0";
     };
@@ -6001,7 +6529,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
+      url = "https://registry.npmjs.org/bytes/-/bytes-0.2.1.tgz";
       name = "bytes-0.2.1.tgz";
       sha1 = "555b08abcb063f8975905302523e4cd4ffdfdf31";
     };
@@ -6020,7 +6548,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
+      url = "https://registry.npmjs.org/bytes/-/bytes-0.3.0.tgz";
       name = "bytes-0.3.0.tgz";
       sha1 = "78e2e0e28c7f9c7b988ea8aee0db4d5fa9941935";
     };
@@ -6039,7 +6567,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
+      url = "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz";
       name = "bytes-1.0.0.tgz";
       sha1 = "3569ede8ba34315fab99c3e92cb04c7220de1fa8";
     };
@@ -6053,23 +6581,141 @@
   };
   by-spec."bytes"."1.0.0" =
     self.by-version."bytes"."1.0.0";
+  by-spec."bytes"."2.1.0" =
+    self.by-version."bytes"."2.1.0";
+  by-version."bytes"."2.1.0" = self.buildNodePackage {
+    name = "bytes-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz";
+      name = "bytes-2.1.0.tgz";
+      sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bytes"."2.2.0" =
+    self.by-version."bytes"."2.2.0";
+  by-version."bytes"."2.2.0" = self.buildNodePackage {
+    name = "bytes-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz";
+      name = "bytes-2.2.0.tgz";
+      sha1 = "fd35464a403f6f9117c2de3609ecff9cae000588";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bytes"."2.3.0" =
+    self.by-version."bytes"."2.3.0";
+  by-version."bytes"."2.3.0" = self.buildNodePackage {
+    name = "bytes-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bytes/-/bytes-2.3.0.tgz";
+      name = "bytes-2.3.0.tgz";
+      sha1 = "d5b680a165b6201739acb611542aabc2d8ceb070";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."bytes"."~0.2.0" =
     self.by-version."bytes"."0.2.1";
   by-spec."bytes"."~0.3.0" =
     self.by-version."bytes"."0.3.0";
-  by-spec."bytewise"."~0.7.1" =
-    self.by-version."bytewise"."0.7.1";
-  by-version."bytewise"."0.7.1" = self.buildNodePackage {
-    name = "bytewise-0.7.1";
-    version = "0.7.1";
+  by-spec."bytewise"."~1.1.0" =
+    self.by-version."bytewise"."1.1.0";
+  by-version."bytewise"."1.1.0" = self.buildNodePackage {
+    name = "bytewise-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz";
+      name = "bytewise-1.1.0.tgz";
+      sha1 = "1d13cbff717ae7158094aa881b35d081b387253e";
+    };
+    deps = {
+      "bytewise-core-1.2.3" = self.by-version."bytewise-core"."1.2.3";
+      "typewise-1.0.3" = self.by-version."typewise"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."bytewise-core"."^1.2.2" =
+    self.by-version."bytewise-core"."1.2.3";
+  by-version."bytewise-core"."1.2.3" = self.buildNodePackage {
+    name = "bytewise-core-1.2.3";
+    version = "1.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz";
+      name = "bytewise-core-1.2.3.tgz";
+      sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42";
+    };
+    deps = {
+      "typewise-core-1.2.0" = self.by-version."typewise-core"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caller"."~0.0.1" =
+    self.by-version."caller"."0.0.1";
+  by-version."caller"."0.0.1" = self.buildNodePackage {
+    name = "caller-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/caller/-/caller-0.0.1.tgz";
+      name = "caller-0.0.1.tgz";
+      sha1 = "f37a1d6ea10e829d94721ae29a90bb4fb52ab767";
+    };
+    deps = {
+      "tape-2.3.3" = self.by-version."tape"."2.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."caller-path"."^0.1.0" =
+    self.by-version."caller-path"."0.1.0";
+  by-version."caller-path"."0.1.0" = self.buildNodePackage {
+    name = "caller-path-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bytewise/-/bytewise-0.7.1.tgz";
-      name = "bytewise-0.7.1.tgz";
-      sha1 = "43a479d763c85256d5467c8fe05a734f4f2eac2e";
+      url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz";
+      name = "caller-path-0.1.0.tgz";
+      sha1 = "94085ef63581ecd3daa92444a8fe94e82577751f";
     };
     deps = {
-      "bops-0.1.1" = self.by-version."bops"."0.1.1";
+      "callsites-0.2.0" = self.by-version."callsites"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -6084,7 +6730,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+      url = "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
       name = "callsite-1.0.0.tgz";
       sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
     };
@@ -6096,18 +6742,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."callsite"."~1.0.0" =
-    self.by-version."callsite"."1.0.0";
+  by-spec."callsites"."^0.2.0" =
+    self.by-version."callsites"."0.2.0";
+  by-version."callsites"."0.2.0" = self.buildNodePackage {
+    name = "callsites-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz";
+      name = "callsites-0.2.0.tgz";
+      sha1 = "afab96262910a7f33c19a5775825c69f34e350ca";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."camelcase"."^1.0.1" =
-    self.by-version."camelcase"."1.0.2";
-  by-version."camelcase"."1.0.2" = self.buildNodePackage {
-    name = "camelcase-1.0.2";
-    version = "1.0.2";
+    self.by-version."camelcase"."1.2.1";
+  by-version."camelcase"."1.2.1" = self.buildNodePackage {
+    name = "camelcase-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/camelcase/-/camelcase-1.0.2.tgz";
-      name = "camelcase-1.0.2.tgz";
-      sha1 = "7912eac1d496836782c976c2d73e874dc54f2eaf";
+      url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz";
+      name = "camelcase-1.2.1.tgz";
+      sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39";
     };
     deps = {
     };
@@ -6118,7 +6781,30 @@
     cpu = [ ];
   };
   by-spec."camelcase"."^1.0.2" =
-    self.by-version."camelcase"."1.0.2";
+    self.by-version."camelcase"."1.2.1";
+  by-spec."camelcase"."^1.2.1" =
+    self.by-version."camelcase"."1.2.1";
+  by-spec."camelcase"."^2.0.0" =
+    self.by-version."camelcase"."2.1.1";
+  by-version."camelcase"."2.1.1" = self.buildNodePackage {
+    name = "camelcase-2.1.1";
+    version = "2.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz";
+      name = "camelcase-2.1.1.tgz";
+      sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."camelcase"."^2.0.1" =
+    self.by-version."camelcase"."2.1.1";
   by-spec."camelcase-keys"."^1.0.0" =
     self.by-version."camelcase-keys"."1.0.0";
   by-version."camelcase-keys"."1.0.0" = self.buildNodePackage {
@@ -6126,13 +6812,13 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
+      url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz";
       name = "camelcase-keys-1.0.0.tgz";
       sha1 = "bd1a11bf9b31a1ce493493a930de1a0baf4ad7ec";
     };
     deps = {
-      "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2";
-      "map-obj-1.0.0" = self.by-version."map-obj"."1.0.0";
+      "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1";
+      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -6140,20 +6826,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cardinal"."0.4.4" =
-    self.by-version."cardinal"."0.4.4";
-  by-version."cardinal"."0.4.4" = self.buildNodePackage {
-    name = "cardinal-0.4.4";
-    version = "0.4.4";
-    bin = true;
+  by-spec."camelcase-keys"."^2.0.0" =
+    self.by-version."camelcase-keys"."2.1.0";
+  by-version."camelcase-keys"."2.1.0" = self.buildNodePackage {
+    name = "camelcase-keys-2.1.0";
+    version = "2.1.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cardinal/-/cardinal-0.4.4.tgz";
-      name = "cardinal-0.4.4.tgz";
-      sha1 = "ca5bb68a5b511b90fe93b9acea49bdee5c32bfe2";
+      url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
+      name = "camelcase-keys-2.1.0.tgz";
+      sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
     };
     deps = {
-      "redeyed-0.4.4" = self.by-version."redeyed"."0.4.4";
-      "ansicolors-0.2.1" = self.by-version."ansicolors"."0.2.1";
+      "camelcase-2.1.1" = self.by-version."camelcase"."2.1.1";
+      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -6161,16 +6847,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."caseless"."~0.6.0" =
-    self.by-version."caseless"."0.6.0";
-  by-version."caseless"."0.6.0" = self.buildNodePackage {
-    name = "caseless-0.6.0";
-    version = "0.6.0";
+  by-spec."caseless"."~0.11.0" =
+    self.by-version."caseless"."0.11.0";
+  by-version."caseless"."0.11.0" = self.buildNodePackage {
+    name = "caseless-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
-      name = "caseless-0.6.0.tgz";
-      sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
+      url = "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+      name = "caseless-0.11.0.tgz";
+      sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
     };
     deps = {
     };
@@ -6180,16 +6866,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."caseless"."~0.7.0" =
-    self.by-version."caseless"."0.7.0";
-  by-version."caseless"."0.7.0" = self.buildNodePackage {
-    name = "caseless-0.7.0";
-    version = "0.7.0";
+  by-spec."caseless"."~0.6.0" =
+    self.by-version."caseless"."0.6.0";
+  by-version."caseless"."0.6.0" = self.buildNodePackage {
+    name = "caseless-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.7.0.tgz";
-      name = "caseless-0.7.0.tgz";
-      sha1 = "cbd705ae6229158bb0bc971bf7d7a04bdbd51ff8";
+      url = "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz";
+      name = "caseless-0.6.0.tgz";
+      sha1 = "8167c1ab8397fb5bb95f96d28e5a81c50f247ac4";
     };
     deps = {
     };
@@ -6206,7 +6892,7 @@
     version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
+      url = "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz";
       name = "caseless-0.8.0.tgz";
       sha1 = "5bca2881d41437f54b2407ebe34888c7b9ad4f7d";
     };
@@ -6225,7 +6911,7 @@
     version = "0.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
+      url = "https://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
       name = "caseless-0.9.0.tgz";
       sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
     };
@@ -6238,40 +6924,40 @@
     cpu = [ ];
   };
   by-spec."castnow"."*" =
-    self.by-version."castnow"."0.4.13";
-  by-version."castnow"."0.4.13" = self.buildNodePackage {
-    name = "castnow-0.4.13";
-    version = "0.4.13";
+    self.by-version."castnow"."0.4.15";
+  by-version."castnow"."0.4.15" = self.buildNodePackage {
+    name = "castnow-0.4.15";
+    version = "0.4.15";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/castnow/-/castnow-0.4.13.tgz";
-      name = "castnow-0.4.13.tgz";
-      sha1 = "8bb190fb7bffbfc9918b2d226c78905994200e4b";
+      url = "https://registry.npmjs.org/castnow/-/castnow-0.4.15.tgz";
+      name = "castnow-0.4.15.tgz";
+      sha1 = "bd4867334e7cb0df5f53b851021b3da8772fca68";
     };
     deps = {
       "array-loop-1.0.0" = self.by-version."array-loop"."1.0.0";
-      "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
+      "castv2-client-1.1.1" = self.by-version."castv2-client"."1.1.1";
       "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "chromecast-player-0.2.2" = self.by-version."chromecast-player"."0.2.2";
+      "chromecast-player-0.2.3" = self.by-version."chromecast-player"."0.2.3";
       "debounced-seeker-1.0.0" = self.by-version."debounced-seeker"."1.0.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "fs-extended-0.2.0" = self.by-version."fs-extended"."0.2.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "fs-extended-0.2.1" = self.by-version."fs-extended"."0.2.1";
       "get-youtube-id-0.1.3" = self.by-version."get-youtube-id"."0.1.3";
       "got-1.2.2" = self.by-version."got"."1.2.2";
-      "internal-ip-1.0.0" = self.by-version."internal-ip"."1.0.0";
+      "internal-ip-1.2.0" = self.by-version."internal-ip"."1.2.0";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "peerflix-0.29.2" = self.by-version."peerflix"."0.29.2";
       "playerui-1.2.0" = self.by-version."playerui"."1.2.0";
-      "query-string-1.0.0" = self.by-version."query-string"."1.0.0";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "query-string-1.0.1" = self.by-version."query-string"."1.0.1";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
       "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
       "router-0.6.2" = self.by-version."router"."0.6.2";
-      "srt2vtt-1.2.0" = self.by-version."srt2vtt"."1.2.0";
+      "srt2vtt-1.3.1" = self.by-version."srt2vtt"."1.3.1";
       "stream-transcoder-0.0.5" = self.by-version."stream-transcoder"."0.0.5";
-      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -6279,20 +6965,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "castnow" = self.by-version."castnow"."0.4.13";
+  "castnow" = self.by-version."castnow"."0.4.15";
   by-spec."castv2"."~0.1.4" =
-    self.by-version."castv2"."0.1.4";
-  by-version."castv2"."0.1.4" = self.buildNodePackage {
-    name = "castv2-0.1.4";
-    version = "0.1.4";
+    self.by-version."castv2"."0.1.6";
+  by-version."castv2"."0.1.6" = self.buildNodePackage {
+    name = "castv2-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/castv2/-/castv2-0.1.4.tgz";
-      name = "castv2-0.1.4.tgz";
-      sha1 = "f67a8bc4883dc0e1ba0e66ae937c3c9f9914974b";
+      url = "https://registry.npmjs.org/castv2/-/castv2-0.1.6.tgz";
+      name = "castv2-0.1.6.tgz";
+      sha1 = "4465c75684dbac6ad21c93761aa86557da9e0015";
     };
     deps = {
-      "debug-0.8.1" = self.by-version."debug"."0.8.1";
+      "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "protobufjs-3.8.2" = self.by-version."protobufjs"."3.8.2";
     };
     optionalDependencies = {
@@ -6301,20 +6987,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."castv2-client"."0.0.8" =
-    self.by-version."castv2-client"."0.0.8";
-  by-version."castv2-client"."0.0.8" = self.buildNodePackage {
-    name = "castv2-client-0.0.8";
-    version = "0.0.8";
+  by-spec."castv2-client"."^1.1.0" =
+    self.by-version."castv2-client"."1.1.1";
+  by-version."castv2-client"."1.1.1" = self.buildNodePackage {
+    name = "castv2-client-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/castv2-client/-/castv2-client-0.0.8.tgz";
-      name = "castv2-client-0.0.8.tgz";
-      sha1 = "a47adf5cc10575e2a71f3b05eb2b72c8d26bbbdc";
+      url = "https://registry.npmjs.org/castv2-client/-/castv2-client-1.1.1.tgz";
+      name = "castv2-client-1.1.1.tgz";
+      sha1 = "3014b89b830b424f72c17708beb2a1c4e7b1fc88";
     };
     deps = {
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
-      "castv2-0.1.4" = self.by-version."castv2"."0.1.4";
+      "castv2-0.1.6" = self.by-version."castv2"."0.1.6";
     };
     optionalDependencies = {
     };
@@ -6322,20 +7008,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chai"."*" =
-    self.by-version."chai"."2.2.0";
-  by-version."chai"."2.2.0" = self.buildNodePackage {
-    name = "chai-2.2.0";
-    version = "2.2.0";
+  by-spec."center-align"."^0.1.1" =
+    self.by-version."center-align"."0.1.3";
+  by-version."center-align"."0.1.3" = self.buildNodePackage {
+    name = "center-align-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chai/-/chai-2.2.0.tgz";
-      name = "chai-2.2.0.tgz";
-      sha1 = "d21135623bd393ad4702d94536eca482ad78d01d";
+      url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz";
+      name = "center-align-0.1.3.tgz";
+      sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad";
     };
     deps = {
-      "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
-      "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
+      "align-text-0.1.4" = self.by-version."align-text"."0.1.4";
+      "lazy-cache-1.0.3" = self.by-version."lazy-cache"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -6343,22 +7029,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "chai" = self.by-version."chai"."2.2.0";
-  by-spec."chain-node".">=0.0.17" =
-    self.by-version."chain-node"."3.1.0";
-  by-version."chain-node"."3.1.0" = self.buildNodePackage {
-    name = "chain-node-3.1.0";
-    version = "3.1.0";
+  by-spec."chai"."*" =
+    self.by-version."chai"."3.5.0";
+  by-version."chai"."3.5.0" = self.buildNodePackage {
+    name = "chai-3.5.0";
+    version = "3.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chain-node/-/chain-node-3.1.0.tgz";
-      name = "chain-node-3.1.0.tgz";
-      sha1 = "13eca851bbf3ed20877ce15b725ebb7a5c60e54b";
+      url = "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz";
+      name = "chai-3.5.0.tgz";
+      sha1 = "4d02637b067fe958bdbfdd3a40ec56fef7373247";
     };
     deps = {
-      "request-2.36.0" = self.by-version."request"."2.36.0";
-      "bitcoinjs-lib-1.2.0" = self.by-version."bitcoinjs-lib"."1.2.0";
-      "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
+      "assertion-error-1.0.1" = self.by-version."assertion-error"."1.0.1";
+      "deep-eql-0.1.3" = self.by-version."deep-eql"."0.1.3";
+      "type-detect-1.0.0" = self.by-version."type-detect"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -6366,19 +7051,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chainsaw"."~0.1.0" =
-    self.by-version."chainsaw"."0.1.0";
-  by-version."chainsaw"."0.1.0" = self.buildNodePackage {
-    name = "chainsaw-0.1.0";
-    version = "0.1.0";
+  "chai" = self.by-version."chai"."3.5.0";
+  by-spec."chain-node".">=0.0.17" =
+    self.by-version."chain-node"."3.1.2";
+  by-version."chain-node"."3.1.2" = self.buildNodePackage {
+    name = "chain-node-3.1.2";
+    version = "3.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz";
-      name = "chainsaw-0.1.0.tgz";
-      sha1 = "5eab50b28afe58074d0d58291388828b5e5fbc98";
+      url = "https://registry.npmjs.org/chain-node/-/chain-node-3.1.2.tgz";
+      name = "chain-node-3.1.2.tgz";
+      sha1 = "75cb8d02e06732027eed3bebe145d92c93a6fc9b";
     };
     deps = {
-      "traverse-0.3.9" = self.by-version."traverse"."0.3.9";
+      "request-2.36.0" = self.by-version."request"."2.36.0";
+      "bitcoinjs-lib-1.2.0" = self.by-version."bitcoinjs-lib"."1.2.0";
+      "bigi-1.4.1" = self.by-version."bigi"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -6393,13 +7081,13 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
+      url = "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
       name = "chalk-1.0.0.tgz";
       sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
     };
     deps = {
-      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
-      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "ansi-styles-2.2.1" = self.by-version."ansi-styles"."2.2.1";
+      "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5";
       "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
       "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
       "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
@@ -6410,20 +7098,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chalk"."^0.5.0" =
+  by-spec."chalk"."^0.5.1" =
     self.by-version."chalk"."0.5.1";
   by-version."chalk"."0.5.1" = self.buildNodePackage {
     name = "chalk-0.5.1";
     version = "0.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
+      url = "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz";
       name = "chalk-0.5.1.tgz";
       sha1 = "663b3a648b68b55d04690d49167aa837858f2174";
     };
     deps = {
       "ansi-styles-1.1.0" = self.by-version."ansi-styles"."1.1.0";
-      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
+      "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5";
       "has-ansi-0.1.0" = self.by-version."has-ansi"."0.1.0";
       "strip-ansi-0.3.0" = self.by-version."strip-ansi"."0.3.0";
       "supports-color-0.2.0" = self.by-version."supports-color"."0.2.0";
@@ -6434,22 +7122,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chalk"."^0.5.1" =
-    self.by-version."chalk"."0.5.1";
   by-spec."chalk"."^1.0.0" =
-    self.by-version."chalk"."1.0.0";
-  by-spec."char-spinner"."~1.0.1" =
-    self.by-version."char-spinner"."1.0.1";
-  by-version."char-spinner"."1.0.1" = self.buildNodePackage {
-    name = "char-spinner-1.0.1";
-    version = "1.0.1";
+    self.by-version."chalk"."1.1.3";
+  by-version."chalk"."1.1.3" = self.buildNodePackage {
+    name = "chalk-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
-      name = "char-spinner-1.0.1.tgz";
-      sha1 = "e6ea67bd247e107112983b7ab0479ed362800081";
+      url = "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz";
+      name = "chalk-1.1.3.tgz";
+      sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98";
     };
     deps = {
+      "ansi-styles-2.2.1" = self.by-version."ansi-styles"."2.2.1";
+      "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5";
+      "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -6457,16 +7146,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."character-parser"."1.2.0" =
-    self.by-version."character-parser"."1.2.0";
-  by-version."character-parser"."1.2.0" = self.buildNodePackage {
-    name = "character-parser-1.2.0";
-    version = "1.2.0";
+  by-spec."chalk"."^1.1.1" =
+    self.by-version."chalk"."1.1.3";
+  by-spec."chalk"."^1.1.3" =
+    self.by-version."chalk"."1.1.3";
+  by-spec."chalk"."~1.1.1" =
+    self.by-version."chalk"."1.1.3";
+  by-spec."char-spinner"."~1.0.1" =
+    self.by-version."char-spinner"."1.0.1";
+  by-version."char-spinner"."1.0.1" = self.buildNodePackage {
+    name = "char-spinner-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.0.tgz";
-      name = "character-parser-1.2.0.tgz";
-      sha1 = "94134d6e5d870a39be359f7d22460935184ddef6";
+      url = "https://registry.npmjs.org/char-spinner/-/char-spinner-1.0.1.tgz";
+      name = "char-spinner-1.0.1.tgz";
+      sha1 = "e6ea67bd247e107112983b7ab0479ed362800081";
     };
     deps = {
     };
@@ -6483,7 +7178,7 @@
     version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
+      url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz";
       name = "character-parser-1.2.1.tgz";
       sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6";
     };
@@ -6495,16 +7190,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."charm"."0.1.x" =
-    self.by-version."charm"."0.1.2";
-  by-version."charm"."0.1.2" = self.buildNodePackage {
-    name = "charm-0.1.2";
-    version = "0.1.2";
+  by-spec."charenc"."~ 0.0.1" =
+    self.by-version."charenc"."0.0.1";
+  by-version."charenc"."0.0.1" = self.buildNodePackage {
+    name = "charenc-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/charm/-/charm-0.1.2.tgz";
-      name = "charm-0.1.2.tgz";
-      sha1 = "06c21eed1a1b06aeb67553cdc53e23274bac2296";
+      url = "https://registry.npmjs.org/charenc/-/charenc-0.0.1.tgz";
+      name = "charenc-0.0.1.tgz";
+      sha1 = "004cff9feaf102382ed12db58dd6f962796d6e88";
     };
     deps = {
     };
@@ -6514,23 +7209,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cheerio"."0.18.0" =
-    self.by-version."cheerio"."0.18.0";
-  by-version."cheerio"."0.18.0" = self.buildNodePackage {
-    name = "cheerio-0.18.0";
-    version = "0.18.0";
+  by-spec."cheerio"."0.19.0" =
+    self.by-version."cheerio"."0.19.0";
+  by-version."cheerio"."0.19.0" = self.buildNodePackage {
+    name = "cheerio-0.19.0";
+    version = "0.19.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cheerio/-/cheerio-0.18.0.tgz";
-      name = "cheerio-0.18.0.tgz";
-      sha1 = "4e1c06377e725b740e996e0dfec353863de677fa";
+      url = "https://registry.npmjs.org/cheerio/-/cheerio-0.19.0.tgz";
+      name = "cheerio-0.19.0.tgz";
+      sha1 = "772e7015f2ee29965096d71ea4175b75ab354925";
     };
     deps = {
-      "CSSselect-0.4.1" = self.by-version."CSSselect"."0.4.1";
+      "css-select-1.0.0" = self.by-version."css-select"."1.0.0";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
-      "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3";
+      "dom-serializer-0.1.0" = self.by-version."dom-serializer"."0.1.0";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
     };
     optionalDependencies = {
     };
@@ -6545,7 +7240,7 @@
     version = "0.17.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz";
+      url = "https://registry.npmjs.org/cheerio/-/cheerio-0.17.0.tgz";
       name = "cheerio-0.17.0.tgz";
       sha1 = "fa5ae42cc60121133d296d0b46d983215f7268ea";
     };
@@ -6554,7 +7249,7 @@
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
       "htmlparser2-3.7.3" = self.by-version."htmlparser2"."3.7.3";
       "dom-serializer-0.0.1" = self.by-version."dom-serializer"."0.0.1";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
     };
     optionalDependencies = {
     };
@@ -6562,16 +7257,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."child-process-close"."~0.1.1" =
-    self.by-version."child-process-close"."0.1.1";
-  by-version."child-process-close"."0.1.1" = self.buildNodePackage {
-    name = "child-process-close-0.1.1";
-    version = "0.1.1";
+  by-spec."chmodr"."~1.0.2" =
+    self.by-version."chmodr"."1.0.2";
+  by-version."chmodr"."1.0.2" = self.buildNodePackage {
+    name = "chmodr-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/child-process-close/-/child-process-close-0.1.1.tgz";
-      name = "child-process-close-0.1.1.tgz";
-      sha1 = "c153ede7a5eb65ac69e78a38973b1a286377f75f";
+      url = "https://registry.npmjs.org/chmodr/-/chmodr-1.0.2.tgz";
+      name = "chmodr-1.0.2.tgz";
+      sha1 = "04662b932d0f02ec66deaa2b0ea42811968e3eb9";
     };
     deps = {
     };
@@ -6581,66 +7276,69 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chmodr"."0.1.0" =
-    self.by-version."chmodr"."0.1.0";
-  by-version."chmodr"."0.1.0" = self.buildNodePackage {
-    name = "chmodr-0.1.0";
-    version = "0.1.0";
+  by-spec."chokidar"."^1.0.0" =
+    self.by-version."chokidar"."1.4.3";
+  by-version."chokidar"."1.4.3" = self.buildNodePackage {
+    name = "chokidar-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz";
-      name = "chmodr-0.1.0.tgz";
-      sha1 = "e09215a1d51542db2a2576969765bcf6125583eb";
+      url = "https://registry.npmjs.org/chokidar/-/chokidar-1.4.3.tgz";
+      name = "chokidar-1.4.3.tgz";
+      sha1 = "5fe733a4d9acaea51b26454b7e59559163d0dbb2";
     };
     deps = {
+      "anymatch-1.3.0" = self.by-version."anymatch"."1.3.0";
+      "async-each-1.0.0" = self.by-version."async-each"."1.0.0";
+      "glob-parent-2.0.0" = self.by-version."glob-parent"."2.0.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "is-binary-path-1.0.1" = self.by-version."is-binary-path"."1.0.1";
+      "is-glob-2.0.1" = self.by-version."is-glob"."2.0.1";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "readdirp-2.0.0" = self.by-version."readdirp"."2.0.0";
     };
     optionalDependencies = {
+      "fsevents-1.0.11" = self.by-version."fsevents"."1.0.11";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chmodr"."~0.1.0" =
-    self.by-version."chmodr"."0.1.0";
-  by-spec."chokidar".">=0.8.2" =
-    self.by-version."chokidar"."1.0.1";
-  by-version."chokidar"."1.0.1" = self.buildNodePackage {
-    name = "chokidar-1.0.1";
-    version = "1.0.1";
+  by-spec."chokidar"."^1.0.1" =
+    self.by-version."chokidar"."1.4.3";
+  by-spec."chokidar"."^1.2.0" =
+    self.by-version."chokidar"."1.4.3";
+  by-spec."chokidar"."^1.4.1" =
+    self.by-version."chokidar"."1.4.3";
+  by-spec."chownr"."0" =
+    self.by-version."chownr"."0.0.2";
+  by-version."chownr"."0.0.2" = self.buildNodePackage {
+    name = "chownr-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chokidar/-/chokidar-1.0.1.tgz";
-      name = "chokidar-1.0.1.tgz";
-      sha1 = "b19e476a071ac0c7a01279cdc936e0d31c6ee06a";
+      url = "https://registry.npmjs.org/chownr/-/chownr-0.0.2.tgz";
+      name = "chownr-0.0.2.tgz";
+      sha1 = "2f9aebf746f90808ce00607b72ba73b41604c485";
     };
     deps = {
-      "anymatch-1.2.1" = self.by-version."anymatch"."1.2.1";
-      "arrify-1.0.0" = self.by-version."arrify"."1.0.0";
-      "async-each-0.1.6" = self.by-version."async-each"."0.1.6";
-      "glob-parent-1.2.0" = self.by-version."glob-parent"."1.2.0";
-      "is-binary-path-1.0.0" = self.by-version."is-binary-path"."1.0.0";
-      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
-      "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
     };
     optionalDependencies = {
-      "fsevents-0.3.5" = self.by-version."fsevents"."0.3.5";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chokidar"."^1.0.0" =
-    self.by-version."chokidar"."1.0.1";
-  by-spec."chownr"."0" =
-    self.by-version."chownr"."0.0.1";
-  by-version."chownr"."0.0.1" = self.buildNodePackage {
-    name = "chownr-0.0.1";
-    version = "0.0.1";
+  by-spec."chownr"."^1.0.1" =
+    self.by-version."chownr"."1.0.1";
+  by-version."chownr"."1.0.1" = self.buildNodePackage {
+    name = "chownr-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chownr/-/chownr-0.0.1.tgz";
-      name = "chownr-0.0.1.tgz";
-      sha1 = "51d18189d9092d5f8afd623f3288bfd1c6bf1a62";
+      url = "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz";
+      name = "chownr-1.0.1.tgz";
+      sha1 = "e2a75042a9551908bebd25b8523d5f9769d79181";
     };
     deps = {
     };
@@ -6650,26 +7348,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chromecast-player"."^0.2.2" =
-    self.by-version."chromecast-player"."0.2.2";
-  by-version."chromecast-player"."0.2.2" = self.buildNodePackage {
-    name = "chromecast-player-0.2.2";
-    version = "0.2.2";
+  by-spec."chownr"."~1.0.1" =
+    self.by-version."chownr"."1.0.1";
+  by-spec."chromecast-player"."^0.2.3" =
+    self.by-version."chromecast-player"."0.2.3";
+  by-version."chromecast-player"."0.2.3" = self.buildNodePackage {
+    name = "chromecast-player-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.2.tgz";
-      name = "chromecast-player-0.2.2.tgz";
-      sha1 = "a228080e1a49c2881ae5d4ab2f9a0cd2de0ab443";
+      url = "https://registry.npmjs.org/chromecast-player/-/chromecast-player-0.2.3.tgz";
+      name = "chromecast-player-0.2.3.tgz";
+      sha1 = "fe9ce69911c88096d681e4242c1902ad30787216";
     };
     deps = {
-      "castv2-client-0.0.8" = self.by-version."castv2-client"."0.0.8";
-      "chromecast-scanner-0.4.3" = self.by-version."chromecast-scanner"."0.4.3";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "castv2-client-1.1.1" = self.by-version."castv2-client"."1.1.1";
+      "chromecast-scanner-0.5.0" = self.by-version."chromecast-scanner"."0.5.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "mutate.js-0.2.0" = self.by-version."mutate.js"."0.2.0";
       "promiscuous-0.6.0" = self.by-version."promiscuous"."0.6.0";
       "time-line-1.0.1" = self.by-version."time-line"."1.0.1";
-      "ware-1.2.0" = self.by-version."ware"."1.2.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "ware-1.3.0" = self.by-version."ware"."1.3.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -6677,21 +7377,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chromecast-scanner"."^0.4.1" =
-    self.by-version."chromecast-scanner"."0.4.3";
-  by-version."chromecast-scanner"."0.4.3" = self.buildNodePackage {
-    name = "chromecast-scanner-0.4.3";
-    version = "0.4.3";
+  by-spec."chromecast-scanner"."^0.5.0" =
+    self.by-version."chromecast-scanner"."0.5.0";
+  by-version."chromecast-scanner"."0.5.0" = self.buildNodePackage {
+    name = "chromecast-scanner-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.4.3.tgz";
-      name = "chromecast-scanner-0.4.3.tgz";
-      sha1 = "4b3392195acdc3e82ed6e8f2285cf36e94e62cdb";
+      url = "https://registry.npmjs.org/chromecast-scanner/-/chromecast-scanner-0.5.0.tgz";
+      name = "chromecast-scanner-0.5.0.tgz";
+      sha1 = "01296a3e5d130cce34974eb509cbbc7d6f78dd3d";
     };
     deps = {
       "array-find-0.1.1" = self.by-version."array-find"."0.1.1";
-      "multicast-dns-2.1.0" = self.by-version."multicast-dns"."2.1.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "multicast-dns-4.0.1" = self.by-version."multicast-dns"."4.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -6706,7 +7406,7 @@
     version = "8.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cint/-/cint-8.2.1.tgz";
+      url = "https://registry.npmjs.org/cint/-/cint-8.2.1.tgz";
       name = "cint-8.2.1.tgz";
       sha1 = "70386b1b48e2773d0d63166a55aff94ef4456a12";
     };
@@ -6718,20 +7418,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."clean-css"."^3.0.1" =
-    self.by-version."clean-css"."3.2.1";
-  by-version."clean-css"."3.2.1" = self.buildNodePackage {
-    name = "clean-css-3.2.1";
-    version = "3.2.1";
+  by-spec."cipher-base"."^1.0.0" =
+    self.by-version."cipher-base"."1.0.2";
+  by-version."cipher-base"."1.0.2" = self.buildNodePackage {
+    name = "cipher-base-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.2.tgz";
+      name = "cipher-base-1.0.2.tgz";
+      sha1 = "54ac1d1ebdf6a1bcd3559e6f369d72697f2cab8f";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cipher-base"."^1.0.1" =
+    self.by-version."cipher-base"."1.0.2";
+  by-spec."clean-css"."^3.1.9" =
+    self.by-version."clean-css"."3.4.11";
+  by-version."clean-css"."3.4.11" = self.buildNodePackage {
+    name = "clean-css-3.4.11";
+    version = "3.4.11";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clean-css/-/clean-css-3.2.1.tgz";
-      name = "clean-css-3.2.1.tgz";
-      sha1 = "748303351495726144d45c4e1ea4677087b65be2";
+      url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.11.tgz";
+      name = "clean-css-3.4.11.tgz";
+      sha1 = "171a76f8fca5d74877d7d80b511ce3e73c86333d";
     };
     deps = {
-      "commander-2.8.0" = self.by-version."commander"."2.8.0";
-      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
+      "commander-2.8.1" = self.by-version."commander"."2.8.1";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
     };
     optionalDependencies = {
     };
@@ -6739,6 +7461,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."clean-css"."~3.4.2" =
+    self.by-version."clean-css"."3.4.11";
   by-spec."cli"."0.6.x" =
     self.by-version."cli"."0.6.6";
   by-version."cli"."0.6.6" = self.buildNodePackage {
@@ -6746,7 +7470,7 @@
     version = "0.6.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cli/-/cli-0.6.6.tgz";
+      url = "https://registry.npmjs.org/cli/-/cli-0.6.6.tgz";
       name = "cli-0.6.6.tgz";
       sha1 = "02ad44a380abf27adac5e6f0cdd7b043d74c53e3";
     };
@@ -6760,22 +7484,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cli-color"."~0.3.2" =
-    self.by-version."cli-color"."0.3.3";
-  by-version."cli-color"."0.3.3" = self.buildNodePackage {
-    name = "cli-color-0.3.3";
-    version = "0.3.3";
+  by-spec."cli-cursor"."^1.0.1" =
+    self.by-version."cli-cursor"."1.0.2";
+  by-version."cli-cursor"."1.0.2" = self.buildNodePackage {
+    name = "cli-cursor-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cli-color/-/cli-color-0.3.3.tgz";
-      name = "cli-color-0.3.3.tgz";
-      sha1 = "12d5bdd158ff8a0b0db401198913c03df069f6f5";
+      url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz";
+      name = "cli-cursor-1.0.2.tgz";
+      sha1 = "64da3f7d56a54412e59794bd62dc35295e8f2987";
     };
     deps = {
-      "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
-      "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8";
-      "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0";
+      "restore-cursor-1.0.1" = self.by-version."restore-cursor"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -6790,7 +7511,7 @@
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
+      url = "https://registry.npmjs.org/cli-table/-/cli-table-0.3.1.tgz";
       name = "cli-table-0.3.1.tgz";
       sha1 = "f53b05266a8b1a0b934b3d0821e6e2dc5914ae23";
     };
@@ -6804,15 +7525,15 @@
     cpu = [ ];
   };
   by-spec."cli-width"."^1.0.1" =
-    self.by-version."cli-width"."1.0.1";
-  by-version."cli-width"."1.0.1" = self.buildNodePackage {
-    name = "cli-width-1.0.1";
-    version = "1.0.1";
+    self.by-version."cli-width"."1.1.1";
+  by-version."cli-width"."1.1.1" = self.buildNodePackage {
+    name = "cli-width-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cli-width/-/cli-width-1.0.1.tgz";
-      name = "cli-width-1.0.1.tgz";
-      sha1 = "14d4f6870234d91e97f7dd81e76be8271410a1ef";
+      url = "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz";
+      name = "cli-width-1.1.1.tgz";
+      sha1 = "a4d293ef67ebb7b88d4a4d42c0ccf00c4d1e366d";
     };
     deps = {
     };
@@ -6822,6 +7543,47 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cli-width"."^2.0.0" =
+    self.by-version."cli-width"."2.1.0";
+  by-version."cli-width"."2.1.0" = self.buildNodePackage {
+    name = "cli-width-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz";
+      name = "cli-width-2.1.0.tgz";
+      sha1 = "b234ca209b29ef66fc518d9b98d5847b00edf00a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cliff"."0.1.8" =
+    self.by-version."cliff"."0.1.8";
+  by-version."cliff"."0.1.8" = self.buildNodePackage {
+    name = "cliff-0.1.8";
+    version = "0.1.8";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cliff/-/cliff-0.1.8.tgz";
+      name = "cliff-0.1.8.tgz";
+      sha1 = "43ca8ad9fe3943489693ab62dce0cae22509d272";
+    };
+    deps = {
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "winston-0.6.2" = self.by-version."winston"."0.6.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cliff"."0.1.9" =
     self.by-version."cliff"."0.1.9";
   by-version."cliff"."0.1.9" = self.buildNodePackage {
@@ -6829,7 +7591,7 @@
     version = "0.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz";
+      url = "https://registry.npmjs.org/cliff/-/cliff-0.1.9.tgz";
       name = "cliff-0.1.9.tgz";
       sha1 = "a211e09c6a3de3ba1af27d049d301250d18812bc";
     };
@@ -6851,7 +7613,7 @@
     version = "0.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz";
+      url = "https://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz";
       name = "cliff-0.1.10.tgz";
       sha1 = "53be33ea9f59bec85609ee300ac4207603e52013";
     };
@@ -6866,18 +7628,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."clivas"."^0.1.4" =
-    self.by-version."clivas"."0.1.4";
-  by-version."clivas"."0.1.4" = self.buildNodePackage {
-    name = "clivas-0.1.4";
-    version = "0.1.4";
+  by-spec."cliui"."^2.1.0" =
+    self.by-version."cliui"."2.1.0";
+  by-version."cliui"."2.1.0" = self.buildNodePackage {
+    name = "cliui-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz";
-      name = "clivas-0.1.4.tgz";
-      sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a";
+      url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz";
+      name = "cliui-2.1.0.tgz";
+      sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1";
     };
     deps = {
+      "center-align-0.1.3" = self.by-version."center-align"."0.1.3";
+      "right-align-0.1.3" = self.by-version."right-align"."0.1.3";
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
     };
     optionalDependencies = {
     };
@@ -6885,16 +7650,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."clone"."0.1.11" =
-    self.by-version."clone"."0.1.11";
-  by-version."clone"."0.1.11" = self.buildNodePackage {
-    name = "clone-0.1.11";
-    version = "0.1.11";
+  by-spec."cliui"."^3.0.3" =
+    self.by-version."cliui"."3.1.2";
+  by-version."cliui"."3.1.2" = self.buildNodePackage {
+    name = "cliui-3.1.2";
+    version = "3.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-0.1.11.tgz";
-      name = "clone-0.1.11.tgz";
-      sha1 = "408b7d1773eb0dfbf2ddb156c1c47170c17e3a96";
+      url = "https://registry.npmjs.org/cliui/-/cliui-3.1.2.tgz";
+      name = "cliui-3.1.2.tgz";
+      sha1 = "5ebdc752ce6740ca0df470a3b215e82a5da0277c";
+    };
+    deps = {
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "wrap-ansi-2.0.0" = self.by-version."wrap-ansi"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."clivas"."^0.1.4" =
+    self.by-version."clivas"."0.1.4";
+  by-version."clivas"."0.1.4" = self.buildNodePackage {
+    name = "clivas-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/clivas/-/clivas-0.1.4.tgz";
+      name = "clivas-0.1.4.tgz";
+      sha1 = "e1c1e481d1273d57f1752132b0e4410a0d88235a";
     };
     deps = {
     };
@@ -6911,7 +7698,7 @@
     version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
+      url = "https://registry.npmjs.org/clone/-/clone-0.1.5.tgz";
       name = "clone-0.1.5.tgz";
       sha1 = "46f29143d0766d663dbd7f80b7520a15783d2042";
     };
@@ -6930,7 +7717,7 @@
     version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
+      url = "https://registry.npmjs.org/clone/-/clone-0.1.6.tgz";
       name = "clone-0.1.6.tgz";
       sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000";
     };
@@ -6942,33 +7729,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."clone"."0.2.0" =
-    self.by-version."clone"."0.2.0";
-  by-version."clone"."0.2.0" = self.buildNodePackage {
-    name = "clone-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz";
-      name = "clone-0.2.0.tgz";
-      sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."clone".">=0.1.0" =
+  by-spec."clone"."1.0.2" =
     self.by-version."clone"."1.0.2";
   by-version."clone"."1.0.2" = self.buildNodePackage {
     name = "clone-1.0.2";
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
+      url = "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz";
       name = "clone-1.0.2.tgz";
       sha1 = "260b7a99ebb1edfe247538175f783243cb19d149";
     };
@@ -6980,18 +7748,18 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."clone".">=0.1.0" =
+    self.by-version."clone"."1.0.2";
   by-spec."clone"."^0.2.0" =
     self.by-version."clone"."0.2.0";
-  by-spec."clone"."~0.1.15" =
-    self.by-version."clone"."0.1.19";
-  by-version."clone"."0.1.19" = self.buildNodePackage {
-    name = "clone-0.1.19";
-    version = "0.1.19";
+  by-version."clone"."0.2.0" = self.buildNodePackage {
+    name = "clone-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz";
-      name = "clone-0.1.19.tgz";
-      sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85";
+      url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz";
+      name = "clone-0.2.0.tgz";
+      sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f";
     };
     deps = {
     };
@@ -7001,10 +7769,12 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."clone"."~0.1.5" =
-    self.by-version."clone"."0.1.19";
-  by-spec."clone"."~0.2.0" =
-    self.by-version."clone"."0.2.0";
+  by-spec."clone"."^1.0.0" =
+    self.by-version."clone"."1.0.2";
+  by-spec."clone"."^1.0.2" =
+    self.by-version."clone"."1.0.2";
+  by-spec."clone"."~1.0.2" =
+    self.by-version."clone"."1.0.2";
   by-spec."clone-stats"."^0.0.1" =
     self.by-version."clone-stats"."0.0.1";
   by-version."clone-stats"."0.0.1" = self.buildNodePackage {
@@ -7012,7 +7782,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
+      url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
       name = "clone-stats-0.0.1.tgz";
       sha1 = "b88f94a82cf38b8791d58046ea4029ad88ca99d1";
     };
@@ -7024,60 +7794,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."closest-package"."^1.0.0" =
-    self.by-version."closest-package"."1.0.0";
-  by-version."closest-package"."1.0.0" = self.buildNodePackage {
-    name = "closest-package-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/closest-package/-/closest-package-1.0.0.tgz";
-      name = "closest-package-1.0.0.tgz";
-      sha1 = "ef7a73ad90baae43a89db53777b20fcc0350d4cf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cmd-shim"."~1.1.0" =
-    self.by-version."cmd-shim"."1.1.2";
-  by-version."cmd-shim"."1.1.2" = self.buildNodePackage {
-    name = "cmd-shim-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-1.1.2.tgz";
-      name = "cmd-shim-1.1.2.tgz";
-      sha1 = "e4f9198802e361e8eb43b591959ef4dc6cdb6754";
-    };
-    deps = {
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-    };
-    optionalDependencies = {
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."cmd-shim"."~2.0.1" =
-    self.by-version."cmd-shim"."2.0.1";
-  by-version."cmd-shim"."2.0.1" = self.buildNodePackage {
-    name = "cmd-shim-2.0.1";
-    version = "2.0.1";
+  by-spec."cmd-shim"."~2.0.2" =
+    self.by-version."cmd-shim"."2.0.2";
+  by-version."cmd-shim"."2.0.2" = self.buildNodePackage {
+    name = "cmd-shim-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.1.tgz";
-      name = "cmd-shim-2.0.1.tgz";
-      sha1 = "4512a373d2391679aec51ad1d4733559e9b85d4a";
+      url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz";
+      name = "cmd-shim-2.0.2.tgz";
+      sha1 = "6fcbda99483a8fd15d7d30a196ca69d688a2efdb";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
     };
     optionalDependencies = {
     };
@@ -7085,22 +7815,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cmdln"."1.3.2" =
-    self.by-version."cmdln"."1.3.2";
-  by-version."cmdln"."1.3.2" = self.buildNodePackage {
-    name = "cmdln-1.3.2";
-    version = "1.3.2";
+  by-spec."cmdln"."3.2.1" =
+    self.by-version."cmdln"."3.2.1";
+  by-version."cmdln"."3.2.1" = self.buildNodePackage {
+    name = "cmdln-3.2.1";
+    version = "3.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cmdln/-/cmdln-1.3.2.tgz";
-      name = "cmdln-1.3.2.tgz";
-      sha1 = "46a7b362166875cdafe7bc3fe6c73e4644dc6884";
+      url = "https://registry.npmjs.org/cmdln/-/cmdln-3.2.1.tgz";
+      name = "cmdln-3.2.1.tgz";
+      sha1 = "8d21967625b25ee35fca8e8453ccf10fccd04e45";
     };
     deps = {
-      "assert-plus-0.1.3" = self.by-version."assert-plus"."0.1.3";
-      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
-      "verror-1.3.6" = self.by-version."verror"."1.3.6";
-      "dashdash-1.3.2" = self.by-version."dashdash"."1.3.2";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "extsprintf-1.3.0" = self.by-version."extsprintf"."1.3.0";
+      "verror-1.6.1" = self.by-version."verror"."1.6.1";
+      "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0";
     };
     optionalDependencies = {
     };
@@ -7115,7 +7845,7 @@
     version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/co/-/co-3.1.0.tgz";
+      url = "https://registry.npmjs.org/co/-/co-3.1.0.tgz";
       name = "co-3.1.0.tgz";
       sha1 = "4ea54ea5a08938153185e15210c68d9092bc1b78";
     };
@@ -7134,7 +7864,7 @@
     version = "3.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/co/-/co-3.0.6.tgz";
+      url = "https://registry.npmjs.org/co/-/co-3.0.6.tgz";
       name = "co-3.0.6.tgz";
       sha1 = "1445f226c5eb956138e68c9ac30167ea7d2e6bda";
     };
@@ -7146,21 +7876,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."codepage"."~1.3.4" =
-    self.by-version."codepage"."1.3.8";
-  by-version."codepage"."1.3.8" = self.buildNodePackage {
-    name = "codepage-1.3.8";
-    version = "1.3.8";
+  by-spec."code-point-at"."^1.0.0" =
+    self.by-version."code-point-at"."1.0.0";
+  by-version."code-point-at"."1.0.0" = self.buildNodePackage {
+    name = "code-point-at-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.0.0.tgz";
+      name = "code-point-at-1.0.0.tgz";
+      sha1 = "f69b192d3f7d91e382e4b71bddb77878619ab0c6";
+    };
+    deps = {
+      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."codepage"."~1.4.0" =
+    self.by-version."codepage"."1.4.0";
+  by-version."codepage"."1.4.0" = self.buildNodePackage {
+    name = "codepage-1.4.0";
+    version = "1.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/codepage/-/codepage-1.3.8.tgz";
-      name = "codepage-1.3.8.tgz";
-      sha1 = "4f2e5d7c0975de28f88498058dcb5afcab6a5f71";
+      url = "https://registry.npmjs.org/codepage/-/codepage-1.4.0.tgz";
+      name = "codepage-1.4.0.tgz";
+      sha1 = "ffd5b603ae6a8ebb63559d5fb89a57d12b943837";
     };
     deps = {
       "voc-0.5.0" = self.by-version."voc"."0.5.0";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "commander-2.8.0" = self.by-version."commander"."2.8.0";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "exit-on-epipe-0.0.1" = self.by-version."exit-on-epipe"."0.0.1";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
     };
     optionalDependencies = {
     };
@@ -7169,15 +7920,15 @@
     cpu = [ ];
   };
   by-spec."coffee-script"."*" =
-    self.by-version."coffee-script"."1.9.2";
-  by-version."coffee-script"."1.9.2" = self.buildNodePackage {
-    name = "coffee-script-1.9.2";
-    version = "1.9.2";
+    self.by-version."coffee-script"."1.10.0";
+  by-version."coffee-script"."1.10.0" = self.buildNodePackage {
+    name = "coffee-script-1.10.0";
+    version = "1.10.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.9.2.tgz";
-      name = "coffee-script-1.9.2.tgz";
-      sha1 = "2da4b663c61c6d1d851788aa31f941fc7b63edf3";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.10.0.tgz";
+      name = "coffee-script-1.10.0.tgz";
+      sha1 = "12938bcf9be1948fa006f92e0c4c9e81705108c0";
     };
     deps = {
     };
@@ -7187,7 +7938,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "coffee-script" = self.by-version."coffee-script"."1.9.2";
+  "coffee-script" = self.by-version."coffee-script"."1.10.0";
   by-spec."coffee-script"."1.6.3" =
     self.by-version."coffee-script"."1.6.3";
   by-version."coffee-script"."1.6.3" = self.buildNodePackage {
@@ -7195,7 +7946,7 @@
     version = "1.6.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.6.3.tgz";
       name = "coffee-script-1.6.3.tgz";
       sha1 = "6355d32cf1b04cdff6b484e5e711782b2f0c39be";
     };
@@ -7208,13 +7959,15 @@
     cpu = [ ];
   };
   by-spec."coffee-script".">= 0.0.1" =
-    self.by-version."coffee-script"."1.9.2";
+    self.by-version."coffee-script"."1.10.0";
   by-spec."coffee-script".">=1.2.0" =
-    self.by-version."coffee-script"."1.9.2";
+    self.by-version."coffee-script"."1.10.0";
   by-spec."coffee-script".">=1.6.2 <2.0.0" =
-    self.by-version."coffee-script"."1.9.2";
+    self.by-version."coffee-script"."1.10.0";
   by-spec."coffee-script"."^1.9.2" =
-    self.by-version."coffee-script"."1.9.2";
+    self.by-version."coffee-script"."1.10.0";
+  by-spec."coffee-script"."~1.10.0" =
+    self.by-version."coffee-script"."1.10.0";
   by-spec."coffee-script"."~1.3.3" =
     self.by-version."coffee-script"."1.3.3";
   by-version."coffee-script"."1.3.3" = self.buildNodePackage {
@@ -7222,7 +7975,7 @@
     version = "1.3.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
+      url = "https://registry.npmjs.org/coffee-script/-/coffee-script-1.3.3.tgz";
       name = "coffee-script-1.3.3.tgz";
       sha1 = "150d6b4cb522894369efed6a2101c20bc7f4a4f4";
     };
@@ -7234,19 +7987,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."color"."~0.8.0" =
-    self.by-version."color"."0.8.0";
-  by-version."color"."0.8.0" = self.buildNodePackage {
-    name = "color-0.8.0";
-    version = "0.8.0";
+  by-spec."color"."~0.11.1" =
+    self.by-version."color"."0.11.1";
+  by-version."color"."0.11.1" = self.buildNodePackage {
+    name = "color-0.11.1";
+    version = "0.11.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/color/-/color-0.8.0.tgz";
-      name = "color-0.8.0.tgz";
-      sha1 = "890c07c3fd4e649537638911cf691e5458b6fca5";
+      url = "https://registry.npmjs.org/color/-/color-0.11.1.tgz";
+      name = "color-0.11.1.tgz";
+      sha1 = "19e357ce1872e191e8a91702b4ee1b0ed844187a";
     };
     deps = {
-      "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2";
+      "color-convert-0.5.3" = self.by-version."color-convert"."0.5.3";
       "color-string-0.3.0" = self.by-version."color-string"."0.3.0";
     };
     optionalDependencies = {
@@ -7255,16 +8008,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."color-convert"."^0.5.0" =
-    self.by-version."color-convert"."0.5.2";
-  by-version."color-convert"."0.5.2" = self.buildNodePackage {
-    name = "color-convert-0.5.2";
-    version = "0.5.2";
+  by-spec."color-convert"."^0.5.3" =
+    self.by-version."color-convert"."0.5.3";
+  by-version."color-convert"."0.5.3" = self.buildNodePackage {
+    name = "color-convert-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/color-convert/-/color-convert-0.5.2.tgz";
-      name = "color-convert-0.5.2.tgz";
-      sha1 = "febd9efc33674df3374ff8eeaec3bc56c79a9b35";
+      url = "https://registry.npmjs.org/color-convert/-/color-convert-0.5.3.tgz";
+      name = "color-convert-0.5.3.tgz";
+      sha1 = "bdb6c69ce660fadffe0b0007cc447e1b9f7282bd";
     };
     deps = {
     };
@@ -7275,15 +8028,15 @@
     cpu = [ ];
   };
   by-spec."color-name"."^1.0.0" =
-    self.by-version."color-name"."1.0.0";
-  by-version."color-name"."1.0.0" = self.buildNodePackage {
-    name = "color-name-1.0.0";
-    version = "1.0.0";
+    self.by-version."color-name"."1.1.1";
+  by-version."color-name"."1.1.1" = self.buildNodePackage {
+    name = "color-name-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz";
-      name = "color-name-1.0.0.tgz";
-      sha1 = "ce3579a4ef43b672bee4f37e8876332b5a36e6b5";
+      url = "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz";
+      name = "color-name-1.1.1.tgz";
+      sha1 = "4b1415304cf50028ea81643643bd82ea05803689";
     };
     deps = {
     };
@@ -7300,12 +8053,12 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
+      url = "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz";
       name = "color-string-0.3.0.tgz";
       sha1 = "27d46fb67025c5c2fa25993bfbf579e47841b991";
     };
     deps = {
-      "color-name-1.0.0" = self.by-version."color-name"."1.0.0";
+      "color-name-1.1.1" = self.by-version."color-name"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -7320,7 +8073,7 @@
     version = "0.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
+      url = "https://registry.npmjs.org/colors/-/colors-0.5.1.tgz";
       name = "colors-0.5.1.tgz";
       sha1 = "7d0023eaeb154e8ee9fce75dcb923d0ed1667774";
     };
@@ -7339,7 +8092,7 @@
     version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
+      url = "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz";
       name = "colors-0.6.2.tgz";
       sha1 = "2423fe6678ac0c5dae8852e5d0e5be08c997abcc";
     };
@@ -7360,7 +8113,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
+      url = "https://registry.npmjs.org/colors/-/colors-1.0.3.tgz";
       name = "colors-1.0.3.tgz";
       sha1 = "0433f44d809680fdeb60ed260f1b0c262e82a40b";
     };
@@ -7374,10 +8127,37 @@
   };
   by-spec."colors"."1.0.x" =
     self.by-version."colors"."1.0.3";
+  by-spec."colors"."1.1.2" =
+    self.by-version."colors"."1.1.2";
+  by-version."colors"."1.1.2" = self.buildNodePackage {
+    name = "colors-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+      name = "colors-1.1.2.tgz";
+      sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."colors"."^1.0.3" =
+    self.by-version."colors"."1.1.2";
+  by-spec."colors"."^1.1.0" =
+    self.by-version."colors"."1.1.2";
+  by-spec."colors"."^1.1.2" =
+    self.by-version."colors"."1.1.2";
   by-spec."colors"."~0.6.2" =
     self.by-version."colors"."0.6.2";
   by-spec."colors"."~1.0.3" =
     self.by-version."colors"."1.0.3";
+  by-spec."colors"."~1.1.2" =
+    self.by-version."colors"."1.1.2";
   by-spec."colour"."*" =
     self.by-version."colour"."0.7.1";
   by-version."colour"."0.7.1" = self.buildNodePackage {
@@ -7385,7 +8165,7 @@
     version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
+      url = "https://registry.npmjs.org/colour/-/colour-0.7.1.tgz";
       name = "colour-0.7.1.tgz";
       sha1 = "9cb169917ec5d12c0736d3e8685746df1cadf778";
     };
@@ -7397,19 +8177,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."columnify"."~1.5.1" =
-    self.by-version."columnify"."1.5.1";
-  by-version."columnify"."1.5.1" = self.buildNodePackage {
-    name = "columnify-1.5.1";
-    version = "1.5.1";
+  by-spec."columnify"."~1.5.4" =
+    self.by-version."columnify"."1.5.4";
+  by-version."columnify"."1.5.4" = self.buildNodePackage {
+    name = "columnify-1.5.4";
+    version = "1.5.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/columnify/-/columnify-1.5.1.tgz";
-      name = "columnify-1.5.1.tgz";
-      sha1 = "15fdda803a3875f87f9d302b3bc828932d664003";
+      url = "https://registry.npmjs.org/columnify/-/columnify-1.5.4.tgz";
+      name = "columnify-1.5.4.tgz";
+      sha1 = "4737ddf1c7b69a8a7c340570782e947eec8e78bb";
     };
     deps = {
-      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
       "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0";
     };
     optionalDependencies = {
@@ -7425,7 +8205,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
+      url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.3.0.tgz";
       name = "combine-source-map-0.3.0.tgz";
       sha1 = "d9e74f593d9cd43807312cb5d846d451efaa9eb7";
     };
@@ -7440,6 +8220,72 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."combine-source-map"."~0.6.1" =
+    self.by-version."combine-source-map"."0.6.1";
+  by-version."combine-source-map"."0.6.1" = self.buildNodePackage {
+    name = "combine-source-map-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.6.1.tgz";
+      name = "combine-source-map-0.6.1.tgz";
+      sha1 = "9b4a09c316033d768e0f11e029fa2730e079ad96";
+    };
+    deps = {
+      "convert-source-map-1.1.3" = self.by-version."convert-source-map"."1.1.3";
+      "inline-source-map-0.5.0" = self.by-version."inline-source-map"."0.5.0";
+      "lodash.memoize-3.0.4" = self.by-version."lodash.memoize"."3.0.4";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combine-source-map"."~0.7.1" =
+    self.by-version."combine-source-map"."0.7.1";
+  by-version."combine-source-map"."0.7.1" = self.buildNodePackage {
+    name = "combine-source-map-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/combine-source-map/-/combine-source-map-0.7.1.tgz";
+      name = "combine-source-map-0.7.1.tgz";
+      sha1 = "1720771dee7f3221ce3c62a104ee9a963f12009e";
+    };
+    deps = {
+      "convert-source-map-1.1.3" = self.by-version."convert-source-map"."1.1.3";
+      "inline-source-map-0.6.1" = self.by-version."inline-source-map"."0.6.1";
+      "lodash.memoize-3.0.4" = self.by-version."lodash.memoize"."3.0.4";
+      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."combined-stream"."^1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
+  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
+    name = "combined-stream-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+      name = "combined-stream-1.0.5.tgz";
+      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
+    };
+    deps = {
+      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."combined-stream"."~0.0.4" =
     self.by-version."combined-stream"."0.0.7";
   by-version."combined-stream"."0.0.7" = self.buildNodePackage {
@@ -7447,7 +8293,7 @@
     version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
+      url = "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
       name = "combined-stream-0.0.7.tgz";
       sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
     };
@@ -7462,16 +8308,20 @@
   };
   by-spec."combined-stream"."~0.0.5" =
     self.by-version."combined-stream"."0.0.7";
+  by-spec."combined-stream"."~1.0.1" =
+    self.by-version."combined-stream"."1.0.5";
+  by-spec."combined-stream"."~1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
   by-spec."commander"."*" =
-    self.by-version."commander"."2.8.0";
-  by-version."commander"."2.8.0" = self.buildNodePackage {
-    name = "commander-2.8.0";
-    version = "2.8.0";
+    self.by-version."commander"."2.9.0";
+  by-version."commander"."2.9.0" = self.buildNodePackage {
+    name = "commander-2.9.0";
+    version = "2.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.8.0.tgz";
-      name = "commander-2.8.0.tgz";
-      sha1 = "117c42659a72338e3364877df20852344095dc11";
+      url = "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+      name = "commander-2.9.0.tgz";
+      sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
     };
     deps = {
       "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
@@ -7489,7 +8339,7 @@
     version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
+      url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
       name = "commander-0.6.1.tgz";
       sha1 = "fa68a14f6a945d54dbbe50d8cdb3320e9e3b1a06";
     };
@@ -7501,26 +8351,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."1.3.1" =
-    self.by-version."commander"."1.3.1";
-  by-version."commander"."1.3.1" = self.buildNodePackage {
-    name = "commander-1.3.1";
-    version = "1.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-1.3.1.tgz";
-      name = "commander-1.3.1.tgz";
-      sha1 = "02443e02db96f4b32b674225451abb6e9510000e";
-    };
-    deps = {
-      "keypress-0.1.0" = self.by-version."keypress"."0.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."commander"."1.3.2" =
     self.by-version."commander"."1.3.2";
   by-version."commander"."1.3.2" = self.buildNodePackage {
@@ -7528,7 +8358,7 @@
     version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
+      url = "https://registry.npmjs.org/commander/-/commander-1.3.2.tgz";
       name = "commander-1.3.2.tgz";
       sha1 = "8a8f30ec670a6fdd64af52f1914b907d79ead5b5";
     };
@@ -7548,7 +8378,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
+      url = "https://registry.npmjs.org/commander/-/commander-2.0.0.tgz";
       name = "commander-2.0.0.tgz";
       sha1 = "d1b86f901f8b64bd941bdeadaf924530393be928";
     };
@@ -7560,25 +8390,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."2.1.0" =
-    self.by-version."commander"."2.1.0";
-  by-version."commander"."2.1.0" = self.buildNodePackage {
-    name = "commander-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-      name = "commander-2.1.0.tgz";
-      sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."commander"."2.3.0" =
     self.by-version."commander"."2.3.0";
   by-version."commander"."2.3.0" = self.buildNodePackage {
@@ -7586,7 +8397,7 @@
     version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+      url = "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
       name = "commander-2.3.0.tgz";
       sha1 = "fd430e889832ec353b9acd1de217c11cb3eef873";
     };
@@ -7605,7 +8416,7 @@
     version = "2.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
+      url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz";
       name = "commander-2.6.0.tgz";
       sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d";
     };
@@ -7617,16 +8428,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."2.7.1" =
-    self.by-version."commander"."2.7.1";
-  by-version."commander"."2.7.1" = self.buildNodePackage {
-    name = "commander-2.7.1";
-    version = "2.7.1";
+  by-spec."commander"."2.8.x" =
+    self.by-version."commander"."2.8.1";
+  by-version."commander"."2.8.1" = self.buildNodePackage {
+    name = "commander-2.8.1";
+    version = "2.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.7.1.tgz";
-      name = "commander-2.7.1.tgz";
-      sha1 = "5d419a2bbed2c32ee3e4dca9bb45ab83ecc3065a";
+      url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
+      name = "commander-2.8.1.tgz";
+      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
     };
     deps = {
       "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
@@ -7637,34 +8448,30 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."2.8.x" =
-    self.by-version."commander"."2.8.0";
-  by-spec."commander"."2.x" =
-    self.by-version."commander"."2.8.0";
   by-spec."commander".">=2.0.0" =
-    self.by-version."commander"."2.8.0";
+    self.by-version."commander"."2.9.0";
   by-spec."commander".">=2.3.0 <3.0.0-0" =
-    self.by-version."commander"."2.8.0";
-  by-spec."commander"."^2.6.0" =
-    self.by-version."commander"."2.8.0";
-  by-spec."commander"."^2.7.1" =
-    self.by-version."commander"."2.8.0";
+    self.by-version."commander"."2.9.0";
+  by-spec."commander"."^2.5.0" =
+    self.by-version."commander"."2.9.0";
+  by-spec."commander"."^2.8.1" =
+    self.by-version."commander"."2.9.0";
+  by-spec."commander"."^2.9.0" =
+    self.by-version."commander"."2.9.0";
   by-spec."commander"."~0.6.1" =
     self.by-version."commander"."0.6.1";
   by-spec."commander"."~2.0.0" =
     self.by-version."commander"."2.0.0";
   by-spec."commander"."~2.1.0" =
     self.by-version."commander"."2.1.0";
-  by-spec."commander"."~2.5.0" =
-    self.by-version."commander"."2.5.1";
-  by-version."commander"."2.5.1" = self.buildNodePackage {
-    name = "commander-2.5.1";
-    version = "2.5.1";
+  by-version."commander"."2.1.0" = self.buildNodePackage {
+    name = "commander-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz";
-      name = "commander-2.5.1.tgz";
-      sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883";
+      url = "https://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
+      name = "commander-2.1.0.tgz";
+      sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
     };
     deps = {
     };
@@ -7676,18 +8483,22 @@
   };
   by-spec."commander"."~2.6.0" =
     self.by-version."commander"."2.6.0";
-  by-spec."commondir"."0.0.1" =
-    self.by-version."commondir"."0.0.1";
-  by-version."commondir"."0.0.1" = self.buildNodePackage {
-    name = "commondir-0.0.1";
-    version = "0.0.1";
+  by-spec."commander"."~2.9.0" =
+    self.by-version."commander"."2.9.0";
+  by-spec."commist"."^1.0.0" =
+    self.by-version."commist"."1.0.0";
+  by-version."commist"."1.0.0" = self.buildNodePackage {
+    name = "commist-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
-      name = "commondir-0.0.1.tgz";
-      sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
+      url = "https://registry.npmjs.org/commist/-/commist-1.0.0.tgz";
+      name = "commist-1.0.0.tgz";
+      sha1 = "c0c352501cf6f52e9124e3ef89c9806e2022ebef";
     };
     deps = {
+      "leven-1.0.2" = self.by-version."leven"."1.0.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -7695,16 +8506,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commondir"."~0.0.1" =
-    self.by-version."commondir"."0.0.2";
-  by-version."commondir"."0.0.2" = self.buildNodePackage {
-    name = "commondir-0.0.2";
-    version = "0.0.2";
+  by-spec."commondir"."0.0.1" =
+    self.by-version."commondir"."0.0.1";
+  by-version."commondir"."0.0.1" = self.buildNodePackage {
+    name = "commondir-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commondir/-/commondir-0.0.2.tgz";
-      name = "commondir-0.0.2.tgz";
-      sha1 = "c49c8880c6fe96844bb3525dd2e7314050c389ee";
+      url = "https://registry.npmjs.org/commondir/-/commondir-0.0.1.tgz";
+      name = "commondir-0.0.1.tgz";
+      sha1 = "89f00fdcd51b519c578733fec563e6a6da7f5be2";
     };
     deps = {
     };
@@ -7715,26 +8526,26 @@
     cpu = [ ];
   };
   by-spec."commoner"."^0.10.0" =
-    self.by-version."commoner"."0.10.1";
-  by-version."commoner"."0.10.1" = self.buildNodePackage {
-    name = "commoner-0.10.1";
-    version = "0.10.1";
+    self.by-version."commoner"."0.10.4";
+  by-version."commoner"."0.10.4" = self.buildNodePackage {
+    name = "commoner-0.10.4";
+    version = "0.10.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commoner/-/commoner-0.10.1.tgz";
-      name = "commoner-0.10.1.tgz";
-      sha1 = "53ab254aeb93ec0b19e9a1ca14e1d0e5fe998588";
+      url = "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz";
+      name = "commoner-0.10.4.tgz";
+      sha1 = "98f3333dd3ad399596bb2d384a783bb7213d68f8";
     };
     deps = {
-      "q-1.1.2" = self.by-version."q"."1.1.2";
-      "recast-0.9.18" = self.by-version."recast"."0.9.18";
-      "commander-2.5.1" = self.by-version."commander"."2.5.1";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "glob-4.2.2" = self.by-version."glob"."4.2.2";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "detective-4.3.1" = self.by-version."detective"."4.3.1";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "install-0.1.8" = self.by-version."install"."0.1.8";
-      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "recast-0.10.43" = self.by-version."recast"."0.10.43";
     };
     optionalDependencies = {
     };
@@ -7742,8 +8553,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commoner"."~0.10.0" =
-    self.by-version."commoner"."0.10.1";
+  by-spec."commoner"."^0.10.1" =
+    self.by-version."commoner"."0.10.4";
+  by-spec."commoner"."~0.10.3" =
+    self.by-version."commoner"."0.10.4";
   by-spec."compact2string"."^1.2.0" =
     self.by-version."compact2string"."1.4.0";
   by-version."compact2string"."1.4.0" = self.buildNodePackage {
@@ -7751,12 +8564,12 @@
     version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz";
+      url = "https://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz";
       name = "compact2string-1.4.0.tgz";
       sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49";
     };
     deps = {
-      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
+      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -7771,7 +8584,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+      url = "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
       name = "component-bind-1.0.0.tgz";
       sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
     };
@@ -7790,7 +8603,7 @@
     version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
+      url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
       name = "component-emitter-1.1.2.tgz";
       sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
     };
@@ -7802,6 +8615,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."component-emitter"."1.2.0" =
+    self.by-version."component-emitter"."1.2.0";
+  by-version."component-emitter"."1.2.0" = self.buildNodePackage {
+    name = "component-emitter-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
+      name = "component-emitter-1.2.0.tgz";
+      sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-emitter"."^1.1.3" =
+    self.by-version."component-emitter"."1.2.0";
   by-spec."component-inherit"."0.0.3" =
     self.by-version."component-inherit"."0.0.3";
   by-version."component-inherit"."0.0.3" = self.buildNodePackage {
@@ -7809,7 +8643,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+      url = "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
       name = "component-inherit-0.0.3.tgz";
       sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
     };
@@ -7821,20 +8655,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compress-commons"."~0.1.0" =
-    self.by-version."compress-commons"."0.1.6";
-  by-version."compress-commons"."0.1.6" = self.buildNodePackage {
-    name = "compress-commons-0.1.6";
-    version = "0.1.6";
+  by-spec."compress-commons"."~0.2.0" =
+    self.by-version."compress-commons"."0.2.9";
+  by-version."compress-commons"."0.2.9" = self.buildNodePackage {
+    name = "compress-commons-0.2.9";
+    version = "0.2.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compress-commons/-/compress-commons-0.1.6.tgz";
-      name = "compress-commons-0.1.6.tgz";
-      sha1 = "0c740870fde58cba516f0ac0c822e33a0b85dfa3";
+      url = "https://registry.npmjs.org/compress-commons/-/compress-commons-0.2.9.tgz";
+      name = "compress-commons-0.2.9.tgz";
+      sha1 = "422d927430c01abd06cd455b6dfc04cb4cf8003c";
     };
     deps = {
       "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
-      "crc32-stream-0.3.3" = self.by-version."crc32-stream"."0.3.3";
+      "crc32-stream-0.3.4" = self.by-version."crc32-stream"."0.3.4";
+      "node-int64-0.3.3" = self.by-version."node-int64"."0.3.3";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
     optionalDependencies = {
@@ -7850,7 +8685,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
+      url = "https://registry.npmjs.org/compressible/-/compressible-1.0.0.tgz";
       name = "compressible-1.0.0.tgz";
       sha1 = "f83e49c1cb61421753545125a8011d68b492427d";
     };
@@ -7862,19 +8697,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compressible"."~2.0.1" =
-    self.by-version."compressible"."2.0.2";
-  by-version."compressible"."2.0.2" = self.buildNodePackage {
-    name = "compressible-2.0.2";
-    version = "2.0.2";
+  by-spec."compressible"."~2.0.5" =
+    self.by-version."compressible"."2.0.7";
+  by-version."compressible"."2.0.7" = self.buildNodePackage {
+    name = "compressible-2.0.7";
+    version = "2.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compressible/-/compressible-2.0.2.tgz";
-      name = "compressible-2.0.2.tgz";
-      sha1 = "d0474a6ba6590a43d39c2ce9a6cfbb6479be76a5";
+      url = "https://registry.npmjs.org/compressible/-/compressible-2.0.7.tgz";
+      name = "compressible-2.0.7.tgz";
+      sha1 = "2058c52722fd3f1538a4f22ab14d0635904d19ae";
     };
     deps = {
-      "mime-db-1.9.1" = self.by-version."mime-db"."1.9.1";
+      "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0";
     };
     optionalDependencies = {
     };
@@ -7882,8 +8717,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compressible"."~2.0.2" =
-    self.by-version."compressible"."2.0.2";
+  by-spec."compressible"."~2.0.7" =
+    self.by-version."compressible"."2.0.7";
   by-spec."compression"."1.0.0" =
     self.by-version."compression"."1.0.0";
   by-version."compression"."1.0.0" = self.buildNodePackage {
@@ -7891,7 +8726,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
+      url = "https://registry.npmjs.org/compression/-/compression-1.0.0.tgz";
       name = "compression-1.0.0.tgz";
       sha1 = "8aeb85d48db5145d38bc8b181b6352d8eab26020";
     };
@@ -7907,23 +8742,23 @@
     cpu = [ ];
   };
   by-spec."compression".">=1.2.0 <2.0.0-0" =
-    self.by-version."compression"."1.4.3";
-  by-version."compression"."1.4.3" = self.buildNodePackage {
-    name = "compression-1.4.3";
-    version = "1.4.3";
+    self.by-version."compression"."1.6.1";
+  by-version."compression"."1.6.1" = self.buildNodePackage {
+    name = "compression-1.6.1";
+    version = "1.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compression/-/compression-1.4.3.tgz";
-      name = "compression-1.4.3.tgz";
-      sha1 = "7161bc0441df629273e5c31dd631b8e41e886b4d";
+      url = "https://registry.npmjs.org/compression/-/compression-1.6.1.tgz";
+      name = "compression-1.6.1.tgz";
+      sha1 = "1bf4f96fd72019a3fd11513b4fc4dcd3bd16db55";
     };
     deps = {
-      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "compressible-2.0.2" = self.by-version."compressible"."2.0.2";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "accepts-1.3.2" = self.by-version."accepts"."1.3.2";
+      "bytes-2.2.0" = self.by-version."bytes"."2.2.0";
+      "compressible-2.0.7" = self.by-version."compressible"."2.0.7";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+      "vary-1.1.0" = self.by-version."vary"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -7931,24 +8766,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compression"."~1.1.0" =
-    self.by-version."compression"."1.1.2";
-  by-version."compression"."1.1.2" = self.buildNodePackage {
-    name = "compression-1.1.2";
-    version = "1.1.2";
+  by-spec."compression"."^1.5.0" =
+    self.by-version."compression"."1.6.1";
+  by-spec."compression"."^1.6.0" =
+    self.by-version."compression"."1.6.1";
+  by-spec."compression"."~1.5.2" =
+    self.by-version."compression"."1.5.2";
+  by-version."compression"."1.5.2" = self.buildNodePackage {
+    name = "compression-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/compression/-/compression-1.1.2.tgz";
-      name = "compression-1.1.2.tgz";
-      sha1 = "f93fb7fcdb3573ec4c7d5398984caae230e2a8d7";
+      url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz";
+      name = "compression-1.5.2.tgz";
+      sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395";
     };
     deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "compressible-2.0.2" = self.by-version."compressible"."2.0.2";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
+      "bytes-2.1.0" = self.by-version."bytes"."2.1.0";
+      "compressible-2.0.7" = self.by-version."compressible"."2.0.7";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+      "vary-1.0.1" = self.by-version."vary"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -7956,10 +8795,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."compression"."~1.1.2" =
-    self.by-version."compression"."1.1.2";
-  by-spec."compression"."~1.4.3" =
-    self.by-version."compression"."1.4.3";
   by-spec."concat-map"."0.0.1" =
     self.by-version."concat-map"."0.0.1";
   by-version."concat-map"."0.0.1" = self.buildNodePackage {
@@ -7967,7 +8802,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
+      url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz";
       name = "concat-map-0.0.1.tgz";
       sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b";
     };
@@ -7980,20 +8815,42 @@
     cpu = [ ];
   };
   by-spec."concat-stream"."*" =
-    self.by-version."concat-stream"."1.4.8";
-  by-version."concat-stream"."1.4.8" = self.buildNodePackage {
-    name = "concat-stream-1.4.8";
-    version = "1.4.8";
+    self.by-version."concat-stream"."1.5.1";
+  by-version."concat-stream"."1.5.1" = self.buildNodePackage {
+    name = "concat-stream-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/concat-stream/-/concat-stream-1.4.8.tgz";
-      name = "concat-stream-1.4.8.tgz";
-      sha1 = "e8325bb89e55000e52b626d97466fde1a28cfe5d";
+      url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz";
+      name = "concat-stream-1.5.1.tgz";
+      sha1 = "f3b80acf9e1f48e3875c0688b41b6c31602eea1c";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."concat-stream"."1.5.0" =
+    self.by-version."concat-stream"."1.5.0";
+  by-version."concat-stream"."1.5.0" = self.buildNodePackage {
+    name = "concat-stream-1.5.0";
+    version = "1.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.0.tgz";
+      name = "concat-stream-1.5.0.tgz";
+      sha1 = "53f7d43c51c5e43f81c8fdd03321c631be68d611";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -8002,13 +8859,41 @@
     cpu = [ ];
   };
   by-spec."concat-stream"."^1.4.1" =
-    self.by-version."concat-stream"."1.4.8";
+    self.by-version."concat-stream"."1.5.1";
   by-spec."concat-stream"."^1.4.6" =
-    self.by-version."concat-stream"."1.4.8";
+    self.by-version."concat-stream"."1.5.1";
+  by-spec."concat-stream"."^1.4.7" =
+    self.by-version."concat-stream"."1.5.1";
   by-spec."concat-stream"."~1.4.1" =
-    self.by-version."concat-stream"."1.4.8";
+    self.by-version."concat-stream"."1.4.10";
+  by-version."concat-stream"."1.4.10" = self.buildNodePackage {
+    name = "concat-stream-1.4.10";
+    version = "1.4.10";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/concat-stream/-/concat-stream-1.4.10.tgz";
+      name = "concat-stream-1.4.10.tgz";
+      sha1 = "acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "typedarray-0.0.6" = self.by-version."typedarray"."0.0.6";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."concat-stream"."~1.4.5" =
-    self.by-version."concat-stream"."1.4.8";
+    self.by-version."concat-stream"."1.4.10";
+  by-spec."concat-stream"."~1.4.7" =
+    self.by-version."concat-stream"."1.4.10";
+  by-spec."concat-stream"."~1.5.0" =
+    self.by-version."concat-stream"."1.5.1";
+  by-spec."concat-stream"."~1.5.1" =
+    self.by-version."concat-stream"."1.5.1";
   by-spec."config"."0.4.15" =
     self.by-version."config"."0.4.15";
   by-version."config"."0.4.15" = self.buildNodePackage {
@@ -8016,13 +8901,13 @@
     version = "0.4.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/config/-/config-0.4.15.tgz";
+      url = "https://registry.npmjs.org/config/-/config-0.4.15.tgz";
       name = "config-0.4.15.tgz";
       sha1 = "d43ddf58b8df5637fdd1314fc816ccae7bfbcd18";
     };
     deps = {
       "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7";
-      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
+      "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
       "vows-0.8.1" = self.by-version."vows"."0.8.1";
     };
     optionalDependencies = {
@@ -8038,7 +8923,7 @@
     version = "0.4.36";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/config/-/config-0.4.36.tgz";
+      url = "https://registry.npmjs.org/config/-/config-0.4.36.tgz";
       name = "config-0.4.36.tgz";
       sha1 = "02af1237f519c00f1e3aac22f9a034148fc3e786";
     };
@@ -8051,19 +8936,19 @@
     cpu = [ ];
   };
   by-spec."config-chain"."~1.1.1" =
-    self.by-version."config-chain"."1.1.8";
-  by-version."config-chain"."1.1.8" = self.buildNodePackage {
-    name = "config-chain-1.1.8";
-    version = "1.1.8";
+    self.by-version."config-chain"."1.1.10";
+  by-version."config-chain"."1.1.10" = self.buildNodePackage {
+    name = "config-chain-1.1.10";
+    version = "1.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/config-chain/-/config-chain-1.1.8.tgz";
-      name = "config-chain-1.1.8.tgz";
-      sha1 = "0943d0b7227213a20d4eaff4434f4a1c0a052cad";
+      url = "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz";
+      name = "config-chain-1.1.10.tgz";
+      sha1 = "7fc383de0fcc84d711cb465bd176579cad612346";
     };
     deps = {
-      "proto-list-1.2.3" = self.by-version."proto-list"."1.2.3";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+      "proto-list-1.2.4" = self.by-version."proto-list"."1.2.4";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
     };
     optionalDependencies = {
     };
@@ -8071,28 +8956,30 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."config-chain"."~1.1.10" =
+    self.by-version."config-chain"."1.1.10";
   by-spec."config-chain"."~1.1.8" =
-    self.by-version."config-chain"."1.1.8";
-  by-spec."configstore"."^0.3.1" =
-    self.by-version."configstore"."0.3.2";
-  by-version."configstore"."0.3.2" = self.buildNodePackage {
-    name = "configstore-0.3.2";
-    version = "0.3.2";
+    self.by-version."config-chain"."1.1.10";
+  by-spec."configstore"."^1.0.0" =
+    self.by-version."configstore"."1.4.0";
+  by-version."configstore"."1.4.0" = self.buildNodePackage {
+    name = "configstore-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz";
-      name = "configstore-0.3.2.tgz";
-      sha1 = "25e4c16c3768abf75c5a65bc61761f495055b459";
+      url = "https://registry.npmjs.org/configstore/-/configstore-1.4.0.tgz";
+      name = "configstore-1.4.0.tgz";
+      sha1 = "c35781d0501d268c25c54b8b17f6240e8a4fb021";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
+      "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
-      "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1";
+      "write-file-atomic-1.1.4" = self.by-version."write-file-atomic"."1.1.4";
+      "xdg-basedir-2.0.0" = self.by-version."xdg-basedir"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -8100,8 +8987,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."configstore"."^0.3.2" =
-    self.by-version."configstore"."0.3.2";
   by-spec."connect"."1.x" =
     self.by-version."connect"."1.9.2";
   by-version."connect"."1.9.2" = self.buildNodePackage {
@@ -8109,12 +8994,12 @@
     version = "1.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
+      url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
       name = "connect-1.9.2.tgz";
       sha1 = "42880a22e9438ae59a8add74e437f58ae8e52807";
     };
     deps = {
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
+      "qs-6.1.0" = self.by-version."qs"."6.1.0";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
     };
@@ -8131,7 +9016,7 @@
     version = "2.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
+      url = "https://registry.npmjs.org/connect/-/connect-2.11.0.tgz";
       name = "connect-2.11.0.tgz";
       sha1 = "9991ce09ff9b85d9ead27f9d41d0b2a2df2f9284";
     };
@@ -8145,7 +9030,7 @@
       "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
       "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "methods-0.0.1" = self.by-version."methods"."0.0.1";
       "raw-body-0.0.3" = self.by-version."raw-body"."0.0.3";
       "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0";
@@ -8164,7 +9049,7 @@
     version = "2.14.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.14.5.tgz";
+      url = "https://registry.npmjs.org/connect/-/connect-2.14.5.tgz";
       name = "connect-2.14.5.tgz";
       sha1 = "73217513152c152ebe049c499fa09211b8c476f4";
     };
@@ -8199,104 +9084,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect"."2.26.1" =
-    self.by-version."connect"."2.26.1";
-  by-version."connect"."2.26.1" = self.buildNodePackage {
-    name = "connect-2.26.1";
-    version = "2.26.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.26.1.tgz";
-      name = "connect-2.26.1.tgz";
-      sha1 = "e8eb8c182c5120d25f5a5b76a09e7b99694d1403";
-    };
-    deps = {
-      "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
-      "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4";
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "compression-1.1.2" = self.by-version."compression"."1.1.2";
-      "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0";
-      "csurf-1.6.6" = self.by-version."csurf"."1.6.6";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
-      "errorhandler-1.2.4" = self.by-version."errorhandler"."1.2.4";
-      "express-session-1.8.2" = self.by-version."express-session"."1.8.2";
-      "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "method-override-2.2.0" = self.by-version."method-override"."2.2.0";
-      "morgan-1.3.2" = self.by-version."morgan"."1.3.2";
-      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "qs-2.2.3" = self.by-version."qs"."2.2.3";
-      "response-time-2.0.1" = self.by-version."response-time"."2.0.1";
-      "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7";
-      "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1";
-      "serve-static-1.6.5" = self.by-version."serve-static"."1.6.5";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
-      "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
-      "pause-0.0.1" = self.by-version."pause"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."connect"."2.29.1" =
-    self.by-version."connect"."2.29.1";
-  by-version."connect"."2.29.1" = self.buildNodePackage {
-    name = "connect-2.29.1";
-    version = "2.29.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.29.1.tgz";
-      name = "connect-2.29.1.tgz";
-      sha1 = "e0456742d25ed232b573ce156883dd4e6f208538";
-    };
-    deps = {
-      "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
-      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "compression-1.4.3" = self.by-version."compression"."1.4.3";
-      "connect-timeout-1.6.1" = self.by-version."connect-timeout"."1.6.1";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "csurf-1.7.0" = self.by-version."csurf"."1.7.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "errorhandler-1.3.5" = self.by-version."errorhandler"."1.3.5";
-      "express-session-1.10.4" = self.by-version."express-session"."1.10.4";
-      "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "method-override-2.3.2" = self.by-version."method-override"."2.3.2";
-      "morgan-1.5.2" = self.by-version."morgan"."1.5.2";
-      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "response-time-2.3.0" = self.by-version."response-time"."2.3.0";
-      "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
-      "serve-index-1.6.3" = self.by-version."serve-index"."1.6.3";
-      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
-      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-      "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
-      "pause-0.0.1" = self.by-version."pause"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."connect"."2.3.x" =
     self.by-version."connect"."2.3.9";
   by-version."connect"."2.3.9" = self.buildNodePackage {
@@ -8304,7 +9091,7 @@
     version = "2.3.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
+      url = "https://registry.npmjs.org/connect/-/connect-2.3.9.tgz";
       name = "connect-2.3.9.tgz";
       sha1 = "4d26ddc485c32e5a1cf1b35854823b4720d25a52";
     };
@@ -8316,7 +9103,7 @@
       "bytes-0.1.0" = self.by-version."bytes"."0.1.0";
       "send-0.0.3" = self.by-version."send"."0.0.3";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -8324,28 +9111,49 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect"."2.7.5" =
-    self.by-version."connect"."2.7.5";
-  by-version."connect"."2.7.5" = self.buildNodePackage {
-    name = "connect-2.7.5";
-    version = "2.7.5";
+  by-spec."connect"."2.30.2" =
+    self.by-version."connect"."2.30.2";
+  by-version."connect"."2.30.2" = self.buildNodePackage {
+    name = "connect-2.30.2";
+    version = "2.30.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.7.5.tgz";
-      name = "connect-2.7.5.tgz";
-      sha1 = "139111b4b03f0533a524927a88a646ae467b2c02";
+      url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz";
+      name = "connect-2.30.2.tgz";
+      sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609";
     };
     deps = {
-      "qs-0.5.1" = self.by-version."qs"."0.5.1";
-      "formidable-1.0.11" = self.by-version."formidable"."1.0.11";
-      "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
-      "buffer-crc32-0.1.1" = self.by-version."buffer-crc32"."0.1.1";
-      "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
-      "send-0.1.0" = self.by-version."send"."0.1.0";
-      "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
-      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
-      "pause-0.0.1" = self.by-version."pause"."0.0.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
+      "body-parser-1.13.3" = self.by-version."body-parser"."1.13.3";
+      "bytes-2.1.0" = self.by-version."bytes"."2.1.0";
+      "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
+      "cookie-parser-1.3.5" = self.by-version."cookie-parser"."1.3.5";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "compression-1.5.2" = self.by-version."compression"."1.5.2";
+      "connect-timeout-1.6.2" = self.by-version."connect-timeout"."1.6.2";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "csurf-1.8.3" = self.by-version."csurf"."1.8.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "errorhandler-1.4.3" = self.by-version."errorhandler"."1.4.3";
+      "express-session-1.11.3" = self.by-version."express-session"."1.11.3";
+      "finalhandler-0.4.0" = self.by-version."finalhandler"."0.4.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "method-override-2.3.5" = self.by-version."method-override"."2.3.5";
+      "morgan-1.6.1" = self.by-version."morgan"."1.6.1";
+      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "pause-0.1.0" = self.by-version."pause"."0.1.0";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "response-time-2.3.1" = self.by-version."response-time"."2.3.1";
+      "serve-favicon-2.3.0" = self.by-version."serve-favicon"."2.3.0";
+      "serve-index-1.7.3" = self.by-version."serve-index"."1.7.3";
+      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
+      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "vhost-3.0.2" = self.by-version."vhost"."3.0.2";
     };
     optionalDependencies = {
     };
@@ -8360,7 +9168,7 @@
     version = "2.7.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
+      url = "https://registry.npmjs.org/connect/-/connect-2.7.6.tgz";
       name = "connect-2.7.6.tgz";
       sha1 = "b83b68fa6f245c5020e2395472cc8322b0060738";
     };
@@ -8374,7 +9182,7 @@
       "bytes-0.2.0" = self.by-version."bytes"."0.2.0";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "pause-0.0.1" = self.by-version."pause"."0.0.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -8389,7 +9197,7 @@
     version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-3.0.2.tgz";
+      url = "https://registry.npmjs.org/connect/-/connect-3.0.2.tgz";
       name = "connect-3.0.2.tgz";
       sha1 = "1f90b4672fe009fa2876df860442d30db18609a2";
     };
@@ -8405,51 +9213,44 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect"."^2.14.5" =
-    self.by-version."connect"."2.29.1";
+  by-spec."connect"."^3.3.5" =
+    self.by-version."connect"."3.4.1";
+  by-version."connect"."3.4.1" = self.buildNodePackage {
+    name = "connect-3.4.1";
+    version = "3.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/connect/-/connect-3.4.1.tgz";
+      name = "connect-3.4.1.tgz";
+      sha1 = "a21361d3f4099ef761cda6dc4a973bb1ebb0a34d";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "finalhandler-0.4.1" = self.by-version."finalhandler"."0.4.1";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."connect"."~2" =
-    self.by-version."connect"."2.29.1";
-  by-spec."connect"."~2.26.0" =
-    self.by-version."connect"."2.26.6";
-  by-version."connect"."2.26.6" = self.buildNodePackage {
-    name = "connect-2.26.6";
-    version = "2.26.6";
+    self.by-version."connect"."2.30.2";
+  by-spec."connect-busboy"."^0.0.2" =
+    self.by-version."connect-busboy"."0.0.2";
+  by-version."connect-busboy"."0.0.2" = self.buildNodePackage {
+    name = "connect-busboy-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect/-/connect-2.26.6.tgz";
-      name = "connect-2.26.6.tgz";
-      sha1 = "94f3eef3fdeeb405806ea46dc036ee0b2acae700";
+      url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz";
+      name = "connect-busboy-0.0.2.tgz";
+      sha1 = "ac5c9c96672171885e576c66b2bfd95d3bb11097";
     };
     deps = {
-      "basic-auth-connect-1.0.0" = self.by-version."basic-auth-connect"."1.0.0";
-      "body-parser-1.8.4" = self.by-version."body-parser"."1.8.4";
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "compression-1.1.2" = self.by-version."compression"."1.1.2";
-      "connect-timeout-1.3.0" = self.by-version."connect-timeout"."1.3.0";
-      "csurf-1.6.6" = self.by-version."csurf"."1.6.6";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
-      "errorhandler-1.2.4" = self.by-version."errorhandler"."1.2.4";
-      "express-session-1.8.2" = self.by-version."express-session"."1.8.2";
-      "finalhandler-0.2.0" = self.by-version."finalhandler"."0.2.0";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "method-override-2.2.0" = self.by-version."method-override"."2.2.0";
-      "morgan-1.3.2" = self.by-version."morgan"."1.3.2";
-      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "qs-2.2.4" = self.by-version."qs"."2.2.4";
-      "response-time-2.0.1" = self.by-version."response-time"."2.0.1";
-      "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7";
-      "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1";
-      "serve-static-1.6.5" = self.by-version."serve-static"."1.6.5";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
-      "vhost-3.0.0" = self.by-version."vhost"."3.0.0";
-      "pause-0.0.1" = self.by-version."pause"."0.0.1";
+      "busboy-0.2.13" = self.by-version."busboy"."0.2.13";
     };
     optionalDependencies = {
     };
@@ -8464,7 +9265,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
+      url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.1.tgz";
       name = "connect-flash-0.1.1.tgz";
       sha1 = "d8630f26d95a7f851f9956b1e8cc6732f3b6aa30";
     };
@@ -8484,7 +9285,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
+      url = "https://registry.npmjs.org/connect-flash/-/connect-flash-0.1.0.tgz";
       name = "connect-flash-0.1.0.tgz";
       sha1 = "82b381d61a12b651437df1c259c1f1c841239b88";
     };
@@ -8503,12 +9304,12 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.2.2.tgz";
+      url = "https://registry.npmjs.org/connect-jade-static/-/connect-jade-static-0.2.2.tgz";
       name = "connect-jade-static-0.2.2.tgz";
       sha1 = "c1812f6245ee38a6db0e278c4043b53464099f84";
     };
     deps = {
-      "jade-1.9.2" = self.by-version."jade"."1.9.2";
+      "jade-1.11.0" = self.by-version."jade"."1.11.0";
     };
     optionalDependencies = {
     };
@@ -8518,21 +9319,19 @@
   };
   "connect-jade-static" = self.by-version."connect-jade-static"."0.2.2";
   by-spec."connect-mongo"."*" =
-    self.by-version."connect-mongo"."0.8.0";
-  by-version."connect-mongo"."0.8.0" = self.buildNodePackage {
-    name = "connect-mongo-0.8.0";
-    version = "0.8.0";
+    self.by-version."connect-mongo"."1.1.0";
+  by-version."connect-mongo"."1.1.0" = self.buildNodePackage {
+    name = "connect-mongo-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.8.0.tgz";
-      name = "connect-mongo-0.8.0.tgz";
-      sha1 = "5775b43a2762e4f39121d4a41a2871c3b42fbd4f";
+      url = "https://registry.npmjs.org/connect-mongo/-/connect-mongo-1.1.0.tgz";
+      name = "connect-mongo-1.1.0.tgz";
+      sha1 = "b9de9433afd4807d8965377dfb73e67507bd2439";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
-      "mongodb-2.0.27" = self.by-version."mongodb"."2.0.27";
+      "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
+      "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14";
     };
     optionalDependencies = {
     };
@@ -8540,25 +9339,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "connect-mongo" = self.by-version."connect-mongo"."0.8.0";
-  by-spec."connect-mongo".">=0.4.0" =
-    self.by-version."connect-mongo"."0.8.0";
-  by-spec."connect-multiparty"."^1.2.5" =
-    self.by-version."connect-multiparty"."1.2.5";
-  by-version."connect-multiparty"."1.2.5" = self.buildNodePackage {
-    name = "connect-multiparty-1.2.5";
-    version = "1.2.5";
+  "connect-mongo" = self.by-version."connect-mongo"."1.1.0";
+  by-spec."connect-mongo"."0.8.2" =
+    self.by-version."connect-mongo"."0.8.2";
+  by-version."connect-mongo"."0.8.2" = self.buildNodePackage {
+    name = "connect-mongo-0.8.2";
+    version = "0.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz";
-      name = "connect-multiparty-1.2.5.tgz";
-      sha1 = "2fabecfdc1a8a774ba19484dce660c818a8555e7";
+      url = "https://registry.npmjs.org/connect-mongo/-/connect-mongo-0.8.2.tgz";
+      name = "connect-mongo-0.8.2.tgz";
+      sha1 = "c92878eec0c5a5a6625b79a0c214f37f861fc6e0";
     };
     deps = {
-      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
-      "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
-      "qs-2.2.5" = self.by-version."qs"."2.2.5";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "mongodb-2.0.55" = self.by-version."mongodb"."2.0.55";
     };
     optionalDependencies = {
     };
@@ -8566,18 +9363,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect-restreamer"."*" =
-    self.by-version."connect-restreamer"."1.0.2";
-  by-version."connect-restreamer"."1.0.2" = self.buildNodePackage {
-    name = "connect-restreamer-1.0.2";
-    version = "1.0.2";
+  by-spec."connect-multiparty"."^1.2.5" =
+    self.by-version."connect-multiparty"."1.2.5";
+  by-version."connect-multiparty"."1.2.5" = self.buildNodePackage {
+    name = "connect-multiparty-1.2.5";
+    version = "1.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-restreamer/-/connect-restreamer-1.0.2.tgz";
-      name = "connect-restreamer-1.0.2.tgz";
-      sha1 = "51dcc63860c4320aef1e72b137123f7653bfe397";
+      url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-1.2.5.tgz";
+      name = "connect-multiparty-1.2.5.tgz";
+      sha1 = "2fabecfdc1a8a774ba19484dce660c818a8555e7";
     };
     deps = {
+      "multiparty-3.3.2" = self.by-version."multiparty"."3.3.2";
+      "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
+      "qs-2.2.5" = self.by-version."qs"."2.2.5";
+      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
     };
     optionalDependencies = {
     };
@@ -8592,34 +9393,12 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
+      url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.0.0.tgz";
       name = "connect-timeout-1.0.0.tgz";
       sha1 = "12054799f90bb9566f8b274efe7842d6465d10bb";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."connect-timeout"."~1.3.0" =
-    self.by-version."connect-timeout"."1.3.0";
-  by-version."connect-timeout"."1.3.0" = self.buildNodePackage {
-    name = "connect-timeout-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.3.0.tgz";
-      name = "connect-timeout-1.3.0.tgz";
-      sha1 = "d9d1d2df2900d490ed54190809f37e6b4508a1ec";
-    };
-    deps = {
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -8627,41 +9406,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."connect-timeout"."~1.6.1" =
-    self.by-version."connect-timeout"."1.6.1";
-  by-version."connect-timeout"."1.6.1" = self.buildNodePackage {
-    name = "connect-timeout-1.6.1";
-    version = "1.6.1";
+  by-spec."connect-timeout"."~1.6.2" =
+    self.by-version."connect-timeout"."1.6.2";
+  by-version."connect-timeout"."1.6.2" = self.buildNodePackage {
+    name = "connect-timeout-1.6.2";
+    version = "1.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.1.tgz";
-      name = "connect-timeout-1.6.1.tgz";
-      sha1 = "1de3a2b853734820a232080b95742494ba4cd067";
+      url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz";
+      name = "connect-timeout-1.6.2.tgz";
+      sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."connection-parse"."0.0.x" =
-    self.by-version."connection-parse"."0.0.7";
-  by-version."connection-parse"."0.0.7" = self.buildNodePackage {
-    name = "connection-parse-0.0.7";
-    version = "0.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/connection-parse/-/connection-parse-0.0.7.tgz";
-      name = "connection-parse-0.0.7.tgz";
-      sha1 = "18e7318aab06a699267372b10c5226d25a1c9a69";
-    };
-    deps = {
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -8676,7 +9436,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
+      url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
       name = "console-browserify-1.1.0.tgz";
       sha1 = "f0241c45730a9fc6323b206dbf38edc741d0bb10";
     };
@@ -8691,18 +9451,19 @@
   };
   by-spec."console-browserify"."^1.1.0" =
     self.by-version."console-browserify"."1.1.0";
-  by-spec."console-browserify"."~1.0.1" =
-    self.by-version."console-browserify"."1.0.3";
-  by-version."console-browserify"."1.0.3" = self.buildNodePackage {
-    name = "console-browserify-1.0.3";
-    version = "1.0.3";
+  by-spec."constantinople"."~3.0.1" =
+    self.by-version."constantinople"."3.0.2";
+  by-version."constantinople"."3.0.2" = self.buildNodePackage {
+    name = "constantinople-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/console-browserify/-/console-browserify-1.0.3.tgz";
-      name = "console-browserify-1.0.3.tgz";
-      sha1 = "d3898d2c3a93102f364197f8874b4f92b5286a8e";
+      url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz";
+      name = "constantinople-3.0.2.tgz";
+      sha1 = "4b945d9937907bcd98ee575122c3817516544141";
     };
     deps = {
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
     };
     optionalDependencies = {
     };
@@ -8710,19 +9471,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."constantinople"."~1.0.1" =
-    self.by-version."constantinople"."1.0.2";
-  by-version."constantinople"."1.0.2" = self.buildNodePackage {
-    name = "constantinople-1.0.2";
-    version = "1.0.2";
+  by-spec."constants-browserify"."0.0.1" =
+    self.by-version."constants-browserify"."0.0.1";
+  by-version."constants-browserify"."0.0.1" = self.buildNodePackage {
+    name = "constants-browserify-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/constantinople/-/constantinople-1.0.2.tgz";
-      name = "constantinople-1.0.2.tgz";
-      sha1 = "0e64747dc836644d3f659247efd95231b48c3e71";
+      url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
+      name = "constants-browserify-0.0.1.tgz";
+      sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
     };
     deps = {
-      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
     };
     optionalDependencies = {
     };
@@ -8730,21 +9490,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."constantinople"."~1.0.2" =
-    self.by-version."constantinople"."1.0.2";
-  by-spec."constantinople"."~3.0.1" =
-    self.by-version."constantinople"."3.0.1";
-  by-version."constantinople"."3.0.1" = self.buildNodePackage {
-    name = "constantinople-3.0.1";
-    version = "3.0.1";
+  by-spec."constants-browserify"."^1.0.0" =
+    self.by-version."constants-browserify"."1.0.0";
+  by-version."constants-browserify"."1.0.0" = self.buildNodePackage {
+    name = "constants-browserify-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/constantinople/-/constantinople-3.0.1.tgz";
-      name = "constantinople-3.0.1.tgz";
-      sha1 = "1ddf9deac0d14c4367c1d5b3f16fb2763f123108";
+      url = "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz";
+      name = "constants-browserify-1.0.0.tgz";
+      sha1 = "c20b96d8c617748aaf1c16021760cd27fcb8cb75";
     };
     deps = {
-      "acorn-globals-1.0.4" = self.by-version."acorn-globals"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -8752,16 +9509,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."constants-browserify"."0.0.1" =
+  by-spec."constants-browserify"."~0.0.1" =
     self.by-version."constants-browserify"."0.0.1";
-  by-version."constants-browserify"."0.0.1" = self.buildNodePackage {
-    name = "constants-browserify-0.0.1";
-    version = "0.0.1";
+  by-spec."constants-browserify"."~1.0.0" =
+    self.by-version."constants-browserify"."1.0.0";
+  by-spec."content-disposition"."0.5.0" =
+    self.by-version."content-disposition"."0.5.0";
+  by-version."content-disposition"."0.5.0" = self.buildNodePackage {
+    name = "content-disposition-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/constants-browserify/-/constants-browserify-0.0.1.tgz";
-      name = "constants-browserify-0.0.1.tgz";
-      sha1 = "92577db527ba6c4cf0a4568d84bc031f441e21f2";
+      url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
+      name = "content-disposition-0.5.0.tgz";
+      sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
     };
     deps = {
     };
@@ -8771,18 +9532,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."constants-browserify"."~0.0.1" =
-    self.by-version."constants-browserify"."0.0.1";
-  by-spec."content-disposition"."0.5.0" =
-    self.by-version."content-disposition"."0.5.0";
-  by-version."content-disposition"."0.5.0" = self.buildNodePackage {
-    name = "content-disposition-0.5.0";
-    version = "0.5.0";
+  by-spec."content-disposition"."0.5.1" =
+    self.by-version."content-disposition"."0.5.1";
+  by-version."content-disposition"."0.5.1" = self.buildNodePackage {
+    name = "content-disposition-0.5.1";
+    version = "0.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz";
-      name = "content-disposition-0.5.0.tgz";
-      sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e";
+      url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.1.tgz";
+      name = "content-disposition-0.5.1.tgz";
+      sha1 = "87476c6a67c8daa87e32e87616df883ba7fb071b";
     };
     deps = {
     };
@@ -8799,7 +9558,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
+      url = "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz";
       name = "content-type-1.0.1.tgz";
       sha1 = "a19d2247327dc038050ce622b7a154ec59c5e600";
     };
@@ -8811,20 +9570,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."contextify"."~0.1.5" =
-    self.by-version."contextify"."0.1.13";
-  by-version."contextify"."0.1.13" = self.buildNodePackage {
-    name = "contextify-0.1.13";
-    version = "0.1.13";
+  by-spec."contextify".">= 0.1.9 < 0.2.0" =
+    self.by-version."contextify"."0.1.15";
+  by-version."contextify"."0.1.15" = self.buildNodePackage {
+    name = "contextify-0.1.15";
+    version = "0.1.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/contextify/-/contextify-0.1.13.tgz";
-      name = "contextify-0.1.13.tgz";
-      sha1 = "4ecac6abf6fd266aff1a7b5c4fcc902932cb4efe";
+      url = "https://registry.npmjs.org/contextify/-/contextify-0.1.15.tgz";
+      name = "contextify-0.1.15.tgz";
+      sha1 = "3d34681d14a5ccbbe609c9ee11eda206b8cf266f";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.5.3" = self.by-version."nan"."1.5.3";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -8832,6 +9591,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."contextify"."~0.1.5" =
+    self.by-version."contextify"."0.1.15";
   by-spec."convert-source-map"."~0.3.0" =
     self.by-version."convert-source-map"."0.3.5";
   by-version."convert-source-map"."0.3.5" = self.buildNodePackage {
@@ -8839,7 +9600,7 @@
     version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
+      url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-0.3.5.tgz";
       name = "convert-source-map-0.3.5.tgz";
       sha1 = "f1d802950af7dd2631a1febe0596550c86ab3190";
     };
@@ -8851,6 +9612,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."convert-source-map"."~1.1.0" =
+    self.by-version."convert-source-map"."1.1.3";
+  by-version."convert-source-map"."1.1.3" = self.buildNodePackage {
+    name = "convert-source-map-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz";
+      name = "convert-source-map-1.1.3.tgz";
+      sha1 = "4829c877e9fe49b3161f3bf3673888e204699860";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cookie"."0.0.4" =
     self.by-version."cookie"."0.0.4";
   by-version."cookie"."0.0.4" = self.buildNodePackage {
@@ -8858,7 +9638,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.0.4.tgz";
       name = "cookie-0.0.4.tgz";
       sha1 = "5456bd47aee2666eac976ea80a6105940483fe98";
     };
@@ -8877,7 +9657,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.0.5.tgz";
       name = "cookie-0.0.5.tgz";
       sha1 = "f9acf9db57eb7568c9fcc596256b7bb22e307c81";
     };
@@ -8896,7 +9676,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.1.0.tgz";
       name = "cookie-0.1.0.tgz";
       sha1 = "90eb469ddce905c866de687efc43131d8801f9d0";
     };
@@ -8915,7 +9695,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.1.2.tgz";
       name = "cookie-0.1.2.tgz";
       sha1 = "72fec3d24e48a3432073d90c12642005061004b1";
     };
@@ -8927,6 +9707,63 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cookie"."0.1.3" =
+    self.by-version."cookie"."0.1.3";
+  by-version."cookie"."0.1.3" = self.buildNodePackage {
+    name = "cookie-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz";
+      name = "cookie-0.1.3.tgz";
+      sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie"."0.1.5" =
+    self.by-version."cookie"."0.1.5";
+  by-version."cookie"."0.1.5" = self.buildNodePackage {
+    name = "cookie-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.1.5.tgz";
+      name = "cookie-0.1.5.tgz";
+      sha1 = "6ab9948a4b1ae21952cd2588530a4722d4044d7c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cookie"."0.2.3" =
+    self.by-version."cookie"."0.2.3";
+  by-version."cookie"."0.2.3" = self.buildNodePackage {
+    name = "cookie-0.2.3";
+    version = "0.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cookie/-/cookie-0.2.3.tgz";
+      name = "cookie-0.2.3.tgz";
+      sha1 = "1a59536af68537a21178a01346f87cb059d2ae5c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."cookie-jar"."~0.2.0" =
     self.by-version."cookie-jar"."0.2.0";
   by-version."cookie-jar"."0.2.0" = self.buildNodePackage {
@@ -8934,7 +9771,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
+      url = "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.2.0.tgz";
       name = "cookie-jar-0.2.0.tgz";
       sha1 = "64ecc06ac978db795e4b5290cbe48ba3781400fa";
     };
@@ -8953,7 +9790,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
+      url = "https://registry.npmjs.org/cookie-jar/-/cookie-jar-0.3.0.tgz";
       name = "cookie-jar-0.3.0.tgz";
       sha1 = "bc9a27d4e2b97e186cd57c9e2063cb99fa68cccc";
     };
@@ -8972,7 +9809,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
+      url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.0.1.tgz";
       name = "cookie-parser-1.0.1.tgz";
       sha1 = "17bd622c9717cd0858a912a9fef4c0362360a7b0";
     };
@@ -8987,18 +9824,18 @@
     cpu = [ ];
   };
   by-spec."cookie-parser"."^1.0.1" =
-    self.by-version."cookie-parser"."1.3.4";
-  by-version."cookie-parser"."1.3.4" = self.buildNodePackage {
-    name = "cookie-parser-1.3.4";
-    version = "1.3.4";
+    self.by-version."cookie-parser"."1.4.1";
+  by-version."cookie-parser"."1.4.1" = self.buildNodePackage {
+    name = "cookie-parser-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.4.tgz";
-      name = "cookie-parser-1.3.4.tgz";
-      sha1 = "193035a5be97117a21709b3aa737f6132717bda6";
+      url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.1.tgz";
+      name = "cookie-parser-1.4.1.tgz";
+      sha1 = "6b0ee6a8dec27a063af42d188a592cc1d72ba4f4";
     };
     deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "cookie-0.2.3" = self.by-version."cookie"."0.2.3";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
     };
     optionalDependencies = {
@@ -9007,22 +9844,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cookie-parser"."~1.3.3" =
-    self.by-version."cookie-parser"."1.3.4";
-  by-spec."cookie-parser"."~1.3.4" =
-    self.by-version."cookie-parser"."1.3.4";
-  by-spec."cookie-signature"."1.0.0" =
-    self.by-version."cookie-signature"."1.0.0";
-  by-version."cookie-signature"."1.0.0" = self.buildNodePackage {
-    name = "cookie-signature-1.0.0";
-    version = "1.0.0";
+  by-spec."cookie-parser"."~1.3.5" =
+    self.by-version."cookie-parser"."1.3.5";
+  by-version."cookie-parser"."1.3.5" = self.buildNodePackage {
+    name = "cookie-parser-1.3.5";
+    version = "1.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.0.tgz";
-      name = "cookie-signature-1.0.0.tgz";
-      sha1 = "0044f332ac623df851c914e88eacc57f0c9704fe";
+      url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz";
+      name = "cookie-parser-1.3.5.tgz";
+      sha1 = "9d755570fb5d17890771227a02314d9be7cf8356";
     };
     deps = {
+      "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
     };
     optionalDependencies = {
     };
@@ -9030,6 +9865,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."cookie-parser"."~1.4.1" =
+    self.by-version."cookie-parser"."1.4.1";
   by-spec."cookie-signature"."1.0.1" =
     self.by-version."cookie-signature"."1.0.1";
   by-version."cookie-signature"."1.0.1" = self.buildNodePackage {
@@ -9037,7 +9874,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
+      url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.1.tgz";
       name = "cookie-signature-1.0.1.tgz";
       sha1 = "44e072148af01e6e8e24afbf12690d68ae698ecb";
     };
@@ -9056,7 +9893,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
+      url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.3.tgz";
       name = "cookie-signature-1.0.3.tgz";
       sha1 = "91cd997cc51fb641595738c69cda020328f50ff9";
     };
@@ -9075,7 +9912,7 @@
     version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
+      url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.4.tgz";
       name = "cookie-signature-1.0.4.tgz";
       sha1 = "0edd22286e3a111b9a2a70db363e925e867f6aca";
     };
@@ -9087,25 +9924,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cookie-signature"."1.0.5" =
-    self.by-version."cookie-signature"."1.0.5";
-  by-version."cookie-signature"."1.0.5" = self.buildNodePackage {
-    name = "cookie-signature-1.0.5";
-    version = "1.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.5.tgz";
-      name = "cookie-signature-1.0.5.tgz";
-      sha1 = "a122e3f1503eca0f5355795b0711bb2368d450f9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."cookie-signature"."1.0.6" =
     self.by-version."cookie-signature"."1.0.6";
   by-version."cookie-signature"."1.0.6" = self.buildNodePackage {
@@ -9113,7 +9931,7 @@
     version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
+      url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz";
       name = "cookie-signature-1.0.6.tgz";
       sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c";
     };
@@ -9134,7 +9952,7 @@
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
+      url = "https://registry.npmjs.org/cookiejar/-/cookiejar-2.0.1.tgz";
       name = "cookiejar-2.0.1.tgz";
       sha1 = "3d12752f6adf68a892f332433492bd5812bb668f";
     };
@@ -9153,7 +9971,7 @@
     version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookies/-/cookies-0.1.6.tgz";
+      url = "https://registry.npmjs.org/cookies/-/cookies-0.1.6.tgz";
       name = "cookies-0.1.6.tgz";
       sha1 = "2129588b8b1e382ffba990d9f9cf9ddf2c142846";
     };
@@ -9166,17 +9984,18 @@
     cpu = [ ];
   };
   by-spec."cookies".">= 0.2.2" =
-    self.by-version."cookies"."0.5.0";
-  by-version."cookies"."0.5.0" = self.buildNodePackage {
-    name = "cookies-0.5.0";
-    version = "0.5.0";
+    self.by-version."cookies"."0.6.1";
+  by-version."cookies"."0.6.1" = self.buildNodePackage {
+    name = "cookies-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cookies/-/cookies-0.5.0.tgz";
-      name = "cookies-0.5.0.tgz";
-      sha1 = "164cac46a1d3ca3b3b87427414c24931d8381025";
+      url = "https://registry.npmjs.org/cookies/-/cookies-0.6.1.tgz";
+      name = "cookies-0.6.1.tgz";
+      sha1 = "ef693b1bc6f01f567d46e2f504e9c15fb70cba90";
     };
     deps = {
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
       "keygrip-1.0.1" = self.by-version."keygrip"."1.0.1";
     };
     optionalDependencies = {
@@ -9186,23 +10005,26 @@
     cpu = [ ];
   };
   by-spec."cookies".">=0.5.0 <1.0.0-0" =
-    self.by-version."cookies"."0.5.0";
+    self.by-version."cookies"."0.6.1";
   by-spec."cordova"."*" =
-    self.by-version."cordova"."5.0.0";
-  by-version."cordova"."5.0.0" = self.buildNodePackage {
-    name = "cordova-5.0.0";
-    version = "5.0.0";
+    self.by-version."cordova"."6.1.1";
+  by-version."cordova"."6.1.1" = self.buildNodePackage {
+    name = "cordova-6.1.1";
+    version = "6.1.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova/-/cordova-5.0.0.tgz";
-      name = "cordova-5.0.0.tgz";
-      sha1 = "696907aff7c889beea4422b6c80e57558a905c05";
+      url = "https://registry.npmjs.org/cordova/-/cordova-6.1.1.tgz";
+      name = "cordova-6.1.1.tgz";
+      sha1 = "156488fe453182941e6034516d4e0f2f85dd47bc";
     };
     deps = {
-      "cordova-lib-5.0.0" = self.by-version."cordova-lib"."5.0.0";
+      "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
+      "cordova-lib-6.1.1" = self.by-version."cordova-lib"."6.1.1";
+      "cordova-common-1.1.1" = self.by-version."cordova-common"."1.1.1";
       "q-1.0.1" = self.by-version."q"."1.0.1";
       "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
+      "update-notifier-0.5.0" = self.by-version."update-notifier"."0.5.0";
     };
     optionalDependencies = {
     };
@@ -9210,17 +10032,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "cordova" = self.by-version."cordova"."5.0.0";
-  by-spec."cordova-app-hello-world"."3.9.0" =
-    self.by-version."cordova-app-hello-world"."3.9.0";
-  by-version."cordova-app-hello-world"."3.9.0" = self.buildNodePackage {
-    name = "cordova-app-hello-world-3.9.0";
-    version = "3.9.0";
+  "cordova" = self.by-version."cordova"."6.1.1";
+  by-spec."cordova-app-hello-world"."3.10.0" =
+    self.by-version."cordova-app-hello-world"."3.10.0";
+  by-version."cordova-app-hello-world"."3.10.0" = self.buildNodePackage {
+    name = "cordova-app-hello-world-3.10.0";
+    version = "3.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.9.0.tgz";
-      name = "cordova-app-hello-world-3.9.0.tgz";
-      sha1 = "5866d8fed5582686c68ec59a6d1097c4ec0fcc4b";
+      url = "https://registry.npmjs.org/cordova-app-hello-world/-/cordova-app-hello-world-3.10.0.tgz";
+      name = "cordova-app-hello-world-3.10.0.tgz";
+      sha1 = "e3825fc6ca950090a6a37437fcfb88c1622fd80e";
     };
     deps = {
     };
@@ -9230,21 +10052,30 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cordova-js"."3.9.0" =
-    self.by-version."cordova-js"."3.9.0";
-  by-version."cordova-js"."3.9.0" = self.buildNodePackage {
-    name = "cordova-js-3.9.0";
-    version = "3.9.0";
+  by-spec."cordova-common"."1.1.x" =
+    self.by-version."cordova-common"."1.1.1";
+  by-version."cordova-common"."1.1.1" = self.buildNodePackage {
+    name = "cordova-common-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova-js/-/cordova-js-3.9.0.tgz";
-      name = "cordova-js-3.9.0.tgz";
-      sha1 = "d5e0b7a97e475a6c70a901b49c3ed44637b2b7f2";
+      url = "https://registry.npmjs.org/cordova-common/-/cordova-common-1.1.1.tgz";
+      name = "cordova-common-1.1.1.tgz";
+      sha1 = "4f74e182fe706b7a0ad626b0b3d303910af21d25";
     };
     deps = {
-      "browserify-7.1.0" = self.by-version."browserify"."7.1.0";
-      "through-2.3.4" = self.by-version."through"."2.3.4";
-      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
+      "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
+      "bplist-parser-0.1.1" = self.by-version."bplist-parser"."0.1.1";
+      "cordova-registry-mapper-1.1.15" = self.by-version."cordova-registry-mapper"."1.1.15";
+      "elementtree-0.1.6" = self.by-version."elementtree"."0.1.6";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
+      "plist-1.2.0" = self.by-version."plist"."1.2.0";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "shelljs-0.5.3" = self.by-version."shelljs"."0.5.3";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "unorm-1.4.1" = self.by-version."unorm"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -9252,44 +10083,64 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cordova-lib"."5.0.0" =
-    self.by-version."cordova-lib"."5.0.0";
-  by-version."cordova-lib"."5.0.0" = self.buildNodePackage {
-    name = "cordova-lib-5.0.0";
-    version = "5.0.0";
+  by-spec."cordova-common"."^1.1.0" =
+    self.by-version."cordova-common"."1.1.1";
+  by-spec."cordova-js"."4.1.4" =
+    self.by-version."cordova-js"."4.1.4";
+  by-version."cordova-js"."4.1.4" = self.buildNodePackage {
+    name = "cordova-js-4.1.4";
+    version = "4.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cordova-js/-/cordova-js-4.1.4.tgz";
+      name = "cordova-js-4.1.4.tgz";
+      sha1 = "33c67efcc751a4b36d91301c2e5bd409003daf13";
+    };
+    deps = {
+      "browserify-10.1.3" = self.by-version."browserify"."10.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."cordova-lib"."6.1.1" =
+    self.by-version."cordova-lib"."6.1.1";
+  by-version."cordova-lib"."6.1.1" = self.buildNodePackage {
+    name = "cordova-lib-6.1.1";
+    version = "6.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova-lib/-/cordova-lib-5.0.0.tgz";
-      name = "cordova-lib-5.0.0.tgz";
-      sha1 = "39588131d11b79c92fd1b590549454bea04257c9";
+      url = "https://registry.npmjs.org/cordova-lib/-/cordova-lib-6.1.1.tgz";
+      name = "cordova-lib-6.1.1.tgz";
+      sha1 = "d527ceca6f91476ad759d339886f26f7d7af810f";
     };
     deps = {
-      "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6";
-      "cordova-app-hello-world-3.9.0" = self.by-version."cordova-app-hello-world"."3.9.0";
-      "cordova-js-3.9.0" = self.by-version."cordova-js"."3.9.0";
-      "cordova-registry-mapper-1.1.0" = self.by-version."cordova-registry-mapper"."1.1.0";
-      "d8-0.4.4" = self.by-version."d8"."0.4.4";
+      "aliasify-1.9.0" = self.by-version."aliasify"."1.9.0";
+      "cordova-app-hello-world-3.10.0" = self.by-version."cordova-app-hello-world"."3.10.0";
+      "cordova-common-1.1.1" = self.by-version."cordova-common"."1.1.1";
+      "cordova-js-4.1.4" = self.by-version."cordova-js"."4.1.4";
+      "cordova-registry-mapper-1.1.15" = self.by-version."cordova-registry-mapper"."1.1.15";
+      "cordova-serve-1.0.0" = self.by-version."cordova-serve"."1.0.0";
       "dep-graph-1.1.0" = self.by-version."dep-graph"."1.1.0";
-      "elementtree-0.1.5" = self.by-version."elementtree"."0.1.5";
-      "glob-4.0.6" = self.by-version."glob"."4.0.6";
-      "init-package-json-1.4.1" = self.by-version."init-package-json"."1.4.1";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "npm-1.3.4" = self.by-version."npm"."1.3.4";
-      "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "plist-1.1.0" = self.by-version."plist"."1.1.0";
+      "elementtree-0.1.6" = self.by-version."elementtree"."0.1.6";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "init-package-json-1.9.3" = self.by-version."init-package-json"."1.9.3";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "npm-2.15.3" = self.by-version."npm"."2.15.3";
+      "opener-1.4.1" = self.by-version."opener"."1.4.1";
+      "plist-1.2.0" = self.by-version."plist"."1.2.0";
       "properties-parser-0.2.3" = self.by-version."properties-parser"."0.2.3";
       "q-1.0.1" = self.by-version."q"."1.0.1";
-      "rc-0.5.2" = self.by-version."rc"."0.5.2";
       "request-2.47.0" = self.by-version."request"."2.47.0";
-      "semver-2.1.0" = self.by-version."semver"."2.1.0";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
       "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0";
       "tar-1.0.2" = self.by-version."tar"."1.0.2";
-      "through2-0.6.3" = self.by-version."through2"."0.6.3";
       "underscore-1.7.0" = self.by-version."underscore"."1.7.0";
       "unorm-1.3.3" = self.by-version."unorm"."1.3.3";
       "valid-identifier-0.0.1" = self.by-version."valid-identifier"."0.0.1";
-      "xcode-0.6.7" = self.by-version."xcode"."0.6.7";
+      "xcode-0.8.0" = self.by-version."xcode"."0.8.0";
     };
     optionalDependencies = {
     };
@@ -9298,18 +10149,17 @@
     cpu = [ ];
   };
   by-spec."cordova-registry-mapper"."1.x" =
-    self.by-version."cordova-registry-mapper"."1.1.0";
-  by-version."cordova-registry-mapper"."1.1.0" = self.buildNodePackage {
-    name = "cordova-registry-mapper-1.1.0";
-    version = "1.1.0";
+    self.by-version."cordova-registry-mapper"."1.1.15";
+  by-version."cordova-registry-mapper"."1.1.15" = self.buildNodePackage {
+    name = "cordova-registry-mapper-1.1.15";
+    version = "1.1.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.0.tgz";
-      name = "cordova-registry-mapper-1.1.0.tgz";
-      sha1 = "3d4d2283207776960d054d4966a1e31901f0c281";
+      url = "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz";
+      name = "cordova-registry-mapper-1.1.15.tgz";
+      sha1 = "e244b9185b8175473bff6079324905115f83dc7c";
     };
     deps = {
-      "tape-3.5.0" = self.by-version."tape"."3.5.0";
     };
     optionalDependencies = {
     };
@@ -9317,18 +10167,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."core-util-is"."~1.0.0" =
-    self.by-version."core-util-is"."1.0.1";
-  by-version."core-util-is"."1.0.1" = self.buildNodePackage {
-    name = "core-util-is-1.0.1";
-    version = "1.0.1";
+  by-spec."cordova-registry-mapper"."^1.1.8" =
+    self.by-version."cordova-registry-mapper"."1.1.15";
+  by-spec."cordova-serve"."^1.0.0" =
+    self.by-version."cordova-serve"."1.0.0";
+  by-version."cordova-serve"."1.0.0" = self.buildNodePackage {
+    name = "cordova-serve-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
-      name = "core-util-is-1.0.1.tgz";
-      sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+      url = "https://registry.npmjs.org/cordova-serve/-/cordova-serve-1.0.0.tgz";
+      name = "cordova-serve-1.0.0.tgz";
+      sha1 = "7fa1c40183d2b82adb792f9cb9e0d554a23eed85";
     };
     deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "compression-1.6.1" = self.by-version."compression"."1.6.1";
+      "express-4.13.4" = self.by-version."express"."4.13.4";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -9336,19 +10192,97 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cors"."2.5.3" =
-    self.by-version."cors"."2.5.3";
-  by-version."cors"."2.5.3" = self.buildNodePackage {
-    name = "cors-2.5.3";
-    version = "2.5.3";
+  by-spec."core-js"."^0.8.1" =
+    self.by-version."core-js"."0.8.4";
+  by-version."core-js"."0.8.4" = self.buildNodePackage {
+    name = "core-js-0.8.4";
+    version = "0.8.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/core-js/-/core-js-0.8.4.tgz";
+      name = "core-js-0.8.4.tgz";
+      sha1 = "c22665f1e0d1b9c3c5e1b08dabd1f108695e4fcf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."core-js"."^1.0.0" =
+    self.by-version."core-js"."1.2.6";
+  by-version."core-js"."1.2.6" = self.buildNodePackage {
+    name = "core-js-1.2.6";
+    version = "1.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/core-js/-/core-js-1.2.6.tgz";
+      name = "core-js-1.2.6.tgz";
+      sha1 = "e2351f6cae764f8c34e5d839acb6a60cef8b4a45";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."core-js"."^2.1.0" =
+    self.by-version."core-js"."2.2.1";
+  by-version."core-js"."2.2.1" = self.buildNodePackage {
+    name = "core-js-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/core-js/-/core-js-2.2.1.tgz";
+      name = "core-js-2.2.1.tgz";
+      sha1 = "e809840c0650ccae87209b4b2f13ed2d2f9e4005";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."core-util-is"."1.0.2" =
+    self.by-version."core-util-is"."1.0.2";
+  by-version."core-util-is"."1.0.2" = self.buildNodePackage {
+    name = "core-util-is-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+      name = "core-util-is-1.0.2.tgz";
+      sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."core-util-is"."~1.0.0" =
+    self.by-version."core-util-is"."1.0.2";
+  by-spec."cors"."2.7.1" =
+    self.by-version."cors"."2.7.1";
+  by-version."cors"."2.7.1" = self.buildNodePackage {
+    name = "cors-2.7.1";
+    version = "2.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cors/-/cors-2.5.3.tgz";
-      name = "cors-2.5.3.tgz";
-      sha1 = "0d70a211ec3b6cc9824e6cdc299c0630ef69c392";
+      url = "https://registry.npmjs.org/cors/-/cors-2.7.1.tgz";
+      name = "cors-2.7.1.tgz";
+      sha1 = "3c2e50a58af9ef8c89bee21226b099be1f02739b";
     };
     deps = {
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "vary-1.1.0" = self.by-version."vary"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -9357,7 +10291,7 @@
     cpu = [ ];
   };
   by-spec."cors"."^2.4.2" =
-    self.by-version."cors"."2.5.3";
+    self.by-version."cors"."2.7.1";
   by-spec."couch-login"."~0.1.15" =
     self.by-version."couch-login"."0.1.20";
   by-version."couch-login"."0.1.20" = self.buildNodePackage {
@@ -9365,12 +10299,12 @@
     version = "0.1.20";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
+      url = "https://registry.npmjs.org/couch-login/-/couch-login-0.1.20.tgz";
       name = "couch-login-0.1.20.tgz";
       sha1 = "007c70ef80089dbae6f59eeeec37480799b39595";
     };
     deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -9378,24 +10312,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."couch-login"."~0.1.18" =
-    self.by-version."couch-login"."0.1.20";
   by-spec."coveralls"."*" =
-    self.by-version."coveralls"."2.11.2";
-  by-version."coveralls"."2.11.2" = self.buildNodePackage {
-    name = "coveralls-2.11.2";
-    version = "2.11.2";
+    self.by-version."coveralls"."2.11.9";
+  by-version."coveralls"."2.11.9" = self.buildNodePackage {
+    name = "coveralls-2.11.9";
+    version = "2.11.9";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/coveralls/-/coveralls-2.11.2.tgz";
-      name = "coveralls-2.11.2.tgz";
-      sha1 = "d4d982016cb2f9da89d77ab204d86a8537e6a12d";
+      url = "https://registry.npmjs.org/coveralls/-/coveralls-2.11.9.tgz";
+      name = "coveralls-2.11.9.tgz";
+      sha1 = "f9ff01a1adbf22a129e35a8d62345a52a781b395";
     };
     deps = {
       "js-yaml-3.0.1" = self.by-version."js-yaml"."3.0.1";
       "lcov-parse-0.0.6" = self.by-version."lcov-parse"."0.0.6";
       "log-driver-1.2.4" = self.by-version."log-driver"."1.2.4";
-      "request-2.40.0" = self.by-version."request"."2.40.0";
+      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -9403,7 +10336,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "coveralls" = self.by-version."coveralls"."2.11.2";
+  "coveralls" = self.by-version."coveralls"."2.11.9";
   by-spec."crc"."0.2.0" =
     self.by-version."crc"."0.2.0";
   by-version."crc"."0.2.0" = self.buildNodePackage {
@@ -9411,7 +10344,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
+      url = "https://registry.npmjs.org/crc/-/crc-0.2.0.tgz";
       name = "crc-0.2.0.tgz";
       sha1 = "f4486b9bf0a12df83c3fca14e31e030fdabd9454";
     };
@@ -9430,7 +10363,7 @@
     version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz";
+      url = "https://registry.npmjs.org/crc/-/crc-3.0.0.tgz";
       name = "crc-3.0.0.tgz";
       sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22";
     };
@@ -9442,16 +10375,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."crc"."3.2.1" =
-    self.by-version."crc"."3.2.1";
-  by-version."crc"."3.2.1" = self.buildNodePackage {
-    name = "crc-3.2.1";
-    version = "3.2.1";
+  by-spec."crc"."3.3.0" =
+    self.by-version."crc"."3.3.0";
+  by-version."crc"."3.3.0" = self.buildNodePackage {
+    name = "crc-3.3.0";
+    version = "3.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crc/-/crc-3.2.1.tgz";
-      name = "crc-3.2.1.tgz";
-      sha1 = "5d9c8fb77a245cd5eca291e5d2d005334bab0082";
+      url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz";
+      name = "crc-3.3.0.tgz";
+      sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."crc"."3.4.0" =
+    self.by-version."crc"."3.4.0";
+  by-version."crc"."3.4.0" = self.buildNodePackage {
+    name = "crc-3.4.0";
+    version = "3.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/crc/-/crc-3.4.0.tgz";
+      name = "crc-3.4.0.tgz";
+      sha1 = "4258e351613a74ef1153dfcb05e820c3e9715d7f";
     };
     deps = {
     };
@@ -9462,15 +10414,15 @@
     cpu = [ ];
   };
   by-spec."crc32-stream"."~0.3.1" =
-    self.by-version."crc32-stream"."0.3.3";
-  by-version."crc32-stream"."0.3.3" = self.buildNodePackage {
-    name = "crc32-stream-0.3.3";
-    version = "0.3.3";
+    self.by-version."crc32-stream"."0.3.4";
+  by-version."crc32-stream"."0.3.4" = self.buildNodePackage {
+    name = "crc32-stream-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.3.tgz";
-      name = "crc32-stream-0.3.3.tgz";
-      sha1 = "27cdfad6eec97a139820e3bff2b4aaad82e85e19";
+      url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.3.4.tgz";
+      name = "crc32-stream-0.3.4.tgz";
+      sha1 = "73bc25b45fac1db6632231a7bfce8927e9f06552";
     };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
@@ -9482,20 +10434,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."create-ecdh"."^2.0.0" =
-    self.by-version."create-ecdh"."2.0.0";
-  by-version."create-ecdh"."2.0.0" = self.buildNodePackage {
-    name = "create-ecdh-2.0.0";
-    version = "2.0.0";
+  by-spec."create-ecdh"."^4.0.0" =
+    self.by-version."create-ecdh"."4.0.0";
+  by-version."create-ecdh"."4.0.0" = self.buildNodePackage {
+    name = "create-ecdh-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/create-ecdh/-/create-ecdh-2.0.0.tgz";
-      name = "create-ecdh-2.0.0.tgz";
-      sha1 = "59a11dbd3af8de5acbc8d005b624ccf7136f2a78";
+      url = "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz";
+      name = "create-ecdh-4.0.0.tgz";
+      sha1 = "888c723596cdf7612f6498233eebd7a35301737d";
     };
     deps = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
-      "elliptic-1.0.1" = self.by-version."elliptic"."1.0.1";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "elliptic-6.2.3" = self.by-version."elliptic"."6.2.3";
     };
     optionalDependencies = {
     };
@@ -9504,20 +10456,21 @@
     cpu = [ ];
   };
   by-spec."create-hash"."^1.1.0" =
-    self.by-version."create-hash"."1.1.1";
-  by-version."create-hash"."1.1.1" = self.buildNodePackage {
-    name = "create-hash-1.1.1";
-    version = "1.1.1";
+    self.by-version."create-hash"."1.1.2";
+  by-version."create-hash"."1.1.2" = self.buildNodePackage {
+    name = "create-hash-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/create-hash/-/create-hash-1.1.1.tgz";
-      name = "create-hash-1.1.1.tgz";
-      sha1 = "a55424f97b5369bfb2a97e53bd9b7a1aa6dd3a17";
+      url = "https://registry.npmjs.org/create-hash/-/create-hash-1.1.2.tgz";
+      name = "create-hash-1.1.2.tgz";
+      sha1 = "51210062d7bb7479f6c65bb41a92208b1d61abad";
     };
     deps = {
+      "cipher-base-1.0.2" = self.by-version."cipher-base"."1.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ripemd160-1.0.0" = self.by-version."ripemd160"."1.0.0";
-      "sha.js-2.4.0" = self.by-version."sha.js"."2.4.0";
+      "ripemd160-1.0.1" = self.by-version."ripemd160"."1.0.1";
+      "sha.js-2.4.5" = self.by-version."sha.js"."2.4.5";
     };
     optionalDependencies = {
     };
@@ -9525,19 +10478,21 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."create-hash"."^1.1.1" =
+    self.by-version."create-hash"."1.1.2";
   by-spec."create-hmac"."^1.1.0" =
-    self.by-version."create-hmac"."1.1.3";
-  by-version."create-hmac"."1.1.3" = self.buildNodePackage {
-    name = "create-hmac-1.1.3";
-    version = "1.1.3";
+    self.by-version."create-hmac"."1.1.4";
+  by-version."create-hmac"."1.1.4" = self.buildNodePackage {
+    name = "create-hmac-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.3.tgz";
-      name = "create-hmac-1.1.3.tgz";
-      sha1 = "29843e9c191ba412ab001bc55ac8b8b9ae54b670";
+      url = "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.4.tgz";
+      name = "create-hmac-1.1.4.tgz";
+      sha1 = "d3fb4ba253eb8b3f56e39ea2fbcb8af747bd3170";
     };
     deps = {
-      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
+      "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -9547,20 +10502,20 @@
     cpu = [ ];
   };
   by-spec."create-hmac"."^1.1.2" =
-    self.by-version."create-hmac"."1.1.3";
-  by-spec."cron"."1.0.6" =
-    self.by-version."cron"."1.0.6";
-  by-version."cron"."1.0.6" = self.buildNodePackage {
-    name = "cron-1.0.6";
-    version = "1.0.6";
+    self.by-version."create-hmac"."1.1.4";
+  by-spec."cron"."1.1.0" =
+    self.by-version."cron"."1.1.0";
+  by-version."cron"."1.1.0" = self.buildNodePackage {
+    name = "cron-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cron/-/cron-1.0.6.tgz";
-      name = "cron-1.0.6.tgz";
-      sha1 = "92a32920a8d0fa433248e9de46768d53c55269d7";
+      url = "https://registry.npmjs.org/cron/-/cron-1.1.0.tgz";
+      name = "cron-1.1.0.tgz";
+      sha1 = "61e868c6f18f98e8bcb88bcd7ab9fb8fae909453";
     };
     deps = {
-      "moment-timezone-0.2.4" = self.by-version."moment-timezone"."0.2.4";
+      "moment-timezone-0.3.1" = self.by-version."moment-timezone"."0.3.1";
     };
     optionalDependencies = {
     };
@@ -9569,18 +10524,22 @@
     cpu = [ ];
   };
   by-spec."cron".">=1.0.1" =
-    self.by-version."cron"."1.0.9";
-  by-version."cron"."1.0.9" = self.buildNodePackage {
-    name = "cron-1.0.9";
-    version = "1.0.9";
+    self.by-version."cron"."1.1.0";
+  by-spec."cron"."^1.0.4" =
+    self.by-version."cron"."1.1.0";
+  by-spec."crossroads"."~0.12.2" =
+    self.by-version."crossroads"."0.12.2";
+  by-version."crossroads"."0.12.2" = self.buildNodePackage {
+    name = "crossroads-0.12.2";
+    version = "0.12.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cron/-/cron-1.0.9.tgz";
-      name = "cron-1.0.9.tgz";
-      sha1 = "5177cf751f3263f00f45ebf69fead1ea96d31cfc";
+      url = "https://registry.npmjs.org/crossroads/-/crossroads-0.12.2.tgz";
+      name = "crossroads-0.12.2.tgz";
+      sha1 = "b1d5f9c1d98af3bdd61f1bda6a86dd1aee4ff8f2";
     };
     deps = {
-      "moment-timezone-0.3.1" = self.by-version."moment-timezone"."0.3.1";
+      "signals-1.0.0" = self.by-version."signals"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -9588,21 +10547,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cron"."^1.0.4" =
-    self.by-version."cron"."1.0.9";
-  by-spec."crossroads"."~0.12.0" =
-    self.by-version."crossroads"."0.12.0";
-  by-version."crossroads"."0.12.0" = self.buildNodePackage {
-    name = "crossroads-0.12.0";
-    version = "0.12.0";
+  by-spec."crypt"."~ 0.0.1" =
+    self.by-version."crypt"."0.0.1";
+  by-version."crypt"."0.0.1" = self.buildNodePackage {
+    name = "crypt-0.0.1";
+    version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crossroads/-/crossroads-0.12.0.tgz";
-      name = "crossroads-0.12.0.tgz";
-      sha1 = "24114f9de3abfa0271df66b4ec56c3b984b7f56e";
+      url = "https://registry.npmjs.org/crypt/-/crypt-0.0.1.tgz";
+      name = "crypt-0.0.1.tgz";
+      sha1 = "5f11b21a6c05ef1b5e79708366da6374ece1e6a2";
     };
     deps = {
-      "signals-1.0.0" = self.by-version."signals"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -9611,18 +10567,18 @@
     cpu = [ ];
   };
   by-spec."crypt3".">=0.1.5 <1.0.0-0" =
-    self.by-version."crypt3"."0.1.8";
-  by-version."crypt3"."0.1.8" = self.buildNodePackage {
-    name = "crypt3-0.1.8";
-    version = "0.1.8";
+    self.by-version."crypt3"."0.2.0";
+  by-version."crypt3"."0.2.0" = self.buildNodePackage {
+    name = "crypt3-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crypt3/-/crypt3-0.1.8.tgz";
-      name = "crypt3-0.1.8.tgz";
-      sha1 = "60f27edeb4ec10703012463e6b974c73a1129688";
+      url = "https://registry.npmjs.org/crypt3/-/crypt3-0.2.0.tgz";
+      name = "crypt3-0.2.0.tgz";
+      sha1 = "4bd28e0770fad421fc807745c1ef3010905b2332";
     };
     deps = {
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -9631,7 +10587,7 @@
     cpu = [ ];
   };
   by-spec."crypt3".">=0.1.6 <1.0.0-0" =
-    self.by-version."crypt3"."0.1.8";
+    self.by-version."crypt3"."0.2.0";
   by-spec."cryptiles"."0.1.x" =
     self.by-version."cryptiles"."0.1.3";
   by-version."cryptiles"."0.1.3" = self.buildNodePackage {
@@ -9639,7 +10595,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
+      url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.1.3.tgz";
       name = "cryptiles-0.1.3.tgz";
       sha1 = "1a556734f06d24ba34862ae9cb9e709a3afbff1c";
     };
@@ -9659,7 +10615,7 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
+      url = "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz";
       name = "cryptiles-0.2.2.tgz";
       sha1 = "ed91ff1f17ad13d3748288594f8a48a0d26f325c";
     };
@@ -9673,18 +10629,18 @@
     cpu = [ ];
   };
   by-spec."cryptiles"."2.x.x" =
-    self.by-version."cryptiles"."2.0.4";
-  by-version."cryptiles"."2.0.4" = self.buildNodePackage {
-    name = "cryptiles-2.0.4";
-    version = "2.0.4";
+    self.by-version."cryptiles"."2.0.5";
+  by-version."cryptiles"."2.0.5" = self.buildNodePackage {
+    name = "cryptiles-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
-      name = "cryptiles-2.0.4.tgz";
-      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
+      url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+      name = "cryptiles-2.0.5.tgz";
+      sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
     };
     deps = {
-      "boom-2.7.1" = self.by-version."boom"."2.7.1";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
     };
     optionalDependencies = {
     };
@@ -9699,7 +10655,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
+      url = "https://registry.npmjs.org/crypto/-/crypto-0.0.3.tgz";
       name = "crypto-0.0.3.tgz";
       sha1 = "470a81b86be4c5ee17acc8207a1f5315ae20dbb0";
     };
@@ -9712,27 +10668,27 @@
     cpu = [ ];
   };
   by-spec."crypto-browserify"."^3.0.0" =
-    self.by-version."crypto-browserify"."3.9.14";
-  by-version."crypto-browserify"."3.9.14" = self.buildNodePackage {
-    name = "crypto-browserify-3.9.14";
-    version = "3.9.14";
+    self.by-version."crypto-browserify"."3.11.0";
+  by-version."crypto-browserify"."3.11.0" = self.buildNodePackage {
+    name = "crypto-browserify-3.11.0";
+    version = "3.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.9.14.tgz";
-      name = "crypto-browserify-3.9.14.tgz";
-      sha1 = "d69925252c845392714aed1460c54b56605314ab";
+      url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.0.tgz";
+      name = "crypto-browserify-3.11.0.tgz";
+      sha1 = "3652a0906ab9b2a7e0c3ce66a408e957a2485522";
     };
     deps = {
-      "browserify-aes-1.0.0" = self.by-version."browserify-aes"."1.0.0";
-      "browserify-sign-3.0.1" = self.by-version."browserify-sign"."3.0.1";
-      "create-ecdh-2.0.0" = self.by-version."create-ecdh"."2.0.0";
-      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
-      "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
-      "diffie-hellman-3.0.1" = self.by-version."diffie-hellman"."3.0.1";
+      "browserify-cipher-1.0.0" = self.by-version."browserify-cipher"."1.0.0";
+      "browserify-sign-4.0.0" = self.by-version."browserify-sign"."4.0.0";
+      "create-ecdh-4.0.0" = self.by-version."create-ecdh"."4.0.0";
+      "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
+      "create-hmac-1.1.4" = self.by-version."create-hmac"."1.1.4";
+      "diffie-hellman-5.0.2" = self.by-version."diffie-hellman"."5.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "pbkdf2-3.0.4" = self.by-version."pbkdf2"."3.0.4";
-      "public-encrypt-2.0.0" = self.by-version."public-encrypt"."2.0.0";
-      "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
+      "public-encrypt-4.0.0" = self.by-version."public-encrypt"."4.0.0";
+      "randombytes-2.0.3" = self.by-version."randombytes"."2.0.3";
     };
     optionalDependencies = {
     };
@@ -9740,27 +10696,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."crypto-browserify"."^3.11.0" =
+    self.by-version."crypto-browserify"."3.11.0";
   by-spec."crypto-browserify"."^3.2.6" =
-    self.by-version."crypto-browserify"."3.9.14";
-  by-spec."crypto-browserify"."~1.0.9" =
-    self.by-version."crypto-browserify"."1.0.9";
-  by-version."crypto-browserify"."1.0.9" = self.buildNodePackage {
-    name = "crypto-browserify-1.0.9";
-    version = "1.0.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-1.0.9.tgz";
-      name = "crypto-browserify-1.0.9.tgz";
-      sha1 = "cc5449685dfb85eb11c9828acc7cb87ab5bbfcc0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."crypto-browserify"."3.11.0";
   by-spec."crypto-browserify"."~3.2.6" =
     self.by-version."crypto-browserify"."3.2.8";
   by-version."crypto-browserify"."3.2.8" = self.buildNodePackage {
@@ -9768,7 +10707,7 @@
     version = "3.2.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
+      url = "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.2.8.tgz";
       name = "crypto-browserify-3.2.8.tgz";
       sha1 = "b9b11dbe6d9651dd882a01e6cc467df718ecf189";
     };
@@ -9783,22 +10722,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csrf"."~2.0.5" =
-    self.by-version."csrf"."2.0.6";
-  by-version."csrf"."2.0.6" = self.buildNodePackage {
-    name = "csrf-2.0.6";
-    version = "2.0.6";
+  by-spec."csrf"."~3.0.0" =
+    self.by-version."csrf"."3.0.1";
+  by-version."csrf"."3.0.1" = self.buildNodePackage {
+    name = "csrf-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csrf/-/csrf-2.0.6.tgz";
-      name = "csrf-2.0.6.tgz";
-      sha1 = "a90a9d88fc7411423cb0c5c13e901a8cc588132e";
+      url = "https://registry.npmjs.org/csrf/-/csrf-3.0.1.tgz";
+      name = "csrf-3.0.1.tgz";
+      sha1 = "985b218d7e2e558ed3d980fa38f694ba682784c2";
     };
     deps = {
       "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
-      "rndm-1.1.0" = self.by-version."rndm"."1.1.0";
+      "rndm-1.2.0" = self.by-version."rndm"."1.2.0";
       "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
-      "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
+      "uid-safe-2.1.0" = self.by-version."uid-safe"."2.1.0";
     };
     optionalDependencies = {
     };
@@ -9806,8 +10745,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csrf"."~2.0.6" =
-    self.by-version."csrf"."2.0.6";
   by-spec."css"."~1.0.8" =
     self.by-version."css"."1.0.8";
   by-version."css"."1.0.8" = self.buildNodePackage {
@@ -9815,7 +10752,7 @@
     version = "1.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/css/-/css-1.0.8.tgz";
+      url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz";
       name = "css-1.0.8.tgz";
       sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7";
     };
@@ -9836,7 +10773,7 @@
     version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
+      url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz";
       name = "css-parse-1.0.4.tgz";
       sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd";
     };
@@ -9855,7 +10792,7 @@
     version = "1.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
+      url = "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz";
       name = "css-parse-1.7.0.tgz";
       sha1 = "321f6cf73782a6ff751111390fc05e2c657d8c9b";
     };
@@ -9867,18 +10804,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."css-stringify"."1.0.5" =
-    self.by-version."css-stringify"."1.0.5";
-  by-version."css-stringify"."1.0.5" = self.buildNodePackage {
-    name = "css-stringify-1.0.5";
-    version = "1.0.5";
+  by-spec."css-select"."~1.0.0" =
+    self.by-version."css-select"."1.0.0";
+  by-version."css-select"."1.0.0" = self.buildNodePackage {
+    name = "css-select-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
-      name = "css-stringify-1.0.5.tgz";
-      sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
+      url = "https://registry.npmjs.org/css-select/-/css-select-1.0.0.tgz";
+      name = "css-select-1.0.0.tgz";
+      sha1 = "b1121ca51848dd264e2244d058cee254deeb44b0";
     };
     deps = {
+      "css-what-1.0.0" = self.by-version."css-what"."1.0.0";
+      "domutils-1.4.3" = self.by-version."domutils"."1.4.3";
+      "boolbase-1.0.0" = self.by-version."boolbase"."1.0.0";
+      "nth-check-1.0.1" = self.by-version."nth-check"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -9886,16 +10827,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cssom"."0.3.x" =
-    self.by-version."cssom"."0.3.0";
-  by-version."cssom"."0.3.0" = self.buildNodePackage {
-    name = "cssom-0.3.0";
-    version = "0.3.0";
+  by-spec."css-stringify"."1.0.5" =
+    self.by-version."css-stringify"."1.0.5";
+  by-version."css-stringify"."1.0.5" = self.buildNodePackage {
+    name = "css-stringify-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cssom/-/cssom-0.3.0.tgz";
-      name = "cssom-0.3.0.tgz";
-      sha1 = "386d5135528fe65c1ee1bc7c4e55a38854dbcf7a";
+      url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz";
+      name = "css-stringify-1.0.5.tgz";
+      sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031";
     };
     deps = {
     };
@@ -9905,21 +10846,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."cssom"."~0.3.0" =
-    self.by-version."cssom"."0.3.0";
-  by-spec."cssstyle"."~0.2.9" =
-    self.by-version."cssstyle"."0.2.23";
-  by-version."cssstyle"."0.2.23" = self.buildNodePackage {
-    name = "cssstyle-0.2.23";
-    version = "0.2.23";
+  by-spec."css-what"."1.0" =
+    self.by-version."css-what"."1.0.0";
+  by-version."css-what"."1.0.0" = self.buildNodePackage {
+    name = "css-what-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cssstyle/-/cssstyle-0.2.23.tgz";
-      name = "cssstyle-0.2.23.tgz";
-      sha1 = "34af29a8e9d82ffa031573cbce4309ca27a899f6";
+      url = "https://registry.npmjs.org/css-what/-/css-what-1.0.0.tgz";
+      name = "css-what-1.0.0.tgz";
+      sha1 = "d7cc2df45180666f99d2b14462639469e00f736c";
     };
     deps = {
-      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
     };
     optionalDependencies = {
     };
@@ -9927,20 +10865,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csurf"."1.1.0" =
-    self.by-version."csurf"."1.1.0";
-  by-version."csurf"."1.1.0" = self.buildNodePackage {
-    name = "csurf-1.1.0";
-    version = "1.1.0";
+  by-spec."cssom"."0.3.x" =
+    self.by-version."cssom"."0.3.1";
+  by-version."cssom"."0.3.1" = self.buildNodePackage {
+    name = "cssom-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
-      name = "csurf-1.1.0.tgz";
-      sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
+      url = "https://registry.npmjs.org/cssom/-/cssom-0.3.1.tgz";
+      name = "cssom-0.3.1.tgz";
+      sha1 = "c9e37ef2490e64f6d1baa10fda852257082c25d3";
     };
     deps = {
-      "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
-      "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -9948,22 +10884,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csurf"."~1.6.1" =
-    self.by-version."csurf"."1.6.6";
-  by-version."csurf"."1.6.6" = self.buildNodePackage {
-    name = "csurf-1.6.6";
-    version = "1.6.6";
+  by-spec."cssom".">= 0.3.0 < 0.4.0" =
+    self.by-version."cssom"."0.3.1";
+  by-spec."cssom"."~0.3.0" =
+    self.by-version."cssom"."0.3.1";
+  by-spec."cssstyle".">= 0.2.21 < 0.3.0" =
+    self.by-version."cssstyle"."0.2.34";
+  by-version."cssstyle"."0.2.34" = self.buildNodePackage {
+    name = "cssstyle-0.2.34";
+    version = "0.2.34";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csurf/-/csurf-1.6.6.tgz";
-      name = "csurf-1.6.6.tgz";
-      sha1 = "fc4b1aa293f65da87731c049350d01b25bda3ece";
+      url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.34.tgz";
+      name = "cssstyle-0.2.34.tgz";
+      sha1 = "7a7a1bd44b60753926a6738e7bc075f15d97c970";
     };
     deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "csrf-2.0.6" = self.by-version."csrf"."2.0.6";
-      "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8";
+      "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
     };
     optionalDependencies = {
     };
@@ -9971,24 +10908,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csurf"."~1.6.2" =
-    self.by-version."csurf"."1.6.6";
-  by-spec."csurf"."~1.7.0" =
-    self.by-version."csurf"."1.7.0";
-  by-version."csurf"."1.7.0" = self.buildNodePackage {
-    name = "csurf-1.7.0";
-    version = "1.7.0";
+  by-spec."cssstyle"."~0.2.9" =
+    self.by-version."cssstyle"."0.2.34";
+  by-spec."csurf"."1.1.0" =
+    self.by-version."csurf"."1.1.0";
+  by-version."csurf"."1.1.0" = self.buildNodePackage {
+    name = "csurf-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csurf/-/csurf-1.7.0.tgz";
-      name = "csurf-1.7.0.tgz";
-      sha1 = "f24dc53753fccbdce0505f2abc5b57167b65ff18";
+      url = "https://registry.npmjs.org/csurf/-/csurf-1.1.0.tgz";
+      name = "csurf-1.1.0.tgz";
+      sha1 = "5dd459df40df43b9eb828284d6d03132f42cb8b2";
     };
     deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "csrf-2.0.6" = self.by-version."csrf"."2.0.6";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
+      "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -9996,22 +10931,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csv"."^0.4.0" =
-    self.by-version."csv"."0.4.1";
-  by-version."csv"."0.4.1" = self.buildNodePackage {
-    name = "csv-0.4.1";
-    version = "0.4.1";
+  by-spec."csurf"."~1.8.3" =
+    self.by-version."csurf"."1.8.3";
+  by-version."csurf"."1.8.3" = self.buildNodePackage {
+    name = "csurf-1.8.3";
+    version = "1.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csv/-/csv-0.4.1.tgz";
-      name = "csv-0.4.1.tgz";
-      sha1 = "aa58f059591c98a361a61b287d1c0a394c79160e";
+      url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz";
+      name = "csurf-1.8.3.tgz";
+      sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a";
     };
     deps = {
-      "csv-generate-0.0.4" = self.by-version."csv-generate"."0.0.4";
-      "csv-parse-0.1.0" = self.by-version."csv-parse"."0.1.0";
-      "stream-transform-0.0.7" = self.by-version."stream-transform"."0.0.7";
-      "csv-stringify-0.0.6" = self.by-version."csv-stringify"."0.0.6";
+      "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "csrf-3.0.1" = self.by-version."csrf"."3.0.1";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
     };
     optionalDependencies = {
     };
@@ -10019,18 +10954,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csv-generate"."*" =
-    self.by-version."csv-generate"."0.0.4";
-  by-version."csv-generate"."0.0.4" = self.buildNodePackage {
-    name = "csv-generate-0.0.4";
-    version = "0.0.4";
+  by-spec."csv"."^0.4.0" =
+    self.by-version."csv"."0.4.6";
+  by-version."csv"."0.4.6" = self.buildNodePackage {
+    name = "csv-0.4.6";
+    version = "0.4.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csv-generate/-/csv-generate-0.0.4.tgz";
-      name = "csv-generate-0.0.4.tgz";
-      sha1 = "6d0329b847ba0e12e24b82f4cf949c38c6f84d2f";
+      url = "https://registry.npmjs.org/csv/-/csv-0.4.6.tgz";
+      name = "csv-0.4.6.tgz";
+      sha1 = "8dbae7ddfdbaae62c1ea987c3e0f8a9ac737b73d";
     };
     deps = {
+      "csv-generate-0.0.6" = self.by-version."csv-generate"."0.0.6";
+      "csv-parse-1.0.4" = self.by-version."csv-parse"."1.0.4";
+      "stream-transform-0.1.1" = self.by-version."stream-transform"."0.1.1";
+      "csv-stringify-0.0.8" = self.by-version."csv-stringify"."0.0.8";
     };
     optionalDependencies = {
     };
@@ -10038,16 +10977,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csv-parse"."*" =
-    self.by-version."csv-parse"."0.1.0";
-  by-version."csv-parse"."0.1.0" = self.buildNodePackage {
-    name = "csv-parse-0.1.0";
-    version = "0.1.0";
+  by-spec."csv-generate"."^0.0.6" =
+    self.by-version."csv-generate"."0.0.6";
+  by-version."csv-generate"."0.0.6" = self.buildNodePackage {
+    name = "csv-generate-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csv-parse/-/csv-parse-0.1.0.tgz";
-      name = "csv-parse-0.1.0.tgz";
-      sha1 = "da80610577d05b1cfd7cabd0376bb7cdf707aa42";
+      url = "https://registry.npmjs.org/csv-generate/-/csv-generate-0.0.6.tgz";
+      name = "csv-generate-0.0.6.tgz";
+      sha1 = "97e4e63ae46b21912cd9475bc31469d26f5ade66";
     };
     deps = {
     };
@@ -10057,16 +10996,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."csv-stringify"."*" =
-    self.by-version."csv-stringify"."0.0.6";
-  by-version."csv-stringify"."0.0.6" = self.buildNodePackage {
-    name = "csv-stringify-0.0.6";
-    version = "0.0.6";
+  by-spec."csv-parse"."^1.0.0" =
+    self.by-version."csv-parse"."1.0.4";
+  by-version."csv-parse"."1.0.4" = self.buildNodePackage {
+    name = "csv-parse-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.6.tgz";
-      name = "csv-stringify-0.0.6.tgz";
-      sha1 = "7cf09e868b1b18a497dac1553420bdabb99b6b62";
+      url = "https://registry.npmjs.org/csv-parse/-/csv-parse-1.0.4.tgz";
+      name = "csv-parse-1.0.4.tgz";
+      sha1 = "200ad360b07c3e8986ddc990b7bc070bc85f147a";
     };
     deps = {
     };
@@ -10076,16 +11015,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ctype"."0.5.2" =
-    self.by-version."ctype"."0.5.2";
-  by-version."ctype"."0.5.2" = self.buildNodePackage {
-    name = "ctype-0.5.2";
-    version = "0.5.2";
+  by-spec."csv-stringify"."^0.0.8" =
+    self.by-version."csv-stringify"."0.0.8";
+  by-version."csv-stringify"."0.0.8" = self.buildNodePackage {
+    name = "csv-stringify-0.0.8";
+    version = "0.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.2.tgz";
-      name = "ctype-0.5.2.tgz";
-      sha1 = "fe8091d468a373a0b0c9ff8bbfb3425c00973a1d";
+      url = "https://registry.npmjs.org/csv-stringify/-/csv-stringify-0.0.8.tgz";
+      name = "csv-stringify-0.0.8.tgz";
+      sha1 = "52cc3b3dfc197758c55ad325a95be85071f9e51b";
     };
     deps = {
     };
@@ -10102,7 +11041,7 @@
     version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
+      url = "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
       name = "ctype-0.5.3.tgz";
       sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
     };
@@ -10114,16 +11053,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ctype"."0.5.4" =
-    self.by-version."ctype"."0.5.4";
-  by-version."ctype"."0.5.4" = self.buildNodePackage {
-    name = "ctype-0.5.4";
-    version = "0.5.4";
+  by-spec."custom-event"."~1.0.0" =
+    self.by-version."custom-event"."1.0.0";
+  by-version."custom-event"."1.0.0" = self.buildNodePackage {
+    name = "custom-event-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.4.tgz";
-      name = "ctype-0.5.4.tgz";
-      sha1 = "5cfffbc266442ce8a1239a5f37091a085b7a3e6e";
+      url = "https://registry.npmjs.org/custom-event/-/custom-event-1.0.0.tgz";
+      name = "custom-event-1.0.0.tgz";
+      sha1 = "2e4628be19dc4b214b5c02630c5971e811618062";
     };
     deps = {
     };
@@ -10140,7 +11079,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
+      url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz";
       name = "cycle-1.0.3.tgz";
       sha1 = "21e80b2be8580f98b468f379430662b046c34ad2";
     };
@@ -10152,19 +11091,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."d"."~0.1.1" =
+  by-spec."cyclist"."~0.1.0" =
+    self.by-version."cyclist"."0.1.1";
+  by-version."cyclist"."0.1.1" = self.buildNodePackage {
+    name = "cyclist-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/cyclist/-/cyclist-0.1.1.tgz";
+      name = "cyclist-0.1.1.tgz";
+      sha1 = "1bcfa56b081448cdb5e12bfc1bfad34b47fba8f3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."d"."^0.1.1" =
     self.by-version."d"."0.1.1";
   by-version."d"."0.1.1" = self.buildNodePackage {
     name = "d-0.1.1";
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/d/-/d-0.1.1.tgz";
+      url = "https://registry.npmjs.org/d/-/d-0.1.1.tgz";
       name = "d-0.1.1.tgz";
       sha1 = "da184c535d18d8ee7ba2aa229b914009fae11309";
     };
     deps = {
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
     };
     optionalDependencies = {
     };
@@ -10172,19 +11130,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."d8"."0.4.4" =
-    self.by-version."d8"."0.4.4";
-  by-version."d8"."0.4.4" = self.buildNodePackage {
-    name = "d8-0.4.4";
-    version = "0.4.4";
+  by-spec."d"."~0.1.1" =
+    self.by-version."d"."0.1.1";
+  by-spec."dashdash"."1.10.1" =
+    self.by-version."dashdash"."1.10.1";
+  by-version."dashdash"."1.10.1" = self.buildNodePackage {
+    name = "dashdash-1.10.1";
+    version = "1.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/d8/-/d8-0.4.4.tgz";
-      name = "d8-0.4.4.tgz";
-      sha1 = "5989dd62b90bdd853d3978f1261a4bc76bcf6485";
+      url = "https://registry.npmjs.org/dashdash/-/dashdash-1.10.1.tgz";
+      name = "dashdash-1.10.1.tgz";
+      sha1 = "0abf1af89a8f5129a81f18c2b35b21df22622f60";
     };
     deps = {
-      "m8-0.4.4" = self.by-version."m8"."0.4.4";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
     };
     optionalDependencies = {
     };
@@ -10192,19 +11152,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."dashdash"."1.3.2" =
-    self.by-version."dashdash"."1.3.2";
-  by-version."dashdash"."1.3.2" = self.buildNodePackage {
-    name = "dashdash-1.3.2";
-    version = "1.3.2";
+  by-spec."dashdash"."1.7.3" =
+    self.by-version."dashdash"."1.7.3";
+  by-version."dashdash"."1.7.3" = self.buildNodePackage {
+    name = "dashdash-1.7.3";
+    version = "1.7.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.3.2.tgz";
-      name = "dashdash-1.3.2.tgz";
-      sha1 = "1e76d13fadf25f8f50e70212c98a25beb1b3b8eb";
+      url = "https://registry.npmjs.org/dashdash/-/dashdash-1.7.3.tgz";
+      name = "dashdash-1.7.3.tgz";
+      sha1 = "bf533fedaa455ed8fee11519ebfb9ad66170dcdf";
     };
     deps = {
-      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
     };
     optionalDependencies = {
     };
@@ -10212,19 +11172,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."dashdash"."1.5.0" =
-    self.by-version."dashdash"."1.5.0";
-  by-version."dashdash"."1.5.0" = self.buildNodePackage {
-    name = "dashdash-1.5.0";
-    version = "1.5.0";
+  by-spec."dashdash".">=1.10.1 <2.0.0" =
+    self.by-version."dashdash"."1.13.0";
+  by-version."dashdash"."1.13.0" = self.buildNodePackage {
+    name = "dashdash-1.13.0";
+    version = "1.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.5.0.tgz";
-      name = "dashdash-1.5.0.tgz";
-      sha1 = "fa5aa8a9415a7c5c3928be18bd4975458e666452";
+      url = "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz";
+      name = "dashdash-1.13.0.tgz";
+      sha1 = "a5aae6fd9d8e156624eb0dd9259eb12ba245385a";
     };
     deps = {
-      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+      "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -10232,16 +11192,18 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."dashdash"."^1.7.1" =
+    self.by-version."dashdash"."1.13.0";
   by-spec."data-uri-to-buffer"."0" =
-    self.by-version."data-uri-to-buffer"."0.0.3";
-  by-version."data-uri-to-buffer"."0.0.3" = self.buildNodePackage {
-    name = "data-uri-to-buffer-0.0.3";
-    version = "0.0.3";
+    self.by-version."data-uri-to-buffer"."0.0.4";
+  by-version."data-uri-to-buffer"."0.0.4" = self.buildNodePackage {
+    name = "data-uri-to-buffer-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.3.tgz";
-      name = "data-uri-to-buffer-0.0.3.tgz";
-      sha1 = "18ae979a6a0ca994b0625853916d2662bbae0b1a";
+      url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.4.tgz";
+      name = "data-uri-to-buffer-0.0.4.tgz";
+      sha1 = "46e13ab9da8e309745c8d01ce547213ebdb2fe3f";
     };
     deps = {
     };
@@ -10258,7 +11220,7 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
+      url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
       name = "date-now-0.1.4.tgz";
       sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b";
     };
@@ -10277,7 +11239,7 @@
     version = "1.0.2-1.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
+      url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.2-1.2.3.tgz";
       name = "dateformat-1.0.2-1.2.3.tgz";
       sha1 = "b0220c02de98617433b72851cf47de3df2cdbee9";
     };
@@ -10296,7 +11258,7 @@
     version = "1.0.7-1.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz";
+      url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.7-1.2.3.tgz";
       name = "dateformat-1.0.7-1.2.3.tgz";
       sha1 = "ebb561bb7214ee57a8dc2687adab1d555de9419c";
     };
@@ -10309,19 +11271,19 @@
     cpu = [ ];
   };
   by-spec."dateformat"."^1.0.11" =
-    self.by-version."dateformat"."1.0.11";
-  by-version."dateformat"."1.0.11" = self.buildNodePackage {
-    name = "dateformat-1.0.11";
-    version = "1.0.11";
+    self.by-version."dateformat"."1.0.12";
+  by-version."dateformat"."1.0.12" = self.buildNodePackage {
+    name = "dateformat-1.0.12";
+    version = "1.0.12";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz";
-      name = "dateformat-1.0.11.tgz";
-      sha1 = "f27cbee7a012bbfb82ea051562d3977f6093dbb1";
+      url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz";
+      name = "dateformat-1.0.12.tgz";
+      sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9";
     };
     deps = {
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-      "meow-3.1.0" = self.by-version."meow"."3.1.0";
+      "meow-3.7.0" = self.by-version."meow"."3.7.0";
     };
     optionalDependencies = {
     };
@@ -10329,8 +11291,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."dateformat"."~1.0.6" =
-    self.by-version."dateformat"."1.0.11";
+  by-spec."dateformat"."^1.0.6" =
+    self.by-version."dateformat"."1.0.12";
+  by-spec."dateformat"."~1.0.12" =
+    self.by-version."dateformat"."1.0.12";
   by-spec."datejs".">=0.0.2" =
     self.by-version."datejs"."0.0.2";
   by-version."datejs"."0.0.2" = self.buildNodePackage {
@@ -10338,7 +11302,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/datejs/-/datejs-0.0.2.tgz";
+      url = "https://registry.npmjs.org/datejs/-/datejs-0.0.2.tgz";
       name = "datejs-0.0.2.tgz";
       sha1 = "242cf2e1c7338d9502a5ae4196fd69e234211f4a";
     };
@@ -10358,7 +11322,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz";
+      url = "https://registry.npmjs.org/debounced-seeker/-/debounced-seeker-1.0.0.tgz";
       name = "debounced-seeker-1.0.0.tgz";
       sha1 = "e74befcd1a62ae7a5e5fbfbfa6f5d2bacd962bdd";
     };
@@ -10371,37 +11335,18 @@
     cpu = [ ];
   };
   by-spec."debug"."*" =
-    self.by-version."debug"."2.1.3";
-  by-version."debug"."2.1.3" = self.buildNodePackage {
-    name = "debug-2.1.3";
-    version = "2.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
-      name = "debug-2.1.3.tgz";
-      sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e";
-    };
-    deps = {
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."debug"."0" =
-    self.by-version."debug"."0.8.1";
-  by-version."debug"."0.8.1" = self.buildNodePackage {
-    name = "debug-0.8.1";
-    version = "0.8.1";
+    self.by-version."debug"."2.2.0";
+  by-version."debug"."2.2.0" = self.buildNodePackage {
+    name = "debug-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
-      name = "debug-0.8.1.tgz";
-      sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+      url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+      name = "debug-2.2.0.tgz";
+      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
     };
     deps = {
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
     };
     optionalDependencies = {
     };
@@ -10416,7 +11361,7 @@
     version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-0.5.0.tgz";
       name = "debug-0.5.0.tgz";
       sha1 = "9d48c946fb7d7d59807ffe07822f515fd76d7a9e";
     };
@@ -10435,7 +11380,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-0.6.0.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-0.6.0.tgz";
       name = "debug-0.6.0.tgz";
       sha1 = "ce9d5d025d5294b3f0748a494bebaf3c9fd8734f";
     };
@@ -10454,7 +11399,7 @@
     version = "0.7.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
       name = "debug-0.7.4.tgz";
       sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
     };
@@ -10466,8 +11411,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug"."0.7.x" =
-    self.by-version."debug"."0.7.4";
   by-spec."debug"."0.8.0" =
     self.by-version."debug"."0.8.0";
   by-version."debug"."0.8.0" = self.buildNodePackage {
@@ -10475,7 +11418,7 @@
     version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-0.8.0.tgz";
       name = "debug-0.8.0.tgz";
       sha1 = "0541ea91f0e503fdf0c5eed418a32550234967f0";
     };
@@ -10494,7 +11437,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-1.0.2.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz";
       name = "debug-1.0.2.tgz";
       sha1 = "3849591c10cce648476c3c7c2e2e3416db5963c4";
     };
@@ -10514,7 +11457,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-1.0.3.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz";
       name = "debug-1.0.3.tgz";
       sha1 = "fc8c6b2d6002804b4081c0208e0f6460ba1fa3e4";
     };
@@ -10527,14 +11470,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug"."1.0.4" =
+  by-spec."debug"."2" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug"."2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug"."2.x.x" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug".">= 0.7.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug".">= 0.7.3 < 1" =
+    self.by-version."debug"."0.8.1";
+  by-version."debug"."0.8.1" = self.buildNodePackage {
+    name = "debug-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/debug/-/debug-0.8.1.tgz";
+      name = "debug-0.8.1.tgz";
+      sha1 = "20ff4d26f5e422cb68a1bacbbb61039ad8c1c130";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."^1.0.2" =
     self.by-version."debug"."1.0.4";
   by-version."debug"."1.0.4" = self.buildNodePackage {
     name = "debug-1.0.4";
     version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-1.0.4.tgz";
       name = "debug-1.0.4.tgz";
       sha1 = "5b9c256bd54b6ec02283176fa8a0ede6d154cbf8";
     };
@@ -10547,16 +11517,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug"."2" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."2.0.0" =
+  by-spec."debug"."^2.0.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug"."^2.1.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug"."^2.1.1" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug"."^2.1.3" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug"."^2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debug"."~1.0.1" =
+    self.by-version."debug"."1.0.4";
+  by-spec."debug"."~2.0.0" =
     self.by-version."debug"."2.0.0";
   by-version."debug"."2.0.0" = self.buildNodePackage {
     name = "debug-2.0.0";
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+      url = "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
       name = "debug-2.0.0.tgz";
       sha1 = "89bd9df6732b51256bc6705342bba02ed12131ef";
     };
@@ -10569,19 +11549,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug"."2.1.0" =
-    self.by-version."debug"."2.1.0";
-  by-version."debug"."2.1.0" = self.buildNodePackage {
-    name = "debug-2.1.0";
-    version = "2.1.0";
+  by-spec."debug"."~2.1.1" =
+    self.by-version."debug"."2.1.3";
+  by-version."debug"."2.1.3" = self.buildNodePackage {
+    name = "debug-2.1.3";
+    version = "2.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.1.0.tgz";
-      name = "debug-2.1.0.tgz";
-      sha1 = "33ab915659d8c2cc8a41443d94d6ebd37697ed21";
+      url = "https://registry.npmjs.org/debug/-/debug-2.1.3.tgz";
+      name = "debug-2.1.3.tgz";
+      sha1 = "ce8ab1b5ee8fbee2bfa3b633cab93d366b63418e";
     };
     deps = {
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+      "ms-0.7.0" = self.by-version."ms"."0.7.0";
     };
     optionalDependencies = {
     };
@@ -10589,56 +11569,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."debug".">= 0.7.0" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug".">= 0.7.3 < 1" =
-    self.by-version."debug"."0.8.1";
-  by-spec."debug"."^0.8.1" =
-    self.by-version."debug"."0.8.1";
-  by-spec."debug"."^1.0" =
-    self.by-version."debug"."1.0.4";
-  by-spec."debug"."^1.0.0" =
-    self.by-version."debug"."1.0.4";
-  by-spec."debug"."^1.0.2" =
-    self.by-version."debug"."1.0.4";
-  by-spec."debug"."^2.0.0" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."^2.1.0" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."^2.1.1" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."^2.1.3" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."~0.7.2" =
-    self.by-version."debug"."0.7.4";
-  by-spec."debug"."~0.7.4" =
-    self.by-version."debug"."0.7.4";
-  by-spec."debug"."~0.8.1" =
-    self.by-version."debug"."0.8.1";
-  by-spec."debug"."~0.x" =
-    self.by-version."debug"."0.8.1";
-  by-spec."debug"."~1.0.0" =
-    self.by-version."debug"."1.0.4";
-  by-spec."debug"."~1.0.1" =
-    self.by-version."debug"."1.0.4";
-  by-spec."debug"."~2.0.0" =
-    self.by-version."debug"."2.0.0";
-  by-spec."debug"."~2.1.0" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."~2.1.1" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."~2.1.2" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debug"."~2.1.3" =
-    self.by-version."debug"."2.1.3";
-  by-spec."debuglog"."^1.0.1" =
+  by-spec."debug"."~2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-spec."debuglog"."*" =
     self.by-version."debuglog"."1.0.1";
   by-version."debuglog"."1.0.1" = self.buildNodePackage {
     name = "debuglog-1.0.1";
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
+      url = "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz";
       name = "debuglog-1.0.1.tgz";
       sha1 = "aa24ffb9ac3df9a2351837cfb2d279360cd78492";
     };
@@ -10650,44 +11590,20 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."debuglog"."^1.0.1" =
+    self.by-version."debuglog"."1.0.1";
   by-spec."decamelize"."^1.0.0" =
-    self.by-version."decamelize"."1.0.0";
-  by-version."decamelize"."1.0.0" = self.buildNodePackage {
-    name = "decamelize-1.0.0";
-    version = "1.0.0";
+    self.by-version."decamelize"."1.2.0";
+  by-version."decamelize"."1.2.0" = self.buildNodePackage {
+    name = "decamelize-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/decamelize/-/decamelize-1.0.0.tgz";
-      name = "decamelize-1.0.0.tgz";
-      sha1 = "5287122f71691d4505b18ff2258dc400a5b23847";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."decompress-zip"."^0.1.0" =
-    self.by-version."decompress-zip"."0.1.0";
-  by-version."decompress-zip"."0.1.0" = self.buildNodePackage {
-    name = "decompress-zip-0.1.0";
-    version = "0.1.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/decompress-zip/-/decompress-zip-0.1.0.tgz";
-      name = "decompress-zip-0.1.0.tgz";
-      sha1 = "bce60c11664f2d660fca4bcf634af6de5d6c14c7";
+      url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
+      name = "decamelize-1.2.0.tgz";
+      sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
     };
     deps = {
-      "binary-0.3.0" = self.by-version."binary"."0.3.0";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "mkpath-0.1.0" = self.by-version."mkpath"."0.1.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "q-1.2.0" = self.by-version."q"."1.2.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "touch-0.0.3" = self.by-version."touch"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -10695,14 +11611,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-eql"."0.1.3" =
+  by-spec."decamelize"."^1.1.1" =
+    self.by-version."decamelize"."1.2.0";
+  by-spec."decamelize"."^1.1.2" =
+    self.by-version."decamelize"."1.2.0";
+  by-spec."deep-eql"."^0.1.3" =
     self.by-version."deep-eql"."0.1.3";
   by-version."deep-eql"."0.1.3" = self.buildNodePackage {
     name = "deep-eql-0.1.3";
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
+      url = "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz";
       name = "deep-eql-0.1.3.tgz";
       sha1 = "ef558acab8de25206cd713906d74e56930eb69f2";
     };
@@ -10716,34 +11636,15 @@
     cpu = [ ];
   };
   by-spec."deep-equal"."*" =
-    self.by-version."deep-equal"."1.0.0";
-  by-version."deep-equal"."1.0.0" = self.buildNodePackage {
-    name = "deep-equal-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz";
-      name = "deep-equal-1.0.0.tgz";
-      sha1 = "d4564f07d2f0ab3e46110bec16592abd7dc2e326";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."deep-equal"."^0.2.1" =
-    self.by-version."deep-equal"."0.2.2";
-  by-version."deep-equal"."0.2.2" = self.buildNodePackage {
-    name = "deep-equal-0.2.2";
-    version = "0.2.2";
+    self.by-version."deep-equal"."1.0.1";
+  by-version."deep-equal"."1.0.1" = self.buildNodePackage {
+    name = "deep-equal-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz";
-      name = "deep-equal-0.2.2.tgz";
-      sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d";
+      url = "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
+      name = "deep-equal-1.0.1.tgz";
+      sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
     };
     deps = {
     };
@@ -10754,17 +11655,17 @@
     cpu = [ ];
   };
   by-spec."deep-equal"."^1.0.0" =
-    self.by-version."deep-equal"."1.0.0";
-  by-spec."deep-equal"."~0.0.0" =
-    self.by-version."deep-equal"."0.0.0";
-  by-version."deep-equal"."0.0.0" = self.buildNodePackage {
-    name = "deep-equal-0.0.0";
-    version = "0.0.0";
+    self.by-version."deep-equal"."1.0.1";
+  by-spec."deep-equal"."~0.1.0" =
+    self.by-version."deep-equal"."0.1.2";
+  by-version."deep-equal"."0.1.2" = self.buildNodePackage {
+    name = "deep-equal-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.0.0.tgz";
-      name = "deep-equal-0.0.0.tgz";
-      sha1 = "99679d3bbd047156fcd450d3d01eeb9068691e83";
+      url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
+      name = "deep-equal-0.1.2.tgz";
+      sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
     };
     deps = {
     };
@@ -10774,16 +11675,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-equal"."~0.1.0" =
-    self.by-version."deep-equal"."0.1.2";
-  by-version."deep-equal"."0.1.2" = self.buildNodePackage {
-    name = "deep-equal-0.1.2";
-    version = "0.1.2";
+  by-spec."deep-extend"."^0.4.0" =
+    self.by-version."deep-extend"."0.4.1";
+  by-version."deep-extend"."0.4.1" = self.buildNodePackage {
+    name = "deep-extend-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-0.1.2.tgz";
-      name = "deep-equal-0.1.2.tgz";
-      sha1 = "b246c2b80a570a47c11be1d9bd1070ec878b87ce";
+      url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz";
+      name = "deep-extend-0.4.1.tgz";
+      sha1 = "efe4113d08085f4e6f9687759810f807469e2253";
     };
     deps = {
     };
@@ -10793,10 +11694,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-equal"."~0.2.0" =
-    self.by-version."deep-equal"."0.2.2";
-  by-spec."deep-equal"."~0.2.1" =
-    self.by-version."deep-equal"."0.2.2";
   by-spec."deep-extend"."~0.2.5" =
     self.by-version."deep-extend"."0.2.11";
   by-version."deep-extend"."0.2.11" = self.buildNodePackage {
@@ -10804,7 +11701,7 @@
     version = "0.2.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
+      url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz";
       name = "deep-extend-0.2.11.tgz";
       sha1 = "7a16ba69729132340506170494bc83f7076fe08f";
     };
@@ -10816,14 +11713,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-is"."0.1.x" =
+  by-spec."deep-extend"."~0.4.0" =
+    self.by-version."deep-extend"."0.4.1";
+  by-spec."deep-is"."~0.1.2" =
     self.by-version."deep-is"."0.1.3";
   by-version."deep-is"."0.1.3" = self.buildNodePackage {
     name = "deep-is-0.1.3";
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
+      url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz";
       name = "deep-is-0.1.3.tgz";
       sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34";
     };
@@ -10835,18 +11734,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-is"."~0.1.2" =
+  by-spec."deep-is"."~0.1.3" =
     self.by-version."deep-is"."0.1.3";
   by-spec."deepmerge"."*" =
-    self.by-version."deepmerge"."0.2.7";
-  by-version."deepmerge"."0.2.7" = self.buildNodePackage {
-    name = "deepmerge-0.2.7";
-    version = "0.2.7";
+    self.by-version."deepmerge"."0.2.10";
+  by-version."deepmerge"."0.2.10" = self.buildNodePackage {
+    name = "deepmerge-0.2.10";
+    version = "0.2.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deepmerge/-/deepmerge-0.2.7.tgz";
-      name = "deepmerge-0.2.7.tgz";
-      sha1 = "3a5ab8d37311c4d1aefb22209693afe0a91a0563";
+      url = "https://registry.npmjs.org/deepmerge/-/deepmerge-0.2.10.tgz";
+      name = "deepmerge-0.2.10.tgz";
+      sha1 = "8906bf9e525a4fbf1b203b2afcb4640249821219";
     };
     deps = {
     };
@@ -10856,26 +11755,27 @@
     os = [ ];
     cpu = [ ];
   };
-  "deepmerge" = self.by-version."deepmerge"."0.2.7";
-  by-spec."default-browser-id"."1.0.2" =
-    self.by-version."default-browser-id"."1.0.2";
-  by-version."default-browser-id"."1.0.2" = self.buildNodePackage {
-    name = "default-browser-id-1.0.2";
-    version = "1.0.2";
+  "deepmerge" = self.by-version."deepmerge"."0.2.10";
+  by-spec."default-browser-id"."^1.0.4" =
+    self.by-version."default-browser-id"."1.0.4";
+  by-version."default-browser-id"."1.0.4" = self.buildNodePackage {
+    name = "default-browser-id-1.0.4";
+    version = "1.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.2.tgz";
-      name = "default-browser-id-1.0.2.tgz";
-      sha1 = "17f500f18e466d1a82c06cd7ccba71c6ee6600a9";
+      url = "https://registry.npmjs.org/default-browser-id/-/default-browser-id-1.0.4.tgz";
+      name = "default-browser-id-1.0.4.tgz";
+      sha1 = "e59d09a5d157b828b876c26816e61c3d2a2c203a";
     };
     deps = {
-      "bplist-parser-0.0.6" = self.by-version."bplist-parser"."0.0.6";
-      "untildify-1.0.0" = self.by-version."untildify"."1.0.0";
+      "bplist-parser-0.1.1" = self.by-version."bplist-parser"."0.1.1";
+      "meow-3.7.0" = self.by-version."meow"."3.7.0";
+      "untildify-2.1.0" = self.by-version."untildify"."2.1.0";
     };
     optionalDependencies = {
     };
     peerDependencies = [];
-    os = [ "darwin" ];
+    os = [ ];
     cpu = [ ];
   };
   by-spec."defaultable"."~0.7.2" =
@@ -10885,7 +11785,7 @@
     version = "0.7.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/defaultable/-/defaultable-0.7.2.tgz";
+      url = "https://registry.npmjs.org/defaultable/-/defaultable-0.7.2.tgz";
       name = "defaultable-0.7.2.tgz";
       sha1 = "7c1564ca14f9eca4c4127a539790777d44085bd7";
     };
@@ -10898,18 +11798,18 @@
     cpu = [ ];
   };
   by-spec."defaults"."^1.0.0" =
-    self.by-version."defaults"."1.0.2";
-  by-version."defaults"."1.0.2" = self.buildNodePackage {
-    name = "defaults-1.0.2";
-    version = "1.0.2";
+    self.by-version."defaults"."1.0.3";
+  by-version."defaults"."1.0.3" = self.buildNodePackage {
+    name = "defaults-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/defaults/-/defaults-1.0.2.tgz";
-      name = "defaults-1.0.2.tgz";
-      sha1 = "6902e25aa047649a501e19ef9e98f3e8365c109a";
+      url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz";
+      name = "defaults-1.0.3.tgz";
+      sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d";
     };
     deps = {
-      "clone-0.1.19" = self.by-version."clone"."0.1.19";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -10924,7 +11824,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz";
+      url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz";
       name = "deferred-leveldown-0.2.0.tgz";
       sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4";
     };
@@ -10937,14 +11837,33 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."defined"."0.0.0" =
+  by-spec."defined"."^1.0.0" =
+    self.by-version."defined"."1.0.0";
+  by-version."defined"."1.0.0" = self.buildNodePackage {
+    name = "defined-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz";
+      name = "defined-1.0.0.tgz";
+      sha1 = "c98d9bcef75674188e110969151199e39b1fa693";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."defined"."~0.0.0" =
     self.by-version."defined"."0.0.0";
   by-version."defined"."0.0.0" = self.buildNodePackage {
     name = "defined-0.0.0";
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
+      url = "https://registry.npmjs.org/defined/-/defined-0.0.0.tgz";
       name = "defined-0.0.0.tgz";
       sha1 = "f35eea7d705e933baf13b2f03b3f83d921403b3e";
     };
@@ -10956,30 +11875,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."defined"."~0.0.0" =
-    self.by-version."defined"."0.0.0";
   by-spec."defs"."~1.1.0" =
-    self.by-version."defs"."1.1.0";
-  by-version."defs"."1.1.0" = self.buildNodePackage {
-    name = "defs-1.1.0";
-    version = "1.1.0";
+    self.by-version."defs"."1.1.1";
+  by-version."defs"."1.1.1" = self.buildNodePackage {
+    name = "defs-1.1.1";
+    version = "1.1.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/defs/-/defs-1.1.0.tgz";
-      name = "defs-1.1.0.tgz";
-      sha1 = "a271201acd271eb0be887eefc61edd9f89f32b49";
+      url = "https://registry.npmjs.org/defs/-/defs-1.1.1.tgz";
+      name = "defs-1.1.1.tgz";
+      sha1 = "b22609f2c7a11ba7a3db116805c139b1caffa9d2";
     };
     deps = {
       "alter-0.2.0" = self.by-version."alter"."0.2.0";
       "ast-traverse-0.1.1" = self.by-version."ast-traverse"."0.1.1";
       "breakable-1.0.0" = self.by-version."breakable"."1.0.0";
-      "esprima-fb-8001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb";
+      "esprima-fb-15001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
       "simple-fmt-0.1.0" = self.by-version."simple-fmt"."0.1.0";
       "simple-is-0.2.0" = self.by-version."simple-is"."0.2.0";
       "stringmap-0.2.2" = self.by-version."stringmap"."0.2.2";
       "stringset-0.2.1" = self.by-version."stringset"."0.2.1";
       "tryor-0.1.2" = self.by-version."tryor"."0.1.2";
-      "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
+      "yargs-3.27.0" = self.by-version."yargs"."3.27.0";
     };
     optionalDependencies = {
     };
@@ -10988,18 +11905,18 @@
     cpu = [ ];
   };
   by-spec."degenerator"."~1.0.0" =
-    self.by-version."degenerator"."1.0.1";
-  by-version."degenerator"."1.0.1" = self.buildNodePackage {
-    name = "degenerator-1.0.1";
-    version = "1.0.1";
+    self.by-version."degenerator"."1.0.2";
+  by-version."degenerator"."1.0.2" = self.buildNodePackage {
+    name = "degenerator-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/degenerator/-/degenerator-1.0.1.tgz";
-      name = "degenerator-1.0.1.tgz";
-      sha1 = "54a67ae57012ced53b0d51d8dcf7a5d3ee79cf62";
+      url = "https://registry.npmjs.org/degenerator/-/degenerator-1.0.2.tgz";
+      name = "degenerator-1.0.2.tgz";
+      sha1 = "c22222c8115cb22f3bfeee0a7b55843f1677caaa";
     };
     deps = {
-      "esprima-1.1.0-dev-harmony" = self.by-version."esprima"."1.1.0-dev-harmony";
+      "esprima-2.3.0" = self.by-version."esprima"."2.3.0";
       "escodegen-1.3.3" = self.by-version."escodegen"."1.3.3";
       "ast-types-0.3.38" = self.by-version."ast-types"."0.3.38";
     };
@@ -11009,6 +11926,32 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."del"."^2.0.2" =
+    self.by-version."del"."2.2.0";
+  by-version."del"."2.2.0" = self.buildNodePackage {
+    name = "del-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/del/-/del-2.2.0.tgz";
+      name = "del-2.2.0.tgz";
+      sha1 = "9a50f04bf37325e283b4f44e985336c252456bd5";
+    };
+    deps = {
+      "globby-4.0.0" = self.by-version."globby"."4.0.0";
+      "is-path-cwd-1.0.0" = self.by-version."is-path-cwd"."1.0.0";
+      "is-path-in-cwd-1.0.0" = self.by-version."is-path-in-cwd"."1.0.0";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "pify-2.3.0" = self.by-version."pify"."2.3.0";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."delayed-stream"."0.0.5" =
     self.by-version."delayed-stream"."0.0.5";
   by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
@@ -11016,7 +11959,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
+      url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
       name = "delayed-stream-0.0.5.tgz";
       sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
     };
@@ -11028,16 +11971,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."delegates"."^0.1.0" =
-    self.by-version."delegates"."0.1.0";
-  by-version."delegates"."0.1.0" = self.buildNodePackage {
-    name = "delegates-0.1.0";
-    version = "0.1.0";
+  by-spec."delayed-stream"."~1.0.0" =
+    self.by-version."delayed-stream"."1.0.0";
+  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
+    name = "delayed-stream-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz";
-      name = "delegates-0.1.0.tgz";
-      sha1 = "b4b57be11a1653517a04b27f0949bdc327dfe390";
+      url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+      name = "delayed-stream-1.0.0.tgz";
+      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."delegates"."^1.0.0" =
+    self.by-version."delegates"."1.0.0";
+  by-version."delegates"."1.0.0" = self.buildNodePackage {
+    name = "delegates-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz";
+      name = "delegates-1.0.0.tgz";
+      sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a";
     };
     deps = {
     };
@@ -11054,7 +12016,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz";
+      url = "https://registry.npmjs.org/dep-graph/-/dep-graph-1.1.0.tgz";
       name = "dep-graph-1.1.0.tgz";
       sha1 = "fade86a92799a813e9b42511cdf3dfa6cc8dbefe";
     };
@@ -11074,7 +12036,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
+      url = "https://registry.npmjs.org/depd/-/depd-0.3.0.tgz";
       name = "depd-0.3.0.tgz";
       sha1 = "11c9bc28e425325fbd8b38940beff69fa5326883";
     };
@@ -11093,7 +12055,7 @@
     version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-0.4.2.tgz";
+      url = "https://registry.npmjs.org/depd/-/depd-0.4.2.tgz";
       name = "depd-0.4.2.tgz";
       sha1 = "a4bc8a0e4801770a66363daa6d35138f3e3b54dd";
     };
@@ -11112,7 +12074,7 @@
     version = "0.4.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz";
+      url = "https://registry.npmjs.org/depd/-/depd-0.4.5.tgz";
       name = "depd-0.4.5.tgz";
       sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1";
     };
@@ -11125,13 +12087,32 @@
     cpu = [ ];
   };
   by-spec."depd".">= 0.4.0" =
+    self.by-version."depd"."1.1.0";
+  by-version."depd"."1.1.0" = self.buildNodePackage {
+    name = "depd-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz";
+      name = "depd-1.1.0.tgz";
+      sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."depd"."~1.0.1" =
     self.by-version."depd"."1.0.1";
   by-version."depd"."1.0.1" = self.buildNodePackage {
     name = "depd-1.0.1";
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
+      url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz";
       name = "depd-1.0.1.tgz";
       sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa";
     };
@@ -11143,10 +12124,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."depd"."~1.0.0" =
-    self.by-version."depd"."1.0.1";
-  by-spec."depd"."~1.0.1" =
-    self.by-version."depd"."1.0.1";
+  by-spec."depd"."~1.1.0" =
+    self.by-version."depd"."1.1.0";
+  by-spec."deprecate"."^0.1.0" =
+    self.by-version."deprecate"."0.1.0";
+  by-version."deprecate"."0.1.0" = self.buildNodePackage {
+    name = "deprecate-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/deprecate/-/deprecate-0.1.0.tgz";
+      name = "deprecate-0.1.0.tgz";
+      sha1 = "c49058612dc6c8e5145eafe4839b8c2c7d041c14";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."deprecated"."^0.0.1" =
     self.by-version."deprecated"."0.0.1";
   by-version."deprecated"."0.0.1" = self.buildNodePackage {
@@ -11154,7 +12152,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz";
+      url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz";
       name = "deprecated-0.0.1.tgz";
       sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19";
     };
@@ -11166,23 +12164,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deps-sort"."^1.3.5" =
-    self.by-version."deps-sort"."1.3.5";
-  by-version."deps-sort"."1.3.5" = self.buildNodePackage {
-    name = "deps-sort-1.3.5";
-    version = "1.3.5";
+  by-spec."deps-sort"."^1.3.7" =
+    self.by-version."deps-sort"."1.3.9";
+  by-version."deps-sort"."1.3.9" = self.buildNodePackage {
+    name = "deps-sort-1.3.9";
+    version = "1.3.9";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deps-sort/-/deps-sort-1.3.5.tgz";
-      name = "deps-sort-1.3.5.tgz";
-      sha1 = "89dc3c323504080558f9909bf57df1f7837c5c6f";
+      url = "https://registry.npmjs.org/deps-sort/-/deps-sort-1.3.9.tgz";
+      name = "deps-sort-1.3.9.tgz";
+      sha1 = "29dfff53e17b36aecae7530adbbbf622c2ed1a71";
     };
     deps = {
-      "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
-      "shasum-1.0.1" = self.by-version."shasum"."1.0.1";
-      "through2-0.5.1" = self.by-version."through2"."0.5.1";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
+      "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
+      "through2-1.1.1" = self.by-version."through2"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -11190,21 +12187,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deps-sort"."~0.1.1" =
-    self.by-version."deps-sort"."0.1.2";
-  by-version."deps-sort"."0.1.2" = self.buildNodePackage {
-    name = "deps-sort-0.1.2";
-    version = "0.1.2";
+  by-spec."deps-sort"."^2.0.0" =
+    self.by-version."deps-sort"."2.0.0";
+  by-version."deps-sort"."2.0.0" = self.buildNodePackage {
+    name = "deps-sort-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deps-sort/-/deps-sort-0.1.2.tgz";
-      name = "deps-sort-0.1.2.tgz";
-      sha1 = "daa2fb614a17c9637d801e2f55339ae370f3611a";
+      url = "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz";
+      name = "deps-sort-2.0.0.tgz";
+      sha1 = "091724902e84658260eb910748cccd1af6e21fb5";
     };
     deps = {
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "JSONStream-0.6.4" = self.by-version."JSONStream"."0.6.4";
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "shasum-1.0.2" = self.by-version."shasum"."1.0.2";
+      "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -11212,21 +12210,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."derequire"."~0.6.0" =
-    self.by-version."derequire"."0.6.1";
-  by-version."derequire"."0.6.1" = self.buildNodePackage {
-    name = "derequire-0.6.1";
-    version = "0.6.1";
+  by-spec."des.js"."^1.0.0" =
+    self.by-version."des.js"."1.0.0";
+  by-version."des.js"."1.0.0" = self.buildNodePackage {
+    name = "des.js-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/derequire/-/derequire-0.6.1.tgz";
-      name = "derequire-0.6.1.tgz";
-      sha1 = "cce8ee25380de715deb61900f0bdd38222928788";
+      url = "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz";
+      name = "des.js-1.0.0.tgz";
+      sha1 = "c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc";
     };
     deps = {
-      "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1";
-      "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
-      "esrefactor-0.1.0" = self.by-version."esrefactor"."0.1.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -11241,7 +12238,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
+      url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz";
       name = "destroy-1.0.3.tgz";
       sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9";
     };
@@ -11253,21 +12250,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."detective"."^4.0.0" =
-    self.by-version."detective"."4.0.0";
-  by-version."detective"."4.0.0" = self.buildNodePackage {
-    name = "detective-4.0.0";
-    version = "4.0.0";
+  by-spec."destroy"."~1.0.4" =
+    self.by-version."destroy"."1.0.4";
+  by-version."destroy"."1.0.4" = self.buildNodePackage {
+    name = "destroy-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/detective/-/detective-4.0.0.tgz";
-      name = "detective-4.0.0.tgz";
-      sha1 = "9ffdb5555ddb1571fdbdc6f4ceac08e5e4cf8467";
+      url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz";
+      name = "destroy-1.0.4.tgz";
+      sha1 = "978857442c44749e4206613e37946205826abd80";
     };
     deps = {
-      "acorn-0.9.0" = self.by-version."acorn"."0.9.0";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "escodegen-1.6.1" = self.by-version."escodegen"."1.6.1";
     };
     optionalDependencies = {
     };
@@ -11275,20 +12269,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."detective"."~2.1.2" =
-    self.by-version."detective"."2.1.2";
-  by-version."detective"."2.1.2" = self.buildNodePackage {
-    name = "detective-2.1.2";
-    version = "2.1.2";
+  by-spec."detective"."^4.0.0" =
+    self.by-version."detective"."4.3.1";
+  by-version."detective"."4.3.1" = self.buildNodePackage {
+    name = "detective-4.3.1";
+    version = "4.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/detective/-/detective-2.1.2.tgz";
-      name = "detective-2.1.2.tgz";
-      sha1 = "d22ad9f18c82efb3f55fee2e244883da6bbb8e37";
+      url = "https://registry.npmjs.org/detective/-/detective-4.3.1.tgz";
+      name = "detective-4.3.1.tgz";
+      sha1 = "9fb06dd1ee8f0ea4dbcc607cda39d9ce1d4f726f";
     };
     deps = {
-      "esprima-1.0.2" = self.by-version."esprima"."1.0.2";
-      "escodegen-0.0.15" = self.by-version."escodegen"."0.0.15";
+      "acorn-1.2.2" = self.by-version."acorn"."1.2.2";
+      "defined-1.0.0" = self.by-version."defined"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -11296,19 +12290,21 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."detective"."^4.3.1" =
+    self.by-version."detective"."4.3.1";
   by-spec."dezalgo"."^1.0.0" =
-    self.by-version."dezalgo"."1.0.1";
-  by-version."dezalgo"."1.0.1" = self.buildNodePackage {
-    name = "dezalgo-1.0.1";
-    version = "1.0.1";
+    self.by-version."dezalgo"."1.0.3";
+  by-version."dezalgo"."1.0.3" = self.buildNodePackage {
+    name = "dezalgo-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dezalgo/-/dezalgo-1.0.1.tgz";
-      name = "dezalgo-1.0.1.tgz";
-      sha1 = "12bde135060807900d5a7aebb607c2abb7c76937";
+      url = "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz";
+      name = "dezalgo-1.0.3.tgz";
+      sha1 = "7f742de066fc748bc8db820569dddce49bf0d456";
     };
     deps = {
-      "asap-1.0.0" = self.by-version."asap"."1.0.0";
+      "asap-2.0.3" = self.by-version."asap"."2.0.3";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
     optionalDependencies = {
@@ -11318,17 +12314,19 @@
     cpu = [ ];
   };
   by-spec."dezalgo"."^1.0.1" =
-    self.by-version."dezalgo"."1.0.1";
-  by-spec."dezalgo"."~1.0.1" =
-    self.by-version."dezalgo"."1.0.1";
-  by-spec."di"."~0.0.1" =
+    self.by-version."dezalgo"."1.0.3";
+  by-spec."dezalgo"."^1.0.2" =
+    self.by-version."dezalgo"."1.0.3";
+  by-spec."dezalgo"."~1.0.3" =
+    self.by-version."dezalgo"."1.0.3";
+  by-spec."di"."^0.0.1" =
     self.by-version."di"."0.0.1";
   by-version."di"."0.0.1" = self.buildNodePackage {
     name = "di-0.0.1";
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/di/-/di-0.0.1.tgz";
+      url = "https://registry.npmjs.org/di/-/di-0.0.1.tgz";
       name = "di-0.0.1.tgz";
       sha1 = "806649326ceaa7caa3306d75d985ea2748ba913c";
     };
@@ -11340,16 +12338,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."dicer"."0.2.3" =
-    self.by-version."dicer"."0.2.3";
-  by-version."dicer"."0.2.3" = self.buildNodePackage {
-    name = "dicer-0.2.3";
-    version = "0.2.3";
+  by-spec."dicer"."0.2.5" =
+    self.by-version."dicer"."0.2.5";
+  by-version."dicer"."0.2.5" = self.buildNodePackage {
+    name = "dicer-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dicer/-/dicer-0.2.3.tgz";
-      name = "dicer-0.2.3.tgz";
-      sha1 = "f00281189a55c2351ef80490a4fe9fb2c59c4939";
+      url = "https://registry.npmjs.org/dicer/-/dicer-0.2.5.tgz";
+      name = "dicer-0.2.5.tgz";
+      sha1 = "5996c086bb33218c812c090bddc09cd12facb70f";
     };
     deps = {
       "streamsearch-0.1.2" = self.by-version."streamsearch"."0.1.2";
@@ -11361,16 +12359,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."diff"."1.0.7" =
-    self.by-version."diff"."1.0.7";
-  by-version."diff"."1.0.7" = self.buildNodePackage {
-    name = "diff-1.0.7";
-    version = "1.0.7";
+  by-spec."diff"."1.4.0" =
+    self.by-version."diff"."1.4.0";
+  by-version."diff"."1.4.0" = self.buildNodePackage {
+    name = "diff-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/diff/-/diff-1.0.7.tgz";
-      name = "diff-1.0.7.tgz";
-      sha1 = "24bbb001c4a7d5522169e7cabdb2c2814ed91cf4";
+      url = "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
+      name = "diff-1.4.0.tgz";
+      sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
     };
     deps = {
     };
@@ -11380,16 +12378,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."diff"."1.0.8" =
-    self.by-version."diff"."1.0.8";
-  by-version."diff"."1.0.8" = self.buildNodePackage {
-    name = "diff-1.0.8";
-    version = "1.0.8";
+  by-spec."diff"."2.1.0" =
+    self.by-version."diff"."2.1.0";
+  by-version."diff"."2.1.0" = self.buildNodePackage {
+    name = "diff-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
-      name = "diff-1.0.8.tgz";
-      sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
+      url = "https://registry.npmjs.org/diff/-/diff-2.1.0.tgz";
+      name = "diff-2.1.0.tgz";
+      sha1 = "39b5aa97f0d1600b428ad0a91dc8efcc9b29e288";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."diff"."2.2.*" =
+    self.by-version."diff"."2.2.2";
+  by-version."diff"."2.2.2" = self.buildNodePackage {
+    name = "diff-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/diff/-/diff-2.2.2.tgz";
+      name = "diff-2.2.2.tgz";
+      sha1 = "5f813f994a0caa1a2ef79200759c4b89ca233a81";
     };
     deps = {
     };
@@ -11401,23 +12418,16 @@
   };
   by-spec."diff"."~1.0.7" =
     self.by-version."diff"."1.0.8";
-  by-spec."diff"."~1.0.8" =
-    self.by-version."diff"."1.0.8";
-  by-spec."diff2html"."~0.1.8" =
-    self.by-version."diff2html"."0.1.9";
-  by-version."diff2html"."0.1.9" = self.buildNodePackage {
-    name = "diff2html-0.1.9";
-    version = "0.1.9";
-    bin = true;
+  by-version."diff"."1.0.8" = self.buildNodePackage {
+    name = "diff-1.0.8";
+    version = "1.0.8";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/diff2html/-/diff2html-0.1.9.tgz";
-      name = "diff2html-0.1.9.tgz";
-      sha1 = "7005815d50da0d0729a6a43f0cfb24bbdf375f88";
+      url = "https://registry.npmjs.org/diff/-/diff-1.0.8.tgz";
+      name = "diff-1.0.8.tgz";
+      sha1 = "343276308ec991b7bc82267ed55bc1411f971666";
     };
     deps = {
-      "commander-2.7.1" = self.by-version."commander"."2.7.1";
-      "extend-2.0.0" = self.by-version."extend"."2.0.0";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
     };
     optionalDependencies = {
     };
@@ -11425,21 +12435,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."diffie-hellman"."^3.0.1" =
-    self.by-version."diffie-hellman"."3.0.1";
-  by-version."diffie-hellman"."3.0.1" = self.buildNodePackage {
-    name = "diffie-hellman-3.0.1";
-    version = "3.0.1";
+  by-spec."diff"."~1.0.8" =
+    self.by-version."diff"."1.0.8";
+  by-spec."diff2html"."~1.2.0" =
+    self.by-version."diff2html"."1.2.0";
+  by-version."diff2html"."1.2.0" = self.buildNodePackage {
+    name = "diff2html-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-3.0.1.tgz";
-      name = "diffie-hellman-3.0.1.tgz";
-      sha1 = "13be8fc4ad657278408cd796b554a93e586ed66a";
+      url = "https://registry.npmjs.org/diff2html/-/diff2html-1.2.0.tgz";
+      name = "diff2html-1.2.0.tgz";
+      sha1 = "8b54af41c180befd9cb1caa130a3d76081ae4a07";
     };
     deps = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
-      "miller-rabin-1.1.5" = self.by-version."miller-rabin"."1.1.5";
-      "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
+      "diff-2.2.2" = self.by-version."diff"."2.2.2";
     };
     optionalDependencies = {
     };
@@ -11447,21 +12457,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."difflet"."~0.2.0" =
-    self.by-version."difflet"."0.2.6";
-  by-version."difflet"."0.2.6" = self.buildNodePackage {
-    name = "difflet-0.2.6";
-    version = "0.2.6";
+  by-spec."diffie-hellman"."^5.0.0" =
+    self.by-version."diffie-hellman"."5.0.2";
+  by-version."diffie-hellman"."5.0.2" = self.buildNodePackage {
+    name = "diffie-hellman-5.0.2";
+    version = "5.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/difflet/-/difflet-0.2.6.tgz";
-      name = "difflet-0.2.6.tgz";
-      sha1 = "ab23b31f5649b6faa8e3d2acbd334467365ca6fa";
+      url = "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz";
+      name = "diffie-hellman-5.0.2.tgz";
+      sha1 = "b5835739270cfe26acf632099fded2a07f209e5e";
     };
     deps = {
-      "traverse-0.6.6" = self.by-version."traverse"."0.6.6";
-      "charm-0.1.2" = self.by-version."charm"."0.1.2";
-      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "miller-rabin-4.0.0" = self.by-version."miller-rabin"."4.0.0";
+      "randombytes-2.0.3" = self.by-version."randombytes"."2.0.3";
     };
     optionalDependencies = {
     };
@@ -11476,7 +12486,7 @@
     version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/directmail/-/directmail-0.1.8.tgz";
+      url = "https://registry.npmjs.org/directmail/-/directmail-0.1.8.tgz";
       name = "directmail-0.1.8.tgz";
       sha1 = "e4852c8a0c5519bef4904fcd96d760822f42a446";
     };
@@ -11496,7 +12506,7 @@
     version = "1.2.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz";
+      url = "https://registry.npmjs.org/director/-/director-1.2.7.tgz";
       name = "director-1.2.7.tgz";
       sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3";
     };
@@ -11515,7 +12525,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
+      url = "https://registry.npmjs.org/dkim-signer/-/dkim-signer-0.1.2.tgz";
       name = "dkim-signer-0.1.2.tgz";
       sha1 = "2ff5d61c87d8fbff5a8b131cffc5ec3ba1c25553";
     };
@@ -11536,7 +12546,7 @@
     version = "0.2.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dns/-/dns-0.2.2.tgz";
+      url = "https://registry.npmjs.org/dns/-/dns-0.2.2.tgz";
       name = "dns-0.2.2.tgz";
       sha1 = "a8477ca26b835842c3125204d8cbcdd6af98c9ec";
     };
@@ -11561,7 +12571,7 @@
     version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/docker-parse-image/-/docker-parse-image-3.0.1.tgz";
+      url = "https://registry.npmjs.org/docker-parse-image/-/docker-parse-image-3.0.1.tgz";
       name = "docker-parse-image-3.0.1.tgz";
       sha1 = "33dc69291eac3414f84871f2d59d77b6f6948be4";
     };
@@ -11580,39 +12590,39 @@
     version = "2.2.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/docker-registry-server/-/docker-registry-server-2.2.0.tgz";
+      url = "https://registry.npmjs.org/docker-registry-server/-/docker-registry-server-2.2.0.tgz";
       name = "docker-registry-server-2.2.0.tgz";
       sha1 = "5b98836cd7f0348f7f472f7f5a42dd3cab231731";
     };
     deps = {
       "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4";
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
+      "basic-auth-1.0.3" = self.by-version."basic-auth"."1.0.3";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "cors-2.5.3" = self.by-version."cors"."2.5.3";
+      "cors-2.7.1" = self.by-version."cors"."2.7.1";
       "docker-parse-image-3.0.1" = self.by-version."docker-parse-image"."3.0.1";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
       "from2-1.3.0" = self.by-version."from2"."1.3.0";
-      "fs-blob-store-5.1.1" = self.by-version."fs-blob-store"."5.1.1";
+      "fs-blob-store-5.2.1" = self.by-version."fs-blob-store"."5.2.1";
       "level-0.18.0" = self.by-version."level"."0.18.0";
-      "level-sublevel-6.4.6" = self.by-version."level-sublevel"."6.4.6";
-      "leveldown-0.10.4" = self.by-version."leveldown"."0.10.4";
+      "level-sublevel-6.5.4" = self.by-version."level-sublevel"."6.5.4";
+      "leveldown-0.10.6" = self.by-version."leveldown"."0.10.6";
       "levelup-0.18.6" = self.by-version."levelup"."0.18.6";
       "lexicographic-integer-1.1.0" = self.by-version."lexicographic-integer"."1.1.0";
       "memdown-0.10.2" = self.by-version."memdown"."0.10.2";
       "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "ndjson-1.3.0" = self.by-version."ndjson"."1.3.0";
-      "pump-1.0.0" = self.by-version."pump"."1.0.0";
-      "pumpify-1.3.3" = self.by-version."pumpify"."1.3.3";
-      "relative-date-1.1.2" = self.by-version."relative-date"."1.1.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "ndjson-1.4.3" = self.by-version."ndjson"."1.4.3";
+      "pump-1.0.1" = self.by-version."pump"."1.0.1";
+      "pumpify-1.3.4" = self.by-version."pumpify"."1.3.4";
+      "relative-date-1.1.3" = self.by-version."relative-date"."1.1.3";
       "root-2.0.0" = self.by-version."root"."2.0.0";
       "sorted-union-stream-1.0.2" = self.by-version."sorted-union-stream"."1.0.2";
       "split2-0.2.1" = self.by-version."split2"."0.2.1";
       "stream-collector-1.0.1" = self.by-version."stream-collector"."1.0.1";
-      "tar-stream-1.1.4" = self.by-version."tar-stream"."1.1.4";
+      "tar-stream-1.4.0" = self.by-version."tar-stream"."1.4.0";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -11621,6 +12631,50 @@
     cpu = [ ];
   };
   "docker-registry-server" = self.by-version."docker-registry-server"."2.2.0";
+  by-spec."doctrine"."^1.2.1" =
+    self.by-version."doctrine"."1.2.1";
+  by-version."doctrine"."1.2.1" = self.buildNodePackage {
+    name = "doctrine-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/doctrine/-/doctrine-1.2.1.tgz";
+      name = "doctrine-1.2.1.tgz";
+      sha1 = "ac0c649d70b9501e16e97acb7ec4e27168f746a3";
+    };
+    deps = {
+      "esutils-1.1.6" = self.by-version."esutils"."1.1.6";
+      "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."dom-serialize"."^2.2.0" =
+    self.by-version."dom-serialize"."2.2.1";
+  by-version."dom-serialize"."2.2.1" = self.buildNodePackage {
+    name = "dom-serialize-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz";
+      name = "dom-serialize-2.2.1.tgz";
+      sha1 = "562ae8999f44be5ea3076f5419dcd59eb43ac95b";
+    };
+    deps = {
+      "custom-event-1.0.0" = self.by-version."custom-event"."1.0.0";
+      "ent-2.2.0" = self.by-version."ent"."2.2.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."dom-serializer"."0" =
     self.by-version."dom-serializer"."0.1.0";
   by-version."dom-serializer"."0.1.0" = self.buildNodePackage {
@@ -11628,7 +12682,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
+      url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz";
       name = "dom-serializer-0.1.0.tgz";
       sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82";
     };
@@ -11649,7 +12703,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
+      url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.0.1.tgz";
       name = "dom-serializer-0.0.1.tgz";
       sha1 = "9589827f1e32d22c37c829adabd59b3247af8eaf";
     };
@@ -11663,16 +12717,18 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."dom-serializer"."~0.1.0" =
+    self.by-version."dom-serializer"."0.1.0";
   by-spec."domain-browser"."^1.1.1" =
-    self.by-version."domain-browser"."1.1.4";
-  by-version."domain-browser"."1.1.4" = self.buildNodePackage {
-    name = "domain-browser-1.1.4";
-    version = "1.1.4";
+    self.by-version."domain-browser"."1.1.7";
+  by-version."domain-browser"."1.1.7" = self.buildNodePackage {
+    name = "domain-browser-1.1.7";
+    version = "1.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domain-browser/-/domain-browser-1.1.4.tgz";
-      name = "domain-browser-1.1.4.tgz";
-      sha1 = "90b42769333e909ce3f13bf3e1023ba4a6d6b723";
+      url = "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz";
+      name = "domain-browser-1.1.7.tgz";
+      sha1 = "867aa4b093faa05f1de08c06f4d7b21fdf8698bc";
     };
     deps = {
     };
@@ -11683,7 +12739,7 @@
     cpu = [ ];
   };
   by-spec."domain-browser"."~1.1.0" =
-    self.by-version."domain-browser"."1.1.4";
+    self.by-version."domain-browser"."1.1.7";
   by-spec."domelementtype"."1" =
     self.by-version."domelementtype"."1.3.0";
   by-version."domelementtype"."1.3.0" = self.buildNodePackage {
@@ -11691,7 +12747,7 @@
     version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
+      url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz";
       name = "domelementtype-1.3.0.tgz";
       sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2";
     };
@@ -11703,6 +12759,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."domelementtype"."^1.3.0" =
+    self.by-version."domelementtype"."1.3.0";
   by-spec."domelementtype"."~1.1.1" =
     self.by-version."domelementtype"."1.1.3";
   by-version."domelementtype"."1.1.3" = self.buildNodePackage {
@@ -11710,7 +12768,7 @@
     version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
+      url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz";
       name = "domelementtype-1.1.3.tgz";
       sha1 = "bd28773e2642881aec51544924299c5cd822185b";
     };
@@ -11729,7 +12787,7 @@
     version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz";
+      url = "https://registry.npmjs.org/domhandler/-/domhandler-2.2.1.tgz";
       name = "domhandler-2.2.1.tgz";
       sha1 = "59df9dcd227e808b365ae73e1f6684ac3d946fc2";
     };
@@ -11749,7 +12807,7 @@
     version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
+      url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
       name = "domhandler-2.3.0.tgz";
       sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738";
     };
@@ -11762,16 +12820,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."domino"."~1.0.18" =
-    self.by-version."domino"."1.0.18";
-  by-version."domino"."1.0.18" = self.buildNodePackage {
-    name = "domino-1.0.18";
-    version = "1.0.18";
+  by-spec."domhandler"."^2.3.0" =
+    self.by-version."domhandler"."2.3.0";
+  by-spec."domino"."~1.0.19" =
+    self.by-version."domino"."1.0.23";
+  by-version."domino"."1.0.23" = self.buildNodePackage {
+    name = "domino-1.0.23";
+    version = "1.0.23";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domino/-/domino-1.0.18.tgz";
-      name = "domino-1.0.18.tgz";
-      sha1 = "3a9bcf9db6d693e1ffb7d06d96c9138e1d331a7b";
+      url = "https://registry.npmjs.org/domino/-/domino-1.0.23.tgz";
+      name = "domino-1.0.23.tgz";
+      sha1 = "6f251b0ba3e21a8b4bd1ecbaef01b23f963a512b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."domready"."0.3.0" =
+    self.by-version."domready"."0.3.0";
+  by-version."domready"."0.3.0" = self.buildNodePackage {
+    name = "domready-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/domready/-/domready-0.3.0.tgz";
+      name = "domready-0.3.0.tgz";
+      sha1 = "b3740facbd09163018152d12aec239383e102175";
     };
     deps = {
     };
@@ -11788,7 +12867,7 @@
     version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
+      url = "https://registry.npmjs.org/domutils/-/domutils-1.4.3.tgz";
       name = "domutils-1.4.3.tgz";
       sha1 = "0865513796c6b306031850e175516baf80b72a6f";
     };
@@ -11808,7 +12887,7 @@
     version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
+      url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
       name = "domutils-1.5.1.tgz";
       sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf";
     };
@@ -11822,6 +12901,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."domutils"."^1.5.1" =
+    self.by-version."domutils"."1.5.1";
+  by-spec."double-ended-queue"."^2.1.0-0" =
+    self.by-version."double-ended-queue"."2.1.0-0";
+  by-version."double-ended-queue"."2.1.0-0" = self.buildNodePackage {
+    name = "double-ended-queue-2.1.0-0";
+    version = "2.1.0-0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz";
+      name = "double-ended-queue-2.1.0-0.tgz";
+      sha1 = "103d3527fd31528f40188130c841efdd78264e5c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."dropbox"."=0.9.2" =
     self.by-version."dropbox"."0.9.2";
   by-version."dropbox"."0.9.2" = self.buildNodePackage {
@@ -11829,13 +12929,13 @@
     version = "0.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dropbox/-/dropbox-0.9.2.tgz";
+      url = "https://registry.npmjs.org/dropbox/-/dropbox-0.9.2.tgz";
       name = "dropbox-0.9.2.tgz";
       sha1 = "b516a0483d136c16dd52acf729687e87578425cb";
     };
     deps = {
       "open-0.0.5" = self.by-version."open"."0.0.5";
-      "xhr2-0.1.2" = self.by-version."xhr2"."0.1.2";
+      "xhr2-0.1.3" = self.by-version."xhr2"."0.1.3";
     };
     optionalDependencies = {
     };
@@ -11850,7 +12950,7 @@
     version = "0.2.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
+      url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.2.8.tgz";
       name = "dtrace-provider-0.2.8.tgz";
       sha1 = "e243f19219aa95fbf0d8f2ffb07f5bd64e94fe20";
     };
@@ -11862,39 +12962,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."dtrace-provider"."^0.3.1" =
-    self.by-version."dtrace-provider"."0.3.2";
-  by-version."dtrace-provider"."0.3.2" = self.buildNodePackage {
-    name = "dtrace-provider-0.3.2";
-    version = "0.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.3.2.tgz";
-      name = "dtrace-provider-0.3.2.tgz";
-      sha1 = "794e4df1993d93ec333baed9c1a4d2da72f875b9";
-    };
-    deps = {
-      "nan-1.3.0" = self.by-version."nan"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."dtrace-provider"."~0.4" =
-    self.by-version."dtrace-provider"."0.4.0";
-  by-version."dtrace-provider"."0.4.0" = self.buildNodePackage {
-    name = "dtrace-provider-0.4.0";
-    version = "0.4.0";
+  by-spec."dtrace-provider"."^0.6.0" =
+    self.by-version."dtrace-provider"."0.6.0";
+  by-version."dtrace-provider"."0.6.0" = self.buildNodePackage {
+    name = "dtrace-provider-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.4.0.tgz";
-      name = "dtrace-provider-0.4.0.tgz";
-      sha1 = "0b67bc1cc77e79bf88b87ad20664f4a753ce3f26";
+      url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.6.0.tgz";
+      name = "dtrace-provider-0.6.0.tgz";
+      sha1 = "0b078d5517937d873101452d9146737557b75e51";
     };
     deps = {
-      "nan-1.5.3" = self.by-version."nan"."1.5.3";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -11902,14 +12982,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."duplexer"."~0.1.0" =
+  by-spec."dtrace-provider"."~0.6" =
+    self.by-version."dtrace-provider"."0.6.0";
+  by-spec."duplexer"."~0.1.1" =
     self.by-version."duplexer"."0.1.1";
   by-version."duplexer"."0.1.1" = self.buildNodePackage {
     name = "duplexer-0.1.1";
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
+      url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz";
       name = "duplexer-0.1.1.tgz";
       sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1";
     };
@@ -11921,8 +13003,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."duplexer"."~0.1.1" =
-    self.by-version."duplexer"."0.1.1";
   by-spec."duplexer2"."0.0.2" =
     self.by-version."duplexer2"."0.0.2";
   by-version."duplexer2"."0.0.2" = self.buildNodePackage {
@@ -11930,7 +13010,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
+      url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
       name = "duplexer2-0.0.2.tgz";
       sha1 = "c614dcf67e2fb14995a91711e5a617e8a60a31db";
     };
@@ -11943,22 +13023,47 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."duplexer2"."^0.1.2" =
+    self.by-version."duplexer2"."0.1.4";
+  by-version."duplexer2"."0.1.4" = self.buildNodePackage {
+    name = "duplexer2-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz";
+      name = "duplexer2-0.1.4.tgz";
+      sha1 = "8b12dab878c0d69e3e7891051662a32fc6bddcc1";
+    };
+    deps = {
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."duplexer2"."~0.0.2" =
     self.by-version."duplexer2"."0.0.2";
+  by-spec."duplexer2"."~0.1.0" =
+    self.by-version."duplexer2"."0.1.4";
+  by-spec."duplexer2"."~0.1.2" =
+    self.by-version."duplexer2"."0.1.4";
   by-spec."duplexify"."^3.1.2" =
-    self.by-version."duplexify"."3.3.0";
-  by-version."duplexify"."3.3.0" = self.buildNodePackage {
-    name = "duplexify-3.3.0";
-    version = "3.3.0";
+    self.by-version."duplexify"."3.4.3";
+  by-version."duplexify"."3.4.3" = self.buildNodePackage {
+    name = "duplexify-3.4.3";
+    version = "3.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/duplexify/-/duplexify-3.3.0.tgz";
-      name = "duplexify-3.3.0.tgz";
-      sha1 = "f5025c4b1f49f998b7399cd2d008e2895d18d247";
+      url = "https://registry.npmjs.org/duplexify/-/duplexify-3.4.3.tgz";
+      name = "duplexify-3.4.3.tgz";
+      sha1 = "af6a7b10d928b095f8ad854d072bb90998db850d";
     };
     deps = {
       "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -11967,21 +13072,40 @@
     cpu = [ ];
   };
   by-spec."duplexify"."^3.2.0" =
-    self.by-version."duplexify"."3.3.0";
-  by-spec."each-async"."^1.1.0" =
-    self.by-version."each-async"."1.1.1";
-  by-version."each-async"."1.1.1" = self.buildNodePackage {
-    name = "each-async-1.1.1";
-    version = "1.1.1";
+    self.by-version."duplexify"."3.4.3";
+  by-spec."ecc-jsbn".">=0.0.1 <1.0.0" =
+    self.by-version."ecc-jsbn"."0.1.1";
+  by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage {
+    name = "ecc-jsbn-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz";
-      name = "each-async-1.1.1.tgz";
-      sha1 = "dee5229bdf0ab6ba2012a395e1b869abf8813473";
+      url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
+      name = "ecc-jsbn-0.1.1.tgz";
+      sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
     };
     deps = {
-      "onetime-1.0.0" = self.by-version."onetime"."1.0.0";
-      "set-immediate-shim-1.0.1" = self.by-version."set-immediate-shim"."1.0.1";
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ecdsa-sig-formatter"."^1.0.0" =
+    self.by-version."ecdsa-sig-formatter"."1.0.5";
+  by-version."ecdsa-sig-formatter"."1.0.5" = self.buildNodePackage {
+    name = "ecdsa-sig-formatter-1.0.5";
+    version = "1.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.5.tgz";
+      name = "ecdsa-sig-formatter-1.0.5.tgz";
+      sha1 = "0d0f32b638611f6b8f36ffd305a3e512ea5444e6";
+    };
+    deps = {
+      "base64-url-1.2.2" = self.by-version."base64-url"."1.2.2";
     };
     optionalDependencies = {
     };
@@ -11996,12 +13120,12 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ecurve/-/ecurve-1.0.0.tgz";
+      url = "https://registry.npmjs.org/ecurve/-/ecurve-1.0.0.tgz";
       name = "ecurve-1.0.0.tgz";
       sha1 = "32cfd5ce5f421e9351206a33d4e3cfd36f3465a4";
     };
     deps = {
-      "bigi-1.4.0" = self.by-version."bigi"."1.4.0";
+      "bigi-1.4.1" = self.by-version."bigi"."1.4.1";
     };
     optionalDependencies = {
     };
@@ -12009,18 +13133,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."editor"."0.0.4" =
-    self.by-version."editor"."0.0.4";
-  by-version."editor"."0.0.4" = self.buildNodePackage {
-    name = "editor-0.0.4";
-    version = "0.0.4";
-    bin = true;
+  by-spec."edit-google-spreadsheet".">=0.0.1" =
+    self.by-version."edit-google-spreadsheet"."0.2.21";
+  by-version."edit-google-spreadsheet"."0.2.21" = self.buildNodePackage {
+    name = "edit-google-spreadsheet-0.2.21";
+    version = "0.2.21";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/editor/-/editor-0.0.4.tgz";
-      name = "editor-0.0.4.tgz";
-      sha1 = "478920f77bca6c1c1749d5e3edde4bd5966efda8";
+      url = "https://registry.npmjs.org/edit-google-spreadsheet/-/edit-google-spreadsheet-0.2.21.tgz";
+      name = "edit-google-spreadsheet-0.2.21.tgz";
+      sha1 = "36a249bb2773c5642b8cba70c31bfb19b421eadc";
     };
     deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "google-auth-library-0.9.7" = self.by-version."google-auth-library"."0.9.7";
+      "google-oauth-jwt-0.1.7" = self.by-version."google-oauth-jwt"."0.1.7";
+      "googleclientlogin-0.2.8" = self.by-version."googleclientlogin"."0.2.8";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
     };
     optionalDependencies = {
     };
@@ -12028,16 +13160,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."editor"."~0.1.0" =
-    self.by-version."editor"."0.1.0";
-  by-version."editor"."0.1.0" = self.buildNodePackage {
-    name = "editor-0.1.0";
-    version = "0.1.0";
+  by-spec."editor"."~1.0.0" =
+    self.by-version."editor"."1.0.0";
+  by-version."editor"."1.0.0" = self.buildNodePackage {
+    name = "editor-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/editor/-/editor-0.1.0.tgz";
-      name = "editor-0.1.0.tgz";
-      sha1 = "542f4662c6a8c88e862fc11945e204e51981b9a1";
+      url = "https://registry.npmjs.org/editor/-/editor-1.0.0.tgz";
+      name = "editor-1.0.0.tgz";
+      sha1 = "60c7f87bd62bcc6a894fa8ccd6afb7823a24f742";
     };
     deps = {
     };
@@ -12054,7 +13186,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
+      url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.3.tgz";
       name = "ee-first-1.0.3.tgz";
       sha1 = "6c98c4089abecb5a7b85c1ac449aa603d3b3dabe";
     };
@@ -12073,7 +13205,7 @@
     version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
+      url = "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz";
       name = "ee-first-1.0.5.tgz";
       sha1 = "8c9b212898d8cd9f1a9436650ce7be202c9e9ff0";
     };
@@ -12092,7 +13224,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
+      url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.0.tgz";
       name = "ee-first-1.1.0.tgz";
       sha1 = "6a0d7c6221e490feefd92ec3f441c9ce8cd097f4";
     };
@@ -12104,6 +13236,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ee-first"."1.1.1" =
+    self.by-version."ee-first"."1.1.1";
+  by-version."ee-first"."1.1.1" = self.buildNodePackage {
+    name = "ee-first-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz";
+      name = "ee-first-1.1.1.tgz";
+      sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."ejs"."0.7.1" =
     self.by-version."ejs"."0.7.1";
   by-version."ejs"."0.7.1" = self.buildNodePackage {
@@ -12111,7 +13262,7 @@
     version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ejs/-/ejs-0.7.1.tgz";
+      url = "https://registry.npmjs.org/ejs/-/ejs-0.7.1.tgz";
       name = "ejs-0.7.1.tgz";
       sha1 = "6dab41cbdee572986db328a2a8d22040f20fba7c";
     };
@@ -12130,7 +13281,7 @@
     version = "0.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
+      url = "https://registry.npmjs.org/ejs/-/ejs-0.8.3.tgz";
       name = "ejs-0.8.3.tgz";
       sha1 = "db8aac47ff80a7df82b4c82c126fe8970870626f";
     };
@@ -12143,15 +13294,15 @@
     cpu = [ ];
   };
   by-spec."ejs".">=0.7.1" =
-    self.by-version."ejs"."2.3.1";
-  by-version."ejs"."2.3.1" = self.buildNodePackage {
-    name = "ejs-2.3.1";
-    version = "2.3.1";
+    self.by-version."ejs"."2.4.1";
+  by-version."ejs"."2.4.1" = self.buildNodePackage {
+    name = "ejs-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ejs/-/ejs-2.3.1.tgz";
-      name = "ejs-2.3.1.tgz";
-      sha1 = "a697d98ac401e32a99c3deed92c60c19b6199a7f";
+      url = "https://registry.npmjs.org/ejs/-/ejs-2.4.1.tgz";
+      name = "ejs-2.4.1.tgz";
+      sha1 = "82e15b1b2a1f948b18097476ba2bd7c66f4d1566";
     };
     deps = {
     };
@@ -12161,16 +13312,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."elementtree"."0.1.5" =
-    self.by-version."elementtree"."0.1.5";
-  by-version."elementtree"."0.1.5" = self.buildNodePackage {
-    name = "elementtree-0.1.5";
-    version = "0.1.5";
+  by-spec."elementtree"."0.1.6" =
+    self.by-version."elementtree"."0.1.6";
+  by-version."elementtree"."0.1.6" = self.buildNodePackage {
+    name = "elementtree-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/elementtree/-/elementtree-0.1.5.tgz";
-      name = "elementtree-0.1.5.tgz";
-      sha1 = "8d5fd80440b4be806c4a01b63914b40e0daab9ff";
+      url = "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz";
+      name = "elementtree-0.1.6.tgz";
+      sha1 = "2ac4c46ea30516c8c4cbdb5e3ac7418e592de20c";
     };
     deps = {
       "sax-0.3.5" = self.by-version."sax"."0.3.5";
@@ -12181,21 +13332,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."elliptic"."^1.0.0" =
-    self.by-version."elliptic"."1.0.1";
-  by-version."elliptic"."1.0.1" = self.buildNodePackage {
-    name = "elliptic-1.0.1";
-    version = "1.0.1";
+  by-spec."elementtree"."^0.1.6" =
+    self.by-version."elementtree"."0.1.6";
+  by-spec."elliptic"."^6.0.0" =
+    self.by-version."elliptic"."6.2.3";
+  by-version."elliptic"."6.2.3" = self.buildNodePackage {
+    name = "elliptic-6.2.3";
+    version = "6.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/elliptic/-/elliptic-1.0.1.tgz";
-      name = "elliptic-1.0.1.tgz";
-      sha1 = "d180376b66a17d74995c837796362ac4d22aefe3";
+      url = "https://registry.npmjs.org/elliptic/-/elliptic-6.2.3.tgz";
+      name = "elliptic-6.2.3.tgz";
+      sha1 = "18e46d7306b0951275a2d42063270a14b74ebe99";
     };
     deps = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
       "brorand-1.0.5" = self.by-version."brorand"."1.0.5";
-      "hash.js-1.0.2" = self.by-version."hash.js"."1.0.2";
+      "hash.js-1.0.3" = self.by-version."hash.js"."1.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -12211,7 +13364,7 @@
     version = "1.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/embedly/-/embedly-1.0.4.tgz";
+      url = "https://registry.npmjs.org/embedly/-/embedly-1.0.4.tgz";
       name = "embedly-1.0.4.tgz";
       sha1 = "2f778885b44a3cf6c377c1dc31ce1321956733a6";
     };
@@ -12247,43 +13400,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."empty-trash"."*" =
-    self.by-version."empty-trash"."1.1.3";
-  by-version."empty-trash"."1.1.3" = self.buildNodePackage {
-    name = "empty-trash-1.1.3";
-    version = "1.1.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.3.tgz";
-      name = "empty-trash-1.1.3.tgz";
-      sha1 = "41676c594d2786760bbfff0013ca5b865da56627";
-    };
-    deps = {
-      "meow-3.1.0" = self.by-version."meow"."3.1.0";
-      "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1";
-      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
-      "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "empty-trash" = self.by-version."empty-trash"."1.1.3";
-  by-spec."encoding"."~0.1.7" =
-    self.by-version."encoding"."0.1.11";
-  by-version."encoding"."0.1.11" = self.buildNodePackage {
-    name = "encoding-0.1.11";
-    version = "0.1.11";
+  by-spec."encoding"."^0.1.11" =
+    self.by-version."encoding"."0.1.12";
+  by-version."encoding"."0.1.12" = self.buildNodePackage {
+    name = "encoding-0.1.12";
+    version = "0.1.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/encoding/-/encoding-0.1.11.tgz";
-      name = "encoding-0.1.11.tgz";
-      sha1 = "52c65ac15aab467f1338451e2615f988eccc0258";
+      url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz";
+      name = "encoding-0.1.12.tgz";
+      sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb";
     };
     deps = {
-      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
     };
     optionalDependencies = {
     };
@@ -12291,6 +13420,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."encoding"."~0.1.7" =
+    self.by-version."encoding"."0.1.12";
   by-spec."end-of-stream"."1.0.0" =
     self.by-version."end-of-stream"."1.0.0";
   by-version."end-of-stream"."1.0.0" = self.buildNodePackage {
@@ -12298,12 +13429,12 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
+      url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz";
       name = "end-of-stream-1.0.0.tgz";
       sha1 = "d4596e702734a93e40e9af864319eabd99ff2f0e";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -12318,12 +13449,12 @@
     version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
+      url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-0.1.5.tgz";
       name = "end-of-stream-0.1.5.tgz";
       sha1 = "8e177206c3c80837d85632e8b9359dfe8b2f6eaf";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -12338,12 +13469,12 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
+      url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz";
       name = "end-of-stream-1.1.0.tgz";
       sha1 = "e9353258baa9108965efc41cb0ef8ade2f3cfb07";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -12357,6 +13488,25 @@
     self.by-version."end-of-stream"."0.1.5";
   by-spec."end-of-stream"."~1.0.0" =
     self.by-version."end-of-stream"."1.0.0";
+  by-spec."ends-with"."^0.2.0" =
+    self.by-version."ends-with"."0.2.0";
+  by-version."ends-with"."0.2.0" = self.buildNodePackage {
+    name = "ends-with-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz";
+      name = "ends-with-0.2.0.tgz";
+      sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."engine.io"."1.3.1" =
     self.by-version."engine.io"."1.3.1";
   by-version."engine.io"."1.3.1" = self.buildNodePackage {
@@ -12364,7 +13514,7 @@
     version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz";
+      url = "https://registry.npmjs.org/engine.io/-/engine.io-1.3.1.tgz";
       name = "engine.io-1.3.1.tgz";
       sha1 = "2d968308fffae5d17f5209b6775246e90d8a705e";
     };
@@ -12380,22 +13530,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."engine.io"."1.5.1" =
-    self.by-version."engine.io"."1.5.1";
-  by-version."engine.io"."1.5.1" = self.buildNodePackage {
-    name = "engine.io-1.5.1";
-    version = "1.5.1";
+  by-spec."engine.io"."1.6.8" =
+    self.by-version."engine.io"."1.6.8";
+  by-version."engine.io"."1.6.8" = self.buildNodePackage {
+    name = "engine.io-1.6.8";
+    version = "1.6.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.5.1.tgz";
-      name = "engine.io-1.5.1.tgz";
-      sha1 = "8f7a4b2aadf974b71ffd185cffe1e2bdf384ddfb";
+      url = "https://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz";
+      name = "engine.io-1.6.8.tgz";
+      sha1 = "de05a06b757e7517695e088c7b051c47819f511b";
     };
     deps = {
-      "debug-1.0.3" = self.by-version."debug"."1.0.3";
-      "ws-0.5.0" = self.by-version."ws"."0.5.0";
-      "engine.io-parser-1.2.1" = self.by-version."engine.io-parser"."1.2.1";
       "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
+      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
     };
     optionalDependencies = {
     };
@@ -12410,7 +13561,7 @@
     version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz";
+      url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.3.1.tgz";
       name = "engine.io-client-1.3.1.tgz";
       sha1 = "1c5a65d5c5af6d04b44c22c3dbcd95c39ed1c989";
     };
@@ -12433,29 +13584,30 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."engine.io-client"."1.5.1" =
-    self.by-version."engine.io-client"."1.5.1";
-  by-version."engine.io-client"."1.5.1" = self.buildNodePackage {
-    name = "engine.io-client-1.5.1";
-    version = "1.5.1";
+  by-spec."engine.io-client"."1.6.8" =
+    self.by-version."engine.io-client"."1.6.8";
+  by-version."engine.io-client"."1.6.8" = self.buildNodePackage {
+    name = "engine.io-client-1.6.8";
+    version = "1.6.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.5.1.tgz";
-      name = "engine.io-client-1.5.1.tgz";
-      sha1 = "ecd0026d90b065169b9885960183f3d56b8da18e";
+      url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz";
+      name = "engine.io-client-1.6.8.tgz";
+      sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb";
     };
     deps = {
-      "has-cors-1.0.3" = self.by-version."has-cors"."1.0.3";
-      "ws-0.4.31" = self.by-version."ws"."0.4.31";
-      "xmlhttprequest-1.5.0" = self.by-version."xmlhttprequest"."1.5.0";
+      "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1";
       "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
-      "engine.io-parser-1.2.1" = self.by-version."engine.io-parser"."1.2.1";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
       "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1";
       "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
       "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
+      "yeast-0.1.2" = self.by-version."yeast"."0.1.2";
     };
     optionalDependencies = {
     };
@@ -12470,7 +13622,7 @@
     version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz";
+      url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.0.6.tgz";
       name = "engine.io-parser-1.0.6.tgz";
       sha1 = "d38813143a411cb3b914132ab05bf99e6f7a248e";
     };
@@ -12487,24 +13639,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."engine.io-parser"."1.2.1" =
-    self.by-version."engine.io-parser"."1.2.1";
-  by-version."engine.io-parser"."1.2.1" = self.buildNodePackage {
-    name = "engine.io-parser-1.2.1";
-    version = "1.2.1";
+  by-spec."engine.io-parser"."1.2.4" =
+    self.by-version."engine.io-parser"."1.2.4";
+  by-version."engine.io-parser"."1.2.4" = self.buildNodePackage {
+    name = "engine.io-parser-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.1.tgz";
-      name = "engine.io-parser-1.2.1.tgz";
-      sha1 = "4462a67d0c70a907c06db2e1de53791a86f5ab37";
+      url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
+      name = "engine.io-parser-1.2.4.tgz";
+      sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
     };
     deps = {
       "after-0.8.1" = self.by-version."after"."0.8.1";
       "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6";
       "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2";
-      "blob-0.0.2" = self.by-version."blob"."0.0.2";
-      "has-binary-0.1.5" = self.by-version."has-binary"."0.1.5";
-      "utf8-2.0.0" = self.by-version."utf8"."2.0.0";
+      "blob-0.0.4" = self.by-version."blob"."0.0.4";
+      "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6";
+      "utf8-2.1.0" = self.by-version."utf8"."2.1.0";
     };
     optionalDependencies = {
     };
@@ -12512,21 +13664,63 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."enhanced-resolve"."~0.8.2" =
-    self.by-version."enhanced-resolve"."0.8.5";
-  by-version."enhanced-resolve"."0.8.5" = self.buildNodePackage {
-    name = "enhanced-resolve-0.8.5";
-    version = "0.8.5";
+  by-spec."enhanced-resolve"."^2.2.0" =
+    self.by-version."enhanced-resolve"."2.2.2";
+  by-version."enhanced-resolve"."2.2.2" = self.buildNodePackage {
+    name = "enhanced-resolve-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.2.2.tgz";
+      name = "enhanced-resolve-2.2.2.tgz";
+      sha1 = "4da494d591183308bd46a95f5b40e255dc9d4a16";
+    };
+    deps = {
+      "tapable-0.2.4" = self.by-version."tapable"."0.2.4";
+      "memory-fs-0.3.0" = self.by-version."memory-fs"."0.3.0";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."enhanced-resolve"."~0.9.0" =
+    self.by-version."enhanced-resolve"."0.9.1";
+  by-version."enhanced-resolve"."0.9.1" = self.buildNodePackage {
+    name = "enhanced-resolve-0.9.1";
+    version = "0.9.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.8.5.tgz";
-      name = "enhanced-resolve-0.8.5.tgz";
-      sha1 = "cf0a05c2d186969e1681963e59593ffdd8a4362c";
+      url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
+      name = "enhanced-resolve-0.9.1.tgz";
+      sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
     };
     deps = {
-      "tapable-0.1.9" = self.by-version."tapable"."0.1.9";
+      "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
       "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ent"."~2.2.0" =
+    self.by-version."ent"."2.2.0";
+  by-version."ent"."2.2.0" = self.buildNodePackage {
+    name = "ent-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz";
+      name = "ent-2.2.0.tgz";
+      sha1 = "e964219325a21d05f44466a2f686ed6ce5f5dd1d";
+    };
+    deps = {
     };
     optionalDependencies = {
     };
@@ -12541,7 +13735,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
+      url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
       name = "entities-1.0.0.tgz";
       sha1 = "b2987aa3821347fcde642b24fdfc9e4fb712bf26";
     };
@@ -12553,14 +13747,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."entities"."~1.1.1" =
+  by-spec."entities"."^1.1.1" =
     self.by-version."entities"."1.1.1";
   by-version."entities"."1.1.1" = self.buildNodePackage {
     name = "entities-1.1.1";
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
+      url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz";
       name = "entities-1.1.1.tgz";
       sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0";
     };
@@ -12572,6 +13766,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."entities"."~1.1.1" =
+    self.by-version."entities"."1.1.1";
   by-spec."envify"."^3.0.0" =
     self.by-version."envify"."3.4.0";
   by-version."envify"."3.4.0" = self.buildNodePackage {
@@ -12579,12 +13775,12 @@
     version = "3.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/envify/-/envify-3.4.0.tgz";
+      url = "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz";
       name = "envify-3.4.0.tgz";
       sha1 = "a0bed52222529076a02fabf6ce00eef42d7b6734";
     };
     deps = {
-      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
       "jstransform-10.1.0" = self.by-version."jstransform"."10.1.0";
     };
     optionalDependencies = {
@@ -12594,15 +13790,15 @@
     cpu = [ ];
   };
   by-spec."errno"."^0.1.1" =
-    self.by-version."errno"."0.1.2";
-  by-version."errno"."0.1.2" = self.buildNodePackage {
-    name = "errno-0.1.2";
-    version = "0.1.2";
+    self.by-version."errno"."0.1.4";
+  by-version."errno"."0.1.4" = self.buildNodePackage {
+    name = "errno-0.1.4";
+    version = "0.1.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errno/-/errno-0.1.2.tgz";
-      name = "errno-0.1.2.tgz";
-      sha1 = "ec94dac3794a92cec9e1f08502b165933a805808";
+      url = "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz";
+      name = "errno-0.1.4.tgz";
+      sha1 = "b896e23a9e5e8ba33871fc996abd3635fc9a1c7d";
     };
     deps = {
       "prr-0.0.0" = self.by-version."prr"."0.0.0";
@@ -12613,8 +13809,30 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."errno"."^0.1.3" =
+    self.by-version."errno"."0.1.4";
   by-spec."errno"."~0.1.1" =
-    self.by-version."errno"."0.1.2";
+    self.by-version."errno"."0.1.4";
+  by-spec."error-ex"."^1.2.0" =
+    self.by-version."error-ex"."1.3.0";
+  by-version."error-ex"."1.3.0" = self.buildNodePackage {
+    name = "error-ex-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz";
+      name = "error-ex-1.3.0.tgz";
+      sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9";
+    };
+    deps = {
+      "is-arrayish-0.2.1" = self.by-version."is-arrayish"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."errorhandler"."1.0.0" =
     self.by-version."errorhandler"."1.0.0";
   by-version."errorhandler"."1.0.0" = self.buildNodePackage {
@@ -12622,7 +13840,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
+      url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.0.0.tgz";
       name = "errorhandler-1.0.0.tgz";
       sha1 = "d74b37e8dc38c99afb3f5a79edcebaea022d042a";
     };
@@ -12641,7 +13859,7 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
+      url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.1.1.tgz";
       name = "errorhandler-1.1.1.tgz";
       sha1 = "18defd436d8ca2efe0a2d886c5c4d6ee6d76d691";
     };
@@ -12656,19 +13874,19 @@
     cpu = [ ];
   };
   by-spec."errorhandler"."^1.1.1" =
-    self.by-version."errorhandler"."1.3.5";
-  by-version."errorhandler"."1.3.5" = self.buildNodePackage {
-    name = "errorhandler-1.3.5";
-    version = "1.3.5";
+    self.by-version."errorhandler"."1.4.3";
+  by-version."errorhandler"."1.4.3" = self.buildNodePackage {
+    name = "errorhandler-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.3.5.tgz";
-      name = "errorhandler-1.3.5.tgz";
-      sha1 = "4ef655dd2c30e1fc1bf9c24805fa34ba20d4f69a";
+      url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz";
+      name = "errorhandler-1.4.3.tgz";
+      sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f";
     };
     deps = {
-      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "accepts-1.3.2" = self.by-version."accepts"."1.3.2";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -12676,20 +13894,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."errorhandler"."~1.2.0" =
-    self.by-version."errorhandler"."1.2.4";
-  by-version."errorhandler"."1.2.4" = self.buildNodePackage {
-    name = "errorhandler-1.2.4";
-    version = "1.2.4";
+  by-spec."errorhandler"."~1.4.2" =
+    self.by-version."errorhandler"."1.4.3";
+  by-spec."errs"."0.3.x" =
+    self.by-version."errs"."0.3.2";
+  by-version."errs"."0.3.2" = self.buildNodePackage {
+    name = "errs-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errorhandler/-/errorhandler-1.2.4.tgz";
-      name = "errorhandler-1.2.4.tgz";
-      sha1 = "4726630d6c6c2c11a7cd589b7376f7336473d6aa";
+      url = "https://registry.npmjs.org/errs/-/errs-0.3.2.tgz";
+      name = "errs-0.3.2.tgz";
+      sha1 = "798099b2dbd37ca2bc749e538a7c1307d0b50499";
     };
     deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -12697,22 +13915,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."errorhandler"."~1.2.2" =
-    self.by-version."errorhandler"."1.2.4";
-  by-spec."errorhandler"."~1.3.5" =
-    self.by-version."errorhandler"."1.3.5";
-  by-spec."errs"."0.3.x" =
-    self.by-version."errs"."0.3.2";
-  by-version."errs"."0.3.2" = self.buildNodePackage {
-    name = "errs-0.3.2";
-    version = "0.3.2";
+  by-spec."es5-ext"."^0.10.7" =
+    self.by-version."es5-ext"."0.10.11";
+  by-version."es5-ext"."0.10.11" = self.buildNodePackage {
+    name = "es5-ext-0.10.11";
+    version = "0.10.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/errs/-/errs-0.3.2.tgz";
-      name = "errs-0.3.2.tgz";
-      sha1 = "798099b2dbd37ca2bc749e538a7c1307d0b50499";
+      url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.11.tgz";
+      name = "es5-ext-0.10.11.tgz";
+      sha1 = "8184c3e705a820948c2dbe043849379b1dbd0c45";
     };
     deps = {
+      "es6-iterator-2.0.0" = self.by-version."es6-iterator"."2.0.0";
+      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
     };
     optionalDependencies = {
     };
@@ -12720,20 +13936,52 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."es5-ext"."^0.10.8" =
+    self.by-version."es5-ext"."0.10.11";
+  by-spec."es5-ext"."~0.10.10" =
+    self.by-version."es5-ext"."0.10.11";
+  by-spec."es5-ext"."~0.10.11" =
+    self.by-version."es5-ext"."0.10.11";
   by-spec."es5-ext"."~0.10.2" =
-    self.by-version."es5-ext"."0.10.6";
-  by-version."es5-ext"."0.10.6" = self.buildNodePackage {
-    name = "es5-ext-0.10.6";
-    version = "0.10.6";
+    self.by-version."es5-ext"."0.10.11";
+  by-spec."es5-ext"."~0.10.7" =
+    self.by-version."es5-ext"."0.10.11";
+  by-spec."es5-ext"."~0.10.8" =
+    self.by-version."es5-ext"."0.10.11";
+  by-spec."es6-collections"."^0.5.5" =
+    self.by-version."es6-collections"."0.5.6";
+  by-version."es6-collections"."0.5.6" = self.buildNodePackage {
+    name = "es6-collections-0.5.6";
+    version = "0.5.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/es6-collections/-/es6-collections-0.5.6.tgz";
+      name = "es6-collections-0.5.6.tgz";
+      sha1 = "5552e800ad12c1820cda2bd4a79ae7dbb03d89a2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."es6-iterator"."2" =
+    self.by-version."es6-iterator"."2.0.0";
+  by-version."es6-iterator"."2.0.0" = self.buildNodePackage {
+    name = "es6-iterator-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es5-ext/-/es5-ext-0.10.6.tgz";
-      name = "es5-ext-0.10.6.tgz";
-      sha1 = "e27d5750401a11c08259e3b9b5d3bdd3281df00a";
+      url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.0.tgz";
+      name = "es6-iterator-2.0.0.tgz";
+      sha1 = "bd968567d61635e33c0b80727613c9cb4b096bac";
     };
     deps = {
-      "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3";
-      "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1";
+      "d-0.1.1" = self.by-version."d"."0.1.1";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
+      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
     };
     optionalDependencies = {
     };
@@ -12741,27 +13989,62 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es5-ext"."~0.10.4" =
-    self.by-version."es5-ext"."0.10.6";
-  by-spec."es5-ext"."~0.10.5" =
-    self.by-version."es5-ext"."0.10.6";
-  by-spec."es5-ext"."~0.10.6" =
-    self.by-version."es5-ext"."0.10.6";
-  by-spec."es6-iterator"."~0.1.3" =
-    self.by-version."es6-iterator"."0.1.3";
-  by-version."es6-iterator"."0.1.3" = self.buildNodePackage {
-    name = "es6-iterator-0.1.3";
+  by-spec."es6-map"."^0.1.3" =
+    self.by-version."es6-map"."0.1.3";
+  by-version."es6-map"."0.1.3" = self.buildNodePackage {
+    name = "es6-map-0.1.3";
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz";
-      name = "es6-iterator-0.1.3.tgz";
-      sha1 = "d6f58b8c4fc413c249b4baa19768f8e4d7c8944e";
+      url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.3.tgz";
+      name = "es6-map-0.1.3.tgz";
+      sha1 = "fe58c6654c6acd54e4397cdb72379d59b6ad5894";
     };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
-      "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
+      "es6-iterator-2.0.0" = self.by-version."es6-iterator"."2.0.0";
+      "es6-set-0.1.4" = self.by-version."es6-set"."0.1.4";
+      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+      "event-emitter-0.3.4" = self.by-version."event-emitter"."0.3.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."es6-promise"."2.1.1" =
+    self.by-version."es6-promise"."2.1.1";
+  by-version."es6-promise"."2.1.1" = self.buildNodePackage {
+    name = "es6-promise-2.1.1";
+    version = "2.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.1.1.tgz";
+      name = "es6-promise-2.1.1.tgz";
+      sha1 = "03e8f3c7297928e5478d6ab1d0643251507bdedd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."es6-promise"."3.0.2" =
+    self.by-version."es6-promise"."3.0.2";
+  by-version."es6-promise"."3.0.2" = self.buildNodePackage {
+    name = "es6-promise-3.0.2";
+    version = "3.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.0.2.tgz";
+      name = "es6-promise-3.0.2.tgz";
+      sha1 = "010d5858423a5f118979665f46486a95c6ee2bb6";
+    };
+    deps = {
     };
     optionalDependencies = {
     };
@@ -12770,17 +14053,60 @@
     cpu = [ ];
   };
   by-spec."es6-promise"."^2.0.0" =
-    self.by-version."es6-promise"."2.1.0";
-  by-version."es6-promise"."2.1.0" = self.buildNodePackage {
-    name = "es6-promise-2.1.0";
-    version = "2.1.0";
+    self.by-version."es6-promise"."2.3.0";
+  by-version."es6-promise"."2.3.0" = self.buildNodePackage {
+    name = "es6-promise-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/es6-promise/-/es6-promise-2.3.0.tgz";
+      name = "es6-promise-2.3.0.tgz";
+      sha1 = "96edb9f2fdb01995822b263dd8aadab6748181bc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."es6-promise"."^3.0.2" =
+    self.by-version."es6-promise"."3.1.2";
+  by-version."es6-promise"."3.1.2" = self.buildNodePackage {
+    name = "es6-promise-3.1.2";
+    version = "3.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.1.2.tgz";
+      name = "es6-promise-3.1.2.tgz";
+      sha1 = "795e25ceb47f7babb263d151afbedd92d18e6a07";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."es6-set"."~0.1.3" =
+    self.by-version."es6-set"."0.1.4";
+  by-version."es6-set"."0.1.4" = self.buildNodePackage {
+    name = "es6-set-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-promise/-/es6-promise-2.1.0.tgz";
-      name = "es6-promise-2.1.0.tgz";
-      sha1 = "ff979910a05a884c0557edc40e6d9c26fe38167a";
+      url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.4.tgz";
+      name = "es6-set-0.1.4.tgz";
+      sha1 = "9516b6761c2964b92ff479456233a247dc707ce8";
     };
     deps = {
+      "d-0.1.1" = self.by-version."d"."0.1.1";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
+      "es6-iterator-2.0.0" = self.by-version."es6-iterator"."2.0.0";
+      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
+      "event-emitter-0.3.4" = self.by-version."event-emitter"."0.3.4";
     };
     optionalDependencies = {
     };
@@ -12795,7 +14121,7 @@
     version = "0.21.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz";
+      url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.21.1.tgz";
       name = "es6-shim-0.21.1.tgz";
       sha1 = "6621bce72e1ac80a6e1f002abd4e789f12489fd2";
     };
@@ -12808,15 +14134,15 @@
     cpu = [ ];
   };
   by-spec."es6-shim".">=0.10.0 <1.0.0-0" =
-    self.by-version."es6-shim"."0.28.1";
-  by-version."es6-shim"."0.28.1" = self.buildNodePackage {
-    name = "es6-shim-0.28.1";
-    version = "0.28.1";
+    self.by-version."es6-shim"."0.35.0";
+  by-version."es6-shim"."0.35.0" = self.buildNodePackage {
+    name = "es6-shim-0.35.0";
+    version = "0.35.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.28.1.tgz";
-      name = "es6-shim-0.28.1.tgz";
-      sha1 = "f59d122a42b810c085fa6b0340e365578a5739ea";
+      url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.35.0.tgz";
+      name = "es6-shim-0.35.0.tgz";
+      sha1 = "272d927950889eabe299927cdc9c0010b7bfc00a";
     };
     deps = {
     };
@@ -12826,18 +14152,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-shim"."~0.16.0" =
-    self.by-version."es6-shim"."0.16.0";
-  by-version."es6-shim"."0.16.0" = self.buildNodePackage {
-    name = "es6-shim-0.16.0";
-    version = "0.16.0";
+  by-spec."es6-symbol"."3" =
+    self.by-version."es6-symbol"."3.0.2";
+  by-version."es6-symbol"."3.0.2" = self.buildNodePackage {
+    name = "es6-symbol-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-shim/-/es6-shim-0.16.0.tgz";
-      name = "es6-shim-0.16.0.tgz";
-      sha1 = "07e122909722d0fce581b17f64d1505c98094454";
+      url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.0.2.tgz";
+      name = "es6-symbol-3.0.2.tgz";
+      sha1 = "1e928878c6f5e63541625b4bb4df4af07d154219";
     };
     deps = {
+      "d-0.1.1" = self.by-version."d"."0.1.1";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
     };
     optionalDependencies = {
     };
@@ -12845,20 +14173,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-symbol"."~2.0.1" =
-    self.by-version."es6-symbol"."2.0.1";
-  by-version."es6-symbol"."2.0.1" = self.buildNodePackage {
-    name = "es6-symbol-2.0.1";
+  by-spec."es6-symbol"."^3.0.2" =
+    self.by-version."es6-symbol"."3.0.2";
+  by-spec."es6-symbol"."~3.0.1" =
+    self.by-version."es6-symbol"."3.0.2";
+  by-spec."es6-symbol"."~3.0.2" =
+    self.by-version."es6-symbol"."3.0.2";
+  by-spec."es6-weak-map"."^2.0.1" =
+    self.by-version."es6-weak-map"."2.0.1";
+  by-version."es6-weak-map"."2.0.1" = self.buildNodePackage {
+    name = "es6-weak-map-2.0.1";
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz";
-      name = "es6-symbol-2.0.1.tgz";
-      sha1 = "761b5c67cfd4f1d18afb234f691d678682cb3bf3";
+      url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.1.tgz";
+      name = "es6-weak-map-2.0.1.tgz";
+      sha1 = "0d2bbd8827eb5fb4ba8f97fbfea50d43db21ea81";
     };
     deps = {
       "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
+      "es6-iterator-2.0.0" = self.by-version."es6-iterator"."2.0.0";
+      "es6-symbol-3.0.2" = self.by-version."es6-symbol"."3.0.2";
     };
     optionalDependencies = {
     };
@@ -12866,22 +14202,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."es6-weak-map"."~0.1.2" =
-    self.by-version."es6-weak-map"."0.1.4";
-  by-version."es6-weak-map"."0.1.4" = self.buildNodePackage {
-    name = "es6-weak-map-0.1.4";
-    version = "0.1.4";
+  by-spec."escape-html"."*" =
+    self.by-version."escape-html"."1.0.3";
+  by-version."escape-html"."1.0.3" = self.buildNodePackage {
+    name = "escape-html-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.4.tgz";
-      name = "es6-weak-map-0.1.4.tgz";
-      sha1 = "706cef9e99aa236ba7766c239c8b9e286ea7d228";
+      url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz";
+      name = "escape-html-1.0.3.tgz";
+      sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988";
     };
     deps = {
-      "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
-      "es6-iterator-0.1.3" = self.by-version."es6-iterator"."0.1.3";
-      "es6-symbol-2.0.1" = self.by-version."es6-symbol"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -12889,14 +14221,15 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."escape-html"."*" =
+  "escape-html" = self.by-version."escape-html"."1.0.3";
+  by-spec."escape-html"."1.0.1" =
     self.by-version."escape-html"."1.0.1";
   by-version."escape-html"."1.0.1" = self.buildNodePackage {
     name = "escape-html-1.0.1";
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
+      url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.1.tgz";
       name = "escape-html-1.0.1.tgz";
       sha1 = "181a286ead397a39a92857cfb1d43052e356bff0";
     };
@@ -12908,19 +14241,16 @@
     os = [ ];
     cpu = [ ];
   };
-  "escape-html" = self.by-version."escape-html"."1.0.1";
-  by-spec."escape-html"."1.0.1" =
-    self.by-version."escape-html"."1.0.1";
-  by-spec."escape-regexp-component"."^1.0.2" =
-    self.by-version."escape-regexp-component"."1.0.2";
-  by-version."escape-regexp-component"."1.0.2" = self.buildNodePackage {
-    name = "escape-regexp-component-1.0.2";
+  by-spec."escape-html"."1.0.2" =
+    self.by-version."escape-html"."1.0.2";
+  by-version."escape-html"."1.0.2" = self.buildNodePackage {
+    name = "escape-html-1.0.2";
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz";
-      name = "escape-regexp-component-1.0.2.tgz";
-      sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
+      url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz";
+      name = "escape-html-1.0.2.tgz";
+      sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c";
     };
     deps = {
     };
@@ -12930,16 +14260,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."escape-string-applescript"."^1.0.0" =
-    self.by-version."escape-string-applescript"."1.0.0";
-  by-version."escape-string-applescript"."1.0.0" = self.buildNodePackage {
-    name = "escape-string-applescript-1.0.0";
-    version = "1.0.0";
+  by-spec."escape-html"."~1.0.3" =
+    self.by-version."escape-html"."1.0.3";
+  by-spec."escape-regexp-component"."^1.0.2" =
+    self.by-version."escape-regexp-component"."1.0.2";
+  by-version."escape-regexp-component"."1.0.2" = self.buildNodePackage {
+    name = "escape-regexp-component-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz";
-      name = "escape-string-applescript-1.0.0.tgz";
-      sha1 = "6f1c2294245d82c63bc03338dc19a94aa8428892";
+      url = "https://registry.npmjs.org/escape-regexp-component/-/escape-regexp-component-1.0.2.tgz";
+      name = "escape-regexp-component-1.0.2.tgz";
+      sha1 = "9c63b6d0b25ff2a88c3adbd18c5b61acc3b9faa2";
     };
     deps = {
     };
@@ -12956,7 +14288,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
+      url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz";
       name = "escape-string-regexp-1.0.2.tgz";
       sha1 = "4dbc2fe674e71949caf3fb2695ce7f2dc1d9a8d1";
     };
@@ -12969,15 +14301,15 @@
     cpu = [ ];
   };
   by-spec."escape-string-regexp"."^1.0.0" =
-    self.by-version."escape-string-regexp"."1.0.3";
-  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
-    name = "escape-string-regexp-1.0.3";
-    version = "1.0.3";
+    self.by-version."escape-string-regexp"."1.0.5";
+  by-version."escape-string-regexp"."1.0.5" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
-      name = "escape-string-regexp-1.0.3.tgz";
-      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+      url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
+      name = "escape-string-regexp-1.0.5.tgz";
+      sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
     };
     deps = {
     };
@@ -12988,76 +14320,57 @@
     cpu = [ ];
   };
   by-spec."escape-string-regexp"."^1.0.2" =
-    self.by-version."escape-string-regexp"."1.0.3";
-  by-spec."escodegen"."0.0.15" =
-    self.by-version."escodegen"."0.0.15";
-  by-version."escodegen"."0.0.15" = self.buildNodePackage {
-    name = "escodegen-0.0.15";
-    version = "0.0.15";
+    self.by-version."escape-string-regexp"."1.0.5";
+  by-spec."escodegen"."1.7.x" =
+    self.by-version."escodegen"."1.7.1";
+  by-version."escodegen"."1.7.1" = self.buildNodePackage {
+    name = "escodegen-1.7.1";
+    version = "1.7.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.15.tgz";
-      name = "escodegen-0.0.15.tgz";
-      sha1 = "ffda9cb26b70b34f7cc19f1d88756539afb543bd";
+      url = "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz";
+      name = "escodegen-1.7.1.tgz";
+      sha1 = "30ecfcf66ca98dc67cd2fd162abeb6eafa8ce6fc";
     };
     deps = {
-      "esprima-2.2.0" = self.by-version."esprima"."2.2.0";
-    };
-    optionalDependencies = {
-      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."escodegen"."0.0.17" =
-    self.by-version."escodegen"."0.0.17";
-  by-version."escodegen"."0.0.17" = self.buildNodePackage {
-    name = "escodegen-0.0.17";
-    version = "0.0.17";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/escodegen/-/escodegen-0.0.17.tgz";
-      name = "escodegen-0.0.17.tgz";
-      sha1 = "1e78d17df1004fd7a88f2fed3b8b8592f3217f9c";
-    };
-    deps = {
-      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
-      "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4";
+      "estraverse-1.9.3" = self.by-version."estraverse"."1.9.3";
+      "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
+      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
+      "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
     };
     optionalDependencies = {
-      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
+      "source-map-0.2.0" = self.by-version."source-map"."0.2.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."escodegen"."1.6.x" =
-    self.by-version."escodegen"."1.6.1";
-  by-version."escodegen"."1.6.1" = self.buildNodePackage {
-    name = "escodegen-1.6.1";
-    version = "1.6.1";
+  by-spec."escodegen"."^1.6.1" =
+    self.by-version."escodegen"."1.8.0";
+  by-version."escodegen"."1.8.0" = self.buildNodePackage {
+    name = "escodegen-1.8.0";
+    version = "1.8.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.6.1.tgz";
-      name = "escodegen-1.6.1.tgz";
-      sha1 = "367de17d8510540d12bc6dcb8b3f918391265815";
+      url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.0.tgz";
+      name = "escodegen-1.8.0.tgz";
+      sha1 = "b246aae829ce73d59e2c55727359edd1c130a81b";
     };
     deps = {
       "estraverse-1.9.3" = self.by-version."estraverse"."1.9.3";
-      "esutils-1.1.6" = self.by-version."esutils"."1.1.6";
-      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
-      "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
+      "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
+      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
+      "optionator-0.8.1" = self.by-version."optionator"."0.8.1";
     };
     optionalDependencies = {
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "source-map-0.2.0" = self.by-version."source-map"."0.2.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."escodegen"."^1.4.1" =
-    self.by-version."escodegen"."1.6.1";
+  by-spec."escodegen"."^1.8.0" =
+    self.by-version."escodegen"."1.8.0";
   by-spec."escodegen"."~1.3.1" =
     self.by-version."escodegen"."1.3.3";
   by-version."escodegen"."1.3.3" = self.buildNodePackage {
@@ -13065,7 +14378,7 @@
     version = "1.3.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
+      url = "https://registry.npmjs.org/escodegen/-/escodegen-1.3.3.tgz";
       name = "escodegen-1.3.3.tgz";
       sha1 = "f024016f5a88e046fd12005055e939802e6c5f23";
     };
@@ -13081,19 +14394,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."escope"."~0.0.13" =
-    self.by-version."escope"."0.0.16";
-  by-version."escope"."0.0.16" = self.buildNodePackage {
-    name = "escope-0.0.16";
-    version = "0.0.16";
+  by-spec."escope"."^3.6.0" =
+    self.by-version."escope"."3.6.0";
+  by-version."escope"."3.6.0" = self.buildNodePackage {
+    name = "escope-3.6.0";
+    version = "3.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escope/-/escope-0.0.16.tgz";
-      name = "escope-0.0.16.tgz";
-      sha1 = "418c7a0afca721dafe659193fd986283e746538f";
+      url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
+      name = "escope-3.6.0.tgz";
+      sha1 = "e01975e812781a163a6dadfdd80398dc64c889c3";
     };
     deps = {
-      "estraverse-3.1.0" = self.by-version."estraverse"."3.1.0";
+      "es6-map-0.1.3" = self.by-version."es6-map"."0.1.3";
+      "es6-weak-map-2.0.1" = self.by-version."es6-weak-map"."2.0.1";
+      "esrecurse-4.1.0" = self.by-version."esrecurse"."4.1.0";
+      "estraverse-4.2.0" = self.by-version."estraverse"."4.2.0";
     };
     optionalDependencies = {
     };
@@ -13101,18 +14417,50 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."1.0.2" =
-    self.by-version."esprima"."1.0.2";
-  by-version."esprima"."1.0.2" = self.buildNodePackage {
-    name = "esprima-1.0.2";
-    version = "1.0.2";
+  by-spec."eslint"."*" =
+    self.by-version."eslint"."2.7.0";
+  by-version."eslint"."2.7.0" = self.buildNodePackage {
+    name = "eslint-2.7.0";
+    version = "2.7.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-1.0.2.tgz";
-      name = "esprima-1.0.2.tgz";
-      sha1 = "8039bf9ceac4d9d2c15f623264fb292b5502ceaf";
+      url = "https://registry.npmjs.org/eslint/-/eslint-2.7.0.tgz";
+      name = "eslint-2.7.0.tgz";
+      sha1 = "b02ac247d13ec45ea5b44a3c383ddb6feda08b00";
     };
     deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "doctrine-1.2.1" = self.by-version."doctrine"."1.2.1";
+      "es6-map-0.1.3" = self.by-version."es6-map"."0.1.3";
+      "escope-3.6.0" = self.by-version."escope"."3.6.0";
+      "espree-3.1.3" = self.by-version."espree"."3.1.3";
+      "estraverse-4.2.0" = self.by-version."estraverse"."4.2.0";
+      "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
+      "file-entry-cache-1.2.4" = self.by-version."file-entry-cache"."1.2.4";
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
+      "globals-9.3.0" = self.by-version."globals"."9.3.0";
+      "ignore-3.0.14" = self.by-version."ignore"."3.0.14";
+      "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
+      "inquirer-0.12.0" = self.by-version."inquirer"."0.12.0";
+      "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1";
+      "is-resolvable-1.0.0" = self.by-version."is-resolvable"."1.0.0";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "json-stable-stringify-1.0.1" = self.by-version."json-stable-stringify"."1.0.1";
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "optionator-0.8.1" = self.by-version."optionator"."0.8.1";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
+      "pluralize-1.2.1" = self.by-version."pluralize"."1.2.1";
+      "progress-1.1.8" = self.by-version."progress"."1.1.8";
+      "require-uncached-1.0.2" = self.by-version."require-uncached"."1.0.2";
+      "shelljs-0.6.0" = self.by-version."shelljs"."0.6.0";
+      "strip-json-comments-1.0.4" = self.by-version."strip-json-comments"."1.0.4";
+      "table-3.7.8" = self.by-version."table"."3.7.8";
+      "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
+      "user-home-2.0.0" = self.by-version."user-home"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -13120,18 +14468,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."2.1.x" =
-    self.by-version."esprima"."2.1.0";
-  by-version."esprima"."2.1.0" = self.buildNodePackage {
-    name = "esprima-2.1.0";
-    version = "2.1.0";
-    bin = true;
+  "eslint" = self.by-version."eslint"."2.7.0";
+  by-spec."eslint".">0.7.3" =
+    self.by-version."eslint"."2.7.0";
+  by-spec."espree"."3.1.3" =
+    self.by-version."espree"."3.1.3";
+  by-version."espree"."3.1.3" = self.buildNodePackage {
+    name = "espree-3.1.3";
+    version = "3.1.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-2.1.0.tgz";
-      name = "esprima-2.1.0.tgz";
-      sha1 = "c1c9fb94975dfcc3fc71c60f074f3c5156a28ef5";
+      url = "https://registry.npmjs.org/espree/-/espree-3.1.3.tgz";
+      name = "espree-3.1.3.tgz";
+      sha1 = "a77ca630986c19b74d95541b845298cd6faa228c";
     };
     deps = {
+      "acorn-3.0.4" = self.by-version."acorn"."3.0.4";
+      "acorn-jsx-2.0.1" = self.by-version."acorn-jsx"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -13139,16 +14492,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima".">= 1.0.0" =
-    self.by-version."esprima"."2.2.0";
-  by-version."esprima"."2.2.0" = self.buildNodePackage {
-    name = "esprima-2.2.0";
-    version = "2.2.0";
+  by-spec."esprima"."2.7.x" =
+    self.by-version."esprima"."2.7.2";
+  by-version."esprima"."2.7.2" = self.buildNodePackage {
+    name = "esprima-2.7.2";
+    version = "2.7.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-2.2.0.tgz";
-      name = "esprima-2.2.0.tgz";
-      sha1 = "4292c1d68e4173d815fa2290dc7afc96d81fcd83";
+      url = "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz";
+      name = "esprima-2.7.2.tgz";
+      sha1 = "f43be543609984eae44c933ac63352a6af35f339";
     };
     deps = {
     };
@@ -13165,7 +14518,7 @@
     version = "1.2.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz";
+      url = "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz";
       name = "esprima-1.2.5.tgz";
       sha1 = "0993502feaf668138325756f30f9a51feeec11e9";
     };
@@ -13177,25 +14530,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."git+https://github.com/ariya/esprima.git#harmony" =
-    self.by-version."esprima"."1.1.0-dev-harmony";
-  by-version."esprima"."1.1.0-dev-harmony" = self.buildNodePackage {
-    name = "esprima-1.1.0-dev-harmony";
-    version = "1.1.0-dev-harmony";
-    bin = true;
-    src = fetchgit {
-      url = "https://github.com/ariya/esprima.git";
-      rev = "a41a40b49046747b3af57341cda048bbd3d9df79";
-      sha256 = "a304effb5bc8e53d0752aeb7e10ab15afd8381ef09056d0fc98d94a43e5c748a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."esprima"."^2.5.0" =
+    self.by-version."esprima"."2.7.2";
+  by-spec."esprima"."^2.6.0" =
+    self.by-version."esprima"."2.7.2";
+  by-spec."esprima"."^2.7" =
+    self.by-version."esprima"."2.7.2";
+  by-spec."esprima"."^2.7.1" =
+    self.by-version."esprima"."2.7.2";
   by-spec."esprima"."~ 1.0.2" =
     self.by-version."esprima"."1.0.4";
   by-version."esprima"."1.0.4" = self.buildNodePackage {
@@ -13203,7 +14545,7 @@
     version = "1.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
+      url = "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz";
       name = "esprima-1.0.4.tgz";
       sha1 = "9f557e08fc3b4d26ece9dd34f8fbf476b62585ad";
     };
@@ -13215,48 +14557,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."~ 2.0.0" =
-    self.by-version."esprima"."2.0.0";
-  by-version."esprima"."2.0.0" = self.buildNodePackage {
-    name = "esprima-2.0.0";
-    version = "2.0.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-2.0.0.tgz";
-      name = "esprima-2.0.0.tgz";
-      sha1 = "609ac5c2667eae5433b41eb9ecece2331b41498f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."esprima"."~0.9.9" =
-    self.by-version."esprima"."0.9.9";
-  by-version."esprima"."0.9.9" = self.buildNodePackage {
-    name = "esprima-0.9.9";
-    version = "0.9.9";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-0.9.9.tgz";
-      name = "esprima-0.9.9.tgz";
-      sha1 = "1b90925c975d632d7282939c3bb9c3a423c30490";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."esprima"."~1.0.2" =
-    self.by-version."esprima"."1.0.4";
-  by-spec."esprima"."~1.0.4" =
-    self.by-version."esprima"."1.0.4";
   by-spec."esprima"."~1.1.1" =
     self.by-version."esprima"."1.1.1";
   by-version."esprima"."1.1.1" = self.buildNodePackage {
@@ -13264,7 +14564,7 @@
     version = "1.1.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
+      url = "https://registry.npmjs.org/esprima/-/esprima-1.1.1.tgz";
       name = "esprima-1.1.1.tgz";
       sha1 = "5b6f1547f4d102e670e140c509be6771d6aeb549";
     };
@@ -13276,75 +14576,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."~1.2.0" =
-    self.by-version."esprima"."1.2.5";
-  by-spec."esprima-fb"."13001.1001.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
-  by-version."esprima-fb"."13001.1001.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-13001.1001.0-dev-harmony-fb";
-    version = "13001.1001.0-dev-harmony-fb";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
-      sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."esprima-fb"."3001.1.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."3001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."3001.1.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-3001.1.0-dev-harmony-fb";
-    version = "3001.1.0-dev-harmony-fb";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-3001.0001.0000-dev-harmony-fb.tgz";
-      name = "esprima-fb-3001.1.0-dev-harmony-fb.tgz";
-      sha1 = "b77d37abcd38ea0b77426bb8bc2922ce6b426411";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."esprima-fb"."~10001.1.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."10001.1.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-10001.1.0-dev-harmony-fb";
-    version = "10001.1.0-dev-harmony-fb";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-10001.1.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-10001.1.0-dev-harmony-fb.tgz";
-      sha1 = "f7efb452d3c8006dde6b3c59678604f7114a882c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."esprima-fb"."~13001.1.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."13001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."13001.1.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-13001.1.0-dev-harmony-fb";
-    version = "13001.1.0-dev-harmony-fb";
+  by-spec."esprima"."~2.3.0" =
+    self.by-version."esprima"."2.3.0";
+  by-version."esprima"."2.3.0" = self.buildNodePackage {
+    name = "esprima-2.3.0";
+    version = "2.3.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-13001.1.0-dev-harmony-fb.tgz";
-      sha1 = "43a4a28f8e01c2e3bb8dfb22fd178474d4d881f5";
+      url = "https://registry.npmjs.org/esprima/-/esprima-2.3.0.tgz";
+      name = "esprima-2.3.0.tgz";
+      sha1 = "d26debd7545fcf8916a80668236310e14da6b345";
     };
     deps = {
     };
@@ -13354,16 +14595,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima-fb"."~14001.1.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."14001.1.0-dev-harmony-fb";
-  by-version."esprima-fb"."14001.1.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-14001.1.0-dev-harmony-fb";
-    version = "14001.1.0-dev-harmony-fb";
+  by-spec."esprima-fb"."13001.1001.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
+  by-version."esprima-fb"."13001.1001.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-13001.1001.0-dev-harmony-fb";
+    version = "13001.1001.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-14001.1.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-14001.1.0-dev-harmony-fb.tgz";
-      sha1 = "9f4b99a36f45aa58e11da95c9bc9ccf25a6e958c";
+      url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
+      sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
     };
     deps = {
     };
@@ -13373,16 +14614,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima-fb"."~8001.1001.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."8001.1001.0-dev-harmony-fb";
-  by-version."esprima-fb"."8001.1001.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-8001.1001.0-dev-harmony-fb";
-    version = "8001.1001.0-dev-harmony-fb";
+  by-spec."esprima-fb"."^15001.1.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."15001.1.0-dev-harmony-fb";
+  by-version."esprima-fb"."15001.1.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-15001.1.0-dev-harmony-fb";
+    version = "15001.1.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-fb/-/esprima-fb-8001.1001.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-8001.1001.0-dev-harmony-fb.tgz";
-      sha1 = "c3190b05341d45643e093af70485ab4988e34d5e";
+      url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-15001.1.0-dev-harmony-fb.tgz";
+      sha1 = "30a947303c6b8d5e955bee2b99b1d233206a6901";
     };
     deps = {
     };
@@ -13392,42 +14633,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima-six"."0.0.3" =
-    self.by-version."esprima-six"."0.0.3";
-  by-version."esprima-six"."0.0.3" = self.buildNodePackage {
-    name = "esprima-six-0.0.3";
-    version = "0.0.3";
+  by-spec."esprima-fb"."~15001.1001.0-dev-harmony-fb" =
+    self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
+  by-version."esprima-fb"."15001.1001.0-dev-harmony-fb" = self.buildNodePackage {
+    name = "esprima-fb-15001.1001.0-dev-harmony-fb";
+    version = "15001.1001.0-dev-harmony-fb";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esprima-six/-/esprima-six-0.0.3.tgz";
-      name = "esprima-six-0.0.3.tgz";
-      sha1 = "8eb750435b02d3e50cf09b5736cbce4606a4399f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."esprima-six"."~0.0.3" =
-    self.by-version."esprima-six"."0.0.3";
-  by-spec."esrefactor"."~0.1.0" =
-    self.by-version."esrefactor"."0.1.0";
-  by-version."esrefactor"."0.1.0" = self.buildNodePackage {
-    name = "esrefactor-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esrefactor/-/esrefactor-0.1.0.tgz";
-      name = "esrefactor-0.1.0.tgz";
-      sha1 = "d142795a282339ab81e936b5b7a21b11bf197b13";
+      url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz";
+      name = "esprima-fb-15001.1001.0-dev-harmony-fb.tgz";
+      sha1 = "43beb57ec26e8cf237d3dd8b33e42533577f2659";
     };
     deps = {
-      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
-      "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4";
-      "escope-0.0.16" = self.by-version."escope"."0.0.16";
     };
     optionalDependencies = {
     };
@@ -13435,18 +14652,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."estraverse".">= 0.0.2" =
-    self.by-version."estraverse"."3.1.0";
-  by-version."estraverse"."3.1.0" = self.buildNodePackage {
-    name = "estraverse-3.1.0";
-    version = "3.1.0";
+  by-spec."esrecurse"."^4.1.0" =
+    self.by-version."esrecurse"."4.1.0";
+  by-version."esrecurse"."4.1.0" = self.buildNodePackage {
+    name = "esrecurse-4.1.0";
+    version = "4.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/estraverse/-/estraverse-3.1.0.tgz";
-      name = "estraverse-3.1.0.tgz";
-      sha1 = "15e28a446b8b82bc700ccc8b96c78af4da0d6cba";
+      url = "https://registry.npmjs.org/esrecurse/-/esrecurse-4.1.0.tgz";
+      name = "esrecurse-4.1.0.tgz";
+      sha1 = "4713b6536adf7f2ac4f327d559e7756bff648220";
     };
     deps = {
+      "estraverse-4.1.1" = self.by-version."estraverse"."4.1.1";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -13461,7 +14680,7 @@
     version = "1.9.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz";
+      url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz";
       name = "estraverse-1.9.3.tgz";
       sha1 = "af67f2dc922582415950926091a4005d29c9bb44";
     };
@@ -13473,16 +14692,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."estraverse"."~0.0.4" =
-    self.by-version."estraverse"."0.0.4";
-  by-version."estraverse"."0.0.4" = self.buildNodePackage {
-    name = "estraverse-0.0.4";
-    version = "0.0.4";
+  by-spec."estraverse"."^4.1.1" =
+    self.by-version."estraverse"."4.2.0";
+  by-version."estraverse"."4.2.0" = self.buildNodePackage {
+    name = "estraverse-4.2.0";
+    version = "4.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/estraverse/-/estraverse-0.0.4.tgz";
-      name = "estraverse-0.0.4.tgz";
-      sha1 = "01a0932dfee574684a598af5a67c3bf9b6428db2";
+      url = "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz";
+      name = "estraverse-4.2.0.tgz";
+      sha1 = "0dee3fed31fcd469618ce7342099fc1afa0bdb13";
     };
     deps = {
     };
@@ -13492,6 +14711,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."estraverse"."^4.2.0" =
+    self.by-version."estraverse"."4.2.0";
   by-spec."estraverse"."~1.5.0" =
     self.by-version."estraverse"."1.5.1";
   by-version."estraverse"."1.5.1" = self.buildNodePackage {
@@ -13499,7 +14720,7 @@
     version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
+      url = "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz";
       name = "estraverse-1.5.1.tgz";
       sha1 = "867a3e8e58a9f84618afb6c2ddbcd916b7cbaf71";
     };
@@ -13511,6 +14732,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."estraverse"."~4.1.0" =
+    self.by-version."estraverse"."4.1.1";
+  by-version."estraverse"."4.1.1" = self.buildNodePackage {
+    name = "estraverse-4.1.1";
+    version = "4.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/estraverse/-/estraverse-4.1.1.tgz";
+      name = "estraverse-4.1.1.tgz";
+      sha1 = "f6caca728933a850ef90661d0e17982ba47111a2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."esutils"."^1.1.6" =
     self.by-version."esutils"."1.1.6";
   by-version."esutils"."1.1.6" = self.buildNodePackage {
@@ -13518,7 +14758,7 @@
     version = "1.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
+      url = "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz";
       name = "esutils-1.1.6.tgz";
       sha1 = "c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375";
     };
@@ -13530,16 +14770,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esutils"."~1.0.0" =
-    self.by-version."esutils"."1.0.0";
-  by-version."esutils"."1.0.0" = self.buildNodePackage {
-    name = "esutils-1.0.0";
-    version = "1.0.0";
+  by-spec."esutils"."^2.0.2" =
+    self.by-version."esutils"."2.0.2";
+  by-version."esutils"."2.0.2" = self.buildNodePackage {
+    name = "esutils-2.0.2";
+    version = "2.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
-      name = "esutils-1.0.0.tgz";
-      sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
+      url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz";
+      name = "esutils-2.0.2.tgz";
+      sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b";
     };
     deps = {
     };
@@ -13549,19 +14789,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."etag"."~1.3.1" =
-    self.by-version."etag"."1.3.1";
-  by-version."etag"."1.3.1" = self.buildNodePackage {
-    name = "etag-1.3.1";
-    version = "1.3.1";
+  by-spec."esutils"."~1.0.0" =
+    self.by-version."esutils"."1.0.0";
+  by-version."esutils"."1.0.0" = self.buildNodePackage {
+    name = "esutils-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/etag/-/etag-1.3.1.tgz";
-      name = "etag-1.3.1.tgz";
-      sha1 = "e51925728688a32dc4eea1cfa9ab4f734d055567";
+      url = "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz";
+      name = "esutils-1.0.0.tgz";
+      sha1 = "8151d358e20c8acc7fb745e7472c0025fe496570";
     };
     deps = {
-      "crc-3.0.0" = self.by-version."crc"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -13576,7 +14815,7 @@
     version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz";
+      url = "https://registry.npmjs.org/etag/-/etag-1.4.0.tgz";
       name = "etag-1.4.0.tgz";
       sha1 = "3050991615857707c04119d075ba2088e0701225";
     };
@@ -13589,19 +14828,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."etag"."~1.5.0" =
-    self.by-version."etag"."1.5.1";
-  by-version."etag"."1.5.1" = self.buildNodePackage {
-    name = "etag-1.5.1";
-    version = "1.5.1";
+  by-spec."etag"."~1.7.0" =
+    self.by-version."etag"."1.7.0";
+  by-version."etag"."1.7.0" = self.buildNodePackage {
+    name = "etag-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/etag/-/etag-1.5.1.tgz";
-      name = "etag-1.5.1.tgz";
-      sha1 = "54c50de04ee42695562925ac566588291be7e9ea";
+      url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz";
+      name = "etag-1.7.0.tgz";
+      sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8";
     };
     deps = {
-      "crc-3.2.1" = self.by-version."crc"."3.2.1";
     };
     optionalDependencies = {
     };
@@ -13609,21 +14847,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."etag"."~1.5.1" =
-    self.by-version."etag"."1.5.1";
-  by-spec."event-emitter"."~0.3.1" =
-    self.by-version."event-emitter"."0.3.3";
-  by-version."event-emitter"."0.3.3" = self.buildNodePackage {
-    name = "event-emitter-0.3.3";
-    version = "0.3.3";
+  by-spec."eve"."~0.4.2" =
+    self.by-version."eve"."0.4.2";
+  by-version."eve"."0.4.2" = self.buildNodePackage {
+    name = "eve-0.4.2";
+    version = "0.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/eve/-/eve-0.4.2.tgz";
+      name = "eve-0.4.2.tgz";
+      sha1 = "7eea0afc0e4efb7c9365615315a3576833ead2ae";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."event-emitter"."~0.3.4" =
+    self.by-version."event-emitter"."0.3.4";
+  by-version."event-emitter"."0.3.4" = self.buildNodePackage {
+    name = "event-emitter-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/event-emitter/-/event-emitter-0.3.3.tgz";
-      name = "event-emitter-0.3.3.tgz";
-      sha1 = "df8e806541c68ab8ff20a79a1841b91abaa1bee4";
+      url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.4.tgz";
+      name = "event-emitter-0.3.4.tgz";
+      sha1 = "8d63ddfb4cfe1fae3b32ca265c4c720222080bb5";
     };
     deps = {
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
+      "es5-ext-0.10.11" = self.by-version."es5-ext"."0.10.11";
       "d-0.1.1" = self.by-version."d"."0.1.1";
     };
     optionalDependencies = {
@@ -13639,7 +14894,7 @@
     version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
+      url = "https://registry.npmjs.org/event-stream/-/event-stream-0.5.3.tgz";
       name = "event-stream-0.5.3.tgz";
       sha1 = "b77b9309f7107addfeab63f0c0eafd8db0bd8c1c";
     };
@@ -13652,6 +14907,32 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."event-stream"."~3.3.0" =
+    self.by-version."event-stream"."3.3.2";
+  by-version."event-stream"."3.3.2" = self.buildNodePackage {
+    name = "event-stream-3.3.2";
+    version = "3.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/event-stream/-/event-stream-3.3.2.tgz";
+      name = "event-stream-3.3.2.tgz";
+      sha1 = "3cc310feb1f28d2f62b2a085d736a9ef566378b8";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+      "from-0.1.3" = self.by-version."from"."0.1.3";
+      "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0";
+      "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11";
+      "split-0.3.3" = self.by-version."split"."0.3.3";
+      "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."eventemitter2"."0.4.14" =
     self.by-version."eventemitter2"."0.4.14";
   by-version."eventemitter2"."0.4.14" = self.buildNodePackage {
@@ -13659,7 +14940,7 @@
     version = "0.4.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
+      url = "https://registry.npmjs.org/eventemitter2/-/eventemitter2-0.4.14.tgz";
       name = "eventemitter2-0.4.14.tgz";
       sha1 = "8f61b75cde012b2e9eb284d4545583b5643b61ab";
     };
@@ -13678,15 +14959,15 @@
   by-spec."eventemitter2"."~0.4.14" =
     self.by-version."eventemitter2"."0.4.14";
   by-spec."eventemitter3"."*" =
-    self.by-version."eventemitter3"."0.1.6";
-  by-version."eventemitter3"."0.1.6" = self.buildNodePackage {
-    name = "eventemitter3-0.1.6";
-    version = "0.1.6";
+    self.by-version."eventemitter3"."1.2.0";
+  by-version."eventemitter3"."1.2.0" = self.buildNodePackage {
+    name = "eventemitter3-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/eventemitter3/-/eventemitter3-0.1.6.tgz";
-      name = "eventemitter3-0.1.6.tgz";
-      sha1 = "8c7ac44b87baab55cd50c828dc38778eac052ea5";
+      url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz";
+      name = "eventemitter3-1.2.0.tgz";
+      sha1 = "1c86991d816ad1e504750e73874224ecf3bec508";
     };
     deps = {
     };
@@ -13696,14 +14977,35 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."eventemitter3"."1.x.x" =
+    self.by-version."eventemitter3"."1.2.0";
   by-spec."events"."^1.0.0" =
+    self.by-version."events"."1.1.0";
+  by-version."events"."1.1.0" = self.buildNodePackage {
+    name = "events-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/events/-/events-1.1.0.tgz";
+      name = "events-1.1.0.tgz";
+      sha1 = "4b389fc200f910742ebff3abb2efe33690f45429";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."events"."~1.0.0" =
     self.by-version."events"."1.0.2";
   by-version."events"."1.0.2" = self.buildNodePackage {
     name = "events-1.0.2";
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/events/-/events-1.0.2.tgz";
+      url = "https://registry.npmjs.org/events/-/events-1.0.2.tgz";
       name = "events-1.0.2.tgz";
       sha1 = "75849dcfe93d10fb057c30055afdbd51d06a8e24";
     };
@@ -13715,8 +15017,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."events"."~1.0.0" =
-    self.by-version."events"."1.0.2";
+  by-spec."events"."~1.1.0" =
+    self.by-version."events"."1.1.0";
   by-spec."events.node".">= 0.4.0" =
     self.by-version."events.node"."0.4.9";
   by-version."events.node"."0.4.9" = self.buildNodePackage {
@@ -13724,7 +15026,7 @@
     version = "0.4.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
+      url = "https://registry.npmjs.org/events.node/-/events.node-0.4.9.tgz";
       name = "events.node-0.4.9.tgz";
       sha1 = "82998ea749501145fd2da7cf8ecbe6420fac02a4";
     };
@@ -13737,18 +15039,18 @@
     cpu = [ ];
   };
   by-spec."evernote"."^1.25.3" =
-    self.by-version."evernote"."1.25.4";
-  by-version."evernote"."1.25.4" = self.buildNodePackage {
-    name = "evernote-1.25.4";
-    version = "1.25.4";
+    self.by-version."evernote"."1.25.82";
+  by-version."evernote"."1.25.82" = self.buildNodePackage {
+    name = "evernote-1.25.82";
+    version = "1.25.82";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/evernote/-/evernote-1.25.4.tgz";
-      name = "evernote-1.25.4.tgz";
-      sha1 = "b2dea7683c4b26ab2af0fc965fdade2d6d022849";
+      url = "https://registry.npmjs.org/evernote/-/evernote-1.25.82.tgz";
+      name = "evernote-1.25.82.tgz";
+      sha1 = "79f3f74767c655c5bb42b2ac341913e81c50fa54";
     };
     deps = {
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
     };
     optionalDependencies = {
     };
@@ -13763,20 +15065,20 @@
     version = "0.4.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
+      url = "https://registry.npmjs.org/everyauth/-/everyauth-0.4.5.tgz";
       name = "everyauth-0.4.5.tgz";
       sha1 = "282d358439d91c30fb4aa2320dc362edac7dd189";
     };
     deps = {
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
       "request-2.9.203" = self.by-version."request"."2.9.203";
       "connect-2.3.9" = self.by-version."connect"."2.3.9";
-      "openid-0.5.11" = self.by-version."openid"."0.5.11";
-      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
+      "openid-2.0.0" = self.by-version."openid"."2.0.0";
+      "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
       "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1";
       "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1";
       "debug-0.5.0" = self.by-version."debug"."0.5.0";
-      "express-3.20.2" = self.by-version."express"."3.20.2";
+      "express-3.21.2" = self.by-version."express"."3.21.2";
     };
     optionalDependencies = {
     };
@@ -13784,19 +15086,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."execSync"."^1.0.2" =
-    self.by-version."execSync"."1.0.2";
-  by-version."execSync"."1.0.2" = self.buildNodePackage {
-    name = "execSync-1.0.2";
-    version = "1.0.2";
+  by-spec."evp_bytestokey"."^1.0.0" =
+    self.by-version."evp_bytestokey"."1.0.0";
+  by-version."evp_bytestokey"."1.0.0" = self.buildNodePackage {
+    name = "evp_bytestokey-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/execSync/-/execSync-1.0.2.tgz";
-      name = "execSync-1.0.2.tgz";
-      sha1 = "1f42eda582225180053224ecdd3fd1960fdb3139";
+      url = "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz";
+      name = "evp_bytestokey-1.0.0.tgz";
+      sha1 = "497b66ad9fef65cd7c08a6180824ba1476b66e53";
     };
     deps = {
-      "temp-0.5.1" = self.by-version."temp"."0.5.1";
+      "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -13811,7 +15113,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
+      url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
       name = "exit-0.1.2.tgz";
       sha1 = "0632638f8d877cc82107d30a0fff1a17cba1cd0c";
     };
@@ -13827,20 +15129,58 @@
     self.by-version."exit"."0.1.2";
   by-spec."exit"."~0.1.1" =
     self.by-version."exit"."0.1.2";
-  by-spec."expand-braces"."~0.1.1" =
-    self.by-version."expand-braces"."0.1.1";
-  by-version."expand-braces"."0.1.1" = self.buildNodePackage {
-    name = "expand-braces-0.1.1";
-    version = "0.1.1";
+  by-spec."exit-hook"."^1.0.0" =
+    self.by-version."exit-hook"."1.1.1";
+  by-version."exit-hook"."1.1.1" = self.buildNodePackage {
+    name = "exit-hook-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz";
+      name = "exit-hook-1.1.1.tgz";
+      sha1 = "f05ca233b48c05d54fff07765df8507e95c02ff8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."exit-on-epipe"."*" =
+    self.by-version."exit-on-epipe"."0.0.1";
+  by-version."exit-on-epipe"."0.0.1" = self.buildNodePackage {
+    name = "exit-on-epipe-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/exit-on-epipe/-/exit-on-epipe-0.0.1.tgz";
+      name = "exit-on-epipe-0.0.1.tgz";
+      sha1 = "ea41650007098c8444519a5d48958170c4ad929b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."expand-braces"."^0.1.1" =
+    self.by-version."expand-braces"."0.1.2";
+  by-version."expand-braces"."0.1.2" = self.buildNodePackage {
+    name = "expand-braces-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/expand-braces/-/expand-braces-0.1.1.tgz";
-      name = "expand-braces-0.1.1.tgz";
-      sha1 = "83f2b897a16abebd406abad10949c2e03cae55d4";
+      url = "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz";
+      name = "expand-braces-0.1.2.tgz";
+      sha1 = "488b1d1d2451cb3d3a6b192cfc030f44c5855fea";
     };
     deps = {
       "array-slice-0.2.3" = self.by-version."array-slice"."0.2.3";
-      "array-uniq-1.0.2" = self.by-version."array-uniq"."1.0.2";
+      "array-unique-0.2.1" = self.by-version."array-unique"."0.2.1";
       "braces-0.1.5" = self.by-version."braces"."0.1.5";
     };
     optionalDependencies = {
@@ -13849,18 +15189,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."expand-brackets"."^0.1.1" =
-    self.by-version."expand-brackets"."0.1.1";
-  by-version."expand-brackets"."0.1.1" = self.buildNodePackage {
-    name = "expand-brackets-0.1.1";
-    version = "0.1.1";
+  by-spec."expand-brackets"."^0.1.4" =
+    self.by-version."expand-brackets"."0.1.5";
+  by-version."expand-brackets"."0.1.5" = self.buildNodePackage {
+    name = "expand-brackets-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.1.tgz";
-      name = "expand-brackets-0.1.1.tgz";
-      sha1 = "e9a1a1a1bbbac19fbf065646fe63fe51f498821f";
+      url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz";
+      name = "expand-brackets-0.1.5.tgz";
+      sha1 = "df07284e342a807cd733ac5af72411e581d1177b";
     };
     deps = {
+      "is-posix-bracket-0.1.1" = self.by-version."is-posix-bracket"."0.1.1";
     };
     optionalDependencies = {
     };
@@ -13875,7 +15216,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz";
+      url = "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz";
       name = "expand-range-0.1.1.tgz";
       sha1 = "4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044";
     };
@@ -13896,12 +15237,12 @@
     version = "1.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz";
+      url = "https://registry.npmjs.org/expand-range/-/expand-range-1.8.1.tgz";
       name = "expand-range-1.8.1.tgz";
       sha1 = "acbd63e56efd9139722b755f099b9db5ac1f33f6";
     };
     deps = {
-      "fill-range-2.2.2" = self.by-version."fill-range"."2.2.2";
+      "fill-range-2.2.3" = self.by-version."fill-range"."2.2.3";
     };
     optionalDependencies = {
     };
@@ -13910,40 +15251,43 @@
     cpu = [ ];
   };
   by-spec."express"."*" =
-    self.by-version."express"."5.0.0-alpha.1";
-  by-version."express"."5.0.0-alpha.1" = self.buildNodePackage {
-    name = "express-5.0.0-alpha.1";
-    version = "5.0.0-alpha.1";
+    self.by-version."express"."5.0.0-alpha.2";
+  by-version."express"."5.0.0-alpha.2" = self.buildNodePackage {
+    name = "express-5.0.0-alpha.2";
+    version = "5.0.0-alpha.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-5.0.0-alpha.1.tgz";
-      name = "express-5.0.0-alpha.1.tgz";
-      sha1 = "415df02c51ae01c221362fca59b03591d956b2d7";
+      url = "https://registry.npmjs.org/express/-/express-5.0.0-alpha.2.tgz";
+      name = "express-5.0.0-alpha.2.tgz";
+      sha1 = "fd54177f657b6a4c4540727702edd1cbaa3a6ac5";
     };
     deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+      "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
+      "array-flatten-1.1.0" = self.by-version."array-flatten"."1.1.0";
       "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "methods-1.1.0" = self.by-version."methods"."1.1.0";
-      "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7";
-      "qs-2.3.2" = self.by-version."qs"."2.3.2";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.10.1" = self.by-version."send"."0.10.1";
-      "serve-static-1.7.2" = self.by-version."serve-static"."1.7.2";
-      "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
+      "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "finalhandler-0.4.0" = self.by-version."finalhandler"."0.4.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "path-to-regexp-0.1.6" = self.by-version."path-to-regexp"."0.1.6";
+      "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "router-1.1.4" = self.by-version."router"."1.1.4";
+      "send-0.13.0" = self.by-version."send"."0.13.0";
+      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
+      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "vary-1.0.1" = self.by-version."vary"."1.0.1";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -13952,7 +15296,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "express" = self.by-version."express"."5.0.0-alpha.1";
+  "express" = self.by-version."express"."5.0.0-alpha.2";
   by-spec."express"."2.5.11" =
     self.by-version."express"."2.5.11";
   by-version."express"."2.5.11" = self.buildNodePackage {
@@ -13960,7 +15304,7 @@
     version = "2.5.11";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-2.5.11.tgz";
+      url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz";
       name = "express-2.5.11.tgz";
       sha1 = "4ce8ea1f3635e69e49f0ebb497b6a4b0a51ce6f0";
     };
@@ -13976,84 +15320,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express"."3.*" =
-    self.by-version."express"."3.20.2";
-  by-version."express"."3.20.2" = self.buildNodePackage {
-    name = "express-3.20.2";
-    version = "3.20.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.20.2.tgz";
-      name = "express-3.20.2.tgz";
-      sha1 = "c604027746e60f3da0a4b43063375d21c3235858";
-    };
-    deps = {
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "connect-2.29.1" = self.by-version."connect"."2.29.1";
-      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.12.2" = self.by-version."send"."0.12.2";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."express"."3.17.2" =
-    self.by-version."express"."3.17.2";
-  by-version."express"."3.17.2" = self.buildNodePackage {
-    name = "express-3.17.2";
-    version = "3.17.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.17.2.tgz";
-      name = "express-3.17.2.tgz";
-      sha1 = "9593dd94af5d4776ea2b6dbff8c4d850a3381353";
-    };
-    deps = {
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "connect-2.26.1" = self.by-version."connect"."2.26.1";
-      "commander-1.3.2" = self.by-version."commander"."1.3.2";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "crc-3.0.0" = self.by-version."crc"."3.0.0";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "methods-1.1.0" = self.by-version."methods"."1.1.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "proxy-addr-1.0.1" = self.by-version."proxy-addr"."1.0.1";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.9.2" = self.by-version."send"."0.9.2";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."express"."3.2.0" =
     self.by-version."express"."3.2.0";
   by-version."express"."3.2.0" = self.buildNodePackage {
@@ -14061,7 +15327,7 @@
     version = "3.2.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.2.0.tgz";
+      url = "https://registry.npmjs.org/express/-/express-3.2.0.tgz";
       name = "express-3.2.0.tgz";
       sha1 = "7b66d6c66b038038eedf452804222b3077374ae0";
     };
@@ -14076,7 +15342,7 @@
       "methods-0.0.1" = self.by-version."methods"."0.0.1";
       "send-0.1.0" = self.by-version."send"."0.1.0";
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -14091,7 +15357,7 @@
     version = "3.4.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.4.4.tgz";
+      url = "https://registry.npmjs.org/express/-/express-3.4.4.tgz";
       name = "express-3.4.4.tgz";
       sha1 = "0b63ae626c96b71b78d13dfce079c10351635a86";
     };
@@ -14106,7 +15372,7 @@
       "methods-0.1.0" = self.by-version."methods"."0.1.0";
       "send-0.1.4" = self.by-version."send"."0.1.4";
       "cookie-signature-1.0.1" = self.by-version."cookie-signature"."1.0.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -14115,7 +15381,89 @@
     cpu = [ ];
   };
   by-spec."express"."3.x" =
-    self.by-version."express"."3.20.2";
+    self.by-version."express"."3.21.2";
+  by-version."express"."3.21.2" = self.buildNodePackage {
+    name = "express-3.21.2";
+    version = "3.21.2";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz";
+      name = "express-3.21.2.tgz";
+      sha1 = "0c2903ee5c54e63d65a96170764703550665a3de";
+    };
+    deps = {
+      "basic-auth-1.0.3" = self.by-version."basic-auth"."1.0.3";
+      "connect-2.30.2" = self.by-version."connect"."2.30.2";
+      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "commander-2.6.0" = self.by-version."commander"."2.6.0";
+      "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "send-0.13.0" = self.by-version."send"."0.13.0";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "vary-1.0.1" = self.by-version."vary"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."express"."4.13.4" =
+    self.by-version."express"."4.13.4";
+  by-version."express"."4.13.4" = self.buildNodePackage {
+    name = "express-4.13.4";
+    version = "4.13.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/express/-/express-4.13.4.tgz";
+      name = "express-4.13.4.tgz";
+      sha1 = "3c0b76f3c77590c8345739061ec0bd3ba067ec24";
+    };
+    deps = {
+      "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
+      "array-flatten-1.1.1" = self.by-version."array-flatten"."1.1.1";
+      "content-disposition-0.5.1" = self.by-version."content-disposition"."0.5.1";
+      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
+      "cookie-0.1.5" = self.by-version."cookie"."0.1.5";
+      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "finalhandler-0.4.1" = self.by-version."finalhandler"."0.4.1";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "merge-descriptors-1.0.1" = self.by-version."merge-descriptors"."1.0.1";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "path-to-regexp-0.1.7" = self.by-version."path-to-regexp"."0.1.7";
+      "proxy-addr-1.0.10" = self.by-version."proxy-addr"."1.0.10";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "send-0.13.1" = self.by-version."send"."0.13.1";
+      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
+      "type-is-1.6.12" = self.by-version."type-is"."1.6.12";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "vary-1.0.1" = self.by-version."vary"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."express"."4.6.1" =
     self.by-version."express"."4.6.1";
   by-version."express"."4.6.1" = self.buildNodePackage {
@@ -14123,7 +15471,7 @@
     version = "4.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-4.6.1.tgz";
+      url = "https://registry.npmjs.org/express/-/express-4.6.1.tgz";
       name = "express-4.6.1.tgz";
       sha1 = "c806e51755cb453ba17fac2f343caff6af885df4";
     };
@@ -14158,86 +15506,19 @@
     cpu = [ ];
   };
   by-spec."express".">=3.0.0" =
-    self.by-version."express"."4.12.3";
-  by-version."express"."4.12.3" = self.buildNodePackage {
-    name = "express-4.12.3";
-    version = "4.12.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-4.12.3.tgz";
-      name = "express-4.12.3.tgz";
-      sha1 = "6b9d94aec5ae03270d86d390c277a8c5a5ad0ee2";
-    };
-    deps = {
-      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
-      "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0";
-      "content-type-1.0.1" = self.by-version."content-type"."1.0.1";
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "finalhandler-0.3.4" = self.by-version."finalhandler"."0.3.4";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "merge-descriptors-1.0.0" = self.by-version."merge-descriptors"."1.0.0";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3";
-      "proxy-addr-1.0.7" = self.by-version."proxy-addr"."1.0.7";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "send-0.12.2" = self.by-version."send"."0.12.2";
-      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
-      "type-is-1.6.1" = self.by-version."type-is"."1.6.1";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."express"."4.13.4";
   by-spec."express".">=4.0.0" =
-    self.by-version."express"."4.12.3";
+    self.by-version."express"."4.13.4";
   by-spec."express".">=5.0.0-0 <6.0.0-0" =
-    self.by-version."express"."5.0.0-alpha.1";
-  by-spec."express"."^4.8.0" =
-    self.by-version."express"."4.12.3";
-  by-spec."express"."~2.5.11" =
-    self.by-version."express"."2.5.11";
-  by-spec."express"."~3.1.1" =
-    self.by-version."express"."3.1.2";
-  by-version."express"."3.1.2" = self.buildNodePackage {
-    name = "express-3.1.2";
-    version = "3.1.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.1.2.tgz";
-      name = "express-3.1.2.tgz";
-      sha1 = "52a02c8db8f22bbfa0d7478d847cd45161f985f7";
-    };
-    deps = {
-      "connect-2.7.5" = self.by-version."connect"."2.7.5";
-      "commander-0.6.1" = self.by-version."commander"."0.6.1";
-      "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "cookie-0.0.5" = self.by-version."cookie"."0.0.5";
-      "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5";
-      "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
-      "methods-0.0.1" = self.by-version."methods"."0.0.1";
-      "send-0.1.0" = self.by-version."send"."0.1.0";
-      "cookie-signature-1.0.0" = self.by-version."cookie-signature"."1.0.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."express"."5.0.0-alpha.2";
+  by-spec."express"."^4.12.2" =
+    self.by-version."express"."4.13.4";
+  by-spec."express"."^4.12.3" =
+    self.by-version."express"."4.13.4";
+  by-spec."express"."^4.12.4" =
+    self.by-version."express"."4.13.4";
+  by-spec."express"."^4.13.3" =
+    self.by-version."express"."4.13.4";
   by-spec."express"."~3.5.1" =
     self.by-version."express"."3.5.3";
   by-version."express"."3.5.3" = self.buildNodePackage {
@@ -14245,7 +15526,7 @@
     version = "3.5.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express/-/express-3.5.3.tgz";
+      url = "https://registry.npmjs.org/express/-/express-3.5.3.tgz";
       name = "express-3.5.3.tgz";
       sha1 = "af440e1ddad078934ec78241420b40bbc56dc2ad";
     };
@@ -14269,32 +15550,56 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express"."~4.12.3" =
-    self.by-version."express"."4.12.3";
+  by-spec."express"."~4.13.4" =
+    self.by-version."express"."4.13.4";
   by-spec."express-form"."*" =
-    self.by-version."express-form"."0.12.4";
-  by-version."express-form"."0.12.4" = self.buildNodePackage {
-    name = "express-form-0.12.4";
-    version = "0.12.4";
+    self.by-version."express-form"."0.12.5";
+  by-version."express-form"."0.12.5" = self.buildNodePackage {
+    name = "express-form-0.12.5";
+    version = "0.12.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-form/-/express-form-0.12.4.tgz";
-      name = "express-form-0.12.4.tgz";
-      sha1 = "d671fa5887acf32a005618ce8b652f67b30e2cb1";
+      url = "https://registry.npmjs.org/express-form/-/express-form-0.12.5.tgz";
+      name = "express-form-0.12.5.tgz";
+      sha1 = "09ac0849ad33ffd6f1980dbad91ca24bbe53c125";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
       "object-additions-0.5.1" = self.by-version."object-additions"."0.5.1";
       "validator-2.1.0" = self.by-version."validator"."2.1.0";
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."express"."4.12.3"];
+      self.by-version."express"."4.13.4"];
+    os = [ ];
+    cpu = [ ];
+  };
+  "express-form" = self.by-version."express-form"."0.12.5";
+  by-spec."express-handlebars"."^2.0.1" =
+    self.by-version."express-handlebars"."2.0.1";
+  by-version."express-handlebars"."2.0.1" = self.buildNodePackage {
+    name = "express-handlebars-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-2.0.1.tgz";
+      name = "express-handlebars-2.0.1.tgz";
+      sha1 = "975661ffebd6e79463230ba4c8e0ca5cd0522fb1";
+    };
+    deps = {
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "graceful-fs-3.0.8" = self.by-version."graceful-fs"."3.0.8";
+      "handlebars-3.0.3" = self.by-version."handlebars"."3.0.3";
+      "object.assign-1.1.1" = self.by-version."object.assign"."1.1.1";
+      "promise-6.1.0" = self.by-version."promise"."6.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "express-form" = self.by-version."express-form"."0.12.4";
   by-spec."express-json5".">=0.1.0 <1.0.0-0" =
     self.by-version."express-json5"."0.1.0";
   by-version."express-json5"."0.1.0" = self.buildNodePackage {
@@ -14302,13 +15607,13 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz";
+      url = "https://registry.npmjs.org/express-json5/-/express-json5-0.1.0.tgz";
       name = "express-json5-0.1.0.tgz";
       sha1 = "114a514bd734b319e018a1bde337923cc455b836";
     };
     deps = {
       "raw-body-1.3.4" = self.by-version."raw-body"."1.3.4";
-      "jju-1.2.0" = self.by-version."jju"."1.2.0";
+      "jju-1.3.0" = self.by-version."jju"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -14323,7 +15628,7 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
+      url = "https://registry.npmjs.org/express-partials/-/express-partials-0.0.6.tgz";
       name = "express-partials-0.0.6.tgz";
       sha1 = "b2664f15c636d5248e60fdbe29131c4440552eda";
     };
@@ -14342,7 +15647,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
+      url = "https://registry.npmjs.org/express-session/-/express-session-1.0.2.tgz";
       name = "express-session-1.0.2.tgz";
       sha1 = "004478c742561774411ceb79733155a56b6d49eb";
     };
@@ -14361,25 +15666,25 @@
     cpu = [ ];
   };
   by-spec."express-session"."^1.0.4" =
-    self.by-version."express-session"."1.11.1";
-  by-version."express-session"."1.11.1" = self.buildNodePackage {
-    name = "express-session-1.11.1";
-    version = "1.11.1";
+    self.by-version."express-session"."1.13.0";
+  by-version."express-session"."1.13.0" = self.buildNodePackage {
+    name = "express-session-1.13.0";
+    version = "1.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.11.1.tgz";
-      name = "express-session-1.11.1.tgz";
-      sha1 = "607eb9458e9e98c1ab576e3408f5c8d9019fe633";
+      url = "https://registry.npmjs.org/express-session/-/express-session-1.13.0.tgz";
+      name = "express-session-1.13.0.tgz";
+      sha1 = "8ac3b5c0188b48382851d88207b8e7746efb4011";
     };
     deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "cookie-0.2.3" = self.by-version."cookie"."0.2.3";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "crc-3.2.1" = self.by-version."crc"."3.2.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
+      "crc-3.4.0" = self.by-version."crc"."3.4.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "uid-safe-2.0.0" = self.by-version."uid-safe"."2.0.0";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -14388,26 +15693,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express-session"."~1.10.4" =
-    self.by-version."express-session"."1.10.4";
-  by-version."express-session"."1.10.4" = self.buildNodePackage {
-    name = "express-session-1.10.4";
-    version = "1.10.4";
+  by-spec."express-session"."~1.11.3" =
+    self.by-version."express-session"."1.11.3";
+  by-version."express-session"."1.11.3" = self.buildNodePackage {
+    name = "express-session-1.11.3";
+    version = "1.11.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.10.4.tgz";
-      name = "express-session-1.10.4.tgz";
-      sha1 = "04e1d92e00593893e1f76569eb3ad63113daf94c";
+      url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz";
+      name = "express-session-1.11.3.tgz";
+      sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af";
     };
     deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
+      "cookie-0.1.3" = self.by-version."cookie"."0.1.3";
       "cookie-signature-1.0.6" = self.by-version."cookie-signature"."1.0.6";
-      "crc-3.2.1" = self.by-version."crc"."3.2.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "crc-3.3.0" = self.by-version."crc"."3.3.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "uid-safe-1.1.0" = self.by-version."uid-safe"."1.1.0";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "uid-safe-2.0.0" = self.by-version."uid-safe"."2.0.0";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -14416,27 +15721,44 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."express-session"."~1.8.2" =
-    self.by-version."express-session"."1.8.2";
-  by-version."express-session"."1.8.2" = self.buildNodePackage {
-    name = "express-session-1.8.2";
-    version = "1.8.2";
+  by-spec."express-session"."~1.13.0" =
+    self.by-version."express-session"."1.13.0";
+  by-spec."ext-list"."^2.0.0" =
+    self.by-version."ext-list"."2.2.0";
+  by-version."ext-list"."2.2.0" = self.buildNodePackage {
+    name = "ext-list-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/express-session/-/express-session-1.8.2.tgz";
-      name = "express-session-1.8.2.tgz";
-      sha1 = "c4011e728a2349b3c18f117a5409908985e83483";
+      url = "https://registry.npmjs.org/ext-list/-/ext-list-2.2.0.tgz";
+      name = "ext-list-2.2.0.tgz";
+      sha1 = "a3e6fdeab978bca7a320c7e786f537083fc30055";
     };
     deps = {
-      "cookie-0.1.2" = self.by-version."cookie"."0.1.2";
-      "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5";
-      "crc-3.0.0" = self.by-version."crc"."3.0.0";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "uid-safe-1.0.1" = self.by-version."uid-safe"."1.0.1";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "got-2.9.2" = self.by-version."got"."2.9.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ext-name"."^3.0.0" =
+    self.by-version."ext-name"."3.0.0";
+  by-version."ext-name"."3.0.0" = self.buildNodePackage {
+    name = "ext-name-3.0.0";
+    version = "3.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz";
+      name = "ext-name-3.0.0.tgz";
+      sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb";
+    };
+    deps = {
+      "ends-with-0.2.0" = self.by-version."ends-with"."0.2.0";
+      "ext-list-2.2.0" = self.by-version."ext-list"."2.2.0";
+      "meow-3.7.0" = self.by-version."meow"."3.7.0";
+      "sort-keys-length-1.0.1" = self.by-version."sort-keys-length"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -14445,15 +15767,15 @@
     cpu = [ ];
   };
   by-spec."extend"."*" =
-    self.by-version."extend"."2.0.0";
-  by-version."extend"."2.0.0" = self.buildNodePackage {
-    name = "extend-2.0.0";
-    version = "2.0.0";
+    self.by-version."extend"."3.0.0";
+  by-version."extend"."3.0.0" = self.buildNodePackage {
+    name = "extend-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extend/-/extend-2.0.0.tgz";
-      name = "extend-2.0.0.tgz";
-      sha1 = "cc3c1e238521df4c28e3f30868b7324bb5898a5c";
+      url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+      name = "extend-3.0.0.tgz";
+      sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
     };
     deps = {
     };
@@ -14463,19 +15785,19 @@
     os = [ ];
     cpu = [ ];
   };
-  "extend" = self.by-version."extend"."2.0.0";
-  by-spec."extend"."2.0.0" =
-    self.by-version."extend"."2.0.0";
+  "extend" = self.by-version."extend"."3.0.0";
+  by-spec."extend"."3" =
+    self.by-version."extend"."3.0.0";
   by-spec."extend".">=1.1.3" =
-    self.by-version."extend"."2.0.0";
-  by-spec."extend"."^1.3.0" =
+    self.by-version."extend"."3.0.0";
+  by-spec."extend"."^1.2.1" =
     self.by-version."extend"."1.3.0";
   by-version."extend"."1.3.0" = self.buildNodePackage {
     name = "extend-1.3.0";
     version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
+      url = "https://registry.npmjs.org/extend/-/extend-1.3.0.tgz";
       name = "extend-1.3.0.tgz";
       sha1 = "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8";
     };
@@ -14487,8 +15809,31 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."extend"."^1.3.0" =
+    self.by-version."extend"."1.3.0";
   by-spec."extend"."^2.0.0" =
-    self.by-version."extend"."2.0.0";
+    self.by-version."extend"."2.0.1";
+  by-version."extend"."2.0.1" = self.buildNodePackage {
+    name = "extend-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/extend/-/extend-2.0.1.tgz";
+      name = "extend-2.0.1.tgz";
+      sha1 = "1ee8010689e7395ff9448241c98652bc759a8260";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extend"."^2.0.1" =
+    self.by-version."extend"."2.0.1";
+  by-spec."extend"."^3.0.0" =
+    self.by-version."extend"."3.0.0";
   by-spec."extend"."~1.2.1" =
     self.by-version."extend"."1.2.1";
   by-version."extend"."1.2.1" = self.buildNodePackage {
@@ -14496,7 +15841,7 @@
     version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
+      url = "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz";
       name = "extend-1.2.1.tgz";
       sha1 = "a0f5fd6cfc83a5fe49ef698d60ec8a624dd4576c";
     };
@@ -14508,8 +15853,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."extend"."~2.0.0" =
-    self.by-version."extend"."2.0.0";
+  by-spec."extend"."~3.0.0" =
+    self.by-version."extend"."3.0.0";
   by-spec."extend.js"."0.0.2" =
     self.by-version."extend.js"."0.0.2";
   by-version."extend.js"."0.0.2" = self.buildNodePackage {
@@ -14517,7 +15862,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
+      url = "https://registry.npmjs.org/extend.js/-/extend.js-0.0.2.tgz";
       name = "extend.js-0.0.2.tgz";
       sha1 = "0f9c7a81a1f208b703eb0c3131fe5716ac6ecd15";
     };
@@ -14529,6 +15874,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."extglob"."^0.3.1" =
+    self.by-version."extglob"."0.3.2";
+  by-version."extglob"."0.3.2" = self.buildNodePackage {
+    name = "extglob-0.3.2";
+    version = "0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz";
+      name = "extglob-0.3.2.tgz";
+      sha1 = "2e18ff3d2f49ab2765cec9023f011daa8d8349a1";
+    };
+    deps = {
+      "is-extglob-1.0.0" = self.by-version."is-extglob"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."extract-opts"."^2.2.0" =
     self.by-version."extract-opts"."2.2.0";
   by-version."extract-opts"."2.2.0" = self.buildNodePackage {
@@ -14536,7 +15901,7 @@
     version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
+      url = "https://registry.npmjs.org/extract-opts/-/extract-opts-2.2.0.tgz";
       name = "extract-opts-2.2.0.tgz";
       sha1 = "1fa28eba7352c6db480f885ceb71a46810be6d7d";
     };
@@ -14549,6 +15914,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."extract-zip"."~1.5.0" =
+    self.by-version."extract-zip"."1.5.0";
+  by-version."extract-zip"."1.5.0" = self.buildNodePackage {
+    name = "extract-zip-1.5.0";
+    version = "1.5.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/extract-zip/-/extract-zip-1.5.0.tgz";
+      name = "extract-zip-1.5.0.tgz";
+      sha1 = "92ccf6d81ef70a9fa4c1747114ccef6d8688a6c4";
+    };
+    deps = {
+      "concat-stream-1.5.0" = self.by-version."concat-stream"."1.5.0";
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "yauzl-2.4.1" = self.by-version."yauzl"."2.4.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."extsprintf"."1.0.0" =
     self.by-version."extsprintf"."1.0.0";
   by-version."extsprintf"."1.0.0" = self.buildNodePackage {
@@ -14556,7 +15944,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
+      url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.0.tgz";
       name = "extsprintf-1.0.0.tgz";
       sha1 = "4d58b815ace5bebfc4ebf03cf98b0a7604a99b86";
     };
@@ -14575,7 +15963,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+      url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
       name = "extsprintf-1.0.2.tgz";
       sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
     };
@@ -14594,7 +15982,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
+      url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.2.0.tgz";
       name = "extsprintf-1.2.0.tgz";
       sha1 = "5ad946c22f5b32ba7f8cd7426711c6e8a3fc2529";
     };
@@ -14606,6 +15994,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."extsprintf"."^1.2.0" =
+    self.by-version."extsprintf"."1.3.0";
+  by-version."extsprintf"."1.3.0" = self.buildNodePackage {
+    name = "extsprintf-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz";
+      name = "extsprintf-1.3.0.tgz";
+      sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."eyes"."0.1.x" =
     self.by-version."eyes"."0.1.8";
   by-version."eyes"."0.1.8" = self.buildNodePackage {
@@ -14613,7 +16020,7 @@
     version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
+      url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz";
       name = "eyes-0.1.8.tgz";
       sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0";
     };
@@ -14629,19 +16036,100 @@
     self.by-version."eyes"."0.1.8";
   by-spec."eyes"."~0.1.8" =
     self.by-version."eyes"."0.1.8";
-  by-spec."falafel"."~0.1.6" =
-    self.by-version."falafel"."0.1.6";
-  by-version."falafel"."0.1.6" = self.buildNodePackage {
-    name = "falafel-0.1.6";
-    version = "0.1.6";
+  by-spec."falafel"."^1.0.1" =
+    self.by-version."falafel"."1.2.0";
+  by-version."falafel"."1.2.0" = self.buildNodePackage {
+    name = "falafel-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/falafel/-/falafel-0.1.6.tgz";
-      name = "falafel-0.1.6.tgz";
-      sha1 = "3084cf3d41b59d15c813be6f259557fdc82b0660";
+      url = "https://registry.npmjs.org/falafel/-/falafel-1.2.0.tgz";
+      name = "falafel-1.2.0.tgz";
+      sha1 = "c18d24ef5091174a497f318cd24b026a25cddab4";
+    };
+    deps = {
+      "acorn-1.2.2" = self.by-version."acorn"."1.2.2";
+      "foreach-2.0.5" = self.by-version."foreach"."2.0.5";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "object-keys-1.0.9" = self.by-version."object-keys"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fancy-log"."^1.1.0" =
+    self.by-version."fancy-log"."1.2.0";
+  by-version."fancy-log"."1.2.0" = self.buildNodePackage {
+    name = "fancy-log-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.2.0.tgz";
+      name = "fancy-log-1.2.0.tgz";
+      sha1 = "d5a51b53e9ab22ca07d558f2b67ae55fdb5fcbd8";
+    };
+    deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "time-stamp-1.0.0" = self.by-version."time-stamp"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fast-diff"."^1.0.1" =
+    self.by-version."fast-diff"."1.0.1";
+  by-version."fast-diff"."1.0.1" = self.buildNodePackage {
+    name = "fast-diff-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.0.1.tgz";
+      name = "fast-diff-1.0.1.tgz";
+      sha1 = "76532d5b8e49f6770fd464658628f9ed47eb5ac8";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fast-json-patch"."0.5.x" =
+    self.by-version."fast-json-patch"."0.5.6";
+  by-version."fast-json-patch"."0.5.6" = self.buildNodePackage {
+    name = "fast-json-patch-0.5.6";
+    version = "0.5.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-0.5.6.tgz";
+      name = "fast-json-patch-0.5.6.tgz";
+      sha1 = "66e4028e381eaa002edeb280d10238f3a46c3402";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fast-levenshtein"."^1.1.0" =
+    self.by-version."fast-levenshtein"."1.1.3";
+  by-version."fast-levenshtein"."1.1.3" = self.buildNodePackage {
+    name = "fast-levenshtein-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.3.tgz";
+      name = "fast-levenshtein-1.1.3.tgz";
+      sha1 = "2ae7b32abc1e612da48a4e13849b888a2f61e7e9";
     };
     deps = {
-      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -14650,15 +16138,15 @@
     cpu = [ ];
   };
   by-spec."fast-levenshtein"."~1.0.0" =
-    self.by-version."fast-levenshtein"."1.0.6";
-  by-version."fast-levenshtein"."1.0.6" = self.buildNodePackage {
-    name = "fast-levenshtein-1.0.6";
-    version = "1.0.6";
+    self.by-version."fast-levenshtein"."1.0.7";
+  by-version."fast-levenshtein"."1.0.7" = self.buildNodePackage {
+    name = "fast-levenshtein-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz";
-      name = "fast-levenshtein-1.0.6.tgz";
-      sha1 = "3bedb184e39f95cb0d88928688e6b1ee3273446a";
+      url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
+      name = "fast-levenshtein-1.0.7.tgz";
+      sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
     };
     deps = {
     };
@@ -14675,15 +16163,15 @@
     version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/favitest/-/favitest-1.0.7.tgz";
+      url = "https://registry.npmjs.org/favitest/-/favitest-1.0.7.tgz";
       name = "favitest-1.0.7.tgz";
       sha1 = "efa1ee02866f6e2f0f619a889a6c993269a0b603";
     };
     deps = {
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
+      "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "q-1.2.0" = self.by-version."q"."1.2.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
       "tldtools-0.0.19" = self.by-version."tldtools"."0.0.19";
     };
     optionalDependencies = {
@@ -14695,18 +16183,18 @@
   by-spec."favitest"."^1.0.7" =
     self.by-version."favitest"."1.0.7";
   by-spec."faye-websocket"."*" =
-    self.by-version."faye-websocket"."0.9.4";
-  by-version."faye-websocket"."0.9.4" = self.buildNodePackage {
-    name = "faye-websocket-0.9.4";
-    version = "0.9.4";
+    self.by-version."faye-websocket"."0.11.0";
+  by-version."faye-websocket"."0.11.0" = self.buildNodePackage {
+    name = "faye-websocket-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.4.tgz";
-      name = "faye-websocket-0.9.4.tgz";
-      sha1 = "885934c79effb0409549e0c0a3801ed17a40cdad";
+      url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.0.tgz";
+      name = "faye-websocket-0.11.0.tgz";
+      sha1 = "d9ccf0e789e7db725d74bc4877d23aa42972ac50";
     };
     deps = {
-      "websocket-driver-0.5.4" = self.by-version."websocket-driver"."0.5.4";
+      "websocket-driver-0.6.4" = self.by-version."websocket-driver"."0.6.4";
     };
     optionalDependencies = {
     };
@@ -14714,24 +16202,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "faye-websocket" = self.by-version."faye-websocket"."0.9.4";
-  by-spec."faye-websocket".">= 0.4.1" =
-    self.by-version."faye-websocket"."0.9.4";
-  by-spec."faye-websocket"."^0.9.3" =
-    self.by-version."faye-websocket"."0.9.4";
-  by-spec."faye-websocket"."~0.7.0" =
-    self.by-version."faye-websocket"."0.7.3";
-  by-version."faye-websocket"."0.7.3" = self.buildNodePackage {
-    name = "faye-websocket-0.7.3";
-    version = "0.7.3";
+  "faye-websocket" = self.by-version."faye-websocket"."0.11.0";
+  by-spec."faye-websocket"."^0.10.0" =
+    self.by-version."faye-websocket"."0.10.0";
+  by-version."faye-websocket"."0.10.0" = self.buildNodePackage {
+    name = "faye-websocket-0.10.0";
+    version = "0.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz";
-      name = "faye-websocket-0.7.3.tgz";
-      sha1 = "cc4074c7f4a4dfd03af54dd65c354b135132ce11";
+      url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz";
+      name = "faye-websocket-0.10.0.tgz";
+      sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4";
     };
     deps = {
-      "websocket-driver-0.5.4" = self.by-version."websocket-driver"."0.5.4";
+      "websocket-driver-0.6.4" = self.by-version."websocket-driver"."0.6.4";
     };
     optionalDependencies = {
     };
@@ -14740,19 +16224,19 @@
     cpu = [ ];
   };
   by-spec."fb".">=0.0.9" =
-    self.by-version."fb"."0.7.0";
-  by-version."fb"."0.7.0" = self.buildNodePackage {
-    name = "fb-0.7.0";
-    version = "0.7.0";
+    self.by-version."fb"."1.0.2";
+  by-version."fb"."1.0.2" = self.buildNodePackage {
+    name = "fb-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fb/-/fb-0.7.0.tgz";
-      name = "fb-0.7.0.tgz";
-      sha1 = "599994a3604d7898eff3108c48c6d3112de10563";
+      url = "https://registry.npmjs.org/fb/-/fb-1.0.2.tgz";
+      name = "fb-1.0.2.tgz";
+      sha1 = "4872ccfa1fc1ce01392e6026826a8197439c01fa";
     };
     deps = {
-      "request-2.9.203" = self.by-version."request"."2.9.203";
-      "crypto-0.0.3" = self.by-version."crypto"."0.0.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -14760,23 +16244,67 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."feedparser"."0.19.2" =
-    self.by-version."feedparser"."0.19.2";
-  by-version."feedparser"."0.19.2" = self.buildNodePackage {
-    name = "feedparser-0.19.2";
-    version = "0.19.2";
+  by-spec."fbjs"."^0.8.0-alpha.2" =
+    self.by-version."fbjs"."0.8.0";
+  by-version."fbjs"."0.8.0" = self.buildNodePackage {
+    name = "fbjs-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/feedparser/-/feedparser-0.19.2.tgz";
-      name = "feedparser-0.19.2.tgz";
-      sha1 = "9de04f1621e755f2c151daf39f0ea662a0e392b7";
+      url = "https://registry.npmjs.org/fbjs/-/fbjs-0.8.0.tgz";
+      name = "fbjs-0.8.0.tgz";
+      sha1 = "1903b52cc9ad6fc7e1df152ae0c89829a833ad46";
+    };
+    deps = {
+      "babel-plugin-syntax-flow-6.5.0" = self.by-version."babel-plugin-syntax-flow"."6.5.0";
+      "core-js-1.2.6" = self.by-version."core-js"."1.2.6";
+      "isomorphic-fetch-2.2.1" = self.by-version."isomorphic-fetch"."2.2.1";
+      "loose-envify-1.1.0" = self.by-version."loose-envify"."1.1.0";
+      "promise-7.1.1" = self.by-version."promise"."7.1.1";
+      "ua-parser-js-0.7.10" = self.by-version."ua-parser-js"."0.7.10";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."fd-slicer"."~1.0.1" =
+    self.by-version."fd-slicer"."1.0.1";
+  by-version."fd-slicer"."1.0.1" = self.buildNodePackage {
+    name = "fd-slicer-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz";
+      name = "fd-slicer-1.0.1.tgz";
+      sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65";
+    };
+    deps = {
+      "pend-1.2.0" = self.by-version."pend"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."feedparser"."1.1.3" =
+    self.by-version."feedparser"."1.1.3";
+  by-version."feedparser"."1.1.3" = self.buildNodePackage {
+    name = "feedparser-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.3.tgz";
+      name = "feedparser-1.1.3.tgz";
+      sha1 = "0b725f6b4cbe4b26d518baec0d010ad020156c8b";
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
       "addressparser-0.1.3" = self.by-version."addressparser"."0.1.3";
       "array-indexofobject-0.0.1" = self.by-version."array-indexofobject"."0.0.1";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "resanitize-0.3.0" = self.by-version."resanitize"."0.3.0";
     };
     optionalDependencies = {
     };
@@ -14785,15 +16313,15 @@
     cpu = [ ];
   };
   by-spec."feedparser".">=0.16.2" =
-    self.by-version."feedparser"."1.0.1";
-  by-version."feedparser"."1.0.1" = self.buildNodePackage {
-    name = "feedparser-1.0.1";
-    version = "1.0.1";
+    self.by-version."feedparser"."1.1.4";
+  by-version."feedparser"."1.1.4" = self.buildNodePackage {
+    name = "feedparser-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/feedparser/-/feedparser-1.0.1.tgz";
-      name = "feedparser-1.0.1.tgz";
-      sha1 = "9db66f6d94072c427cecdb18a9c884a95c7c658e";
+      url = "https://registry.npmjs.org/feedparser/-/feedparser-1.1.4.tgz";
+      name = "feedparser-1.1.4.tgz";
+      sha1 = "17845be84ad3fcd986daee12fe421f8b54df0def";
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
@@ -14807,16 +16335,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fields"."~0.1.22" =
-    self.by-version."fields"."0.1.23";
-  by-version."fields"."0.1.23" = self.buildNodePackage {
-    name = "fields-0.1.23";
-    version = "0.1.23";
+  by-spec."fields"."0.1.24" =
+    self.by-version."fields"."0.1.24";
+  by-version."fields"."0.1.24" = self.buildNodePackage {
+    name = "fields-0.1.24";
+    version = "0.1.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fields/-/fields-0.1.23.tgz";
-      name = "fields-0.1.23.tgz";
-      sha1 = "6ad465e4294a78870aaeb4a63517576f704732f3";
+      url = "https://registry.npmjs.org/fields/-/fields-0.1.24.tgz";
+      name = "fields-0.1.24.tgz";
+      sha1 = "bed93b1c2521f4705fe764f4209267fdfd89f5d3";
     };
     deps = {
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
@@ -14836,7 +16364,7 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz";
+      url = "https://registry.npmjs.org/fifo/-/fifo-0.1.4.tgz";
       name = "fifo-0.1.4.tgz";
       sha1 = "bf42d87c0ad07b00d0949d12388f6289606ece34";
     };
@@ -14849,15 +16377,15 @@
     cpu = [ ];
   };
   by-spec."figures"."^1.0.1" =
-    self.by-version."figures"."1.3.5";
-  by-version."figures"."1.3.5" = self.buildNodePackage {
-    name = "figures-1.3.5";
-    version = "1.3.5";
+    self.by-version."figures"."1.5.0";
+  by-version."figures"."1.5.0" = self.buildNodePackage {
+    name = "figures-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/figures/-/figures-1.3.5.tgz";
-      name = "figures-1.3.5.tgz";
-      sha1 = "d1a31f4e1d2c2938ecde5c06aa16134cf29f4771";
+      url = "https://registry.npmjs.org/figures/-/figures-1.5.0.tgz";
+      name = "figures-1.5.0.tgz";
+      sha1 = "56d8a0949c19643af764d573a648d384218da737";
     };
     deps = {
     };
@@ -14867,10 +16395,29 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."figures"."^1.3.2" =
-    self.by-version."figures"."1.3.5";
   by-spec."figures"."^1.3.5" =
-    self.by-version."figures"."1.3.5";
+    self.by-version."figures"."1.5.0";
+  by-spec."file-entry-cache"."^1.1.1" =
+    self.by-version."file-entry-cache"."1.2.4";
+  by-version."file-entry-cache"."1.2.4" = self.buildNodePackage {
+    name = "file-entry-cache-1.2.4";
+    version = "1.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-1.2.4.tgz";
+      name = "file-entry-cache-1.2.4.tgz";
+      sha1 = "9a586072c69365a7ef7ec72a7c2b9046de091e9c";
+    };
+    deps = {
+      "flat-cache-1.0.10" = self.by-version."flat-cache"."1.0.10";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."file-uri-to-path"."0" =
     self.by-version."file-uri-to-path"."0.0.2";
   by-version."file-uri-to-path"."0.0.2" = self.buildNodePackage {
@@ -14878,7 +16425,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-0.0.2.tgz";
+      url = "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-0.0.2.tgz";
       name = "file-uri-to-path-0.0.2.tgz";
       sha1 = "37cdd1b5b905404b3f05e1b23645be694ff70f82";
     };
@@ -14897,7 +16444,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/filed/-/filed-0.1.0.tgz";
+      url = "https://registry.npmjs.org/filed/-/filed-0.1.0.tgz";
       name = "filed-0.1.0.tgz";
       sha1 = "b0f626472a2366dc1194537a4eea7e7a89f3c735";
     };
@@ -14917,7 +16464,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz";
+      url = "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.0.tgz";
       name = "filename-regex-2.0.0.tgz";
       sha1 = "996e3e80479b98b9897f15a8a58b3d084e926775";
     };
@@ -14929,20 +16476,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fileset"."0.1.x" =
-    self.by-version."fileset"."0.1.5";
-  by-version."fileset"."0.1.5" = self.buildNodePackage {
-    name = "fileset-0.1.5";
-    version = "0.1.5";
+  by-spec."fileset"."0.2.x" =
+    self.by-version."fileset"."0.2.1";
+  by-version."fileset"."0.2.1" = self.buildNodePackage {
+    name = "fileset-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fileset/-/fileset-0.1.5.tgz";
-      name = "fileset-0.1.5.tgz";
-      sha1 = "acc423bfaf92843385c66bf75822264d11b7bd94";
+      url = "https://registry.npmjs.org/fileset/-/fileset-0.2.1.tgz";
+      name = "fileset-0.2.1.tgz";
+      sha1 = "588ef8973c6623b2a76df465105696b96aac8067";
     };
     deps = {
-      "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
     };
     optionalDependencies = {
     };
@@ -14951,22 +16498,22 @@
     cpu = [ ];
   };
   by-spec."fill-range"."^2.1.0" =
-    self.by-version."fill-range"."2.2.2";
-  by-version."fill-range"."2.2.2" = self.buildNodePackage {
-    name = "fill-range-2.2.2";
-    version = "2.2.2";
+    self.by-version."fill-range"."2.2.3";
+  by-version."fill-range"."2.2.3" = self.buildNodePackage {
+    name = "fill-range-2.2.3";
+    version = "2.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fill-range/-/fill-range-2.2.2.tgz";
-      name = "fill-range-2.2.2.tgz";
-      sha1 = "2ad9d158a6a666f9fb8c9f9f05345dff68d45760";
+      url = "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz";
+      name = "fill-range-2.2.3.tgz";
+      sha1 = "50b77dfd7e469bc7492470963699fe7a8485a723";
     };
     deps = {
-      "is-number-1.1.2" = self.by-version."is-number"."1.1.2";
-      "isobject-1.0.0" = self.by-version."isobject"."1.0.0";
-      "randomatic-1.1.0" = self.by-version."randomatic"."1.1.0";
-      "repeat-element-1.1.0" = self.by-version."repeat-element"."1.1.0";
-      "repeat-string-1.5.2" = self.by-version."repeat-string"."1.5.2";
+      "is-number-2.1.0" = self.by-version."is-number"."2.1.0";
+      "isobject-2.0.0" = self.by-version."isobject"."2.0.0";
+      "randomatic-1.1.5" = self.by-version."randomatic"."1.1.5";
+      "repeat-element-1.1.2" = self.by-version."repeat-element"."1.1.2";
+      "repeat-string-1.5.4" = self.by-version."repeat-string"."1.5.4";
     };
     optionalDependencies = {
     };
@@ -14981,7 +16528,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.2.tgz";
+      url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.0.2.tgz";
       name = "finalhandler-0.0.2.tgz";
       sha1 = "0603d875ee87d567a266692815cc8ad44fcceeda";
     };
@@ -15002,7 +16549,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.0.3.tgz";
+      url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.0.3.tgz";
       name = "finalhandler-0.0.3.tgz";
       sha1 = "5a86b7bc4dca3d1275eb0532c81ee81d747504df";
     };
@@ -15016,20 +16563,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."finalhandler"."0.2.0" =
-    self.by-version."finalhandler"."0.2.0";
-  by-version."finalhandler"."0.2.0" = self.buildNodePackage {
-    name = "finalhandler-0.2.0";
-    version = "0.2.0";
+  by-spec."finalhandler"."0.4.0" =
+    self.by-version."finalhandler"."0.4.0";
+  by-version."finalhandler"."0.4.0" = self.buildNodePackage {
+    name = "finalhandler-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.2.0.tgz";
-      name = "finalhandler-0.2.0.tgz";
-      sha1 = "794082424b17f6a4b2a0eda39f9db6948ee4be8d";
+      url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz";
+      name = "finalhandler-0.4.0.tgz";
+      sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b";
     };
     deps = {
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -15037,21 +16586,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."finalhandler"."0.3.2" =
-    self.by-version."finalhandler"."0.3.2";
-  by-version."finalhandler"."0.3.2" = self.buildNodePackage {
-    name = "finalhandler-0.3.2";
-    version = "0.3.2";
+  by-spec."finalhandler"."0.4.1" =
+    self.by-version."finalhandler"."0.4.1";
+  by-version."finalhandler"."0.4.1" = self.buildNodePackage {
+    name = "finalhandler-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.2.tgz";
-      name = "finalhandler-0.3.2.tgz";
-      sha1 = "7b389b0fd3647a6f90bd564e22624bf8a4a77fb5";
+      url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.1.tgz";
+      name = "finalhandler-0.4.1.tgz";
+      sha1 = "85a17c6c59a94717d262d61230d4b0ebe3d4a14d";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -15059,21 +16609,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."finalhandler"."0.3.4" =
-    self.by-version."finalhandler"."0.3.4";
-  by-version."finalhandler"."0.3.4" = self.buildNodePackage {
-    name = "finalhandler-0.3.4";
-    version = "0.3.4";
+  by-spec."find-index"."^0.1.1" =
+    self.by-version."find-index"."0.1.1";
+  by-version."find-index"."0.1.1" = self.buildNodePackage {
+    name = "find-index-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz";
+      name = "find-index-0.1.1.tgz";
+      sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."find-root"."^0.1.1" =
+    self.by-version."find-root"."0.1.2";
+  by-version."find-root"."0.1.2" = self.buildNodePackage {
+    name = "find-root-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finalhandler/-/finalhandler-0.3.4.tgz";
-      name = "finalhandler-0.3.4.tgz";
-      sha1 = "4787d3573d079ae8b07536f26b0b911ebaf2a2ac";
+      url = "https://registry.npmjs.org/find-root/-/find-root-0.1.2.tgz";
+      name = "find-root-0.1.2.tgz";
+      sha1 = "98d2267cff1916ccaf2743b3a0eea81d79d7dcd1";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -15081,18 +16647,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."find-index"."^0.1.1" =
-    self.by-version."find-index"."0.1.1";
-  by-version."find-index"."0.1.1" = self.buildNodePackage {
-    name = "find-index-0.1.1";
-    version = "0.1.1";
+  by-spec."find-up"."^1.0.0" =
+    self.by-version."find-up"."1.1.2";
+  by-version."find-up"."1.1.2" = self.buildNodePackage {
+    name = "find-up-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz";
-      name = "find-index-0.1.1.tgz";
-      sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4";
+      url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
+      name = "find-up-1.1.2.tgz";
+      sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
     };
     deps = {
+      "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -15100,6 +16668,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."find-up"."^1.1.0" =
+    self.by-version."find-up"."1.1.2";
   by-spec."findit".">=1.1.0 <2.0.0" =
     self.by-version."findit"."1.2.0";
   by-version."findit"."1.2.0" = self.buildNodePackage {
@@ -15107,7 +16677,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
+      url = "https://registry.npmjs.org/findit/-/findit-1.2.0.tgz";
       name = "findit-1.2.0.tgz";
       sha1 = "f571a3a840749ae8b0cbf4bf43ced7659eec3ce8";
     };
@@ -15119,20 +16689,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."findup-sync"."~0.1.0" =
-    self.by-version."findup-sync"."0.1.3";
-  by-version."findup-sync"."0.1.3" = self.buildNodePackage {
-    name = "findup-sync-0.1.3";
-    version = "0.1.3";
+  by-spec."findup-sync"."^0.3.0" =
+    self.by-version."findup-sync"."0.3.0";
+  by-version."findup-sync"."0.3.0" = self.buildNodePackage {
+    name = "findup-sync-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
-      name = "findup-sync-0.1.3.tgz";
-      sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
+      url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.3.0.tgz";
+      name = "findup-sync-0.3.0.tgz";
+      sha1 = "37930aa5d816b777c03445e1966cc6790a4c0b16";
     };
     deps = {
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
     };
     optionalDependencies = {
     };
@@ -15142,19 +16711,18 @@
   };
   by-spec."findup-sync"."~0.1.2" =
     self.by-version."findup-sync"."0.1.3";
-  by-spec."findup-sync"."~0.2.0" =
-    self.by-version."findup-sync"."0.2.1";
-  by-version."findup-sync"."0.2.1" = self.buildNodePackage {
-    name = "findup-sync-0.2.1";
-    version = "0.2.1";
+  by-version."findup-sync"."0.1.3" = self.buildNodePackage {
+    name = "findup-sync-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz";
-      name = "findup-sync-0.2.1.tgz";
-      sha1 = "e0a90a450075c49466ee513732057514b81e878c";
+      url = "https://registry.npmjs.org/findup-sync/-/findup-sync-0.1.3.tgz";
+      name = "findup-sync-0.1.3.tgz";
+      sha1 = "7f3e7a97b82392c653bf06589bd85190e93c3683";
     };
     deps = {
-      "glob-4.3.5" = self.by-version."glob"."4.3.5";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
     };
     optionalDependencies = {
     };
@@ -15162,6 +16730,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."findup-sync"."~0.3.0" =
+    self.by-version."findup-sync"."0.3.0";
   by-spec."finished"."1.2.2" =
     self.by-version."finished"."1.2.2";
   by-version."finished"."1.2.2" = self.buildNodePackage {
@@ -15169,7 +16739,7 @@
     version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
+      url = "https://registry.npmjs.org/finished/-/finished-1.2.2.tgz";
       name = "finished-1.2.2.tgz";
       sha1 = "41608eafadfd65683b46a1220bc4b1ec3daedcd8";
     };
@@ -15191,7 +16761,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz";
+      url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz";
       name = "first-chunk-stream-1.0.0.tgz";
       sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e";
     };
@@ -15203,16 +16773,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."flagged-respawn"."~0.3.0" =
-    self.by-version."flagged-respawn"."0.3.1";
-  by-version."flagged-respawn"."0.3.1" = self.buildNodePackage {
-    name = "flagged-respawn-0.3.1";
-    version = "0.3.1";
+  by-spec."flagged-respawn"."^0.3.2" =
+    self.by-version."flagged-respawn"."0.3.2";
+  by-version."flagged-respawn"."0.3.2" = self.buildNodePackage {
+    name = "flagged-respawn-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.1.tgz";
-      name = "flagged-respawn-0.3.1.tgz";
-      sha1 = "397700925df6e12452202a71e89d89545fbbbe9d";
+      url = "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz";
+      name = "flagged-respawn-0.3.2.tgz";
+      sha1 = "ff191eddcd7088a675b2610fffc976be9b8074b5";
     };
     deps = {
     };
@@ -15222,6 +16792,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."flat-cache"."^1.0.9" =
+    self.by-version."flat-cache"."1.0.10";
+  by-version."flat-cache"."1.0.10" = self.buildNodePackage {
+    name = "flat-cache-1.0.10";
+    version = "1.0.10";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.0.10.tgz";
+      name = "flat-cache-1.0.10.tgz";
+      sha1 = "73d6df4a28502160a05e059544a6aeeae8b0047a";
+    };
+    deps = {
+      "del-2.2.0" = self.by-version."del"."2.2.0";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "read-json-sync-1.1.1" = self.by-version."read-json-sync"."1.1.1";
+      "write-0.2.1" = self.by-version."write"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."flatiron"."*" =
     self.by-version."flatiron"."0.4.3";
   by-version."flatiron"."0.4.3" = self.buildNodePackage {
@@ -15229,7 +16822,7 @@
     version = "0.4.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz";
+      url = "https://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz";
       name = "flatiron-0.4.3.tgz";
       sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6";
     };
@@ -15255,7 +16848,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz";
+      url = "https://registry.npmjs.org/flatten/-/flatten-0.0.1.tgz";
       name = "flatten-0.0.1.tgz";
       sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1";
     };
@@ -15268,15 +16861,15 @@
     cpu = [ ];
   };
   by-spec."flickrapi".">=0.3.12" =
-    self.by-version."flickrapi"."0.3.28";
-  by-version."flickrapi"."0.3.28" = self.buildNodePackage {
-    name = "flickrapi-0.3.28";
-    version = "0.3.28";
+    self.by-version."flickrapi"."0.4.2";
+  by-version."flickrapi"."0.4.2" = self.buildNodePackage {
+    name = "flickrapi-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/flickrapi/-/flickrapi-0.3.28.tgz";
-      name = "flickrapi-0.3.28.tgz";
-      sha1 = "7aae812b877e7ba10e100ea0cf4b2abeb0038fda";
+      url = "https://registry.npmjs.org/flickrapi/-/flickrapi-0.4.2.tgz";
+      name = "flickrapi-0.4.2.tgz";
+      sha1 = "b9866a8a9e725920d278e3b936aa6cc0a31bcb58";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
@@ -15293,18 +16886,18 @@
     cpu = [ ];
   };
   by-spec."fluent-ffmpeg"."^2.0.0-rc3" =
-    self.by-version."fluent-ffmpeg"."2.0.0-rc3";
-  by-version."fluent-ffmpeg"."2.0.0-rc3" = self.buildNodePackage {
-    name = "fluent-ffmpeg-2.0.0-rc3";
-    version = "2.0.0-rc3";
+    self.by-version."fluent-ffmpeg"."2.0.1";
+  by-version."fluent-ffmpeg"."2.0.1" = self.buildNodePackage {
+    name = "fluent-ffmpeg-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.0.0-rc3.tgz";
-      name = "fluent-ffmpeg-2.0.0-rc3.tgz";
-      sha1 = "c5a933fe1902fd829c9c060332f6b503d879b083";
+      url = "https://registry.npmjs.org/fluent-ffmpeg/-/fluent-ffmpeg-2.0.1.tgz";
+      name = "fluent-ffmpeg-2.0.1.tgz";
+      sha1 = "4dddcbb82da348158380d5282d21fd4ea64bf4ce";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
     };
     optionalDependencies = {
     };
@@ -15319,7 +16912,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/flushwritable/-/flushwritable-1.0.0.tgz";
+      url = "https://registry.npmjs.org/flushwritable/-/flushwritable-1.0.0.tgz";
       name = "flushwritable-1.0.0.tgz";
       sha1 = "3e328d8fde412ad47e738e3be750b4d290043498";
     };
@@ -15338,7 +16931,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
+      url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.3.tgz";
       name = "follow-redirects-0.0.3.tgz";
       sha1 = "6ce67a24db1fe13f226c1171a72a7ef2b17b8f65";
     };
@@ -15351,18 +16944,59 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."for-in"."^0.1.4" =
-    self.by-version."for-in"."0.1.4";
-  by-version."for-in"."0.1.4" = self.buildNodePackage {
-    name = "for-in-0.1.4";
+  by-spec."follow-redirects"."0.0.7" =
+    self.by-version."follow-redirects"."0.0.7";
+  by-version."follow-redirects"."0.0.7" = self.buildNodePackage {
+    name = "follow-redirects-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-0.0.7.tgz";
+      name = "follow-redirects-0.0.7.tgz";
+      sha1 = "34b90bab2a911aa347571da90f22bd36ecd8a919";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "stream-consume-0.1.0" = self.by-version."stream-consume"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."for-in"."^0.1.5" =
+    self.by-version."for-in"."0.1.5";
+  by-version."for-in"."0.1.5" = self.buildNodePackage {
+    name = "for-in-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/for-in/-/for-in-0.1.5.tgz";
+      name = "for-in-0.1.5.tgz";
+      sha1 = "007374e2b6d5c67420a1479bdb75a04872b738c4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."for-own"."^0.1.3" =
+    self.by-version."for-own"."0.1.4";
+  by-version."for-own"."0.1.4" = self.buildNodePackage {
+    name = "for-own-0.1.4";
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/for-in/-/for-in-0.1.4.tgz";
-      name = "for-in-0.1.4.tgz";
-      sha1 = "9f5cf7b4ffc7e1ae6591a4e97b177aa59d70fb2e";
+      url = "https://registry.npmjs.org/for-own/-/for-own-0.1.4.tgz";
+      name = "for-own-0.1.4.tgz";
+      sha1 = "0149b41a39088c7515f51ebe1c1386d45f935072";
     };
     deps = {
+      "for-in-0.1.5" = self.by-version."for-in"."0.1.5";
     };
     optionalDependencies = {
     };
@@ -15370,19 +17004,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."for-own"."^0.1.1" =
-    self.by-version."for-own"."0.1.3";
-  by-version."for-own"."0.1.3" = self.buildNodePackage {
-    name = "for-own-0.1.3";
-    version = "0.1.3";
+  by-spec."foreach"."^2.0.5" =
+    self.by-version."foreach"."2.0.5";
+  by-version."foreach"."2.0.5" = self.buildNodePackage {
+    name = "foreach-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/for-own/-/for-own-0.1.3.tgz";
-      name = "for-own-0.1.3.tgz";
-      sha1 = "606444cde77c2f0a11088169e2e354eaf56e74fe";
+      url = "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz";
+      name = "foreach-2.0.5.tgz";
+      sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99";
     };
     deps = {
-      "for-in-0.1.4" = self.by-version."for-in"."0.1.4";
     };
     optionalDependencies = {
     };
@@ -15397,7 +17030,7 @@
     version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
+      url = "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz";
       name = "foreachasync-3.0.0.tgz";
       sha1 = "5502987dc8714be3392097f32e0071c9dee07cf6";
     };
@@ -15410,24 +17043,29 @@
     cpu = [ ];
   };
   by-spec."forever"."*" =
-    self.by-version."forever"."0.14.1";
-  by-version."forever"."0.14.1" = self.buildNodePackage {
-    name = "forever-0.14.1";
-    version = "0.14.1";
+    self.by-version."forever"."0.15.1";
+  by-version."forever"."0.15.1" = self.buildNodePackage {
+    name = "forever-0.15.1";
+    version = "0.15.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever/-/forever-0.14.1.tgz";
-      name = "forever-0.14.1.tgz";
-      sha1 = "48bed8c2b215be5c1a3bf429275514a4dca1158a";
+      url = "https://registry.npmjs.org/forever/-/forever-0.15.1.tgz";
+      name = "forever-0.15.1.tgz";
+      sha1 = "5e4e3d4ef946bef88ddcb9cc7412e478ad19e04e";
     };
     deps = {
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cliff-0.1.10" = self.by-version."cliff"."0.1.10";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "flatiron-0.4.3" = self.by-version."flatiron"."0.4.3";
-      "forever-monitor-1.5.2" = self.by-version."forever-monitor"."1.5.2";
+      "forever-monitor-1.6.0" = self.by-version."forever-monitor"."1.6.0";
       "nconf-0.6.9" = self.by-version."nconf"."0.6.9";
       "nssocket-0.5.3" = self.by-version."nssocket"."0.5.3";
+      "object-assign-3.0.0" = self.by-version."object-assign"."3.0.0";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "prettyjson-1.1.3" = self.by-version."prettyjson"."1.1.3";
+      "shush-1.0.0" = self.by-version."shush"."1.0.0";
       "timespan-2.3.0" = self.by-version."timespan"."2.3.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
       "winston-0.8.3" = self.by-version."winston"."0.8.3";
@@ -15438,7 +17076,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "forever" = self.by-version."forever"."0.14.1";
+  "forever" = self.by-version."forever"."0.15.1";
   by-spec."forever-agent"."~0.2.0" =
     self.by-version."forever-agent"."0.2.0";
   by-version."forever-agent"."0.2.0" = self.buildNodePackage {
@@ -15446,7 +17084,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
+      url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.2.0.tgz";
       name = "forever-agent-0.2.0.tgz";
       sha1 = "e1c25c7ad44e09c38f233876c76fcc24ff843b1f";
     };
@@ -15465,7 +17103,7 @@
     version = "0.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
+      url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz";
       name = "forever-agent-0.5.2.tgz";
       sha1 = "6d0e09c4921f94a27f63d3b49c5feff1ea4c5130";
     };
@@ -15484,7 +17122,7 @@
     version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
+      url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz";
       name = "forever-agent-0.6.1.tgz";
       sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91";
     };
@@ -15496,22 +17134,24 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."forever-agent"."~0.6.1" =
+    self.by-version."forever-agent"."0.6.1";
   by-spec."forever-monitor"."*" =
-    self.by-version."forever-monitor"."1.5.2";
-  by-version."forever-monitor"."1.5.2" = self.buildNodePackage {
-    name = "forever-monitor-1.5.2";
-    version = "1.5.2";
+    self.by-version."forever-monitor"."1.7.0";
+  by-version."forever-monitor"."1.7.0" = self.buildNodePackage {
+    name = "forever-monitor-1.7.0";
+    version = "1.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forever-monitor/-/forever-monitor-1.5.2.tgz";
-      name = "forever-monitor-1.5.2.tgz";
-      sha1 = "279388dfa93b085363d6b28a823ef0a6aeeb35d7";
+      url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.7.0.tgz";
+      name = "forever-monitor-1.7.0.tgz";
+      sha1 = "4f3f4d42c78cbf7c795139964f85f2d9167eb192";
     };
     deps = {
       "broadway-0.3.6" = self.by-version."broadway"."0.3.6";
-      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
+      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
       "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
-      "watch-0.13.0" = self.by-version."watch"."0.13.0";
       "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
     optionalDependencies = {
@@ -15520,26 +17160,49 @@
     os = [ ];
     cpu = [ ];
   };
-  "forever-monitor" = self.by-version."forever-monitor"."1.5.2";
-  by-spec."forever-monitor"."~1.5.1" =
-    self.by-version."forever-monitor"."1.5.2";
-  by-spec."forever-monitor"."~1.5.2" =
-    self.by-version."forever-monitor"."1.5.2";
-  by-spec."form-data"."0.0.8" =
-    self.by-version."form-data"."0.0.8";
-  by-version."form-data"."0.0.8" = self.buildNodePackage {
-    name = "form-data-0.0.8";
-    version = "0.0.8";
+  "forever-monitor" = self.by-version."forever-monitor"."1.7.0";
+  by-spec."forever-monitor"."~1.1.0" =
+    self.by-version."forever-monitor"."1.1.0";
+  by-version."forever-monitor"."1.1.0" = self.buildNodePackage {
+    name = "forever-monitor-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.0.8.tgz";
-      name = "form-data-0.0.8.tgz";
-      sha1 = "0890cd1005c5ccecc0b9d24a88052c92442d0db5";
+      url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.1.0.tgz";
+      name = "forever-monitor-1.1.0.tgz";
+      sha1 = "439ce036f999601cff551aea7f5151001a869ef9";
     };
     deps = {
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "async-0.2.10" = self.by-version."async"."0.2.10";
+      "broadway-0.2.10" = self.by-version."broadway"."0.2.10";
+      "minimatch-0.0.5" = self.by-version."minimatch"."0.0.5";
+      "pkginfo-0.4.0" = self.by-version."pkginfo"."0.4.0";
+      "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
+      "watch-0.5.1" = self.by-version."watch"."0.5.1";
+      "utile-0.1.7" = self.by-version."utile"."0.1.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."forever-monitor"."~1.6.0" =
+    self.by-version."forever-monitor"."1.6.0";
+  by-version."forever-monitor"."1.6.0" = self.buildNodePackage {
+    name = "forever-monitor-1.6.0";
+    version = "1.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/forever-monitor/-/forever-monitor-1.6.0.tgz";
+      name = "forever-monitor-1.6.0.tgz";
+      sha1 = "3de1afd3e49f25712987281a252c02cb2463ad40";
+    };
+    deps = {
+      "broadway-0.3.6" = self.by-version."broadway"."0.3.6";
+      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
+      "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
+      "utile-0.2.1" = self.by-version."utile"."0.2.1";
     };
     optionalDependencies = {
     };
@@ -15554,14 +17217,14 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
+      url = "https://registry.npmjs.org/form-data/-/form-data-0.1.3.tgz";
       name = "form-data-0.1.3.tgz";
       sha1 = "4ee4346e6eb5362e8344a02075bd8dbd8c7373ea";
     };
     deps = {
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
     };
     optionalDependencies = {
     };
@@ -15576,14 +17239,14 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
+      url = "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
       name = "form-data-0.2.0.tgz";
       sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
     };
     optionalDependencies = {
     };
@@ -15598,14 +17261,36 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
+      url = "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz";
       name = "form-data-0.1.4.tgz";
       sha1 = "91abd788aba9702b1aabfa8bc01031a2ac9e3b12";
     };
     deps = {
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."form-data"."^1.0.0-rc1" =
+    self.by-version."form-data"."1.0.0-rc4";
+  by-version."form-data"."1.0.0-rc4" = self.buildNodePackage {
+    name = "form-data-1.0.0-rc4";
+    version = "1.0.0-rc4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz";
+      name = "form-data-1.0.0-rc4.tgz";
+      sha1 = "05ac6bc22227b43e4461f488161554699d4f8b5e";
+    };
+    deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
     };
     optionalDependencies = {
     };
@@ -15620,7 +17305,7 @@
     version = "0.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
+      url = "https://registry.npmjs.org/form-data/-/form-data-0.0.10.tgz";
       name = "form-data-0.0.10.tgz";
       sha1 = "db345a5378d86aeeb1ed5d553b869ac192d2f5ed";
     };
@@ -15639,6 +17324,10 @@
     self.by-version."form-data"."0.1.4";
   by-spec."form-data"."~0.2.0" =
     self.by-version."form-data"."0.2.0";
+  by-spec."form-data"."~1.0.0-rc1" =
+    self.by-version."form-data"."1.0.0-rc4";
+  by-spec."form-data"."~1.0.0-rc3" =
+    self.by-version."form-data"."1.0.0-rc4";
   by-spec."formatio"."1.1.1" =
     self.by-version."formatio"."1.1.1";
   by-version."formatio"."1.1.1" = self.buildNodePackage {
@@ -15646,12 +17335,12 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz";
+      url = "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz";
       name = "formatio-1.1.1.tgz";
       sha1 = "5ed3ccd636551097383465d996199100e86161e9";
     };
     deps = {
-      "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
+      "samsam-1.1.3" = self.by-version."samsam"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -15666,7 +17355,7 @@
     version = "1.0.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
+      url = "https://registry.npmjs.org/formidable/-/formidable-1.0.11.tgz";
       name = "formidable-1.0.11.tgz";
       sha1 = "68f63325a035e644b6f7bb3d11243b9761de1b30";
     };
@@ -15685,7 +17374,7 @@
     version = "1.0.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
+      url = "https://registry.npmjs.org/formidable/-/formidable-1.0.14.tgz";
       name = "formidable-1.0.14.tgz";
       sha1 = "2b3f4c411cbb5fdd695c44843e2a23514a43231a";
     };
@@ -15704,7 +17393,7 @@
     version = "1.0.17";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
+      url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
       name = "formidable-1.0.17.tgz";
       sha1 = "ef5491490f9433b705faa77249c99029ae348559";
     };
@@ -15725,7 +17414,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
+      url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz";
       name = "forwarded-0.1.0.tgz";
       sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363";
     };
@@ -15744,7 +17433,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
+      url = "https://registry.npmjs.org/fresh/-/fresh-0.1.0.tgz";
       name = "fresh-0.1.0.tgz";
       sha1 = "03e4b0178424e4c2d5d19a54d8814cdc97934850";
     };
@@ -15763,7 +17452,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
+      url = "https://registry.npmjs.org/fresh/-/fresh-0.2.0.tgz";
       name = "fresh-0.2.0.tgz";
       sha1 = "bfd9402cf3df12c4a4c310c79f99a3dde13d34a7";
     };
@@ -15782,7 +17471,7 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
+      url = "https://registry.npmjs.org/fresh/-/fresh-0.2.2.tgz";
       name = "fresh-0.2.2.tgz";
       sha1 = "9731dcf5678c7faeb44fb903c4f72df55187fa77";
     };
@@ -15801,7 +17490,7 @@
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
+      url = "https://registry.npmjs.org/fresh/-/fresh-0.2.4.tgz";
       name = "fresh-0.2.4.tgz";
       sha1 = "3582499206c9723714190edd74b4604feb4a614c";
     };
@@ -15813,8 +17502,46 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."fresh"."0.3.0" =
+    self.by-version."fresh"."0.3.0";
+  by-version."fresh"."0.3.0" = self.buildNodePackage {
+    name = "fresh-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz";
+      name = "fresh-0.3.0.tgz";
+      sha1 = "651f838e22424e7566de161d8358caa199f83d4f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."fresh"."~0.2.1" =
     self.by-version."fresh"."0.2.4";
+  by-spec."from"."~0" =
+    self.by-version."from"."0.1.3";
+  by-version."from"."0.1.3" = self.buildNodePackage {
+    name = "from-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/from/-/from-0.1.3.tgz";
+      name = "from-0.1.3.tgz";
+      sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."from2"."^1.1.0" =
     self.by-version."from2"."1.3.0";
   by-version."from2"."1.3.0" = self.buildNodePackage {
@@ -15822,7 +17549,7 @@
     version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/from2/-/from2-1.3.0.tgz";
+      url = "https://registry.npmjs.org/from2/-/from2-1.3.0.tgz";
       name = "from2-1.3.0.tgz";
       sha1 = "88413baaa5f9a597cfde9221d86986cd3c061dfd";
     };
@@ -15836,22 +17563,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-blob-store"."^5.0.0" =
-    self.by-version."fs-blob-store"."5.1.1";
-  by-version."fs-blob-store"."5.1.1" = self.buildNodePackage {
-    name = "fs-blob-store-5.1.1";
-    version = "5.1.1";
+  by-spec."fs-access"."^1.0.0" =
+    self.by-version."fs-access"."1.0.0";
+  by-version."fs-access"."1.0.0" = self.buildNodePackage {
+    name = "fs-access-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-blob-store/-/fs-blob-store-5.1.1.tgz";
-      name = "fs-blob-store-5.1.1.tgz";
-      sha1 = "970f2df170d0f21313c932f817b8cb0660c42137";
+      url = "https://registry.npmjs.org/fs-access/-/fs-access-1.0.0.tgz";
+      name = "fs-access-1.0.0.tgz";
+      sha1 = "e96872b1f415ae302bdda4ef05309eb4bde1934c";
     };
     deps = {
-      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
-      "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "null-check-1.0.0" = self.by-version."null-check"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -15859,19 +17583,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-ext"."*" =
-    self.by-version."fs-ext"."0.4.4";
-  by-version."fs-ext"."0.4.4" = self.buildNodePackage {
-    name = "fs-ext-0.4.4";
-    version = "0.4.4";
+  by-spec."fs-blob-store"."^5.0.0" =
+    self.by-version."fs-blob-store"."5.2.1";
+  by-version."fs-blob-store"."5.2.1" = self.buildNodePackage {
+    name = "fs-blob-store-5.2.1";
+    version = "5.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-ext/-/fs-ext-0.4.4.tgz";
-      name = "fs-ext-0.4.4.tgz";
-      sha1 = "406dc3ff81c0db69a63e11b6755916256407bb30";
+      url = "https://registry.npmjs.org/fs-blob-store/-/fs-blob-store-5.2.1.tgz";
+      name = "fs-blob-store-5.2.1.tgz";
+      sha1 = "2a7db7ef59a5ec548cce8564066508224c9b0457";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
+      "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
     };
     optionalDependencies = {
     };
@@ -15879,20 +17606,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-ext".">=0.4.1 <1.0.0-0" =
-    self.by-version."fs-ext"."0.4.4";
-  by-spec."fs-extended"."^0.2.0" =
-    self.by-version."fs-extended"."0.2.0";
-  by-version."fs-extended"."0.2.0" = self.buildNodePackage {
-    name = "fs-extended-0.2.0";
-    version = "0.2.0";
+  by-spec."fs-chunk-store"."^1.3.0" =
+    self.by-version."fs-chunk-store"."1.4.0";
+  by-version."fs-chunk-store"."1.4.0" = self.buildNodePackage {
+    name = "fs-chunk-store-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extended/-/fs-extended-0.2.0.tgz";
-      name = "fs-extended-0.2.0.tgz";
-      sha1 = "9523d413a014d1a6e35b2a64baa5e66d17f0c6fe";
+      url = "https://registry.npmjs.org/fs-chunk-store/-/fs-chunk-store-1.4.0.tgz";
+      name = "fs-chunk-store-1.4.0.tgz";
+      sha1 = "66cfa534780c6ade87a6d4c1e6ffac9be89318a7";
     };
     deps = {
+      "hat-0.0.3" = self.by-version."hat"."0.0.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0";
+      "random-access-file-0.3.2" = self.by-version."random-access-file"."0.3.2";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "run-parallel-1.1.6" = self.by-version."run-parallel"."1.1.6";
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -15900,21 +17632,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-extra"."0.16.3" =
-    self.by-version."fs-extra"."0.16.3";
-  by-version."fs-extra"."0.16.3" = self.buildNodePackage {
-    name = "fs-extra-0.16.3";
-    version = "0.16.3";
+  by-spec."fs-ext"."*" =
+    self.by-version."fs-ext"."0.5.0";
+  by-version."fs-ext"."0.5.0" = self.buildNodePackage {
+    name = "fs-ext-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.3.tgz";
-      name = "fs-extra-0.16.3.tgz";
-      sha1 = "4a5663cc51582546625a1bce04f09a1f5ceec35b";
+      url = "https://registry.npmjs.org/fs-ext/-/fs-ext-0.5.0.tgz";
+      name = "fs-ext-0.5.0.tgz";
+      sha1 = "9c1f9a20b8e7e012e0a914b5e19132724f44f69e";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -15922,21 +17652,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-extra"."^0.18.0" =
-    self.by-version."fs-extra"."0.18.2";
-  by-version."fs-extra"."0.18.2" = self.buildNodePackage {
-    name = "fs-extra-0.18.2";
-    version = "0.18.2";
+  by-spec."fs-ext".">=0.4.1 <1.0.0-0" =
+    self.by-version."fs-ext"."0.5.0";
+  by-spec."fs-extended"."^0.2.0" =
+    self.by-version."fs-extended"."0.2.1";
+  by-version."fs-extended"."0.2.1" = self.buildNodePackage {
+    name = "fs-extended-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.18.2.tgz";
-      name = "fs-extra-0.18.2.tgz";
-      sha1 = "af05ca702b0b6dfa7de803a1f7ab479ec5c21525";
+      url = "https://registry.npmjs.org/fs-extended/-/fs-extended-0.2.1.tgz";
+      name = "fs-extended-0.2.1.tgz";
+      sha1 = "3910358127e9c72c8296c30142c7763b5f5e2d3a";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -15944,21 +17673,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-extra"."~0.16.0" =
-    self.by-version."fs-extra"."0.16.5";
-  by-version."fs-extra"."0.16.5" = self.buildNodePackage {
-    name = "fs-extra-0.16.5";
-    version = "0.16.5";
+  by-spec."fs-extra"."0.26.7" =
+    self.by-version."fs-extra"."0.26.7";
+  by-version."fs-extra"."0.26.7" = self.buildNodePackage {
+    name = "fs-extra-0.26.7";
+    version = "0.26.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.16.5.tgz";
-      name = "fs-extra-0.16.5.tgz";
-      sha1 = "1ad661fa6c86c9608cd1b49efc6fce834939a750";
+      url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz";
+      name = "fs-extra-0.26.7.tgz";
+      sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "jsonfile-2.2.3" = self.by-version."jsonfile"."2.2.3";
+      "klaw-1.1.3" = self.by-version."klaw"."1.1.3";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -15966,6 +17697,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."fs-extra"."~0.26.4" =
+    self.by-version."fs-extra"."0.26.7";
+  by-spec."fs-extra"."~0.26.5" =
+    self.by-version."fs-extra"."0.26.7";
   by-spec."fs-extra"."~0.6.1" =
     self.by-version."fs-extra"."0.6.4";
   by-version."fs-extra"."0.6.4" = self.buildNodePackage {
@@ -15973,7 +17708,7 @@
     version = "0.6.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
+      url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.6.4.tgz";
       name = "fs-extra-0.6.4.tgz";
       sha1 = "f46f0c75b7841f8d200b3348cd4d691d5a099d15";
     };
@@ -15996,7 +17731,7 @@
     version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.7.1.tgz";
+      url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.7.1.tgz";
       name = "fs-extra-0.7.1.tgz";
       sha1 = "516505a3be70c1bead91df000ceb9955ab1b5f8b";
     };
@@ -16012,21 +17747,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs-vacuum"."~1.2.5" =
-    self.by-version."fs-vacuum"."1.2.5";
-  by-version."fs-vacuum"."1.2.5" = self.buildNodePackage {
-    name = "fs-vacuum-1.2.5";
-    version = "1.2.5";
+  by-spec."fs-vacuum"."~1.2.7" =
+    self.by-version."fs-vacuum"."1.2.7";
+  by-version."fs-vacuum"."1.2.7" = self.buildNodePackage {
+    name = "fs-vacuum-1.2.7";
+    version = "1.2.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz";
-      name = "fs-vacuum-1.2.5.tgz";
-      sha1 = "a5cbaa844b4b3a7cff139f3cc90e7f7007e5fbb8";
+      url = "https://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.7.tgz";
+      name = "fs-vacuum-1.2.7.tgz";
+      sha1 = "75e501f9d2889ba2fe9fe12f936ba5dad50ca35a";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -16041,12 +17776,12 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
+      url = "https://registry.npmjs.org/fs-walk/-/fs-walk-0.0.1.tgz";
       name = "fs-walk-0.0.1.tgz";
       sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2";
     };
     optionalDependencies = {
     };
@@ -16055,19 +17790,22 @@
     cpu = [ ];
   };
   "fs-walk" = self.by-version."fs-walk"."0.0.1";
-  by-spec."fs-write-stream-atomic"."~1.0.2" =
-    self.by-version."fs-write-stream-atomic"."1.0.2";
-  by-version."fs-write-stream-atomic"."1.0.2" = self.buildNodePackage {
-    name = "fs-write-stream-atomic-1.0.2";
-    version = "1.0.2";
+  by-spec."fs-write-stream-atomic"."~1.0.8" =
+    self.by-version."fs-write-stream-atomic"."1.0.8";
+  by-version."fs-write-stream-atomic"."1.0.8" = self.buildNodePackage {
+    name = "fs-write-stream-atomic-1.0.8";
+    version = "1.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.2.tgz";
-      name = "fs-write-stream-atomic-1.0.2.tgz";
-      sha1 = "fe0c6cec75256072b2fef8180d97e309fe3f5efb";
+      url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.8.tgz";
+      name = "fs-write-stream-atomic-1.0.8.tgz";
+      sha1 = "e49aaddf288f87d46ff9e882f216a13abc40778b";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "iferr-0.1.5" = self.by-version."iferr"."0.1.5";
+      "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -16082,7 +17820,7 @@
     version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
+      url = "https://registry.npmjs.org/fs.extra/-/fs.extra-1.3.2.tgz";
       name = "fs.extra-1.3.2.tgz";
       sha1 = "dd023f93013bee24531f1b33514c37b20fd93349";
     };
@@ -16097,8 +17835,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fs.extra".">=1.2.1 <2" =
-    self.by-version."fs.extra"."1.3.2";
   by-spec."fs.notify"."0.0.4" =
     self.by-version."fs.notify"."0.0.4";
   by-version."fs.notify"."0.0.4" = self.buildNodePackage {
@@ -16106,7 +17842,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz";
+      url = "https://registry.npmjs.org/fs.notify/-/fs.notify-0.0.4.tgz";
       name = "fs.notify-0.0.4.tgz";
       sha1 = "63284d45a34b52ce60088a6ddbec5b776d3c013d";
     };
@@ -16120,19 +17856,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fsevents"."^0.3.1" =
-    self.by-version."fsevents"."0.3.5";
-  by-version."fsevents"."0.3.5" = self.buildNodePackage {
-    name = "fsevents-0.3.5";
-    version = "0.3.5";
+  by-spec."fsevents"."^1.0.0" =
+    self.by-version."fsevents"."1.0.11";
+  by-version."fsevents"."1.0.11" = self.buildNodePackage {
+    name = "fsevents-1.0.11";
+    version = "1.0.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fsevents/-/fsevents-0.3.5.tgz";
-      name = "fsevents-0.3.5.tgz";
-      sha1 = "d0938147614066c0e1297647b3b8ab5a4baf4688";
+      url = "https://registry.npmjs.org/fsevents/-/fsevents-1.0.11.tgz";
+      name = "fsevents-1.0.11.tgz";
+      sha1 = "303d4051e411a95a7ad187e6f8ccffe936ca78ac";
     };
     deps = {
-      "nan-1.5.3" = self.by-version."nan"."1.5.3";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
     };
     optionalDependencies = {
     };
@@ -16140,45 +17877,22 @@
     os = [ "darwin" ];
     cpu = [ ];
   };
-  by-spec."fstream"."0" =
-    self.by-version."fstream"."0.1.31";
-  by-version."fstream"."0.1.31" = self.buildNodePackage {
-    name = "fstream-0.1.31";
-    version = "0.1.31";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
-      name = "fstream-0.1.31.tgz";
-      sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
-    };
-    deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."fstream"."^1.0.0" =
-    self.by-version."fstream"."1.0.4";
-  by-version."fstream"."1.0.4" = self.buildNodePackage {
-    name = "fstream-1.0.4";
-    version = "1.0.4";
+    self.by-version."fstream"."1.0.8";
+  by-version."fstream"."1.0.8" = self.buildNodePackage {
+    name = "fstream-1.0.8";
+    version = "1.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream/-/fstream-1.0.4.tgz";
-      name = "fstream-1.0.4.tgz";
-      sha1 = "6c52298473fd6351fd22fc4bf9254fcfebe80f2b";
+      url = "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz";
+      name = "fstream-1.0.8.tgz";
+      sha1 = "7e8d7a73abb3647ef36e4b8a15ca801dba03d038";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -16187,36 +17901,23 @@
     cpu = [ ];
   };
   by-spec."fstream"."^1.0.2" =
-    self.by-version."fstream"."1.0.4";
-  by-spec."fstream"."^1.0.3" =
-    self.by-version."fstream"."1.0.4";
-  by-spec."fstream"."~0.1.17" =
-    self.by-version."fstream"."0.1.31";
-  by-spec."fstream"."~0.1.22" =
-    self.by-version."fstream"."0.1.31";
-  by-spec."fstream"."~0.1.23" =
-    self.by-version."fstream"."0.1.31";
-  by-spec."fstream"."~0.1.28" =
-    self.by-version."fstream"."0.1.31";
+    self.by-version."fstream"."1.0.8";
   by-spec."fstream"."~0.1.8" =
     self.by-version."fstream"."0.1.31";
-  by-spec."fstream"."~1.0.4" =
-    self.by-version."fstream"."1.0.4";
-  by-spec."fstream-ignore"."0.0.7" =
-    self.by-version."fstream-ignore"."0.0.7";
-  by-version."fstream-ignore"."0.0.7" = self.buildNodePackage {
-    name = "fstream-ignore-0.0.7";
-    version = "0.0.7";
+  by-version."fstream"."0.1.31" = self.buildNodePackage {
+    name = "fstream-0.1.31";
+    version = "0.1.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz";
-      name = "fstream-ignore-0.0.7.tgz";
-      sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63";
+      url = "https://registry.npmjs.org/fstream/-/fstream-0.1.31.tgz";
+      name = "fstream-0.1.31.tgz";
+      sha1 = "7337f058fbbbbefa8c9f561a28cab0849202c988";
     };
     deps = {
-      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
-      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "graceful-fs-3.0.8" = self.by-version."graceful-fs"."3.0.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -16224,44 +17925,23 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."fstream"."~1.0.8" =
+    self.by-version."fstream"."1.0.8";
   by-spec."fstream-ignore"."^1.0.0" =
-    self.by-version."fstream-ignore"."1.0.2";
-  by-version."fstream-ignore"."1.0.2" = self.buildNodePackage {
-    name = "fstream-ignore-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz";
-      name = "fstream-ignore-1.0.2.tgz";
-      sha1 = "18c891db01b782a74a7bff936a0f24997741c7ab";
-    };
-    deps = {
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."fstream-ignore"."^1.0.2" =
-    self.by-version."fstream-ignore"."1.0.2";
-  by-spec."fstream-npm"."~0.1.3" =
-    self.by-version."fstream-npm"."0.1.8";
-  by-version."fstream-npm"."0.1.8" = self.buildNodePackage {
-    name = "fstream-npm-0.1.8";
-    version = "0.1.8";
+    self.by-version."fstream-ignore"."1.0.3";
+  by-version."fstream-ignore"."1.0.3" = self.buildNodePackage {
+    name = "fstream-ignore-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-0.1.8.tgz";
-      name = "fstream-npm-0.1.8.tgz";
-      sha1 = "38a70fdeb510a443e1a5378d90413403fc724fa8";
+      url = "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.3.tgz";
+      name = "fstream-ignore-1.0.3.tgz";
+      sha1 = "4c74d91fa88b22b42f4f86a18a2820dd79d8fcdd";
     };
     deps = {
-      "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
+      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -16269,19 +17949,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fstream-npm"."~1.0.2" =
-    self.by-version."fstream-npm"."1.0.2";
-  by-version."fstream-npm"."1.0.2" = self.buildNodePackage {
-    name = "fstream-npm-1.0.2";
-    version = "1.0.2";
+  by-spec."fstream-ignore"."~1.0.3" =
+    self.by-version."fstream-ignore"."1.0.3";
+  by-spec."fstream-npm"."~1.0.7" =
+    self.by-version."fstream-npm"."1.0.7";
+  by-version."fstream-npm"."1.0.7" = self.buildNodePackage {
+    name = "fstream-npm-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.2.tgz";
-      name = "fstream-npm-1.0.2.tgz";
-      sha1 = "a1d2a4ce6ac2db731f0f66a85b4dddfea9565d77";
+      url = "https://registry.npmjs.org/fstream-npm/-/fstream-npm-1.0.7.tgz";
+      name = "fstream-npm-1.0.7.tgz";
+      sha1 = "7ed0d1ac13d7686dd9e1bf6ceb8be273bf6d2f86";
     };
     deps = {
-      "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2";
+      "fstream-ignore-1.0.3" = self.by-version."fstream-ignore"."1.0.3";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -16297,7 +17979,7 @@
     version = "0.3.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz";
+      url = "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz";
       name = "ftp-0.3.10.tgz";
       sha1 = "9197d861ad8142f3e63d5a83bfe4c59f7330885d";
     };
@@ -16311,20 +17993,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."gapitoken"."^0.1.3" =
-    self.by-version."gapitoken"."0.1.4";
-  by-version."gapitoken"."0.1.4" = self.buildNodePackage {
-    name = "gapitoken-0.1.4";
-    version = "0.1.4";
+  by-spec."function-bind"."^1.0.2" =
+    self.by-version."function-bind"."1.1.0";
+  by-version."function-bind"."1.1.0" = self.buildNodePackage {
+    name = "function-bind-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gapitoken/-/gapitoken-0.1.4.tgz";
-      name = "gapitoken-0.1.4.tgz";
-      sha1 = "643dedb26cb142466f62b73d2782e7822a6f1ad8";
+      url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz";
+      name = "function-bind-1.1.0.tgz";
+      sha1 = "16176714c801798e4e8f2cf7f7529467bb4a5771";
     };
     deps = {
-      "jws-0.0.2" = self.by-version."jws"."0.0.2";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
     };
     optionalDependencies = {
     };
@@ -16332,25 +18012,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."gapitoken"."~0.1.2" =
-    self.by-version."gapitoken"."0.1.4";
-  by-spec."gauge"."~1.1.0" =
-    self.by-version."gauge"."1.1.0";
-  by-version."gauge"."1.1.0" = self.buildNodePackage {
-    name = "gauge-1.1.0";
-    version = "1.1.0";
+  by-spec."gapitoken"."^0.1.3" =
+    self.by-version."gapitoken"."0.1.5";
+  by-version."gapitoken"."0.1.5" = self.buildNodePackage {
+    name = "gapitoken-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gauge/-/gauge-1.1.0.tgz";
-      name = "gauge-1.1.0.tgz";
-      sha1 = "4f1c13cb6232469f65de92357b34f8ff53c5ca41";
+      url = "https://registry.npmjs.org/gapitoken/-/gapitoken-0.1.5.tgz";
+      name = "gapitoken-0.1.5.tgz";
+      sha1 = "3577fcfb5426be3a7b8ebada92671229d8cc81ce";
     };
     deps = {
-      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
-      "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0";
-      "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0";
-      "lodash.padleft-3.1.0" = self.by-version."lodash.padleft"."3.1.0";
-      "lodash.padright-3.1.0" = self.by-version."lodash.padright"."3.1.0";
+      "jws-3.0.0" = self.by-version."jws"."3.0.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -16358,23 +18033,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."gauge"."~1.2.0" =
-    self.by-version."gauge"."1.2.0";
-  by-version."gauge"."1.2.0" = self.buildNodePackage {
-    name = "gauge-1.2.0";
-    version = "1.2.0";
+  by-spec."gapitoken"."~0.1.2" =
+    self.by-version."gapitoken"."0.1.5";
+  by-spec."gauge"."~1.2.5" =
+    self.by-version."gauge"."1.2.7";
+  by-version."gauge"."1.2.7" = self.buildNodePackage {
+    name = "gauge-1.2.7";
+    version = "1.2.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gauge/-/gauge-1.2.0.tgz";
-      name = "gauge-1.2.0.tgz";
-      sha1 = "3094ab1285633f799814388fc8f2de67b4c012c5";
+      url = "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz";
+      name = "gauge-1.2.7.tgz";
+      sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93";
     };
     deps = {
-      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
-      "has-unicode-1.0.0" = self.by-version."has-unicode"."1.0.0";
-      "lodash.pad-3.1.0" = self.by-version."lodash.pad"."3.1.0";
-      "lodash.padleft-3.1.0" = self.by-version."lodash.padleft"."3.1.0";
-      "lodash.padright-3.1.0" = self.by-version."lodash.padright"."3.1.0";
+      "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
+      "has-unicode-2.0.0" = self.by-version."has-unicode"."2.0.0";
+      "lodash.pad-4.2.0" = self.by-version."lodash.pad"."4.2.0";
+      "lodash.padend-4.3.0" = self.by-version."lodash.padend"."4.3.0";
+      "lodash.padstart-4.3.0" = self.by-version."lodash.padstart"."4.3.0";
     };
     optionalDependencies = {
     };
@@ -16383,15 +18060,15 @@
     cpu = [ ];
   };
   by-spec."gaze"."^0.5.1" =
-    self.by-version."gaze"."0.5.1";
-  by-version."gaze"."0.5.1" = self.buildNodePackage {
-    name = "gaze-0.5.1";
-    version = "0.5.1";
+    self.by-version."gaze"."0.5.2";
+  by-version."gaze"."0.5.2" = self.buildNodePackage {
+    name = "gaze-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz";
-      name = "gaze-0.5.1.tgz";
-      sha1 = "22e731078ef3e49d1c4ab1115ac091192051824c";
+      url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz";
+      name = "gaze-0.5.2.tgz";
+      sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f";
     };
     deps = {
       "globule-0.1.0" = self.by-version."globule"."0.1.0";
@@ -16409,17 +18086,17 @@
     version = "0.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gcloud/-/gcloud-0.10.0.tgz";
+      url = "https://registry.npmjs.org/gcloud/-/gcloud-0.10.0.tgz";
       name = "gcloud-0.10.0.tgz";
       sha1 = "855a26b3531dc7b0791513fffb89fc65921f43ee";
     };
     deps = {
-      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
+      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
       "extend-1.3.0" = self.by-version."extend"."1.3.0";
-      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "gapitoken-0.1.5" = self.by-version."gapitoken"."0.1.5";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "protobufjs-3.8.2" = self.by-version."protobufjs"."3.8.2";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
       "stream-events-1.0.1" = self.by-version."stream-events"."1.0.1";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
@@ -16436,7 +18113,7 @@
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
+      url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-0.2.4.tgz";
       name = "gelf-stream-0.2.4.tgz";
       sha1 = "a418c8c2e39b85b7932a3e8523f6022d6852e013";
     };
@@ -16456,7 +18133,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
+      url = "https://registry.npmjs.org/gelfling/-/gelfling-0.2.0.tgz";
       name = "gelfling-0.2.0.tgz";
       sha1 = "23a13c366883adae32ecfd252a566be302b88dc3";
     };
@@ -16475,7 +18152,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
+      url = "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz";
       name = "generate-function-2.0.0.tgz";
       sha1 = "6858fe7c0969b7d4e9093337647ac79f60dfbe74";
     };
@@ -16488,15 +18165,15 @@
     cpu = [ ];
   };
   by-spec."generate-object-property"."^1.1.0" =
-    self.by-version."generate-object-property"."1.1.1";
-  by-version."generate-object-property"."1.1.1" = self.buildNodePackage {
-    name = "generate-object-property-1.1.1";
-    version = "1.1.1";
+    self.by-version."generate-object-property"."1.2.0";
+  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
+    name = "generate-object-property-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz";
-      name = "generate-object-property-1.1.1.tgz";
-      sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93";
+      url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+      name = "generate-object-property-1.2.0.tgz";
+      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
     };
     deps = {
       "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
@@ -16507,14 +18184,53 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."get-stdin"."*" =
+  by-spec."generate-schema"."^2.1.1" =
+    self.by-version."generate-schema"."2.1.1";
+  by-version."generate-schema"."2.1.1" = self.buildNodePackage {
+    name = "generate-schema-2.1.1";
+    version = "2.1.1";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/generate-schema/-/generate-schema-2.1.1.tgz";
+      name = "generate-schema-2.1.1.tgz";
+      sha1 = "d93e50e08460c02d58cada55317e9f4f588a7d42";
+    };
+    deps = {
+      "type-of-is-3.4.0" = self.by-version."type-of-is"."3.4.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."get-browser-rtc"."^1.0.0" =
+    self.by-version."get-browser-rtc"."1.0.2";
+  by-version."get-browser-rtc"."1.0.2" = self.buildNodePackage {
+    name = "get-browser-rtc-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/get-browser-rtc/-/get-browser-rtc-1.0.2.tgz";
+      name = "get-browser-rtc-1.0.2.tgz";
+      sha1 = "bbcd40c8451a7ed4ef5c373b8169a409dd1d11d9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."get-stdin"."^4.0.1" =
     self.by-version."get-stdin"."4.0.1";
   by-version."get-stdin"."4.0.1" = self.buildNodePackage {
     name = "get-stdin-4.0.1";
     version = "4.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
+      url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
       name = "get-stdin-4.0.1.tgz";
       sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
     };
@@ -16526,26 +18242,43 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."get-stdin"."^4.0.1" =
-    self.by-version."get-stdin"."4.0.1";
+  by-spec."get-stdin"."^5.0.1" =
+    self.by-version."get-stdin"."5.0.1";
+  by-version."get-stdin"."5.0.1" = self.buildNodePackage {
+    name = "get-stdin-5.0.1";
+    version = "5.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz";
+      name = "get-stdin-5.0.1.tgz";
+      sha1 = "122e161591e21ff4c52530305693f20e6393a398";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."get-uri"."~0.1.0" =
-    self.by-version."get-uri"."0.1.3";
-  by-version."get-uri"."0.1.3" = self.buildNodePackage {
-    name = "get-uri-0.1.3";
-    version = "0.1.3";
+    self.by-version."get-uri"."0.1.4";
+  by-version."get-uri"."0.1.4" = self.buildNodePackage {
+    name = "get-uri-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/get-uri/-/get-uri-0.1.3.tgz";
-      name = "get-uri-0.1.3.tgz";
-      sha1 = "b1b3f9dfe0da1c0909097b1ca1ce4d4b72a8d1ab";
+      url = "https://registry.npmjs.org/get-uri/-/get-uri-0.1.4.tgz";
+      name = "get-uri-0.1.4.tgz";
+      sha1 = "35f8a7954c129fb132ff2ddf5ed81a57cb8a9e54";
     };
     deps = {
-      "data-uri-to-buffer-0.0.3" = self.by-version."data-uri-to-buffer"."0.0.3";
+      "data-uri-to-buffer-0.0.4" = self.by-version."data-uri-to-buffer"."0.0.4";
       "ftp-0.3.10" = self.by-version."ftp"."0.3.10";
-      "debug-0.8.1" = self.by-version."debug"."0.8.1";
-      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
       "file-uri-to-path-0.0.2" = self.by-version."file-uri-to-path"."0.0.2";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -16560,7 +18293,7 @@
     version = "0.1.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/get-youtube-id/-/get-youtube-id-0.1.3.tgz";
+      url = "https://registry.npmjs.org/get-youtube-id/-/get-youtube-id-0.1.3.tgz";
       name = "get-youtube-id-0.1.3.tgz";
       sha1 = "eb76a0534cb7e9d1fcce5d4b61a0820d32d6855d";
     };
@@ -16579,7 +18312,7 @@
     version = "1.0.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/getmac/-/getmac-1.0.7.tgz";
+      url = "https://registry.npmjs.org/getmac/-/getmac-1.0.7.tgz";
       name = "getmac-1.0.7.tgz";
       sha1 = "94460f9778698d2e159a03da6c165689f22cdd67";
     };
@@ -16599,7 +18332,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
+      url = "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz";
       name = "getobject-0.1.0.tgz";
       sha1 = "047a449789fa160d018f5486ed91320b6ec7885c";
     };
@@ -16612,18 +18345,18 @@
     cpu = [ ];
   };
   by-spec."git-run"."*" =
-    self.by-version."git-run"."0.3.1";
-  by-version."git-run"."0.3.1" = self.buildNodePackage {
-    name = "git-run-0.3.1";
-    version = "0.3.1";
+    self.by-version."git-run"."0.5.1";
+  by-version."git-run"."0.5.1" = self.buildNodePackage {
+    name = "git-run-0.5.1";
+    version = "0.5.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz";
-      name = "git-run-0.3.1.tgz";
-      sha1 = "34a59d4a90c1501d491ea87d478d26c877808415";
+      url = "https://registry.npmjs.org/git-run/-/git-run-0.5.1.tgz";
+      name = "git-run-0.5.1.tgz";
+      sha1 = "7d9cb28a9e8e1076d005b94baa6ec5c6316fe1e9";
     };
     deps = {
-      "minilog-2.0.7" = self.by-version."minilog"."2.0.7";
+      "minilog-2.0.8" = self.by-version."minilog"."2.0.8";
       "tabtab-0.0.2" = self.by-version."tabtab"."0.0.2";
     };
     optionalDependencies = {
@@ -16632,15 +18365,15 @@
     os = [ ];
     cpu = [ ];
   };
-  "git-run" = self.by-version."git-run"."0.3.1";
-  by-spec."github"."^0.2.3" =
+  "git-run" = self.by-version."git-run"."0.5.1";
+  by-spec."github"."^0.2.4" =
     self.by-version."github"."0.2.4";
   by-version."github"."0.2.4" = self.buildNodePackage {
     name = "github-0.2.4";
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/github/-/github-0.2.4.tgz";
+      url = "https://registry.npmjs.org/github/-/github-0.2.4.tgz";
       name = "github-0.2.4.tgz";
       sha1 = "24fa7f0e13fa11b946af91134c51982a91ce538b";
     };
@@ -16653,14 +18386,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."github-url-from-git"."^1.3.0" =
+  by-spec."github-url-from-git"."~1.4.0" =
     self.by-version."github-url-from-git"."1.4.0";
   by-version."github-url-from-git"."1.4.0" = self.buildNodePackage {
     name = "github-url-from-git-1.4.0";
     version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz";
+      url = "https://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.4.0.tgz";
       name = "github-url-from-git-1.4.0.tgz";
       sha1 = "285e6b520819001bde128674704379e4ff03e0de";
     };
@@ -16672,54 +18405,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."github-url-from-git"."~1.1.1" =
-    self.by-version."github-url-from-git"."1.1.1";
-  by-version."github-url-from-git"."1.1.1" = self.buildNodePackage {
-    name = "github-url-from-git-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz";
-      name = "github-url-from-git-1.1.1.tgz";
-      sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."github-url-from-git"."~1.4.0" =
-    self.by-version."github-url-from-git"."1.4.0";
-  by-spec."github-url-from-username-repo"."^0.1.0" =
-    self.by-version."github-url-from-username-repo"."0.1.0";
-  by-version."github-url-from-username-repo"."0.1.0" = self.buildNodePackage {
-    name = "github-url-from-username-repo-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.1.0.tgz";
-      name = "github-url-from-username-repo-0.1.0.tgz";
-      sha1 = "fe398af670692e91af7bcfc5ae1d99ff97b1df89";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."github-url-from-username-repo"."^1.0.0" =
+  by-spec."github-url-from-username-repo"."~1.0.2" =
     self.by-version."github-url-from-username-repo"."1.0.2";
   by-version."github-url-from-username-repo"."1.0.2" = self.buildNodePackage {
     name = "github-url-from-username-repo-1.0.2";
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz";
+      url = "https://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-1.0.2.tgz";
       name = "github-url-from-username-repo-1.0.2.tgz";
       sha1 = "7dd79330d2abe69c10c2cef79714c97215791dfa";
     };
@@ -16731,29 +18424,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."github-url-from-username-repo"."~1.0.2" =
-    self.by-version."github-url-from-username-repo"."1.0.2";
-  by-spec."glob"."3" =
-    self.by-version."glob"."3.2.11";
-  by-version."glob"."3.2.11" = self.buildNodePackage {
-    name = "glob-3.2.11";
-    version = "3.2.11";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-      name = "glob-3.2.11.tgz";
-      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."glob"."3 || 4" =
     self.by-version."glob"."4.5.3";
   by-version."glob"."4.5.3" = self.buildNodePackage {
@@ -16761,15 +18431,15 @@
     version = "4.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
+      url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
       name = "glob-4.5.3.tgz";
       sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -16784,7 +18454,7 @@
     version = "3.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+      url = "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
       name = "glob-3.2.3.tgz";
       sha1 = "e313eeb249c7affaa5c475286b0e115b59839467";
     };
@@ -16801,24 +18471,66 @@
   };
   by-spec."glob"."3.2.x" =
     self.by-version."glob"."3.2.11";
-  by-spec."glob"."3.x" =
-    self.by-version."glob"."3.2.11";
-  by-spec."glob"."4.0.6" =
-    self.by-version."glob"."4.0.6";
-  by-version."glob"."4.0.6" = self.buildNodePackage {
-    name = "glob-4.0.6";
-    version = "4.0.6";
+  by-version."glob"."3.2.11" = self.buildNodePackage {
+    name = "glob-3.2.11";
+    version = "3.2.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
-      name = "glob-4.0.6.tgz";
-      sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
+      url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+      name = "glob-3.2.11.tgz";
+      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."5.x" =
+    self.by-version."glob"."5.0.15";
+  by-version."glob"."5.0.15" = self.buildNodePackage {
+    name = "glob-5.0.15";
+    version = "5.0.15";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz";
+      name = "glob-5.0.15.tgz";
+      sha1 = "1bc936b9e02f4a603fcc222ecf7633d30b8b93b1";
+    };
+    deps = {
+      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."glob"."6.0.4" =
+    self.by-version."glob"."6.0.4";
+  by-version."glob"."6.0.4" = self.buildNodePackage {
+    name = "glob-6.0.4";
+    version = "6.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz";
+      name = "glob-6.0.4.tgz";
+      sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
+    };
+    deps = {
+      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -16826,36 +18538,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."4.x" =
-    self.by-version."glob"."4.5.3";
-  by-spec."glob".">=3.2.7 <4" =
-    self.by-version."glob"."3.2.11";
   by-spec."glob"."^4.0.5" =
     self.by-version."glob"."4.5.3";
   by-spec."glob"."^4.3.1" =
     self.by-version."glob"."4.5.3";
-  by-spec."glob"."^4.3.2" =
-    self.by-version."glob"."4.5.3";
-  by-spec."glob"."^4.3.5" =
-    self.by-version."glob"."4.5.3";
-  by-spec."glob"."^4.4.2" =
-    self.by-version."glob"."4.5.3";
+  by-spec."glob"."^5.0.0" =
+    self.by-version."glob"."5.0.15";
+  by-spec."glob"."^5.0.13" =
+    self.by-version."glob"."5.0.15";
+  by-spec."glob"."^5.0.14" =
+    self.by-version."glob"."5.0.15";
+  by-spec."glob"."^5.0.15" =
+    self.by-version."glob"."5.0.15";
   by-spec."glob"."^5.0.3" =
-    self.by-version."glob"."5.0.5";
-  by-version."glob"."5.0.5" = self.buildNodePackage {
-    name = "glob-5.0.5";
-    version = "5.0.5";
+    self.by-version."glob"."5.0.15";
+  by-spec."glob"."^5.0.5" =
+    self.by-version."glob"."5.0.15";
+  by-spec."glob"."^6.0.0" =
+    self.by-version."glob"."6.0.4";
+  by-spec."glob"."^6.0.1" =
+    self.by-version."glob"."6.0.4";
+  by-spec."glob"."^7.0.0" =
+    self.by-version."glob"."7.0.3";
+  by-version."glob"."7.0.3" = self.buildNodePackage {
+    name = "glob-7.0.3";
+    version = "7.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-5.0.5.tgz";
-      name = "glob-5.0.5.tgz";
-      sha1 = "784431e4e29a900ae0d47fba6aa1c7f16a8e7df7";
+      url = "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz";
+      name = "glob-7.0.3.tgz";
+      sha1 = "0aa235931a4a96ac13d60ffac2fb877bd6ed4f58";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
     };
     optionalDependencies = {
@@ -16864,6 +18582,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glob"."^7.0.3" =
+    self.by-version."glob"."7.0.3";
   by-spec."glob"."~ 3.2.1" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.1.21" =
@@ -16873,14 +18593,14 @@
     version = "3.1.21";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
+      url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz";
       name = "glob-3.1.21.tgz";
       sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd";
     };
     deps = {
       "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
       "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
-      "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
+      "inherits-1.0.2" = self.by-version."inherits"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -16888,34 +18608,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."~3.2.1" =
-    self.by-version."glob"."3.2.11";
-  by-spec."glob"."~3.2.3" =
-    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.6" =
     self.by-version."glob"."3.2.11";
-  by-spec."glob"."~3.2.7" =
-    self.by-version."glob"."3.2.11";
   by-spec."glob"."~3.2.9" =
     self.by-version."glob"."3.2.11";
   by-spec."glob"."~4.0.6" =
     self.by-version."glob"."4.0.6";
-  by-spec."glob"."~4.2.1" =
-    self.by-version."glob"."4.2.2";
-  by-version."glob"."4.2.2" = self.buildNodePackage {
-    name = "glob-4.2.2";
-    version = "4.2.2";
+  by-version."glob"."4.0.6" = self.buildNodePackage {
+    name = "glob-4.0.6";
+    version = "4.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz";
-      name = "glob-4.2.2.tgz";
-      sha1 = "ad2b047653a58c387e15deb43a19497f83fd2a80";
+      url = "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz";
+      name = "glob-4.0.6.tgz";
+      sha1 = "695c50bdd4e2fb5c5d370b091f388d3707e291a7";
     };
     deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "graceful-fs-3.0.8" = self.by-version."graceful-fs"."3.0.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -16930,15 +18642,15 @@
     version = "4.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.3.5.tgz";
+      url = "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz";
       name = "glob-4.3.5.tgz";
       sha1 = "80fbb08ca540f238acce5d11d1e9bc41e75173d3";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -16946,21 +18658,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."~5.0.5" =
-    self.by-version."glob"."5.0.5";
-  by-spec."glob-base"."^0.2.0" =
-    self.by-version."glob-base"."0.2.0";
-  by-version."glob-base"."0.2.0" = self.buildNodePackage {
-    name = "glob-base-0.2.0";
-    version = "0.2.0";
+  by-spec."glob"."~5.0.0" =
+    self.by-version."glob"."5.0.15";
+  by-spec."glob"."~7.0.0" =
+    self.by-version."glob"."7.0.3";
+  by-spec."glob"."~7.0.3" =
+    self.by-version."glob"."7.0.3";
+  by-spec."glob-base"."^0.3.0" =
+    self.by-version."glob-base"."0.3.0";
+  by-version."glob-base"."0.3.0" = self.buildNodePackage {
+    name = "glob-base-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob-base/-/glob-base-0.2.0.tgz";
-      name = "glob-base-0.2.0.tgz";
-      sha1 = "59d2f38c3ba2860af149b6b174512a169e9f1b3d";
+      url = "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz";
+      name = "glob-base-0.3.0.tgz";
+      sha1 = "dbb164f6221b1c0b1ccf82aea328b497df0ea3c4";
     };
     deps = {
-      "glob-parent-1.2.0" = self.by-version."glob-parent"."1.2.0";
+      "glob-parent-2.0.0" = self.by-version."glob-parent"."2.0.0";
+      "is-glob-2.0.1" = self.by-version."is-glob"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -16968,19 +18685,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob-parent"."^1.0.0" =
-    self.by-version."glob-parent"."1.2.0";
-  by-version."glob-parent"."1.2.0" = self.buildNodePackage {
-    name = "glob-parent-1.2.0";
-    version = "1.2.0";
+  by-spec."glob-parent"."^2.0.0" =
+    self.by-version."glob-parent"."2.0.0";
+  by-version."glob-parent"."2.0.0" = self.buildNodePackage {
+    name = "glob-parent-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob-parent/-/glob-parent-1.2.0.tgz";
-      name = "glob-parent-1.2.0.tgz";
-      sha1 = "8deffabf6317db5b0f775f553fac731ecf41ded5";
+      url = "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz";
+      name = "glob-parent-2.0.0.tgz";
+      sha1 = "81383d72db054fcccf5336daa902f182f6edbb28";
     };
     deps = {
-      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
+      "is-glob-2.0.1" = self.by-version."is-glob"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -16988,8 +18705,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob-parent"."^1.2.0" =
-    self.by-version."glob-parent"."1.2.0";
   by-spec."glob-stream"."^3.1.5" =
     self.by-version."glob-stream"."3.1.18";
   by-version."glob-stream"."3.1.18" = self.buildNodePackage {
@@ -16997,13 +18712,13 @@
     version = "3.1.18";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz";
+      url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz";
       name = "glob-stream-3.1.18.tgz";
       sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b";
     };
     deps = {
       "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
       "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0";
       "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12";
       "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0";
@@ -17022,12 +18737,12 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
+      url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz";
       name = "glob-watcher-0.0.6.tgz";
       sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b";
     };
     deps = {
-      "gaze-0.5.1" = self.by-version."gaze"."0.5.1";
+      "gaze-0.5.2" = self.by-version."gaze"."0.5.2";
     };
     optionalDependencies = {
     };
@@ -17042,7 +18757,7 @@
     version = "0.0.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz";
+      url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz";
       name = "glob2base-0.0.12.tgz";
       sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56";
     };
@@ -17074,6 +18789,50 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."globals"."^9.2.0" =
+    self.by-version."globals"."9.3.0";
+  by-version."globals"."9.3.0" = self.buildNodePackage {
+    name = "globals-9.3.0";
+    version = "9.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/globals/-/globals-9.3.0.tgz";
+      name = "globals-9.3.0.tgz";
+      sha1 = "55a541cf8519d66055ed3c892dd7c49c1504783e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."globby"."^4.0.0" =
+    self.by-version."globby"."4.0.0";
+  by-version."globby"."4.0.0" = self.buildNodePackage {
+    name = "globby-4.0.0";
+    version = "4.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/globby/-/globby-4.0.0.tgz";
+      name = "globby-4.0.0.tgz";
+      sha1 = "36ff06c5a9dc1dbc201f700074992882857e9817";
+    };
+    deps = {
+      "array-union-1.0.1" = self.by-version."array-union"."1.0.1";
+      "arrify-1.0.1" = self.by-version."arrify"."1.0.1";
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "pify-2.3.0" = self.by-version."pify"."2.3.0";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."globule"."~0.1.0" =
     self.by-version."globule"."0.1.0";
   by-version."globule"."0.1.0" = self.buildNodePackage {
@@ -17081,7 +18840,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
+      url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz";
       name = "globule-0.1.0.tgz";
       sha1 = "d9c8edde1da79d125a151b79533b978676346ae5";
     };
@@ -17096,6 +18855,92 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glogg"."^1.0.0" =
+    self.by-version."glogg"."1.0.0";
+  by-version."glogg"."1.0.0" = self.buildNodePackage {
+    name = "glogg-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz";
+      name = "glogg-1.0.0.tgz";
+      sha1 = "7fe0f199f57ac906cf512feead8f90ee4a284fc5";
+    };
+    deps = {
+      "sparkles-1.0.0" = self.by-version."sparkles"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."google-auth-library"."^0.9.6" =
+    self.by-version."google-auth-library"."0.9.7";
+  by-version."google-auth-library"."0.9.7" = self.buildNodePackage {
+    name = "google-auth-library-0.9.7";
+    version = "0.9.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/google-auth-library/-/google-auth-library-0.9.7.tgz";
+      name = "google-auth-library-0.9.7.tgz";
+      sha1 = "f181f276bfe1e2be9ad368a2db2076db3a7e8c88";
+    };
+    deps = {
+      "async-1.4.2" = self.by-version."async"."1.4.2";
+      "gtoken-1.2.0" = self.by-version."gtoken"."1.2.0";
+      "lodash.noop-3.0.1" = self.by-version."lodash.noop"."3.0.1";
+      "jws-3.0.0" = self.by-version."jws"."3.0.0";
+      "request-2.60.0" = self.by-version."request"."2.60.0";
+      "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."google-oauth-jwt"."~0.1.4" =
+    self.by-version."google-oauth-jwt"."0.1.7";
+  by-version."google-oauth-jwt"."0.1.7" = self.buildNodePackage {
+    name = "google-oauth-jwt-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/google-oauth-jwt/-/google-oauth-jwt-0.1.7.tgz";
+      name = "google-oauth-jwt-0.1.7.tgz";
+      sha1 = "3ebb79848aba2602aecc0b482244253df8238033";
+    };
+    deps = {
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."google-p12-pem"."^0.1.0" =
+    self.by-version."google-p12-pem"."0.1.0";
+  by-version."google-p12-pem"."0.1.0" = self.buildNodePackage {
+    name = "google-p12-pem-0.1.0";
+    version = "0.1.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/google-p12-pem/-/google-p12-pem-0.1.0.tgz";
+      name = "google-p12-pem-0.1.0.tgz";
+      sha1 = "fb2523bf84ff74676e84c72b4def50961e617d1c";
+    };
+    deps = {
+      "node-forge-0.6.39" = self.by-version."node-forge"."0.6.39";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."googleapis"."0.8.0" =
     self.by-version."googleapis"."0.8.0";
   by-version."googleapis"."0.8.0" = self.buildNodePackage {
@@ -17103,14 +18948,14 @@
     version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/googleapis/-/googleapis-0.8.0.tgz";
+      url = "https://registry.npmjs.org/googleapis/-/googleapis-0.8.0.tgz";
       name = "googleapis-0.8.0.tgz";
       sha1 = "b7bdf177ee839f1bab5cf5e65cb4d0d74f27a86b";
     };
     deps = {
       "request-2.34.0" = self.by-version."request"."2.34.0";
       "async-0.2.10" = self.by-version."async"."0.2.10";
-      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
+      "gapitoken-0.1.5" = self.by-version."gapitoken"."0.1.5";
     };
     optionalDependencies = {
     };
@@ -17125,15 +18970,34 @@
     version = "1.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/googleapis/-/googleapis-1.1.5.tgz";
+      url = "https://registry.npmjs.org/googleapis/-/googleapis-1.1.5.tgz";
       name = "googleapis-1.1.5.tgz";
       sha1 = "e10150ac9e8b25fb51799f10ed946c5b9f8064aa";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "gapitoken-0.1.4" = self.by-version."gapitoken"."0.1.4";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "gapitoken-0.1.5" = self.by-version."gapitoken"."0.1.5";
       "request-2.51.0" = self.by-version."request"."2.51.0";
-      "string-template-0.2.0" = self.by-version."string-template"."0.2.0";
+      "string-template-0.2.1" = self.by-version."string-template"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."googleclientlogin"."~0.2.8" =
+    self.by-version."googleclientlogin"."0.2.8";
+  by-version."googleclientlogin"."0.2.8" = self.buildNodePackage {
+    name = "googleclientlogin-0.2.8";
+    version = "0.2.8";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/googleclientlogin/-/googleclientlogin-0.2.8.tgz";
+      name = "googleclientlogin-0.2.8.tgz";
+      sha1 = "953ba87bbe8feda8f7e70f9f7721b29a503f8df0";
+    };
+    deps = {
     };
     optionalDependencies = {
     };
@@ -17148,7 +19012,7 @@
     version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz";
+      url = "https://registry.npmjs.org/got/-/got-1.2.2.tgz";
       name = "got-1.2.2.tgz";
       sha1 = "d9430ba32f6a30218243884418767340aafc0400";
     };
@@ -17161,26 +19025,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."got"."^2.4.0" =
-    self.by-version."got"."2.7.2";
-  by-version."got"."2.7.2" = self.buildNodePackage {
-    name = "got-2.7.2";
-    version = "2.7.2";
+  by-spec."got"."^2.7.2" =
+    self.by-version."got"."2.9.2";
+  by-version."got"."2.9.2" = self.buildNodePackage {
+    name = "got-2.9.2";
+    version = "2.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/got/-/got-2.7.2.tgz";
-      name = "got-2.7.2.tgz";
-      sha1 = "089cfe07c37590d6ab59ced31d5ff5b09f05145d";
+      url = "https://registry.npmjs.org/got/-/got-2.9.2.tgz";
+      name = "got-2.9.2.tgz";
+      sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee";
     };
     deps = {
-      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
-      "infinity-agent-1.0.2" = self.by-version."infinity-agent"."1.0.2";
+      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
+      "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3";
       "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
       "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0";
-      "nested-error-stacks-1.0.0" = self.by-version."nested-error-stacks"."1.0.0";
-      "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
-      "prepend-http-1.0.1" = self.by-version."prepend-http"."1.0.1";
-      "read-all-stream-2.1.2" = self.by-version."read-all-stream"."2.1.2";
+      "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2";
+      "object-assign-2.1.1" = self.by-version."object-assign"."2.1.1";
+      "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3";
+      "read-all-stream-2.2.0" = self.by-version."read-all-stream"."2.2.0";
       "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
       "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
     };
@@ -17190,18 +19054,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."graceful-fs"."1.2" =
-    self.by-version."graceful-fs"."1.2.3";
-  by-version."graceful-fs"."1.2.3" = self.buildNodePackage {
-    name = "graceful-fs-1.2.3";
-    version = "1.2.3";
+  by-spec."got"."^3.2.0" =
+    self.by-version."got"."3.3.1";
+  by-version."got"."3.3.1" = self.buildNodePackage {
+    name = "got-3.3.1";
+    version = "3.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
-      name = "graceful-fs-1.2.3.tgz";
-      sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+      url = "https://registry.npmjs.org/got/-/got-3.3.1.tgz";
+      name = "got-3.3.1.tgz";
+      sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
     };
     deps = {
+      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
+      "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3";
+      "is-redirect-1.0.0" = self.by-version."is-redirect"."1.0.0";
+      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
+      "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0";
+      "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2";
+      "object-assign-3.0.0" = self.by-version."object-assign"."3.0.0";
+      "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3";
+      "read-all-stream-3.1.0" = self.by-version."read-all-stream"."3.1.0";
+      "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -17209,16 +19083,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."graceful-fs"."2" =
-    self.by-version."graceful-fs"."2.0.3";
-  by-version."graceful-fs"."2.0.3" = self.buildNodePackage {
-    name = "graceful-fs-2.0.3";
-    version = "2.0.3";
+  by-spec."graceful-fs"."^3.0.0" =
+    self.by-version."graceful-fs"."3.0.8";
+  by-version."graceful-fs"."3.0.8" = self.buildNodePackage {
+    name = "graceful-fs-3.0.8";
+    version = "3.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
-      name = "graceful-fs-2.0.3.tgz";
-      sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz";
+      name = "graceful-fs-3.0.8.tgz";
+      sha1 = "ce813e725fa82f7e6147d51c9a5ca68270551c22";
     };
     deps = {
     };
@@ -17228,16 +19102,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."graceful-fs"."2 || 3" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-version."graceful-fs"."3.0.6" = self.buildNodePackage {
-    name = "graceful-fs-3.0.6";
-    version = "3.0.6";
+  by-spec."graceful-fs"."^3.0.2" =
+    self.by-version."graceful-fs"."3.0.8";
+  by-spec."graceful-fs"."^4.1.2" =
+    self.by-version."graceful-fs"."4.1.3";
+  by-version."graceful-fs"."4.1.3" = self.buildNodePackage {
+    name = "graceful-fs-4.1.3";
+    version = "4.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz";
-      name = "graceful-fs-3.0.6.tgz";
-      sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb";
+      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz";
+      name = "graceful-fs-4.1.3.tgz";
+      sha1 = "92033ce11113c41e2628d61fdfa40bc10dc0155c";
     };
     deps = {
     };
@@ -17247,36 +19123,50 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."graceful-fs"."3" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs".">3.0.1 <4.0.0-0" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs"."^3.0.0" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs"."^3.0.1" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs"."^3.0.2" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs"."^3.0.4" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs"."^3.0.5" =
-    self.by-version."graceful-fs"."3.0.6";
   by-spec."graceful-fs"."~1" =
     self.by-version."graceful-fs"."1.2.3";
+  by-version."graceful-fs"."1.2.3" = self.buildNodePackage {
+    name = "graceful-fs-1.2.3";
+    version = "1.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz";
+      name = "graceful-fs-1.2.3.tgz";
+      sha1 = "15a4806a57547cb2d2dbf27f42e89a8c3451b364";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."graceful-fs"."~1.2.0" =
     self.by-version."graceful-fs"."1.2.3";
-  by-spec."graceful-fs"."~2" =
-    self.by-version."graceful-fs"."2.0.3";
   by-spec."graceful-fs"."~2.0.0" =
     self.by-version."graceful-fs"."2.0.3";
-  by-spec."graceful-fs"."~2.0.1" =
-    self.by-version."graceful-fs"."2.0.3";
+  by-version."graceful-fs"."2.0.3" = self.buildNodePackage {
+    name = "graceful-fs-2.0.3";
+    version = "2.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz";
+      name = "graceful-fs-2.0.3.tgz";
+      sha1 = "7cd2cdb228a4a3f36e95efa6cc142de7d1a136d0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."graceful-fs"."~3.0.2" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs"."~3.0.4" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-spec."graceful-fs"."~3.0.6" =
-    self.by-version."graceful-fs"."3.0.6";
+    self.by-version."graceful-fs"."3.0.8";
+  by-spec."graceful-fs"."~4.1.3" =
+    self.by-version."graceful-fs"."4.1.3";
   by-spec."graceful-readlink".">= 1.0.0" =
     self.by-version."graceful-readlink"."1.0.1";
   by-version."graceful-readlink"."1.0.1" = self.buildNodePackage {
@@ -17284,7 +19174,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
+      url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
       name = "graceful-readlink-1.0.1.tgz";
       sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725";
     };
@@ -17303,7 +19193,7 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.1.1.tgz";
+      url = "https://registry.npmjs.org/gridfs-stream/-/gridfs-stream-1.1.1.tgz";
       name = "gridfs-stream-1.1.1.tgz";
       sha1 = "3dd3a100ec2021a181282f6eb46709636074df89";
     };
@@ -17317,16 +19207,16 @@
     cpu = [ ];
   };
   "gridfs-stream" = self.by-version."gridfs-stream"."1.1.1";
-  by-spec."growl"."1.7.x" =
-    self.by-version."growl"."1.7.0";
-  by-version."growl"."1.7.0" = self.buildNodePackage {
-    name = "growl-1.7.0";
-    version = "1.7.0";
+  by-spec."growl"."1.8.1" =
+    self.by-version."growl"."1.8.1";
+  by-version."growl"."1.8.1" = self.buildNodePackage {
+    name = "growl-1.8.1";
+    version = "1.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/growl/-/growl-1.7.0.tgz";
-      name = "growl-1.7.0.tgz";
-      sha1 = "de2d66136d002e112ba70f3f10c31cf7c350b2da";
+      url = "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
+      name = "growl-1.8.1.tgz";
+      sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
     };
     deps = {
     };
@@ -17336,18 +19226,34 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."growl"."1.8.1" =
-    self.by-version."growl"."1.8.1";
-  by-version."growl"."1.8.1" = self.buildNodePackage {
-    name = "growl-1.8.1";
-    version = "1.8.1";
-    bin = false;
+  by-spec."grunt".">=0.4.0" =
+    self.by-version."grunt"."1.0.0";
+  by-version."grunt"."1.0.0" = self.buildNodePackage {
+    name = "grunt-1.0.0";
+    version = "1.0.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/growl/-/growl-1.8.1.tgz";
-      name = "growl-1.8.1.tgz";
-      sha1 = "4b2dec8d907e93db336624dcec0183502f8c9428";
+      url = "https://registry.npmjs.org/grunt/-/grunt-1.0.0.tgz";
+      name = "grunt-1.0.0.tgz";
+      sha1 = "5fea0f9f40afe65ca1ca61e40031891d325d4b43";
     };
     deps = {
+      "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
+      "dateformat-1.0.12" = self.by-version."dateformat"."1.0.12";
+      "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+      "exit-0.1.2" = self.by-version."exit"."0.1.2";
+      "findup-sync-0.3.0" = self.by-version."findup-sync"."0.3.0";
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
+      "grunt-cli-1.2.0" = self.by-version."grunt-cli"."1.2.0";
+      "grunt-known-options-1.1.0" = self.by-version."grunt-known-options"."1.1.0";
+      "grunt-legacy-log-1.0.0" = self.by-version."grunt-legacy-log"."1.0.0";
+      "grunt-legacy-util-1.0.0" = self.by-version."grunt-legacy-util"."1.0.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
     optionalDependencies = {
     };
@@ -17355,14 +19261,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."grunt"."0.4.x" =
+  by-spec."grunt".">=0.4.x" =
+    self.by-version."grunt"."1.0.0";
+  by-spec."grunt"."~0.4" =
     self.by-version."grunt"."0.4.5";
   by-version."grunt"."0.4.5" = self.buildNodePackage {
     name = "grunt-0.4.5";
     version = "0.4.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
+      url = "https://registry.npmjs.org/grunt/-/grunt-0.4.5.tgz";
       name = "grunt-0.4.5.tgz";
       sha1 = "56937cd5194324adff6d207631832a9d6ba4e7f0";
     };
@@ -17386,7 +19294,7 @@
       "exit-0.1.2" = self.by-version."exit"."0.1.2";
       "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
       "grunt-legacy-util-0.2.0" = self.by-version."grunt-legacy-util"."0.2.0";
-      "grunt-legacy-log-0.1.1" = self.by-version."grunt-legacy-log"."0.1.1";
+      "grunt-legacy-log-0.1.3" = self.by-version."grunt-legacy-log"."0.1.3";
     };
     optionalDependencies = {
     };
@@ -17394,29 +19302,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."grunt".">=0.4.0" =
-    self.by-version."grunt"."0.4.5";
-  by-spec."grunt"."~0.4" =
-    self.by-version."grunt"."0.4.5";
-  by-spec."grunt"."~0.4.0" =
-    self.by-version."grunt"."0.4.5";
-  by-spec."grunt"."~0.4.5" =
-    self.by-version."grunt"."0.4.5";
   by-spec."grunt-cli"."*" =
-    self.by-version."grunt-cli"."0.1.13";
-  by-version."grunt-cli"."0.1.13" = self.buildNodePackage {
-    name = "grunt-cli-0.1.13";
-    version = "0.1.13";
+    self.by-version."grunt-cli"."1.2.0";
+  by-version."grunt-cli"."1.2.0" = self.buildNodePackage {
+    name = "grunt-cli-1.2.0";
+    version = "1.2.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-cli/-/grunt-cli-0.1.13.tgz";
-      name = "grunt-cli-0.1.13.tgz";
-      sha1 = "e9ebc4047631f5012d922770c39378133cad10f4";
+      url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.2.0.tgz";
+      name = "grunt-cli-1.2.0.tgz";
+      sha1 = "562b119ebb069ddb464ace2845501be97b35b6a8";
     };
     deps = {
-      "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
-      "findup-sync-0.1.3" = self.by-version."findup-sync"."0.1.3";
-      "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
+      "findup-sync-0.3.0" = self.by-version."findup-sync"."0.3.0";
+      "grunt-known-options-1.1.0" = self.by-version."grunt-known-options"."1.1.0";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
     };
     optionalDependencies = {
     };
@@ -17424,164 +19325,251 @@
     os = [ ];
     cpu = [ ];
   };
-  "grunt-cli" = self.by-version."grunt-cli"."0.1.13";
+  "grunt-cli" = self.by-version."grunt-cli"."1.2.0";
+  by-spec."grunt-cli"."1.2.0" =
+    self.by-version."grunt-cli"."1.2.0";
   by-spec."grunt-contrib-cssmin"."*" =
-    self.by-version."grunt-contrib-cssmin"."0.12.2";
-  by-version."grunt-contrib-cssmin"."0.12.2" = self.buildNodePackage {
-    name = "grunt-contrib-cssmin-0.12.2";
-    version = "0.12.2";
+    self.by-version."grunt-contrib-cssmin"."1.0.1";
+  by-version."grunt-contrib-cssmin"."1.0.1" = self.buildNodePackage {
+    name = "grunt-contrib-cssmin-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-0.12.2.tgz";
-      name = "grunt-contrib-cssmin-0.12.2.tgz";
-      sha1 = "254957427abdf63cd18f0690d34c0083fb544cff";
+      url = "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-1.0.1.tgz";
+      name = "grunt-contrib-cssmin-1.0.1.tgz";
+      sha1 = "f6d45244cc87efdcc521f6918eafd921efd8c8da";
     };
     deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "clean-css-3.2.1" = self.by-version."clean-css"."3.2.1";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "clean-css-3.4.11" = self.by-version."clean-css"."3.4.11";
       "maxmin-1.1.0" = self.by-version."maxmin"."1.1.0";
     };
     optionalDependencies = {
     };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."1.0.1";
+  by-spec."grunt-contrib-eslint"."*" =
+    self.by-version."grunt-contrib-eslint"."0.0.5";
+  by-version."grunt-contrib-eslint"."0.0.5" = self.buildNodePackage {
+    name = "grunt-contrib-eslint-0.0.5";
+    version = "0.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-contrib-eslint/-/grunt-contrib-eslint-0.0.5.tgz";
+      name = "grunt-contrib-eslint-0.0.5.tgz";
+      sha1 = "6f2096e43262b49d5eaf13b1532dfca00ac9c9b0";
+    };
+    deps = {
+      "eslint-2.7.0" = self.by-version."eslint"."2.7.0";
+    };
+    optionalDependencies = {
+    };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"];
+      self.by-version."grunt"."1.0.0"];
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-cssmin" = self.by-version."grunt-contrib-cssmin"."0.12.2";
+  "grunt-contrib-eslint" = self.by-version."grunt-contrib-eslint"."0.0.5";
   by-spec."grunt-contrib-jshint"."*" =
-    self.by-version."grunt-contrib-jshint"."0.11.2";
-  by-version."grunt-contrib-jshint"."0.11.2" = self.buildNodePackage {
-    name = "grunt-contrib-jshint-0.11.2";
-    version = "0.11.2";
+    self.by-version."grunt-contrib-jshint"."1.0.0";
+  by-version."grunt-contrib-jshint"."1.0.0" = self.buildNodePackage {
+    name = "grunt-contrib-jshint-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-0.11.2.tgz";
-      name = "grunt-contrib-jshint-0.11.2.tgz";
-      sha1 = "a7e000427bb007848c1099264860c0485b4741d3";
+      url = "https://registry.npmjs.org/grunt-contrib-jshint/-/grunt-contrib-jshint-1.0.0.tgz";
+      name = "grunt-contrib-jshint-1.0.0.tgz";
+      sha1 = "30f405a51de656bfa6eb029b9a464b9fe02a402a";
     };
     deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
-      "jshint-2.7.0" = self.by-version."jshint"."2.7.0";
+      "jshint-2.9.1" = self.by-version."jshint"."2.9.1";
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"];
+      self.by-version."grunt"."1.0.0"];
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."0.11.2";
+  "grunt-contrib-jshint" = self.by-version."grunt-contrib-jshint"."1.0.0";
   by-spec."grunt-contrib-less"."*" =
-    self.by-version."grunt-contrib-less"."1.0.1";
-  by-version."grunt-contrib-less"."1.0.1" = self.buildNodePackage {
-    name = "grunt-contrib-less-1.0.1";
-    version = "1.0.1";
+    self.by-version."grunt-contrib-less"."1.2.0";
+  by-version."grunt-contrib-less"."1.2.0" = self.buildNodePackage {
+    name = "grunt-contrib-less-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.0.1.tgz";
-      name = "grunt-contrib-less-1.0.1.tgz";
-      sha1 = "87f32a5e474987a405c9c9890d33686a45021d51";
+      url = "https://registry.npmjs.org/grunt-contrib-less/-/grunt-contrib-less-1.2.0.tgz";
+      name = "grunt-contrib-less-1.2.0.tgz";
+      sha1 = "72268e935e8eca73c2dfd515d0bdb97dfbd76295";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "less-2.4.0" = self.by-version."less"."2.4.0";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "less-2.6.1" = self.by-version."less"."2.6.1";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
     };
     optionalDependencies = {
     };
-    peerDependencies = [
-      self.by-version."grunt"."0.4.5"];
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.0.1";
+  "grunt-contrib-less" = self.by-version."grunt-contrib-less"."1.2.0";
   by-spec."grunt-contrib-requirejs"."*" =
-    self.by-version."grunt-contrib-requirejs"."0.4.4";
-  by-version."grunt-contrib-requirejs"."0.4.4" = self.buildNodePackage {
-    name = "grunt-contrib-requirejs-0.4.4";
-    version = "0.4.4";
+    self.by-version."grunt-contrib-requirejs"."1.0.0";
+  by-version."grunt-contrib-requirejs"."1.0.0" = self.buildNodePackage {
+    name = "grunt-contrib-requirejs-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-0.4.4.tgz";
-      name = "grunt-contrib-requirejs-0.4.4.tgz";
-      sha1 = "87f2165a981e48a45d22f8cc5299d0934031b972";
+      url = "https://registry.npmjs.org/grunt-contrib-requirejs/-/grunt-contrib-requirejs-1.0.0.tgz";
+      name = "grunt-contrib-requirejs-1.0.0.tgz";
+      sha1 = "ec1670cafc32713902ee53569454715b2e3cbad5";
     };
     deps = {
-      "requirejs-2.1.17" = self.by-version."requirejs"."2.1.17";
+      "requirejs-2.2.0" = self.by-version."requirejs"."2.2.0";
     };
     optionalDependencies = {
     };
-    peerDependencies = [
-      self.by-version."grunt"."0.4.5"];
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."0.4.4";
+  "grunt-contrib-requirejs" = self.by-version."grunt-contrib-requirejs"."1.0.0";
   by-spec."grunt-contrib-uglify"."*" =
-    self.by-version."grunt-contrib-uglify"."0.9.1";
-  by-version."grunt-contrib-uglify"."0.9.1" = self.buildNodePackage {
-    name = "grunt-contrib-uglify-0.9.1";
-    version = "0.9.1";
+    self.by-version."grunt-contrib-uglify"."1.0.1";
+  by-version."grunt-contrib-uglify"."1.0.1" = self.buildNodePackage {
+    name = "grunt-contrib-uglify-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-0.9.1.tgz";
-      name = "grunt-contrib-uglify-0.9.1.tgz";
-      sha1 = "1eb8420009f15ed1a97368077479ab25ded28d1b";
+      url = "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-1.0.1.tgz";
+      name = "grunt-contrib-uglify-1.0.1.tgz";
+      sha1 = "ad68411b963b99661211f76f466bdeded4fb07ac";
     };
     deps = {
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
       "maxmin-1.1.0" = self.by-version."maxmin"."1.1.0";
-      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
-      "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2";
+      "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
+      "uri-path-1.0.0" = self.by-version."uri-path"."1.0.0";
     };
     optionalDependencies = {
     };
-    peerDependencies = [
-      self.by-version."grunt"."0.4.5"];
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."0.9.1";
+  "grunt-contrib-uglify" = self.by-version."grunt-contrib-uglify"."1.0.1";
   by-spec."grunt-karma"."*" =
-    self.by-version."grunt-karma"."0.10.1";
-  by-version."grunt-karma"."0.10.1" = self.buildNodePackage {
-    name = "grunt-karma-0.10.1";
-    version = "0.10.1";
+    self.by-version."grunt-karma"."0.12.2";
+  by-version."grunt-karma"."0.12.2" = self.buildNodePackage {
+    name = "grunt-karma-0.12.2";
+    version = "0.12.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-karma/-/grunt-karma-0.10.1.tgz";
-      name = "grunt-karma-0.10.1.tgz";
-      sha1 = "255fae402bb04409cf95c6ac77e8c1968934924b";
+      url = "https://registry.npmjs.org/grunt-karma/-/grunt-karma-0.12.2.tgz";
+      name = "grunt-karma-0.12.2.tgz";
+      sha1 = "d52676ab94779e4b20052b5f3519eb32653dc566";
     };
     deps = {
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."0.4.5"
-      self.by-version."karma"."0.12.32"];
+      self.by-version."grunt"."1.0.0"
+      self.by-version."karma"."0.13.22"];
+    os = [ ];
+    cpu = [ ];
+  };
+  "grunt-karma" = self.by-version."grunt-karma"."0.12.2";
+  by-spec."grunt-known-options"."~1.1.0" =
+    self.by-version."grunt-known-options"."1.1.0";
+  by-version."grunt-known-options"."1.1.0" = self.buildNodePackage {
+    name = "grunt-known-options-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-known-options/-/grunt-known-options-1.1.0.tgz";
+      name = "grunt-known-options-1.1.0.tgz";
+      sha1 = "a4274eeb32fa765da5a7a3b1712617ce3b144149";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "grunt-karma" = self.by-version."grunt-karma"."0.10.1";
   by-spec."grunt-legacy-log"."~0.1.0" =
-    self.by-version."grunt-legacy-log"."0.1.1";
-  by-version."grunt-legacy-log"."0.1.1" = self.buildNodePackage {
-    name = "grunt-legacy-log-0.1.1";
-    version = "0.1.1";
+    self.by-version."grunt-legacy-log"."0.1.3";
+  by-version."grunt-legacy-log"."0.1.3" = self.buildNodePackage {
+    name = "grunt-legacy-log-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.3.tgz";
+      name = "grunt-legacy-log-0.1.3.tgz";
+      sha1 = "ec29426e803021af59029f87d2f9cd7335a05531";
+    };
+    deps = {
+      "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "grunt-legacy-log-utils-0.1.1" = self.by-version."grunt-legacy-log-utils"."0.1.1";
+      "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."grunt-legacy-log"."~1.0.0" =
+    self.by-version."grunt-legacy-log"."1.0.0";
+  by-version."grunt-legacy-log"."1.0.0" = self.buildNodePackage {
+    name = "grunt-legacy-log-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-0.1.1.tgz";
-      name = "grunt-legacy-log-0.1.1.tgz";
-      sha1 = "d41f1a6abc9b0b1256a2b5ff02f4c3298dfcd57a";
+      url = "https://registry.npmjs.org/grunt-legacy-log/-/grunt-legacy-log-1.0.0.tgz";
+      name = "grunt-legacy-log-1.0.0.tgz";
+      sha1 = "fb86f1809847bc07dc47843f9ecd6cacb62df2d5";
     };
     deps = {
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "grunt-legacy-log-utils-1.0.0" = self.by-version."grunt-legacy-log-utils"."1.0.0";
       "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "underscore.string-3.2.3" = self.by-version."underscore.string"."3.2.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."grunt-legacy-log-utils"."~0.1.1" =
+    self.by-version."grunt-legacy-log-utils"."0.1.1";
+  by-version."grunt-legacy-log-utils"."0.1.1" = self.buildNodePackage {
+    name = "grunt-legacy-log-utils-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-0.1.1.tgz";
+      name = "grunt-legacy-log-utils-0.1.1.tgz";
+      sha1 = "c0706b9dd9064e116f36f23fe4e6b048672c0f7e";
+    };
+    deps = {
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
       "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
     };
@@ -17591,6 +19579,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."grunt-legacy-log-utils"."~1.0.0" =
+    self.by-version."grunt-legacy-log-utils"."1.0.0";
+  by-version."grunt-legacy-log-utils"."1.0.0" = self.buildNodePackage {
+    name = "grunt-legacy-log-utils-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-legacy-log-utils/-/grunt-legacy-log-utils-1.0.0.tgz";
+      name = "grunt-legacy-log-utils-1.0.0.tgz";
+      sha1 = "a7b8e2d0fb35b5a50f4af986fc112749ebc96f3d";
+    };
+    deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "lodash-4.3.0" = self.by-version."lodash"."4.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."grunt-legacy-util"."~0.2.0" =
     self.by-version."grunt-legacy-util"."0.2.0";
   by-version."grunt-legacy-util"."0.2.0" = self.buildNodePackage {
@@ -17598,7 +19607,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
+      url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-0.2.0.tgz";
       name = "grunt-legacy-util-0.2.0.tgz";
       sha1 = "93324884dbf7e37a9ff7c026dff451d94a9e554b";
     };
@@ -17617,6 +19626,32 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."grunt-legacy-util"."~1.0.0" =
+    self.by-version."grunt-legacy-util"."1.0.0";
+  by-version."grunt-legacy-util"."1.0.0" = self.buildNodePackage {
+    name = "grunt-legacy-util-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/grunt-legacy-util/-/grunt-legacy-util-1.0.0.tgz";
+      name = "grunt-legacy-util-1.0.0.tgz";
+      sha1 = "386aa78dc6ed50986c2b18957265b1b48abb9b86";
+    };
+    deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "exit-0.1.2" = self.by-version."exit"."0.1.2";
+      "getobject-0.1.0" = self.by-version."getobject"."0.1.0";
+      "hooker-0.2.3" = self.by-version."hooker"."0.2.3";
+      "lodash-4.3.0" = self.by-version."lodash"."4.3.0";
+      "underscore.string-3.2.3" = self.by-version."underscore.string"."3.2.3";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."grunt-sed"."*" =
     self.by-version."grunt-sed"."0.1.1";
   by-version."grunt-sed"."0.1.1" = self.buildNodePackage {
@@ -17624,7 +19659,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz";
+      url = "https://registry.npmjs.org/grunt-sed/-/grunt-sed-0.1.1.tgz";
       name = "grunt-sed-0.1.1.tgz";
       sha1 = "2613d486909319b3f8f4bd75dafb46a642ec3f82";
     };
@@ -17639,6 +19674,29 @@
     cpu = [ ];
   };
   "grunt-sed" = self.by-version."grunt-sed"."0.1.1";
+  by-spec."gtoken"."^1.1.0" =
+    self.by-version."gtoken"."1.2.0";
+  by-version."gtoken"."1.2.0" = self.buildNodePackage {
+    name = "gtoken-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gtoken/-/gtoken-1.2.0.tgz";
+      name = "gtoken-1.2.0.tgz";
+      sha1 = "bdab238758c355cecff569375efd76e236331b13";
+    };
+    deps = {
+      "google-p12-pem-0.1.0" = self.by-version."google-p12-pem"."0.1.0";
+      "jws-3.1.3" = self.by-version."jws"."3.1.3";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."guifi-earth"."https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " =
     self.by-version."guifi-earth"."0.2.1";
   by-version."guifi-earth"."0.2.1" = self.buildNodePackage {
@@ -17651,11 +19709,11 @@
       sha256 = "a51a5beef55c14c68630275d51cf66c44a4462d1b20c0f08aef6d88a62ca077c";
     };
     deps = {
-      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
-      "jade-1.9.2" = self.by-version."jade"."1.9.2";
+      "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
+      "jade-1.11.0" = self.by-version."jade"."1.11.0";
       "q-2.0.3" = self.by-version."q"."2.0.3";
-      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
-      "msgpack-0.2.6" = self.by-version."msgpack"."0.2.6";
+      "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
+      "msgpack-1.0.2" = self.by-version."msgpack"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -17665,30 +19723,30 @@
   };
   "guifi-earth" = self.by-version."guifi-earth"."0.2.1";
   by-spec."gulp"."*" =
-    self.by-version."gulp"."3.8.11";
-  by-version."gulp"."3.8.11" = self.buildNodePackage {
-    name = "gulp-3.8.11";
-    version = "3.8.11";
+    self.by-version."gulp"."3.9.1";
+  by-version."gulp"."3.9.1" = self.buildNodePackage {
+    name = "gulp-3.9.1";
+    version = "3.9.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gulp/-/gulp-3.8.11.tgz";
-      name = "gulp-3.8.11.tgz";
-      sha1 = "d557e0a7283eb4136491969b0497767972f1d28a";
+      url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz";
+      name = "gulp-3.9.1.tgz";
+      sha1 = "571ce45928dd40af6514fc4011866016c13845b4";
     };
     deps = {
       "archy-1.0.0" = self.by-version."archy"."1.0.0";
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1";
-      "gulp-util-3.0.4" = self.by-version."gulp-util"."3.0.4";
-      "interpret-0.3.10" = self.by-version."interpret"."0.3.10";
-      "liftoff-2.0.3" = self.by-version."liftoff"."2.0.3";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "gulp-util-3.0.7" = self.by-version."gulp-util"."3.0.7";
+      "interpret-1.0.0" = self.by-version."interpret"."1.0.0";
+      "liftoff-2.2.1" = self.by-version."liftoff"."2.2.1";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7";
-      "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "tildify-1.0.0" = self.by-version."tildify"."1.0.0";
-      "v8flags-2.0.5" = self.by-version."v8flags"."2.0.5";
-      "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
+      "pretty-hrtime-1.0.2" = self.by-version."pretty-hrtime"."1.0.2";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
+      "tildify-1.1.2" = self.by-version."tildify"."1.1.2";
+      "v8flags-2.0.11" = self.by-version."v8flags"."2.0.11";
+      "vinyl-fs-0.3.14" = self.by-version."vinyl-fs"."0.3.14";
     };
     optionalDependencies = {
     };
@@ -17696,34 +19754,57 @@
     os = [ ];
     cpu = [ ];
   };
-  "gulp" = self.by-version."gulp"."3.8.11";
+  "gulp" = self.by-version."gulp"."3.9.1";
   by-spec."gulp-util"."^3.0.0" =
-    self.by-version."gulp-util"."3.0.4";
-  by-version."gulp-util"."3.0.4" = self.buildNodePackage {
-    name = "gulp-util-3.0.4";
-    version = "3.0.4";
+    self.by-version."gulp-util"."3.0.7";
+  by-version."gulp-util"."3.0.7" = self.buildNodePackage {
+    name = "gulp-util-3.0.7";
+    version = "3.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gulp-util/-/gulp-util-3.0.4.tgz";
-      name = "gulp-util-3.0.4.tgz";
-      sha1 = "ec73553090fdb23d88fa02812ad1b61225854881";
+      url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.7.tgz";
+      name = "gulp-util-3.0.7.tgz";
+      sha1 = "78925c4b8f8b49005ac01a011c557e6218941cbb";
     };
     deps = {
       "array-differ-1.0.0" = self.by-version."array-differ"."1.0.0";
       "array-uniq-1.0.2" = self.by-version."array-uniq"."1.0.2";
-      "beeper-1.0.0" = self.by-version."beeper"."1.0.0";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11";
+      "beeper-1.1.0" = self.by-version."beeper"."1.1.0";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "dateformat-1.0.12" = self.by-version."dateformat"."1.0.12";
+      "fancy-log-1.2.0" = self.by-version."fancy-log"."1.2.0";
+      "gulplog-1.0.0" = self.by-version."gulplog"."1.0.0";
+      "has-gulplog-0.1.0" = self.by-version."has-gulplog"."0.1.0";
       "lodash._reescape-3.0.0" = self.by-version."lodash._reescape"."3.0.0";
       "lodash._reevaluate-3.0.0" = self.by-version."lodash._reevaluate"."3.0.0";
       "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
-      "lodash.template-3.5.0" = self.by-version."lodash.template"."3.5.0";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "lodash.template-3.6.2" = self.by-version."lodash.template"."3.6.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2";
-      "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
+      "object-assign-3.0.0" = self.by-version."object-assign"."3.0.0";
       "replace-ext-0.0.1" = self.by-version."replace-ext"."0.0.1";
-      "through2-0.6.5" = self.by-version."through2"."0.6.5";
-      "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "vinyl-0.5.3" = self.by-version."vinyl"."0.5.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."gulplog"."^1.0.0" =
+    self.by-version."gulplog"."1.0.0";
+  by-version."gulplog"."1.0.0" = self.buildNodePackage {
+    name = "gulplog-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz";
+      name = "gulplog-1.0.0.tgz";
+      sha1 = "e28c4d45d05ecbbed818363ce8f9c5926229ffe5";
+    };
+    deps = {
+      "glogg-1.0.0" = self.by-version."glogg"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -17738,12 +19819,12 @@
     version = "1.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz";
+      url = "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz";
       name = "gzip-size-1.0.0.tgz";
       sha1 = "66cf8b101047227b95bace6ea1da0c177ed5c22f";
     };
     deps = {
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
     };
     optionalDependencies = {
@@ -17759,12 +19840,12 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
+      url = "https://registry.npmjs.org/gzippo/-/gzippo-0.2.0.tgz";
       name = "gzippo-0.2.0.tgz";
       sha1 = "ffc594c482190c56531ed2d4a5864d0b0b7d2733";
     };
     deps = {
-      "send-0.12.2" = self.by-version."send"."0.12.2";
+      "send-0.13.2" = self.by-version."send"."0.13.2";
     };
     optionalDependencies = {
     };
@@ -17780,7 +19861,7 @@
     version = "2.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
+      url = "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz";
       name = "handlebars-2.0.0.tgz";
       sha1 = "6e9d7f8514a3467fa5e9f82cc158ecfc1d5ac76f";
     };
@@ -17794,16 +19875,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."handlebars"."3.0.0" =
-    self.by-version."handlebars"."3.0.0";
-  by-version."handlebars"."3.0.0" = self.buildNodePackage {
-    name = "handlebars-3.0.0";
-    version = "3.0.0";
+  by-spec."handlebars"."^3.0.0" =
+    self.by-version."handlebars"."3.0.3";
+  by-version."handlebars"."3.0.3" = self.buildNodePackage {
+    name = "handlebars-3.0.3";
+    version = "3.0.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/handlebars/-/handlebars-3.0.0.tgz";
-      name = "handlebars-3.0.0.tgz";
-      sha1 = "7f4e537f4dd6992869d66c01b7505eba3561a5d5";
+      url = "https://registry.npmjs.org/handlebars/-/handlebars-3.0.3.tgz";
+      name = "handlebars-3.0.3.tgz";
+      sha1 = "0e09651a2f0fb3c949160583710d551f92e6d2ad";
     };
     deps = {
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
@@ -17816,45 +19897,93 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."handlebars"."^2.0.0" =
-    self.by-version."handlebars"."2.0.0";
-  by-spec."handlebars"."~1.3.0" =
-    self.by-version."handlebars"."1.3.0";
-  by-version."handlebars"."1.3.0" = self.buildNodePackage {
-    name = "handlebars-1.3.0";
-    version = "1.3.0";
+  by-spec."handlebars"."^4.0.1" =
+    self.by-version."handlebars"."4.0.5";
+  by-version."handlebars"."4.0.5" = self.buildNodePackage {
+    name = "handlebars-4.0.5";
+    version = "4.0.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/handlebars/-/handlebars-1.3.0.tgz";
-      name = "handlebars-1.3.0.tgz";
-      sha1 = "9e9b130a93e389491322d975cf3ec1818c37ce34";
+      url = "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz";
+      name = "handlebars-4.0.5.tgz";
+      sha1 = "92c6ed6bb164110c50d4d8d0fbddc70806c6f8e7";
     };
     deps = {
-      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
     };
     optionalDependencies = {
-      "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6";
+      "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
+  by-spec."handlebars"."^4.0.3" =
+    self.by-version."handlebars"."4.0.5";
   by-spec."har-validator"."^1.4.0" =
-    self.by-version."har-validator"."1.6.1";
-  by-version."har-validator"."1.6.1" = self.buildNodePackage {
-    name = "har-validator-1.6.1";
-    version = "1.6.1";
+    self.by-version."har-validator"."1.8.0";
+  by-version."har-validator"."1.8.0" = self.buildNodePackage {
+    name = "har-validator-1.8.0";
+    version = "1.8.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.6.1.tgz";
-      name = "har-validator-1.6.1.tgz";
-      sha1 = "baef452cde645eff7d26562e8e749d7fd000b7fd";
+      url = "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz";
+      name = "har-validator-1.8.0.tgz";
+      sha1 = "d83842b0eb4c435960aeb108a067a3aa94c0eeb2";
+    };
+    deps = {
+      "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."^1.6.1" =
+    self.by-version."har-validator"."1.8.0";
+  by-spec."har-validator"."~2.0.2" =
+    self.by-version."har-validator"."2.0.6";
+  by-version."har-validator"."2.0.6" = self.buildNodePackage {
+    name = "har-validator-2.0.6";
+    version = "2.0.6";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+      name = "har-validator-2.0.6.tgz";
+      sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
+    };
+    deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."har-validator"."~2.0.6" =
+    self.by-version."har-validator"."2.0.6";
+  by-spec."harmony-reflect"."^1.4.2" =
+    self.by-version."harmony-reflect"."1.4.4";
+  by-version."harmony-reflect"."1.4.4" = self.buildNodePackage {
+    name = "harmony-reflect-1.4.4";
+    version = "1.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.4.tgz";
+      name = "harmony-reflect-1.4.4.tgz";
+      sha1 = "7abb109183ba577f4b14f8574e98c8b38f97f9ad";
     };
     deps = {
-      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "commander-2.8.0" = self.by-version."commander"."2.8.0";
-      "is-my-json-valid-2.10.1" = self.by-version."is-my-json-valid"."2.10.1";
     };
     optionalDependencies = {
     };
@@ -17863,17 +19992,18 @@
     cpu = [ ];
   };
   by-spec."has"."^1.0.0" =
-    self.by-version."has"."1.0.0";
-  by-version."has"."1.0.0" = self.buildNodePackage {
-    name = "has-1.0.0";
-    version = "1.0.0";
+    self.by-version."has"."1.0.1";
+  by-version."has"."1.0.1" = self.buildNodePackage {
+    name = "has-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has/-/has-1.0.0.tgz";
-      name = "has-1.0.0.tgz";
-      sha1 = "56c6582d23b40f3a5458f68ba79bc6c4bef203b3";
+      url = "https://registry.npmjs.org/has/-/has-1.0.1.tgz";
+      name = "has-1.0.1.tgz";
+      sha1 = "8461733f538b0837c9361e39a9ab9e9704dc2f28";
     };
     deps = {
+      "function-bind-1.1.0" = self.by-version."function-bind"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -17888,7 +20018,7 @@
     version = "0.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
+      url = "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz";
       name = "has-ansi-0.1.0.tgz";
       sha1 = "84f265aae8c0e6a88a12d7022894b7568894c62e";
     };
@@ -17908,7 +20038,7 @@
     version = "1.0.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
+      url = "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
       name = "has-ansi-1.0.3.tgz";
       sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
     };
@@ -17922,19 +20052,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."has-binary"."0.1.5" =
-    self.by-version."has-binary"."0.1.5";
-  by-version."has-binary"."0.1.5" = self.buildNodePackage {
-    name = "has-binary-0.1.5";
-    version = "0.1.5";
+  by-spec."has-ansi"."^2.0.0" =
+    self.by-version."has-ansi"."2.0.0";
+  by-version."has-ansi"."2.0.0" = self.buildNodePackage {
+    name = "has-ansi-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.5.tgz";
-      name = "has-binary-0.1.5.tgz";
-      sha1 = "95e75720ff31b72a3ba89a5b6dce082e4bc6467f";
+      url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+      name = "has-ansi-2.0.0.tgz";
+      sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
     };
     deps = {
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -17949,7 +20079,7 @@
     version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
+      url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
       name = "has-binary-0.1.6.tgz";
       sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
     };
@@ -17962,16 +20092,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."has-binary-data"."0.1.1" =
-    self.by-version."has-binary-data"."0.1.1";
-  by-version."has-binary-data"."0.1.1" = self.buildNodePackage {
-    name = "has-binary-data-0.1.1";
-    version = "0.1.1";
+  by-spec."has-binary"."0.1.7" =
+    self.by-version."has-binary"."0.1.7";
+  by-version."has-binary"."0.1.7" = self.buildNodePackage {
+    name = "has-binary-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz";
-      name = "has-binary-data-0.1.1.tgz";
-      sha1 = "e10749fb87828a52df96f4086587eb4a03966439";
+      url = "https://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
+      name = "has-binary-0.1.7.tgz";
+      sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
     };
     deps = {
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
@@ -17982,16 +20112,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."has-binary-data"."0.1.3" =
-    self.by-version."has-binary-data"."0.1.3";
-  by-version."has-binary-data"."0.1.3" = self.buildNodePackage {
-    name = "has-binary-data-0.1.3";
-    version = "0.1.3";
+  by-spec."has-binary-data"."0.1.1" =
+    self.by-version."has-binary-data"."0.1.1";
+  by-version."has-binary-data"."0.1.1" = self.buildNodePackage {
+    name = "has-binary-data-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.3.tgz";
-      name = "has-binary-data-0.1.3.tgz";
-      sha1 = "8ebb18388b57f19a5231275a16fc18d51f379aae";
+      url = "https://registry.npmjs.org/has-binary-data/-/has-binary-data-0.1.1.tgz";
+      name = "has-binary-data-0.1.1.tgz";
+      sha1 = "e10749fb87828a52df96f4086587eb4a03966439";
     };
     deps = {
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
@@ -18009,7 +20139,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz";
+      url = "https://registry.npmjs.org/has-cors/-/has-cors-1.0.3.tgz";
       name = "has-cors-1.0.3.tgz";
       sha1 = "502acb9b3104dac33dd2630eaf2f888b0baf4cb3";
     };
@@ -18022,16 +20152,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."has-unicode"."^1.0.0" =
-    self.by-version."has-unicode"."1.0.0";
-  by-version."has-unicode"."1.0.0" = self.buildNodePackage {
-    name = "has-unicode-1.0.0";
+  by-spec."has-cors"."1.1.0" =
+    self.by-version."has-cors"."1.1.0";
+  by-version."has-cors"."1.1.0" = self.buildNodePackage {
+    name = "has-cors-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+      name = "has-cors-1.1.0.tgz";
+      sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-flag"."^1.0.0" =
+    self.by-version."has-flag"."1.0.0";
+  by-version."has-flag"."1.0.0" = self.buildNodePackage {
+    name = "has-flag-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/has-unicode/-/has-unicode-1.0.0.tgz";
-      name = "has-unicode-1.0.0.tgz";
-      sha1 = "bac5c44e064c2ffc3b8fcbd8c71afe08f9afc8cc";
+      url = "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz";
+      name = "has-flag-1.0.0.tgz";
+      sha1 = "9d9e793165ce017a00f00418c43f942a7b1d11fa";
     };
     deps = {
     };
@@ -18041,16 +20190,57 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."has-gulplog"."^0.1.0" =
+    self.by-version."has-gulplog"."0.1.0";
+  by-version."has-gulplog"."0.1.0" = self.buildNodePackage {
+    name = "has-gulplog-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz";
+      name = "has-gulplog-0.1.0.tgz";
+      sha1 = "6414c82913697da51590397dafb12f22967811ce";
+    };
+    deps = {
+      "sparkles-1.0.0" = self.by-version."sparkles"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-unicode"."^2.0.0" =
+    self.by-version."has-unicode"."2.0.0";
+  by-version."has-unicode"."2.0.0" = self.buildNodePackage {
+    name = "has-unicode-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.0.tgz";
+      name = "has-unicode-2.0.0.tgz";
+      sha1 = "a3cd96c307ba41d559c5a2ee408c12a11c4c2ec3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-unicode"."~2.0.0" =
+    self.by-version."has-unicode"."2.0.0";
   by-spec."hash.js"."^1.0.0" =
-    self.by-version."hash.js"."1.0.2";
-  by-version."hash.js"."1.0.2" = self.buildNodePackage {
-    name = "hash.js-1.0.2";
-    version = "1.0.2";
+    self.by-version."hash.js"."1.0.3";
+  by-version."hash.js"."1.0.3" = self.buildNodePackage {
+    name = "hash.js-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hash.js/-/hash.js-1.0.2.tgz";
-      name = "hash.js-1.0.2.tgz";
-      sha1 = "bc7d601f4e0d05a32f3526d11fe39f7a5eb8c187";
+      url = "https://registry.npmjs.org/hash.js/-/hash.js-1.0.3.tgz";
+      name = "hash.js-1.0.3.tgz";
+      sha1 = "1332ff00156c0a0ffdd8236013d07b77a0451573";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -18061,6 +20251,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hasha"."^2.2.0" =
+    self.by-version."hasha"."2.2.0";
+  by-version."hasha"."2.2.0" = self.buildNodePackage {
+    name = "hasha-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz";
+      name = "hasha-2.2.0.tgz";
+      sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1";
+    };
+    deps = {
+      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."hasher"."~1.2.0" =
     self.by-version."hasher"."1.2.0";
   by-version."hasher"."1.2.0" = self.buildNodePackage {
@@ -18068,7 +20279,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
+      url = "https://registry.npmjs.org/hasher/-/hasher-1.2.0.tgz";
       name = "hasher-1.2.0.tgz";
       sha1 = "8b5341c3496124b0724ac8555fbb8ca363ebbb73";
     };
@@ -18088,7 +20299,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz";
+      url = "https://registry.npmjs.org/hashish/-/hashish-0.0.4.tgz";
       name = "hashish-0.0.4.tgz";
       sha1 = "6d60bc6ffaf711b6afd60e426d077988014e6554";
     };
@@ -18103,31 +20314,6 @@
   };
   by-spec."hashish"."0.0.4" =
     self.by-version."hashish"."0.0.4";
-  by-spec."hashish"."0.0.x" =
-    self.by-version."hashish"."0.0.4";
-  by-spec."hashring"."3.1.0" =
-    self.by-version."hashring"."3.1.0";
-  by-version."hashring"."3.1.0" = self.buildNodePackage {
-    name = "hashring-3.1.0";
-    version = "3.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hashring/-/hashring-3.1.0.tgz";
-      name = "hashring-3.1.0.tgz";
-      sha1 = "f315f99f281d9ef0292ca7abe50aa8f4ef7f8aad";
-    };
-    deps = {
-      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "connection-parse-0.0.7" = self.by-version."connection-parse"."0.0.7";
-      "nan-1.5.3" = self.by-version."nan"."1.5.3";
-      "simple-lru-cache-0.0.2" = self.by-version."simple-lru-cache"."0.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."hat"."*" =
     self.by-version."hat"."0.0.3";
   by-version."hat"."0.0.3" = self.buildNodePackage {
@@ -18135,7 +20321,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
+      url = "https://registry.npmjs.org/hat/-/hat-0.0.3.tgz";
       name = "hat-0.0.3.tgz";
       sha1 = "bb014a9e64b3788aed8005917413d4ff3d502d8a";
     };
@@ -18151,8 +20337,6 @@
     self.by-version."hat"."0.0.3";
   by-spec."hat"."^0.0.3" =
     self.by-version."hat"."0.0.3";
-  by-spec."hat"."~0.0.3" =
-    self.by-version."hat"."0.0.3";
   by-spec."hawk"."1.1.1" =
     self.by-version."hawk"."1.1.1";
   by-version."hawk"."1.1.1" = self.buildNodePackage {
@@ -18160,7 +20344,7 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
+      url = "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz";
       name = "hawk-1.1.1.tgz";
       sha1 = "87cd491f9b46e4e2aeaca335416766885d2d1ed9";
     };
@@ -18183,7 +20367,7 @@
     version = "0.10.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
+      url = "https://registry.npmjs.org/hawk/-/hawk-0.10.2.tgz";
       name = "hawk-0.10.2.tgz";
       sha1 = "9b361dee95a931640e6d504e05609a8fc3ac45d2";
     };
@@ -18199,29 +20383,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hawk"."~0.13.0" =
-    self.by-version."hawk"."0.13.1";
-  by-version."hawk"."0.13.1" = self.buildNodePackage {
-    name = "hawk-0.13.1";
-    version = "0.13.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-0.13.1.tgz";
-      name = "hawk-0.13.1.tgz";
-      sha1 = "3617958821f58311e4d7f6de291fca662b412ef4";
-    };
-    deps = {
-      "hoek-0.8.5" = self.by-version."hoek"."0.8.5";
-      "boom-0.4.2" = self.by-version."boom"."0.4.2";
-      "cryptiles-0.2.2" = self.by-version."cryptiles"."0.2.2";
-      "sntp-0.2.4" = self.by-version."sntp"."0.2.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."hawk"."~1.0.0" =
     self.by-version."hawk"."1.0.0";
   by-version."hawk"."1.0.0" = self.buildNodePackage {
@@ -18229,7 +20390,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
+      url = "https://registry.npmjs.org/hawk/-/hawk-1.0.0.tgz";
       name = "hawk-1.0.0.tgz";
       sha1 = "b90bb169807285411da7ffcb8dd2598502d3b52d";
     };
@@ -18252,14 +20413,14 @@
     version = "2.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
+      url = "https://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
       name = "hawk-2.3.1.tgz";
       sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
-      "boom-2.7.1" = self.by-version."boom"."2.7.1";
-      "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
+      "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5";
       "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
     };
     optionalDependencies = {
@@ -18268,6 +20429,31 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hawk"."~3.1.0" =
+    self.by-version."hawk"."3.1.3";
+  by-version."hawk"."3.1.3" = self.buildNodePackage {
+    name = "hawk-3.1.3";
+    version = "3.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+      name = "hawk-3.1.3.tgz";
+      sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
+      "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5";
+      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."~3.1.3" =
+    self.by-version."hawk"."3.1.3";
   by-spec."hbo-dnsd"."0.9.8" =
     self.by-version."hbo-dnsd"."0.9.8";
   by-version."hbo-dnsd"."0.9.8" = self.buildNodePackage {
@@ -18275,7 +20461,7 @@
     version = "0.9.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hbo-dnsd/-/hbo-dnsd-0.9.8.tgz";
+      url = "https://registry.npmjs.org/hbo-dnsd/-/hbo-dnsd-0.9.8.tgz";
       name = "hbo-dnsd-0.9.8.tgz";
       sha1 = "ab964f34cf13b40ea7d412f125d576716c551ef2";
     };
@@ -18296,7 +20482,7 @@
     version = "0.3.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/he/-/he-0.3.6.tgz";
+      url = "https://registry.npmjs.org/he/-/he-0.3.6.tgz";
       name = "he-0.3.6.tgz";
       sha1 = "9d7bc446e77963933301dd602d5731cb861135e0";
     };
@@ -18315,7 +20501,7 @@
     version = "0.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/headless/-/headless-0.1.7.tgz";
+      url = "https://registry.npmjs.org/headless/-/headless-0.1.7.tgz";
       name = "headless-0.1.7.tgz";
       sha1 = "6e62fae668947f88184d5c156ede7c5695a7e9c8";
     };
@@ -18327,18 +20513,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."heapdump"."^0.2.9" =
-    self.by-version."heapdump"."0.2.10";
-  by-version."heapdump"."0.2.10" = self.buildNodePackage {
-    name = "heapdump-0.2.10";
-    version = "0.2.10";
+  by-spec."help-me"."^0.1.0" =
+    self.by-version."help-me"."0.1.0";
+  by-version."help-me"."0.1.0" = self.buildNodePackage {
+    name = "help-me-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/heapdump/-/heapdump-0.2.10.tgz";
-      name = "heapdump-0.2.10.tgz";
-      sha1 = "e4fc818f5a33f361238e6dfd59c650ba2da74624";
+      url = "https://registry.npmjs.org/help-me/-/help-me-0.1.0.tgz";
+      name = "help-me-0.1.0.tgz";
+      sha1 = "0fb3a40537ad5265b6b49413022c60d35b49539a";
     };
     deps = {
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "pump-1.0.1" = self.by-version."pump"."1.0.1";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -18347,15 +20537,15 @@
     cpu = [ ];
   };
   by-spec."highlight.js"."8.x" =
-    self.by-version."highlight.js"."8.5.0";
-  by-version."highlight.js"."8.5.0" = self.buildNodePackage {
-    name = "highlight.js-8.5.0";
-    version = "8.5.0";
+    self.by-version."highlight.js"."8.9.1";
+  by-version."highlight.js"."8.9.1" = self.buildNodePackage {
+    name = "highlight.js-8.9.1";
+    version = "8.9.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.5.0.tgz";
-      name = "highlight.js-8.5.0.tgz";
-      sha1 = "6473d5099edb9f82fa50286b9178c8583ad7d652";
+      url = "https://registry.npmjs.org/highlight.js/-/highlight.js-8.9.1.tgz";
+      name = "highlight.js-8.9.1.tgz";
+      sha1 = "b8a9c5493212a9392f0222b649c9611497ebfb88";
     };
     deps = {
     };
@@ -18372,7 +20562,7 @@
     version = "0.3.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
+      url = "https://registry.npmjs.org/hipache/-/hipache-0.3.1.tgz";
       name = "hipache-0.3.1.tgz";
       sha1 = "e21764eafe6429ec8dc9377b55e1ca86799704d5";
     };
@@ -18390,19 +20580,19 @@
   };
   "hipache" = self.by-version."hipache"."0.3.1";
   by-spec."hiredis"."*" =
-    self.by-version."hiredis"."0.3.0";
-  by-version."hiredis"."0.3.0" = self.buildNodePackage {
-    name = "hiredis-0.3.0";
-    version = "0.3.0";
+    self.by-version."hiredis"."0.4.1";
+  by-version."hiredis"."0.4.1" = self.buildNodePackage {
+    name = "hiredis-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hiredis/-/hiredis-0.3.0.tgz";
-      name = "hiredis-0.3.0.tgz";
-      sha1 = "8981aa09d0f9d7e00c88ceec72ece68444f412d9";
+      url = "https://registry.npmjs.org/hiredis/-/hiredis-0.4.1.tgz";
+      name = "hiredis-0.4.1.tgz";
+      sha1 = "aab4dcfd0fc4cbdb219d268005f2335a3c639e8f";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.5.3" = self.by-version."nan"."1.5.3";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -18417,7 +20607,7 @@
     version = "0.7.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
+      url = "https://registry.npmjs.org/hoek/-/hoek-0.7.6.tgz";
       name = "hoek-0.7.6.tgz";
       sha1 = "60fbd904557541cd2b8795abf308a1b3770e155a";
     };
@@ -18429,25 +20619,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hoek"."0.8.x" =
-    self.by-version."hoek"."0.8.5";
-  by-version."hoek"."0.8.5" = self.buildNodePackage {
-    name = "hoek-0.8.5";
-    version = "0.8.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-0.8.5.tgz";
-      name = "hoek-0.8.5.tgz";
-      sha1 = "1e9fd770ef7ebe0274adfcb5b0806a025a5e4e9f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."hoek"."0.9.x" =
     self.by-version."hoek"."0.9.1";
   by-version."hoek"."0.9.1" = self.buildNodePackage {
@@ -18455,7 +20626,7 @@
     version = "0.9.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
+      url = "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz";
       name = "hoek-0.9.1.tgz";
       sha1 = "3d322462badf07716ea7eb85baf88079cddce505";
     };
@@ -18468,15 +20639,15 @@
     cpu = [ ];
   };
   by-spec."hoek"."2.x.x" =
-    self.by-version."hoek"."2.12.0";
-  by-version."hoek"."2.12.0" = self.buildNodePackage {
-    name = "hoek-2.12.0";
-    version = "2.12.0";
+    self.by-version."hoek"."2.16.3";
+  by-version."hoek"."2.16.3" = self.buildNodePackage {
+    name = "hoek-2.16.3";
+    version = "2.16.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-2.12.0.tgz";
-      name = "hoek-2.12.0.tgz";
-      sha1 = "5d1196e0bf20c5cec957e8927101164effdaf1c9";
+      url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+      name = "hoek-2.16.3.tgz";
+      sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
     };
     deps = {
     };
@@ -18486,6 +20657,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."hoek"."^2.14.0" =
+    self.by-version."hoek"."2.16.3";
   by-spec."hooker"."^0.2.3" =
     self.by-version."hooker"."0.2.3";
   by-version."hooker"."0.2.3" = self.buildNodePackage {
@@ -18493,7 +20666,7 @@
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
+      url = "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz";
       name = "hooker-0.2.3.tgz";
       sha1 = "b834f723cc4a242aa65963459df6d984c5d3d959";
     };
@@ -18514,7 +20687,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
+      url = "https://registry.npmjs.org/hooks/-/hooks-0.2.1.tgz";
       name = "hooks-0.2.1.tgz";
       sha1 = "0f591b1b344bdcb3df59773f62fbbaf85bf4028b";
     };
@@ -18526,35 +20699,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hooks"."0.3.2" =
-    self.by-version."hooks"."0.3.2";
-  by-version."hooks"."0.3.2" = self.buildNodePackage {
-    name = "hooks-0.3.2";
-    version = "0.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hooks/-/hooks-0.3.2.tgz";
-      name = "hooks-0.3.2.tgz";
-      sha1 = "a31f060c2026cea6cf1ca3eb178430e718e1c4a3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hosted-git-info"."^1.5.3" =
-    self.by-version."hosted-git-info"."1.6.0";
-  by-version."hosted-git-info"."1.6.0" = self.buildNodePackage {
-    name = "hosted-git-info-1.6.0";
-    version = "1.6.0";
+  by-spec."hooks-fixed"."1.1.0" =
+    self.by-version."hooks-fixed"."1.1.0";
+  by-version."hooks-fixed"."1.1.0" = self.buildNodePackage {
+    name = "hooks-fixed-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-1.6.0.tgz";
-      name = "hosted-git-info-1.6.0.tgz";
-      sha1 = "dbc718bed09c2f30abe6bdc68d46b9c5317282db";
+      url = "https://registry.npmjs.org/hooks-fixed/-/hooks-fixed-1.1.0.tgz";
+      name = "hooks-fixed-1.1.0.tgz";
+      sha1 = "0e8c15336708e6611185fe390b44687dd5230dbb";
     };
     deps = {
     };
@@ -18564,16 +20718,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hosted-git-info"."^2.0.2" =
-    self.by-version."hosted-git-info"."2.1.2";
-  by-version."hosted-git-info"."2.1.2" = self.buildNodePackage {
-    name = "hosted-git-info-2.1.2";
-    version = "2.1.2";
+  by-spec."hosted-git-info"."^2.1.4" =
+    self.by-version."hosted-git-info"."2.1.4";
+  by-version."hosted-git-info"."2.1.4" = self.buildNodePackage {
+    name = "hosted-git-info-2.1.4";
+    version = "2.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.2.tgz";
-      name = "hosted-git-info-2.1.2.tgz";
-      sha1 = "f947976852931851c33644bbce80d1e499795246";
+      url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz";
+      name = "hosted-git-info-2.1.4.tgz";
+      sha1 = "d9e953b26988be88096c46e926494d9604c300f8";
     };
     deps = {
     };
@@ -18583,8 +20737,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hosted-git-info"."~2.1.2" =
-    self.by-version."hosted-git-info"."2.1.2";
+  by-spec."hosted-git-info"."~2.1.4" =
+    self.by-version."hosted-git-info"."2.1.4";
   by-spec."html-md"."^3.0.2" =
     self.by-version."html-md"."3.0.2";
   by-version."html-md"."3.0.2" = self.buildNodePackage {
@@ -18592,7 +20746,7 @@
     version = "3.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/html-md/-/html-md-3.0.2.tgz";
+      url = "https://registry.npmjs.org/html-md/-/html-md-3.0.2.tgz";
       name = "html-md-3.0.2.tgz";
       sha1 = "becac66f3c7d27aa99409d0a17f1131f16fe510f";
     };
@@ -18614,7 +20768,7 @@
     version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/html5/-/html5-1.0.5.tgz";
+      url = "https://registry.npmjs.org/html5/-/html5-1.0.5.tgz";
       name = "html5-1.0.5.tgz";
       sha1 = "c9e6ce4e07a70521904bee1b318a4c48feab5848";
     };
@@ -18636,7 +20790,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz";
+      url = "https://registry.npmjs.org/html5-entities/-/html5-entities-1.0.0.tgz";
       name = "html5-entities-1.0.0.tgz";
       sha1 = "e568fd84d8efb52c806b16c98b92dad548ebe370";
     };
@@ -18648,18 +20802,54 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."html5-entities"."~1.0.0" =
-    self.by-version."html5-entities"."1.0.0";
+  by-spec."htmlencode".">=0.0.1" =
+    self.by-version."htmlencode"."0.0.4";
+  by-version."htmlencode"."0.0.4" = self.buildNodePackage {
+    name = "htmlencode-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/htmlencode/-/htmlencode-0.0.4.tgz";
+      name = "htmlencode-0.0.4.tgz";
+      sha1 = "f7e2d6afbe18a87a78e63ba3308e753766740e3f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."htmlescape"."^1.1.0" =
+    self.by-version."htmlescape"."1.1.1";
+  by-version."htmlescape"."1.1.1" = self.buildNodePackage {
+    name = "htmlescape-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz";
+      name = "htmlescape-1.1.1.tgz";
+      sha1 = "3a03edc2214bca3b66424a3e7959349509cb0351";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."htmlparser2"."3.8.x" =
-    self.by-version."htmlparser2"."3.8.2";
-  by-version."htmlparser2"."3.8.2" = self.buildNodePackage {
-    name = "htmlparser2-3.8.2";
-    version = "3.8.2";
+    self.by-version."htmlparser2"."3.8.3";
+  by-version."htmlparser2"."3.8.3" = self.buildNodePackage {
+    name = "htmlparser2-3.8.3";
+    version = "3.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.2.tgz";
-      name = "htmlparser2-3.8.2.tgz";
-      sha1 = "0d6bc3471d01e9766fc2c274cbac1d55b36c009c";
+      url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
+      name = "htmlparser2-3.8.3.tgz";
+      sha1 = "996c28b191516a8be86501a7d79757e5c70c1068";
     };
     deps = {
       "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
@@ -18675,11 +20865,37 @@
     cpu = [ ];
   };
   by-spec."htmlparser2".">= 3.1.5 <4" =
-    self.by-version."htmlparser2"."3.8.2";
+    self.by-version."htmlparser2"."3.9.0";
+  by-version."htmlparser2"."3.9.0" = self.buildNodePackage {
+    name = "htmlparser2-3.9.0";
+    version = "3.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.0.tgz";
+      name = "htmlparser2-3.9.0.tgz";
+      sha1 = "1bd6ba4d3358bbd31f93e13fb952961cf4d31b3f";
+    };
+    deps = {
+      "domelementtype-1.3.0" = self.by-version."domelementtype"."1.3.0";
+      "domhandler-2.3.0" = self.by-version."domhandler"."2.3.0";
+      "domutils-1.5.1" = self.by-version."domutils"."1.5.1";
+      "entities-1.1.1" = self.by-version."entities"."1.1.1";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."htmlparser2".">= 3.7.3 < 4.0.0" =
+    self.by-version."htmlparser2"."3.9.0";
   by-spec."htmlparser2".">=3.4.0" =
-    self.by-version."htmlparser2"."3.8.2";
+    self.by-version."htmlparser2"."3.9.0";
   by-spec."htmlparser2"."^3.8.2" =
-    self.by-version."htmlparser2"."3.8.2";
+    self.by-version."htmlparser2"."3.9.0";
+  by-spec."htmlparser2"."^3.9.0" =
+    self.by-version."htmlparser2"."3.9.0";
   by-spec."htmlparser2"."~3.7.2" =
     self.by-version."htmlparser2"."3.7.3";
   by-version."htmlparser2"."3.7.3" = self.buildNodePackage {
@@ -18687,7 +20903,7 @@
     version = "3.7.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz";
+      url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.7.3.tgz";
       name = "htmlparser2-3.7.3.tgz";
       sha1 = "6a64c77637c08c6f30ec2a8157a53333be7cb05e";
     };
@@ -18705,7 +20921,7 @@
     cpu = [ ];
   };
   by-spec."htmlparser2"."~3.8.1" =
-    self.by-version."htmlparser2"."3.8.2";
+    self.by-version."htmlparser2"."3.8.3";
   by-spec."http-auth"."2.0.7" =
     self.by-version."http-auth"."2.0.7";
   by-version."http-auth"."2.0.7" = self.buildNodePackage {
@@ -18713,7 +20929,7 @@
     version = "2.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
+      url = "https://registry.npmjs.org/http-auth/-/http-auth-2.0.7.tgz";
       name = "http-auth-2.0.7.tgz";
       sha1 = "aa1a61a4d6baae9d64436c6f0ef0f4de85c430e3";
     };
@@ -18734,7 +20950,7 @@
     version = "1.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
+      url = "https://registry.npmjs.org/http-browserify/-/http-browserify-1.7.0.tgz";
       name = "http-browserify-1.7.0.tgz";
       sha1 = "33795ade72df88acfbfd36773cefeda764735b20";
     };
@@ -18750,20 +20966,20 @@
   };
   by-spec."http-browserify"."^1.4.0" =
     self.by-version."http-browserify"."1.7.0";
-  by-spec."http-browserify"."~1.1.0" =
-    self.by-version."http-browserify"."1.1.0";
-  by-version."http-browserify"."1.1.0" = self.buildNodePackage {
-    name = "http-browserify-1.1.0";
-    version = "1.1.0";
+  by-spec."http-errors".">=1.2.0" =
+    self.by-version."http-errors"."1.4.0";
+  by-version."http-errors"."1.4.0" = self.buildNodePackage {
+    name = "http-errors-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-browserify/-/http-browserify-1.1.0.tgz";
-      name = "http-browserify-1.1.0.tgz";
-      sha1 = "20d0f6fdab370d1fe778d44a7bc48ddb7260206d";
+      url = "https://registry.npmjs.org/http-errors/-/http-errors-1.4.0.tgz";
+      name = "http-errors-1.4.0.tgz";
+      sha1 = "6c0242dea6b3df7afda153c71089b31c6e82aabf";
     };
     deps = {
-      "Base64-0.2.1" = self.by-version."Base64"."0.2.1";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -18771,14 +20987,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-errors".">=1.2.0" =
+  by-spec."http-errors"."~1.3.1" =
     self.by-version."http-errors"."1.3.1";
   by-version."http-errors"."1.3.1" = self.buildNodePackage {
     name = "http-errors-1.3.1";
     version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
+      url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz";
       name = "http-errors-1.3.1.tgz";
       sha1 = "197e22cdebd4198585e8694ef6786197b91ed942";
     };
@@ -18792,20 +21008,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-errors"."~1.2.8" =
-    self.by-version."http-errors"."1.2.8";
-  by-version."http-errors"."1.2.8" = self.buildNodePackage {
-    name = "http-errors-1.2.8";
-    version = "1.2.8";
+  by-spec."http-errors"."~1.4.0" =
+    self.by-version."http-errors"."1.4.0";
+  by-spec."http-proxy"."1.0.2" =
+    self.by-version."http-proxy"."1.0.2";
+  by-version."http-proxy"."1.0.2" = self.buildNodePackage {
+    name = "http-proxy-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz";
-      name = "http-errors-1.2.8.tgz";
-      sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0";
+      url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
+      name = "http-proxy-1.0.2.tgz";
+      sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254";
     };
     deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+      "eventemitter3-1.2.0" = self.by-version."eventemitter3"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -18813,21 +21030,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-errors"."~1.3.1" =
-    self.by-version."http-errors"."1.3.1";
-  by-spec."http-proxy"."1.0.2" =
-    self.by-version."http-proxy"."1.0.2";
-  by-version."http-proxy"."1.0.2" = self.buildNodePackage {
-    name = "http-proxy-1.0.2";
-    version = "1.0.2";
+  by-spec."http-proxy"."^1.13.0" =
+    self.by-version."http-proxy"."1.13.2";
+  by-version."http-proxy"."1.13.2" = self.buildNodePackage {
+    name = "http-proxy-1.13.2";
+    version = "1.13.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-proxy/-/http-proxy-1.0.2.tgz";
-      name = "http-proxy-1.0.2.tgz";
-      sha1 = "08060ff2edb2189e57aa3a152d3ac63ed1af7254";
+      url = "https://registry.npmjs.org/http-proxy/-/http-proxy-1.13.2.tgz";
+      name = "http-proxy-1.13.2.tgz";
+      sha1 = "636bcd09f3e7045377a5e919e92d16d29fdbff09";
     };
     deps = {
-      "eventemitter3-0.1.6" = self.by-version."eventemitter3"."0.1.6";
+      "eventemitter3-1.2.0" = self.by-version."eventemitter3"."1.2.0";
+      "requires-port-1.0.0" = self.by-version."requires-port"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -18835,22 +21051,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-proxy"."~0.10" =
-    self.by-version."http-proxy"."0.10.4";
-  by-version."http-proxy"."0.10.4" = self.buildNodePackage {
-    name = "http-proxy-0.10.4";
-    version = "0.10.4";
-    bin = true;
+  by-spec."http-proxy-agent"."0" =
+    self.by-version."http-proxy-agent"."0.2.7";
+  by-version."http-proxy-agent"."0.2.7" = self.buildNodePackage {
+    name = "http-proxy-agent-0.2.7";
+    version = "0.2.7";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-proxy/-/http-proxy-0.10.4.tgz";
-      name = "http-proxy-0.10.4.tgz";
-      sha1 = "14ba0ceaa2197f89fa30dea9e7b09e19cd93c22f";
+      url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.7.tgz";
+      name = "http-proxy-agent-0.2.7.tgz";
+      sha1 = "e17fda65f0902d952ce7921e62c7ff8862655a5e";
     };
     deps = {
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
-      "utile-0.2.1" = self.by-version."utile"."0.2.1";
+      "agent-base-1.0.2" = self.by-version."agent-base"."1.0.2";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -18858,21 +21073,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-proxy-agent"."0" =
-    self.by-version."http-proxy-agent"."0.2.6";
-  by-version."http-proxy-agent"."0.2.6" = self.buildNodePackage {
-    name = "http-proxy-agent-0.2.6";
-    version = "0.2.6";
+  by-spec."http-signature".">=1.0.2 <2.0.0" =
+    self.by-version."http-signature"."1.1.1";
+  by-version."http-signature"."1.1.1" = self.buildNodePackage {
+    name = "http-signature-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-0.2.6.tgz";
-      name = "http-proxy-agent-0.2.6.tgz";
-      sha1 = "d4a0a2350a75d4fb5102299e8f8c41f625873caa";
+      url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+      name = "http-signature-1.1.1.tgz";
+      sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
     };
     deps = {
-      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
-      "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
+      "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2";
+      "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4";
     };
     optionalDependencies = {
     };
@@ -18880,16 +21095,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-signature"."^0.10.0" =
-    self.by-version."http-signature"."0.10.1";
-  by-version."http-signature"."0.10.1" = self.buildNodePackage {
-    name = "http-signature-0.10.1";
-    version = "0.10.1";
+  by-spec."http-signature"."^0.11.0" =
+    self.by-version."http-signature"."0.11.0";
+  by-version."http-signature"."0.11.0" = self.buildNodePackage {
+    name = "http-signature-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-      name = "http-signature-0.10.1.tgz";
-      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+      url = "https://registry.npmjs.org/http-signature/-/http-signature-0.11.0.tgz";
+      name = "http-signature-0.11.0.tgz";
+      sha1 = "1796cf67a001ad5cd6849dca0991485f09089fe6";
     };
     deps = {
       "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
@@ -18904,21 +21119,19 @@
   };
   by-spec."http-signature"."~0.10.0" =
     self.by-version."http-signature"."0.10.1";
-  by-spec."http-signature"."~0.9.11" =
-    self.by-version."http-signature"."0.9.11";
-  by-version."http-signature"."0.9.11" = self.buildNodePackage {
-    name = "http-signature-0.9.11";
-    version = "0.9.11";
+  by-version."http-signature"."0.10.1" = self.buildNodePackage {
+    name = "http-signature-0.10.1";
+    version = "0.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.9.11.tgz";
-      name = "http-signature-0.9.11.tgz";
-      sha1 = "9e882714572315e6790a5d0a7955efff1f19e653";
+      url = "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
+      name = "http-signature-0.10.1.tgz";
+      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
     };
     deps = {
-      "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
       "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.2" = self.by-version."ctype"."0.5.2";
+      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
     };
     optionalDependencies = {
     };
@@ -18926,6 +21139,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."http-signature"."~0.11.0" =
+    self.by-version."http-signature"."0.11.0";
+  by-spec."http-signature"."~1.1.0" =
+    self.by-version."http-signature"."1.1.1";
   by-spec."https-browserify"."0.0.0" =
     self.by-version."https-browserify"."0.0.0";
   by-version."https-browserify"."0.0.0" = self.buildNodePackage {
@@ -18933,7 +21150,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
+      url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.0.tgz";
       name = "https-browserify-0.0.0.tgz";
       sha1 = "b3ffdfe734b2a3d4a9efd58e8654c91fce86eafd";
     };
@@ -18945,23 +21162,64 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."https-browserify"."0.0.1" =
+    self.by-version."https-browserify"."0.0.1";
+  by-version."https-browserify"."0.0.1" = self.buildNodePackage {
+    name = "https-browserify-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz";
+      name = "https-browserify-0.0.1.tgz";
+      sha1 = "3f91365cabe60b77ed0ebba24b454e3e09d95a82";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."https-browserify"."~0.0.0" =
-    self.by-version."https-browserify"."0.0.0";
+    self.by-version."https-browserify"."0.0.1";
   by-spec."https-proxy-agent"."0" =
-    self.by-version."https-proxy-agent"."0.3.5";
-  by-version."https-proxy-agent"."0.3.5" = self.buildNodePackage {
-    name = "https-proxy-agent-0.3.5";
-    version = "0.3.5";
+    self.by-version."https-proxy-agent"."0.3.6";
+  by-version."https-proxy-agent"."0.3.6" = self.buildNodePackage {
+    name = "https-proxy-agent-0.3.6";
+    version = "0.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.5.tgz";
-      name = "https-proxy-agent-0.3.5.tgz";
-      sha1 = "d41d43a912c0592f17552fc1a29cd484a2145648";
+      url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-0.3.6.tgz";
+      name = "https-proxy-agent-0.3.6.tgz";
+      sha1 = "713fa38e5d353f50eb14a342febe29033ed1619b";
     };
     deps = {
-      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
-      "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "agent-base-1.0.2" = self.by-version."agent-base"."1.0.2";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."https-proxy-agent"."^1.0.0" =
+    self.by-version."https-proxy-agent"."1.0.0";
+  by-version."https-proxy-agent"."1.0.0" = self.buildNodePackage {
+    name = "https-proxy-agent-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz";
+      name = "https-proxy-agent-1.0.0.tgz";
+      sha1 = "35f7da6c48ce4ddbfa264891ac593ee5ff8671e6";
+    };
+    deps = {
+      "agent-base-2.0.1" = self.by-version."agent-base"."2.0.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -18969,14 +21227,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."humanize"."~0.0.9" =
+  by-spec."humanize"."0.0.9" =
     self.by-version."humanize"."0.0.9";
   by-version."humanize"."0.0.9" = self.buildNodePackage {
     name = "humanize-0.0.9";
     version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
+      url = "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz";
       name = "humanize-0.0.9.tgz";
       sha1 = "1994ffaecdfe9c441ed2bdac7452b7bb4c9e41a4";
     };
@@ -18988,20 +21246,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hyperquest"."^0.3.0" =
-    self.by-version."hyperquest"."0.3.0";
-  by-version."hyperquest"."0.3.0" = self.buildNodePackage {
-    name = "hyperquest-0.3.0";
-    version = "0.3.0";
+  by-spec."hyperquest"."^1.2.0" =
+    self.by-version."hyperquest"."1.3.0";
+  by-version."hyperquest"."1.3.0" = self.buildNodePackage {
+    name = "hyperquest-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hyperquest/-/hyperquest-0.3.0.tgz";
-      name = "hyperquest-0.3.0.tgz";
-      sha1 = "4c3c06c074755e921f09a2db51aea5e6e7ee155f";
+      url = "https://registry.npmjs.org/hyperquest/-/hyperquest-1.3.0.tgz";
+      name = "hyperquest-1.3.0.tgz";
+      sha1 = "e7d598030a3fc0229b61725783b641b2c6f1782a";
     };
     deps = {
-      "through-2.2.7" = self.by-version."through"."2.2.7";
-      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
+      "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -19009,20 +21267,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."hyperquest"."^1.2.0" =
-    self.by-version."hyperquest"."1.2.0";
-  by-version."hyperquest"."1.2.0" = self.buildNodePackage {
-    name = "hyperquest-1.2.0";
-    version = "1.2.0";
+  by-spec."i"."0.3.x" =
+    self.by-version."i"."0.3.4";
+  by-version."i"."0.3.4" = self.buildNodePackage {
+    name = "i-0.3.4";
+    version = "0.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hyperquest/-/hyperquest-1.2.0.tgz";
-      name = "hyperquest-1.2.0.tgz";
-      sha1 = "39e1fef66888dc7ce0dec6c0dd814f6fc8944ad5";
+      url = "https://registry.npmjs.org/i/-/i-0.3.4.tgz";
+      name = "i-0.3.4.tgz";
+      sha1 = "e1918d417b363a544e0e4a9b83c36dce1f85c91d";
     };
     deps = {
-      "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
-      "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -19030,16 +21286,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."i"."0.3.x" =
-    self.by-version."i"."0.3.3";
-  by-version."i"."0.3.3" = self.buildNodePackage {
-    name = "i-0.3.3";
-    version = "0.3.3";
+  by-spec."i18next"."*" =
+    self.by-version."i18next"."2.4.1";
+  by-version."i18next"."2.4.1" = self.buildNodePackage {
+    name = "i18next-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/i/-/i-0.3.3.tgz";
-      name = "i-0.3.3.tgz";
-      sha1 = "0ff9a5eb743504aa8ac26a84f84c641287ff24cd";
+      url = "https://registry.npmjs.org/i18next/-/i18next-2.4.1.tgz";
+      name = "i18next-2.4.1.tgz";
+      sha1 = "5981828838b8413070115c89b416696fee134f9f";
     };
     deps = {
     };
@@ -19049,19 +21305,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."i18next"."*" =
-    self.by-version."i18next"."1.7.10";
-  by-version."i18next"."1.7.10" = self.buildNodePackage {
-    name = "i18next-1.7.10";
-    version = "1.7.10";
+  "i18next" = self.by-version."i18next"."2.4.1";
+  by-spec."i18next"."1.10.6" =
+    self.by-version."i18next"."1.10.6";
+  by-version."i18next"."1.10.6" = self.buildNodePackage {
+    name = "i18next-1.10.6";
+    version = "1.10.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/i18next/-/i18next-1.7.10.tgz";
-      name = "i18next-1.7.10.tgz";
-      sha1 = "2bc1ce2cc1bc2e93fa73b588359da02197336875";
+      url = "https://registry.npmjs.org/i18next/-/i18next-1.10.6.tgz";
+      name = "i18next-1.10.6.tgz";
+      sha1 = "fddd8b491502c48967a62963bc722ff897cddea0";
     };
     deps = {
-      "cookies-0.5.0" = self.by-version."cookies"."0.5.0";
+      "cookies-0.6.1" = self.by-version."cookies"."0.6.1";
+      "i18next-client-1.10.3" = self.by-version."i18next-client"."1.10.3";
       "json5-0.2.0" = self.by-version."json5"."0.2.0";
     };
     optionalDependencies = {
@@ -19070,20 +21328,18 @@
     os = [ ];
     cpu = [ ];
   };
-  "i18next" = self.by-version."i18next"."1.7.10";
-  by-spec."iconv"."~2.1.4" =
-    self.by-version."iconv"."2.1.6";
-  by-version."iconv"."2.1.6" = self.buildNodePackage {
-    name = "iconv-2.1.6";
-    version = "2.1.6";
+  by-spec."i18next-client"."1.10.3" =
+    self.by-version."i18next-client"."1.10.3";
+  by-version."i18next-client"."1.10.3" = self.buildNodePackage {
+    name = "i18next-client-1.10.3";
+    version = "1.10.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iconv/-/iconv-2.1.6.tgz";
-      name = "iconv-2.1.6.tgz";
-      sha1 = "cae89175793276e9fe5ffae58abf8c38f2941c42";
+      url = "https://registry.npmjs.org/i18next-client/-/i18next-client-1.10.3.tgz";
+      name = "i18next-client-1.10.3.tgz";
+      sha1 = "76d0353557ed90d1e7a87754d5004d3f7801fde9";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
     };
     optionalDependencies = {
     };
@@ -19091,18 +21347,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."iconv"."~2.1.5" =
-    self.by-version."iconv"."2.1.6";
-  by-spec."iconv-lite"."0.4.4" =
-    self.by-version."iconv-lite"."0.4.4";
-  by-version."iconv-lite"."0.4.4" = self.buildNodePackage {
-    name = "iconv-lite-0.4.4";
-    version = "0.4.4";
+  by-spec."iconv-lite"."0.4.11" =
+    self.by-version."iconv-lite"."0.4.11";
+  by-version."iconv-lite"."0.4.11" = self.buildNodePackage {
+    name = "iconv-lite-0.4.11";
+    version = "0.4.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
-      name = "iconv-lite-0.4.4.tgz";
-      sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
+      url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz";
+      name = "iconv-lite-0.4.11.tgz";
+      sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade";
     };
     deps = {
     };
@@ -19112,16 +21366,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."iconv-lite"."0.4.6" =
-    self.by-version."iconv-lite"."0.4.6";
-  by-version."iconv-lite"."0.4.6" = self.buildNodePackage {
-    name = "iconv-lite-0.4.6";
-    version = "0.4.6";
+  by-spec."iconv-lite"."0.4.13" =
+    self.by-version."iconv-lite"."0.4.13";
+  by-version."iconv-lite"."0.4.13" = self.buildNodePackage {
+    name = "iconv-lite-0.4.13";
+    version = "0.4.13";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz";
+      name = "iconv-lite-0.4.13.tgz";
+      sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."iconv-lite"."0.4.4" =
+    self.by-version."iconv-lite"."0.4.4";
+  by-version."iconv-lite"."0.4.4" = self.buildNodePackage {
+    name = "iconv-lite-0.4.4";
+    version = "0.4.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.6.tgz";
-      name = "iconv-lite-0.4.6.tgz";
-      sha1 = "e39c682610a791f3eedc27382ff49e263f91fa09";
+      url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz";
+      name = "iconv-lite-0.4.4.tgz";
+      sha1 = "e95f2e41db0735fc21652f7827a5ee32e63c83a8";
     };
     deps = {
     };
@@ -19138,7 +21411,7 @@
     version = "0.4.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
+      url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.8.tgz";
       name = "iconv-lite-0.4.8.tgz";
       sha1 = "c6019a7595f2cefca702eab694a010bcd9298d20";
     };
@@ -19150,10 +21423,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."iconv-lite"."^0.4.4" =
-    self.by-version."iconv-lite"."0.4.8";
-  by-spec."iconv-lite"."^0.4.8" =
-    self.by-version."iconv-lite"."0.4.8";
+  by-spec."iconv-lite"."^0.4.13" =
+    self.by-version."iconv-lite"."0.4.13";
+  by-spec."iconv-lite"."^0.4.5" =
+    self.by-version."iconv-lite"."0.4.13";
   by-spec."iconv-lite"."~0.2.11" =
     self.by-version."iconv-lite"."0.2.11";
   by-version."iconv-lite"."0.2.11" = self.buildNodePackage {
@@ -19161,7 +21434,7 @@
     version = "0.2.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
+      url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.2.11.tgz";
       name = "iconv-lite-0.2.11.tgz";
       sha1 = "1ce60a3a57864a292d1321ff4609ca4bb965adc8";
     };
@@ -19173,20 +21446,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."iconv-lite"."~0.4.4" =
-    self.by-version."iconv-lite"."0.4.8";
-  by-spec."iconv-lite"."~0.4.5" =
-    self.by-version."iconv-lite"."0.4.8";
+  by-spec."iconv-lite"."~0.4.13" =
+    self.by-version."iconv-lite"."0.4.13";
   by-spec."ieee754"."^1.1.4" =
-    self.by-version."ieee754"."1.1.4";
-  by-version."ieee754"."1.1.4" = self.buildNodePackage {
-    name = "ieee754-1.1.4";
-    version = "1.1.4";
+    self.by-version."ieee754"."1.1.6";
+  by-version."ieee754"."1.1.6" = self.buildNodePackage {
+    name = "ieee754-1.1.6";
+    version = "1.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ieee754/-/ieee754-1.1.4.tgz";
-      name = "ieee754-1.1.4.tgz";
-      sha1 = "e3ec65200d4ad531d359aabdb6d3ec812699a30b";
+      url = "https://registry.npmjs.org/ieee754/-/ieee754-1.1.6.tgz";
+      name = "ieee754-1.1.6.tgz";
+      sha1 = "2e1013219c6d6712973ec54d981ec19e5579de97";
     };
     deps = {
     };
@@ -19196,18 +21467,75 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ieee754"."~1.1.1" =
-    self.by-version."ieee754"."1.1.4";
-  by-spec."image-size"."~0.3.5" =
-    self.by-version."image-size"."0.3.5";
-  by-version."image-size"."0.3.5" = self.buildNodePackage {
-    name = "image-size-0.3.5";
-    version = "0.3.5";
+  by-spec."iferr"."^0.1.5" =
+    self.by-version."iferr"."0.1.5";
+  by-version."iferr"."0.1.5" = self.buildNodePackage {
+    name = "iferr-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz";
+      name = "iferr-0.1.5.tgz";
+      sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."iferr"."~0.1.5" =
+    self.by-version."iferr"."0.1.5";
+  by-spec."ignore"."^3.0.10" =
+    self.by-version."ignore"."3.0.14";
+  by-version."ignore"."3.0.14" = self.buildNodePackage {
+    name = "ignore-3.0.14";
+    version = "3.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ignore/-/ignore-3.0.14.tgz";
+      name = "ignore-3.0.14.tgz";
+      sha1 = "1b07d5d0810ac2571aab1a8b33485f2c48fb130e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ignore-by-default"."^1.0.0" =
+    self.by-version."ignore-by-default"."1.0.1";
+  by-version."ignore-by-default"."1.0.1" = self.buildNodePackage {
+    name = "ignore-by-default-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz";
+      name = "ignore-by-default-1.0.1.tgz";
+      sha1 = "48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."image-size"."~0.4.0" =
+    self.by-version."image-size"."0.4.0";
+  by-version."image-size"."0.4.0" = self.buildNodePackage {
+    name = "image-size-0.4.0";
+    version = "0.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/image-size/-/image-size-0.3.5.tgz";
-      name = "image-size-0.3.5.tgz";
-      sha1 = "83240eab2fb5b00b04aab8c74b0471e9cba7ad8c";
+      url = "https://registry.npmjs.org/image-size/-/image-size-0.4.0.tgz";
+      name = "image-size-0.4.0.tgz";
+      sha1 = "d4b4e1f61952e4cbc1cea9a6b0c915fecb707510";
     };
     deps = {
     };
@@ -19224,7 +21552,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/imagemagick/-/imagemagick-0.1.3.tgz";
+      url = "https://registry.npmjs.org/imagemagick/-/imagemagick-0.1.3.tgz";
       name = "imagemagick-0.1.3.tgz";
       sha1 = "7483cea093b4d9f2e2f396857adc8821b537c56a";
     };
@@ -19236,16 +21564,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."imap"."0.8.14" =
-    self.by-version."imap"."0.8.14";
-  by-version."imap"."0.8.14" = self.buildNodePackage {
-    name = "imap-0.8.14";
-    version = "0.8.14";
+  by-spec."imap"."0.8.16" =
+    self.by-version."imap"."0.8.16";
+  by-version."imap"."0.8.16" = self.buildNodePackage {
+    name = "imap-0.8.16";
+    version = "0.8.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/imap/-/imap-0.8.14.tgz";
-      name = "imap-0.8.14.tgz";
-      sha1 = "d4e6b333163ba0bb5be33cab98e5b19db3e9aa54";
+      url = "https://registry.npmjs.org/imap/-/imap-0.8.16.tgz";
+      name = "imap-0.8.16.tgz";
+      sha1 = "e6010866462f77301a119be28bf175f2dec055b0";
     };
     deps = {
       "utf7-1.0.0" = self.by-version."utf7"."1.0.0";
@@ -19257,21 +21585,81 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."immediate-chunk-store"."^1.0.5" =
+    self.by-version."immediate-chunk-store"."1.0.8";
+  by-version."immediate-chunk-store"."1.0.8" = self.buildNodePackage {
+    name = "immediate-chunk-store-1.0.8";
+    version = "1.0.8";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-1.0.8.tgz";
+      name = "immediate-chunk-store-1.0.8.tgz";
+      sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."imurmurhash"."*" =
+    self.by-version."imurmurhash"."0.1.4";
+  by-version."imurmurhash"."0.1.4" = self.buildNodePackage {
+    name = "imurmurhash-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz";
+      name = "imurmurhash-0.1.4.tgz";
+      sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."imurmurhash"."^0.1.4" =
+    self.by-version."imurmurhash"."0.1.4";
   by-spec."indent-string"."^1.1.0" =
-    self.by-version."indent-string"."1.2.1";
-  by-version."indent-string"."1.2.1" = self.buildNodePackage {
-    name = "indent-string-1.2.1";
-    version = "1.2.1";
+    self.by-version."indent-string"."1.2.2";
+  by-version."indent-string"."1.2.2" = self.buildNodePackage {
+    name = "indent-string-1.2.2";
+    version = "1.2.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/indent-string/-/indent-string-1.2.1.tgz";
-      name = "indent-string-1.2.1.tgz";
-      sha1 = "294c5930792f8bb5b14462a4aa425b94f07d3a56";
+      url = "https://registry.npmjs.org/indent-string/-/indent-string-1.2.2.tgz";
+      name = "indent-string-1.2.2.tgz";
+      sha1 = "db99bcc583eb6abbb1e48dcbb1999a986041cb6b";
     };
     deps = {
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
-      "repeating-1.1.2" = self.by-version."repeating"."1.1.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "repeating-1.1.3" = self.by-version."repeating"."1.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."indent-string"."^2.1.0" =
+    self.by-version."indent-string"."2.1.0";
+  by-version."indent-string"."2.1.0" = self.buildNodePackage {
+    name = "indent-string-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz";
+      name = "indent-string-2.1.0.tgz";
+      sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
+    };
+    deps = {
+      "repeating-2.0.0" = self.by-version."repeating"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -19286,7 +21674,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+      url = "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
       name = "indexof-0.0.1.tgz";
       sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
     };
@@ -19298,16 +21686,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."infinity-agent"."^1.0.0" =
-    self.by-version."infinity-agent"."1.0.2";
-  by-version."infinity-agent"."1.0.2" = self.buildNodePackage {
-    name = "infinity-agent-1.0.2";
-    version = "1.0.2";
+  by-spec."infinity-agent"."^2.0.0" =
+    self.by-version."infinity-agent"."2.0.3";
+  by-version."infinity-agent"."2.0.3" = self.buildNodePackage {
+    name = "infinity-agent-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/infinity-agent/-/infinity-agent-1.0.2.tgz";
-      name = "infinity-agent-1.0.2.tgz";
-      sha1 = "2e9da2c070b9864a8bc66c0194e1791ed8058025";
+      url = "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz";
+      name = "infinity-agent-2.0.3.tgz";
+      sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
     };
     deps = {
     };
@@ -19324,7 +21712,7 @@
     version = "1.3.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz";
+      url = "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz";
       name = "inflection-1.3.8.tgz";
       sha1 = "cbd160da9f75b14c3cc63578d4f396784bf3014e";
     };
@@ -19343,7 +21731,7 @@
     version = "1.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inflection/-/inflection-1.5.3.tgz";
+      url = "https://registry.npmjs.org/inflection/-/inflection-1.5.3.tgz";
       name = "inflection-1.5.3.tgz";
       sha1 = "192a6d80f666d11b10012311d7f330ee40dbc01e";
     };
@@ -19362,12 +21750,12 @@
     version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
+      url = "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz";
       name = "inflight-1.0.4.tgz";
       sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
     optionalDependencies = {
@@ -19378,16 +21766,16 @@
   };
   by-spec."inflight"."~1.0.4" =
     self.by-version."inflight"."1.0.4";
-  by-spec."inherits"."*" =
-    self.by-version."inherits"."2.0.1";
-  by-version."inherits"."2.0.1" = self.buildNodePackage {
-    name = "inherits-2.0.1";
-    version = "2.0.1";
+  by-spec."inherits"."1" =
+    self.by-version."inherits"."1.0.2";
+  by-version."inherits"."1.0.2" = self.buildNodePackage {
+    name = "inherits-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
-      name = "inherits-2.0.1.tgz";
-      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
+      url = "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz";
+      name = "inherits-1.0.2.tgz";
+      sha1 = "ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b";
     };
     deps = {
     };
@@ -19397,16 +21785,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inherits"."1" =
-    self.by-version."inherits"."1.0.0";
-  by-version."inherits"."1.0.0" = self.buildNodePackage {
-    name = "inherits-1.0.0";
-    version = "1.0.0";
+  by-spec."inherits"."1.x" =
+    self.by-version."inherits"."1.0.2";
+  by-spec."inherits"."2" =
+    self.by-version."inherits"."2.0.1";
+  by-version."inherits"."2.0.1" = self.buildNodePackage {
+    name = "inherits-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inherits/-/inherits-1.0.0.tgz";
-      name = "inherits-1.0.0.tgz";
-      sha1 = "38e1975285bf1f7ba9c84da102bb12771322ac48";
+      url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz";
+      name = "inherits-2.0.1.tgz";
+      sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1";
     };
     deps = {
     };
@@ -19416,30 +21806,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inherits"."1.x" =
-    self.by-version."inherits"."1.0.0";
-  by-spec."inherits"."2" =
-    self.by-version."inherits"."2.0.1";
   by-spec."inherits"."2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-spec."inherits"."^2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-spec."inherits"."~1.0.0" =
-    self.by-version."inherits"."1.0.0";
+    self.by-version."inherits"."1.0.2";
   by-spec."inherits"."~2.0.0" =
     self.by-version."inherits"."2.0.1";
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
-  by-spec."ini"."1" =
-    self.by-version."ini"."1.3.3";
-  by-version."ini"."1.3.3" = self.buildNodePackage {
-    name = "ini-1.3.3";
-    version = "1.3.3";
+  by-spec."ini"."1.x.x" =
+    self.by-version."ini"."1.3.4";
+  by-version."ini"."1.3.4" = self.buildNodePackage {
+    name = "ini-1.3.4";
+    version = "1.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ini/-/ini-1.3.3.tgz";
-      name = "ini-1.3.3.tgz";
-      sha1 = "c07e34aef1de06aff21d413b458e52b21533a11e";
+      url = "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
+      name = "ini-1.3.4.tgz";
+      sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
     };
     deps = {
     };
@@ -19449,10 +21835,12 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ini"."1.x.x" =
-    self.by-version."ini"."1.3.3";
   by-spec."ini"."^1.2.0" =
-    self.by-version."ini"."1.3.3";
+    self.by-version."ini"."1.3.4";
+  by-spec."ini"."^1.3.0" =
+    self.by-version."ini"."1.3.4";
+  by-spec."ini"."^1.3.4" =
+    self.by-version."ini"."1.3.4";
   by-spec."ini"."~1.1.0" =
     self.by-version."ini"."1.1.0";
   by-version."ini"."1.1.0" = self.buildNodePackage {
@@ -19460,7 +21848,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
+      url = "https://registry.npmjs.org/ini/-/ini-1.1.0.tgz";
       name = "ini-1.1.0.tgz";
       sha1 = "4e808c2ce144c6c1788918e034d6797bc6cf6281";
     };
@@ -19473,25 +21861,29 @@
     cpu = [ ];
   };
   by-spec."ini"."~1.3.0" =
-    self.by-version."ini"."1.3.3";
-  by-spec."ini"."~1.3.3" =
-    self.by-version."ini"."1.3.3";
-  by-spec."init-package-json"."0.0.10" =
-    self.by-version."init-package-json"."0.0.10";
-  by-version."init-package-json"."0.0.10" = self.buildNodePackage {
-    name = "init-package-json-0.0.10";
-    version = "0.0.10";
+    self.by-version."ini"."1.3.4";
+  by-spec."ini"."~1.3.4" =
+    self.by-version."ini"."1.3.4";
+  by-spec."init-package-json"."^1.2.0" =
+    self.by-version."init-package-json"."1.9.3";
+  by-version."init-package-json"."1.9.3" = self.buildNodePackage {
+    name = "init-package-json-1.9.3";
+    version = "1.9.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.10.tgz";
-      name = "init-package-json-0.0.10.tgz";
-      sha1 = "7baf10535227e0878105a04e44b78f132475da6a";
+      url = "https://registry.npmjs.org/init-package-json/-/init-package-json-1.9.3.tgz";
+      name = "init-package-json-1.9.3.tgz";
+      sha1 = "ca2ff94709b6d9aaad66533c11a0aff645f15c7d";
     };
     deps = {
-      "promzard-0.2.2" = self.by-version."promzard"."0.2.2";
-      "read-1.0.5" = self.by-version."read"."1.0.5";
-      "read-package-json-1.3.3" = self.by-version."read-package-json"."1.3.3";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
+      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "promzard-0.3.0" = self.by-version."promzard"."0.3.0";
+      "read-1.0.7" = self.by-version."read"."1.0.7";
+      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
+      "validate-npm-package-name-2.2.2" = self.by-version."validate-npm-package-name"."2.2.2";
     };
     optionalDependencies = {
     };
@@ -19499,25 +21891,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."init-package-json"."^1.2.0" =
-    self.by-version."init-package-json"."1.4.1";
-  by-version."init-package-json"."1.4.1" = self.buildNodePackage {
-    name = "init-package-json-1.4.1";
-    version = "1.4.1";
+  by-spec."init-package-json"."~1.9.3" =
+    self.by-version."init-package-json"."1.9.3";
+  by-spec."inline-source-map"."~0.3.0" =
+    self.by-version."inline-source-map"."0.3.1";
+  by-version."inline-source-map"."0.3.1" = self.buildNodePackage {
+    name = "inline-source-map-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.4.1.tgz";
-      name = "init-package-json-1.4.1.tgz";
-      sha1 = "6f68a14e181941849d84f6861f946e0028716cee";
+      url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz";
+      name = "inline-source-map-0.3.1.tgz";
+      sha1 = "a528b514e689fce90db3089e870d92f527acb5eb";
     };
     deps = {
-      "glob-5.0.5" = self.by-version."glob"."5.0.5";
-      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
-      "promzard-0.3.0" = self.by-version."promzard"."0.3.0";
-      "read-1.0.5" = self.by-version."read"."1.0.5";
-      "read-package-json-2.0.0" = self.by-version."read-package-json"."2.0.0";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "validate-npm-package-name-2.0.1" = self.by-version."validate-npm-package-name"."2.0.1";
+      "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
     };
     optionalDependencies = {
     };
@@ -19525,21 +21913,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."init-package-json"."~1.4.1" =
-    self.by-version."init-package-json"."1.4.1";
-  by-spec."inline-source-map"."~0.3.0" =
-    self.by-version."inline-source-map"."0.3.1";
-  by-version."inline-source-map"."0.3.1" = self.buildNodePackage {
-    name = "inline-source-map-0.3.1";
-    version = "0.3.1";
+  by-spec."inline-source-map"."~0.5.0" =
+    self.by-version."inline-source-map"."0.5.0";
+  by-version."inline-source-map"."0.5.0" = self.buildNodePackage {
+    name = "inline-source-map-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inline-source-map/-/inline-source-map-0.3.1.tgz";
-      name = "inline-source-map-0.3.1.tgz";
-      sha1 = "a528b514e689fce90db3089e870d92f527acb5eb";
+      url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.5.0.tgz";
+      name = "inline-source-map-0.5.0.tgz";
+      sha1 = "4a4c5dd8e4fb5e9b3cda60c822dfadcaee66e0af";
     };
     deps = {
-      "source-map-0.3.0" = self.by-version."source-map"."0.3.0";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
     };
     optionalDependencies = {
     };
@@ -19547,27 +21933,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inquirer"."0.8.0" =
-    self.by-version."inquirer"."0.8.0";
-  by-version."inquirer"."0.8.0" = self.buildNodePackage {
-    name = "inquirer-0.8.0";
-    version = "0.8.0";
+  by-spec."inline-source-map"."~0.6.0" =
+    self.by-version."inline-source-map"."0.6.1";
+  by-version."inline-source-map"."0.6.1" = self.buildNodePackage {
+    name = "inline-source-map-0.6.1";
+    version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.0.tgz";
-      name = "inquirer-0.8.0.tgz";
-      sha1 = "525d4dd827d4f3d506b453726068f90deb99b443";
+      url = "https://registry.npmjs.org/inline-source-map/-/inline-source-map-0.6.1.tgz";
+      name = "inline-source-map-0.6.1.tgz";
+      sha1 = "f9d1f19690674d51539cdfd44efd713dac2cfe04";
     };
     deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "cli-color-0.3.3" = self.by-version."cli-color"."0.3.3";
-      "figures-1.3.5" = self.by-version."figures"."1.3.5";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
-      "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.5.2" = self.by-version."rx"."2.5.2";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
     };
     optionalDependencies = {
     };
@@ -19576,25 +21954,30 @@
     cpu = [ ];
   };
   by-spec."inquirer".">=0.2.4" =
-    self.by-version."inquirer"."0.8.2";
-  by-version."inquirer"."0.8.2" = self.buildNodePackage {
-    name = "inquirer-0.8.2";
-    version = "0.8.2";
+    self.by-version."inquirer"."0.12.0";
+  by-version."inquirer"."0.12.0" = self.buildNodePackage {
+    name = "inquirer-0.12.0";
+    version = "0.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/inquirer/-/inquirer-0.8.2.tgz";
-      name = "inquirer-0.8.2.tgz";
-      sha1 = "41586548e1c5d9b3f81df7325034baacab6f58ab";
+      url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
+      name = "inquirer-0.12.0.tgz";
+      sha1 = "1ef2bfd63504df0bc75785fff8c2c41df12f077e";
     };
     deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "cli-width-1.0.1" = self.by-version."cli-width"."1.0.1";
-      "figures-1.3.5" = self.by-version."figures"."1.3.5";
-      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
-      "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
-      "rx-2.5.2" = self.by-version."rx"."2.5.2";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "ansi-escapes-1.3.0" = self.by-version."ansi-escapes"."1.3.0";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "cli-cursor-1.0.2" = self.by-version."cli-cursor"."1.0.2";
+      "cli-width-2.1.0" = self.by-version."cli-width"."2.1.0";
+      "figures-1.5.0" = self.by-version."figures"."1.5.0";
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "readline2-1.0.1" = self.by-version."readline2"."1.0.1";
+      "run-async-0.1.0" = self.by-version."run-async"."0.1.0";
+      "rx-lite-3.1.2" = self.by-version."rx-lite"."3.1.2";
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
     };
     optionalDependencies = {
     };
@@ -19602,27 +21985,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."inquirer"."^0.12.0" =
+    self.by-version."inquirer"."0.12.0";
   by-spec."inquirer"."^0.8.0" =
-    self.by-version."inquirer"."0.8.2";
-  by-spec."insert-module-globals"."^6.1.0" =
-    self.by-version."insert-module-globals"."6.2.1";
-  by-version."insert-module-globals"."6.2.1" = self.buildNodePackage {
-    name = "insert-module-globals-6.2.1";
-    version = "6.2.1";
-    bin = true;
+    self.by-version."inquirer"."0.8.5";
+  by-version."inquirer"."0.8.5" = self.buildNodePackage {
+    name = "inquirer-0.8.5";
+    version = "0.8.5";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.2.1.tgz";
-      name = "insert-module-globals-6.2.1.tgz";
-      sha1 = "95b8ec9ef8da579ceee827255a6a00e5b5cabaea";
+      url = "https://registry.npmjs.org/inquirer/-/inquirer-0.8.5.tgz";
+      name = "inquirer-0.8.5.tgz";
+      sha1 = "dbd740cf6ca3b731296a63ce6f6d961851f336df";
     };
     deps = {
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "combine-source-map-0.3.0" = self.by-version."combine-source-map"."0.3.0";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "lexical-scope-1.1.0" = self.by-version."lexical-scope"."1.1.0";
-      "process-0.6.0" = self.by-version."process"."0.6.0";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
+      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "cli-width-1.1.1" = self.by-version."cli-width"."1.1.1";
+      "figures-1.5.0" = self.by-version."figures"."1.5.0";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "readline2-0.1.1" = self.by-version."readline2"."0.1.1";
+      "rx-2.5.3" = self.by-version."rx"."2.5.3";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
     };
     optionalDependencies = {
     };
@@ -19630,29 +22014,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."insert-module-globals"."^6.2.0" =
-    self.by-version."insert-module-globals"."6.2.1";
-  by-spec."insert-module-globals"."~2.3.0" =
-    self.by-version."insert-module-globals"."2.3.4";
-  by-version."insert-module-globals"."2.3.4" = self.buildNodePackage {
-    name = "insert-module-globals-2.3.4";
-    version = "2.3.4";
+  by-spec."insert-module-globals"."^6.4.1" =
+    self.by-version."insert-module-globals"."6.6.3";
+  by-version."insert-module-globals"."6.6.3" = self.buildNodePackage {
+    name = "insert-module-globals-6.6.3";
+    version = "6.6.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-2.3.4.tgz";
-      name = "insert-module-globals-2.3.4.tgz";
-      sha1 = "e920cd470bcf1f47713eac6cc5cc13437e1a9e7e";
+      url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-6.6.3.tgz";
+      name = "insert-module-globals-6.6.3.tgz";
+      sha1 = "20638e29a30f9ed1ca2e3a825fbc2cba5246ddfc";
     };
     deps = {
-      "commondir-0.0.2" = self.by-version."commondir"."0.0.2";
-      "lexical-scope-0.0.15" = self.by-version."lexical-scope"."0.0.15";
-      "process-0.5.2" = self.by-version."process"."0.5.2";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "native-buffer-browserify-2.0.17" = self.by-version."native-buffer-browserify"."2.0.17";
-      "browserify-3.24.13" = self.by-version."browserify"."3.24.13";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "combine-source-map-0.6.1" = self.by-version."combine-source-map"."0.6.1";
+      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
+      "is-buffer-1.1.3" = self.by-version."is-buffer"."1.1.3";
+      "lexical-scope-1.2.0" = self.by-version."lexical-scope"."1.2.0";
+      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "through2-1.1.1" = self.by-version."through2"."1.1.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -19660,23 +22041,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."insert-module-globals"."~3.1.2" =
-    self.by-version."insert-module-globals"."3.1.3";
-  by-version."insert-module-globals"."3.1.3" = self.buildNodePackage {
-    name = "insert-module-globals-3.1.3";
-    version = "3.1.3";
+  by-spec."insert-module-globals"."^7.0.0" =
+    self.by-version."insert-module-globals"."7.0.1";
+  by-version."insert-module-globals"."7.0.1" = self.buildNodePackage {
+    name = "insert-module-globals-7.0.1";
+    version = "7.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/insert-module-globals/-/insert-module-globals-3.1.3.tgz";
-      name = "insert-module-globals-3.1.3.tgz";
-      sha1 = "d5b80e3a9c86d2bf9a522baee3c14f00d931038a";
+      url = "https://registry.npmjs.org/insert-module-globals/-/insert-module-globals-7.0.1.tgz";
+      name = "insert-module-globals-7.0.1.tgz";
+      sha1 = "c03bf4e01cb086d5b5e5ace8ad0afe7889d638c3";
     };
     deps = {
-      "lexical-scope-0.1.0" = self.by-version."lexical-scope"."0.1.0";
-      "process-0.5.2" = self.by-version."process"."0.5.2";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "combine-source-map-0.7.1" = self.by-version."combine-source-map"."0.7.1";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "is-buffer-1.1.3" = self.by-version."is-buffer"."1.1.3";
+      "lexical-scope-1.2.0" = self.by-version."lexical-scope"."1.2.0";
+      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -19684,27 +22068,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."insight"."^0.5.0" =
-    self.by-version."insight"."0.5.3";
-  by-version."insight"."0.5.3" = self.buildNodePackage {
-    name = "insight-0.5.3";
-    version = "0.5.3";
-    bin = false;
+  by-spec."internal-ip"."^1.0.0" =
+    self.by-version."internal-ip"."1.2.0";
+  by-version."internal-ip"."1.2.0" = self.buildNodePackage {
+    name = "internal-ip-1.2.0";
+    version = "1.2.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/insight/-/insight-0.5.3.tgz";
-      name = "insight-0.5.3.tgz";
-      sha1 = "353626c1b86b12c7bdfecb0a54ef80cd7e6f89e0";
+      url = "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz";
+      name = "internal-ip-1.2.0.tgz";
+      sha1 = "ae9fbf93b984878785d50a8de1b356956058cf5c";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
-      "inquirer-0.8.2" = self.by-version."inquirer"."0.8.2";
-      "lodash.debounce-3.0.3" = self.by-version."lodash.debounce"."3.0.3";
-      "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
-      "os-name-1.0.3" = self.by-version."os-name"."1.0.3";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "meow-3.7.0" = self.by-version."meow"."3.7.0";
     };
     optionalDependencies = {
     };
@@ -19712,16 +22088,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."install"."~0.1.7" =
-    self.by-version."install"."0.1.8";
-  by-version."install"."0.1.8" = self.buildNodePackage {
-    name = "install-0.1.8";
-    version = "0.1.8";
+  by-spec."interpret"."^0.6.4" =
+    self.by-version."interpret"."0.6.6";
+  by-version."interpret"."0.6.6" = self.buildNodePackage {
+    name = "interpret-0.6.6";
+    version = "0.6.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/install/-/install-0.1.8.tgz";
-      name = "install-0.1.8.tgz";
-      sha1 = "9980ef93e30dfb534778d163bc86ddd472ad5fe8";
+      url = "https://registry.npmjs.org/interpret/-/interpret-0.6.6.tgz";
+      name = "interpret-0.6.6.tgz";
+      sha1 = "fecd7a18e7ce5ca6abfb953e1f86213a49f1625b";
     };
     deps = {
     };
@@ -19731,16 +22107,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."internal-ip"."^1.0.0" =
-    self.by-version."internal-ip"."1.0.0";
-  by-version."internal-ip"."1.0.0" = self.buildNodePackage {
-    name = "internal-ip-1.0.0";
+  by-spec."interpret"."^1.0.0" =
+    self.by-version."interpret"."1.0.0";
+  by-version."interpret"."1.0.0" = self.buildNodePackage {
+    name = "interpret-1.0.0";
     version = "1.0.0";
-    bin = true;
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/internal-ip/-/internal-ip-1.0.0.tgz";
-      name = "internal-ip-1.0.0.tgz";
-      sha1 = "b484048e9051d07251bcc7e4396df547f4e3497e";
+      url = "https://registry.npmjs.org/interpret/-/interpret-1.0.0.tgz";
+      name = "interpret-1.0.0.tgz";
+      sha1 = "2a3338fa1c2bdbe58cdbfffabcbd0eb52b05241f";
     };
     deps = {
     };
@@ -19750,16 +22126,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."interpret"."^0.3.2" =
-    self.by-version."interpret"."0.3.10";
-  by-version."interpret"."0.3.10" = self.buildNodePackage {
-    name = "interpret-0.3.10";
-    version = "0.3.10";
+  by-spec."intersect"."^1.0.1" =
+    self.by-version."intersect"."1.0.1";
+  by-version."intersect"."1.0.1" = self.buildNodePackage {
+    name = "intersect-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz";
-      name = "interpret-0.3.10.tgz";
-      sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb";
+      url = "https://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz";
+      name = "intersect-1.0.1.tgz";
+      sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c";
     };
     deps = {
     };
@@ -19769,16 +22145,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."interpret"."^0.5.2" =
-    self.by-version."interpret"."0.5.2";
-  by-version."interpret"."0.5.2" = self.buildNodePackage {
-    name = "interpret-0.5.2";
-    version = "0.5.2";
+  by-spec."invert-kv"."^1.0.0" =
+    self.by-version."invert-kv"."1.0.0";
+  by-version."invert-kv"."1.0.0" = self.buildNodePackage {
+    name = "invert-kv-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/interpret/-/interpret-0.5.2.tgz";
-      name = "interpret-0.5.2.tgz";
-      sha1 = "377833b04b5ea693ff0d533380e3dda0c0381be0";
+      url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
+      name = "invert-kv-1.0.0.tgz";
+      sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6";
     };
     deps = {
     };
@@ -19788,16 +22164,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."intersect"."~0.0.3" =
-    self.by-version."intersect"."0.0.3";
-  by-version."intersect"."0.0.3" = self.buildNodePackage {
-    name = "intersect-0.0.3";
-    version = "0.0.3";
+  by-spec."ip"."0.3.x" =
+    self.by-version."ip"."0.3.3";
+  by-version."ip"."0.3.3" = self.buildNodePackage {
+    name = "ip-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz";
-      name = "intersect-0.0.3.tgz";
-      sha1 = "c1a4a5e5eac6ede4af7504cc07e0ada7bc9f4920";
+      url = "https://registry.npmjs.org/ip/-/ip-0.3.3.tgz";
+      name = "ip-0.3.3.tgz";
+      sha1 = "8ee8309e92f0b040d287f72efaca1a21702d3fb4";
     };
     deps = {
     };
@@ -19807,16 +22183,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ip"."0.3.x" =
-    self.by-version."ip"."0.3.2";
-  by-version."ip"."0.3.2" = self.buildNodePackage {
-    name = "ip-0.3.2";
-    version = "0.3.2";
+  by-spec."ip"."^0.3.0" =
+    self.by-version."ip"."0.3.3";
+  by-spec."ip"."^0.3.2" =
+    self.by-version."ip"."0.3.3";
+  by-spec."ip"."^1.0.1" =
+    self.by-version."ip"."1.1.2";
+  by-version."ip"."1.1.2" = self.buildNodePackage {
+    name = "ip-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ip/-/ip-0.3.2.tgz";
-      name = "ip-0.3.2.tgz";
-      sha1 = "7d5ed34326688b36b6ab81f1865ea8266c28f0db";
+      url = "https://registry.npmjs.org/ip/-/ip-1.1.2.tgz";
+      name = "ip-1.1.2.tgz";
+      sha1 = "a05ba664479611d0229fd21d2572fec4505f778e";
     };
     deps = {
     };
@@ -19826,8 +22206,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ip"."^0.3.0" =
-    self.by-version."ip"."0.3.2";
   by-spec."ip-regex"."^1.0.0" =
     self.by-version."ip-regex"."1.0.3";
   by-version."ip-regex"."1.0.3" = self.buildNodePackage {
@@ -19835,7 +22213,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz";
+      url = "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz";
       name = "ip-regex-1.0.3.tgz";
       sha1 = "dc589076f659f419c222039a33316f1c7387effd";
     };
@@ -19854,12 +22232,12 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ip-set/-/ip-set-1.0.0.tgz";
+      url = "https://registry.npmjs.org/ip-set/-/ip-set-1.0.0.tgz";
       name = "ip-set-1.0.0.tgz";
       sha1 = "54782fb5ae37ab6e697a2b49e07748d9e069dda6";
     };
     deps = {
-      "ip-0.3.2" = self.by-version."ip"."0.3.2";
+      "ip-0.3.3" = self.by-version."ip"."0.3.3";
     };
     optionalDependencies = {
     };
@@ -19874,7 +22252,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz";
       name = "ipaddr.js-0.1.2.tgz";
       sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e";
     };
@@ -19886,16 +22264,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ipaddr.js"."0.1.9" =
-    self.by-version."ipaddr.js"."0.1.9";
-  by-version."ipaddr.js"."0.1.9" = self.buildNodePackage {
-    name = "ipaddr.js-0.1.9";
-    version = "0.1.9";
+  by-spec."ipaddr.js"."1.0.5" =
+    self.by-version."ipaddr.js"."1.0.5";
+  by-version."ipaddr.js"."1.0.5" = self.buildNodePackage {
+    name = "ipaddr.js-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz";
-      name = "ipaddr.js-0.1.9.tgz";
-      sha1 = "a9c78ccc12dc9010f296ab9aef2f61f432d69efa";
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz";
+      name = "ipaddr.js-1.0.5.tgz";
+      sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7";
     };
     deps = {
     };
@@ -19906,15 +22284,15 @@
     cpu = [ ];
   };
   by-spec."ipaddr.js".">= 0.1.1" =
-    self.by-version."ipaddr.js"."1.0.1";
-  by-version."ipaddr.js"."1.0.1" = self.buildNodePackage {
-    name = "ipaddr.js-1.0.1";
-    version = "1.0.1";
+    self.by-version."ipaddr.js"."1.1.0";
+  by-version."ipaddr.js"."1.1.0" = self.buildNodePackage {
+    name = "ipaddr.js-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.1.tgz";
-      name = "ipaddr.js-1.0.1.tgz";
-      sha1 = "5f38801dc73e0400fc7076386f6ed5215fbd8f95";
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.0.tgz";
+      name = "ipaddr.js-1.1.0.tgz";
+      sha1 = "5fd380584eb3e2d55904dbe3047a2627d4199a14";
     };
     deps = {
     };
@@ -19925,47 +22303,58 @@
     cpu = [ ];
   };
   by-spec."ipaddr.js".">= 0.1.5" =
-    self.by-version."ipaddr.js"."1.0.1";
+    self.by-version."ipaddr.js"."1.1.0";
   by-spec."ipaddr.js".">=0.1.2" =
-    self.by-version."ipaddr.js"."1.0.1";
+    self.by-version."ipaddr.js"."1.1.0";
   by-spec."ipaddr.js"."^0.1.5" =
     self.by-version."ipaddr.js"."0.1.9";
-  by-spec."irc"."0.3.9" =
-    self.by-version."irc"."0.3.9";
-  by-version."irc"."0.3.9" = self.buildNodePackage {
-    name = "irc-0.3.9";
-    version = "0.3.9";
+  by-version."ipaddr.js"."0.1.9" = self.buildNodePackage {
+    name = "ipaddr.js-0.1.9";
+    version = "0.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/irc/-/irc-0.3.9.tgz";
-      name = "irc-0.3.9.tgz";
-      sha1 = "9c0d846379dbc306b38de5d08cf354f4fc6c83d9";
+      url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.9.tgz";
+      name = "ipaddr.js-0.1.9.tgz";
+      sha1 = "a9c78ccc12dc9010f296ab9aef2f61f432d69efa";
     };
     deps = {
-      "ansi-color-0.2.1" = self.by-version."ansi-color"."0.2.1";
-      "irc-colors-1.1.0" = self.by-version."irc-colors"."1.1.0";
     };
     optionalDependencies = {
-      "iconv-2.1.6" = self.by-version."iconv"."2.1.6";
-      "node-icu-charset-detector-0.0.7" = self.by-version."node-icu-charset-detector"."0.0.7";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."irc-colors"."^1.1.0" =
-    self.by-version."irc-colors"."1.1.0";
-  by-version."irc-colors"."1.1.0" = self.buildNodePackage {
-    name = "irc-colors-1.1.0";
-    version = "1.1.0";
+  by-spec."ipaddr.js"."^1.0.1" =
+    self.by-version."ipaddr.js"."1.1.0";
+  by-spec."ironhorse"."*" =
+    self.by-version."ironhorse"."0.0.11";
+  by-version."ironhorse"."0.0.11" = self.buildNodePackage {
+    name = "ironhorse-0.0.11";
+    version = "0.0.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/irc-colors/-/irc-colors-1.1.0.tgz";
-      name = "irc-colors-1.1.0.tgz";
-      sha1 = "f92f184c136e8893ad3fe55d130ed409b0dc0745";
+      url = "https://registry.npmjs.org/ironhorse/-/ironhorse-0.0.11.tgz";
+      name = "ironhorse-0.0.11.tgz";
+      sha1 = "e28ea9c4f23d1fd17008f97df5f2a24f7bb928d2";
     };
     deps = {
-      "hashish-0.0.4" = self.by-version."hashish"."0.0.4";
+      "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
+      "winston-2.2.0" = self.by-version."winston"."2.2.0";
+      "nconf-0.8.4" = self.by-version."nconf"."0.8.4";
+      "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
+      "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2";
+      "express-5.0.0-alpha.2" = self.by-version."express"."5.0.0-alpha.2";
+      "jade-1.11.0" = self.by-version."jade"."1.11.0";
+      "passport-0.3.2" = self.by-version."passport"."0.3.2";
+      "passport-http-0.3.0" = self.by-version."passport-http"."0.3.0";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "mongoose-4.4.11" = self.by-version."mongoose"."4.4.11";
+      "gridfs-stream-1.1.1" = self.by-version."gridfs-stream"."1.1.1";
+      "temp-0.8.3" = self.by-version."temp"."0.8.3";
+      "kue-0.10.5" = self.by-version."kue"."0.10.5";
+      "redis-2.6.0-1" = self.by-version."redis"."2.6.0-1";
+      "hiredis-0.4.1" = self.by-version."hiredis"."0.4.1";
     };
     optionalDependencies = {
     };
@@ -19973,34 +22362,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ironhorse"."*" =
-    self.by-version."ironhorse"."0.0.10";
-  by-version."ironhorse"."0.0.10" = self.buildNodePackage {
-    name = "ironhorse-0.0.10";
-    version = "0.0.10";
+  "ironhorse" = self.by-version."ironhorse"."0.0.11";
+  by-spec."is-absolute"."^0.1.7" =
+    self.by-version."is-absolute"."0.1.7";
+  by-version."is-absolute"."0.1.7" = self.buildNodePackage {
+    name = "is-absolute-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ironhorse/-/ironhorse-0.0.10.tgz";
-      name = "ironhorse-0.0.10.tgz";
-      sha1 = "98c1c9e29889fabbaaea0ce558501c47f9319856";
+      url = "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz";
+      name = "is-absolute-0.1.7.tgz";
+      sha1 = "847491119fccb5fb436217cc737f7faad50f603f";
     };
     deps = {
-      "underscore-1.5.2" = self.by-version."underscore"."1.5.2";
-      "winston-1.0.0" = self.by-version."winston"."1.0.0";
-      "nconf-0.7.1" = self.by-version."nconf"."0.7.1";
-      "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1";
-      "jade-1.9.2" = self.by-version."jade"."1.9.2";
-      "passport-0.2.1" = self.by-version."passport"."0.2.1";
-      "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2";
-      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
-      "mongoose-3.8.26" = self.by-version."mongoose"."3.8.26";
-      "gridfs-stream-1.1.1" = self.by-version."gridfs-stream"."1.1.1";
-      "temp-0.8.1" = self.by-version."temp"."0.8.1";
-      "kue-0.8.12" = self.by-version."kue"."0.8.12";
-      "redis-0.12.1" = self.by-version."redis"."0.12.1";
-      "hiredis-0.3.0" = self.by-version."hiredis"."0.3.0";
+      "is-relative-0.1.3" = self.by-version."is-relative"."0.1.3";
     };
     optionalDependencies = {
     };
@@ -20008,17 +22383,16 @@
     os = [ ];
     cpu = [ ];
   };
-  "ironhorse" = self.by-version."ironhorse"."0.0.10";
-  by-spec."is-array"."^1.0.1" =
-    self.by-version."is-array"."1.0.1";
-  by-version."is-array"."1.0.1" = self.buildNodePackage {
-    name = "is-array-1.0.1";
-    version = "1.0.1";
+  by-spec."is-arrayish"."^0.2.1" =
+    self.by-version."is-arrayish"."0.2.1";
+  by-version."is-arrayish"."0.2.1" = self.buildNodePackage {
+    name = "is-arrayish-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-array/-/is-array-1.0.1.tgz";
-      name = "is-array-1.0.1.tgz";
-      sha1 = "e9850cc2cc860c3bc0977e84ccf0dd464584279a";
+      url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
+      name = "is-arrayish-0.2.1.tgz";
+      sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
     };
     deps = {
     };
@@ -20029,18 +22403,78 @@
     cpu = [ ];
   };
   by-spec."is-binary-path"."^1.0.0" =
-    self.by-version."is-binary-path"."1.0.0";
-  by-version."is-binary-path"."1.0.0" = self.buildNodePackage {
-    name = "is-binary-path-1.0.0";
+    self.by-version."is-binary-path"."1.0.1";
+  by-version."is-binary-path"."1.0.1" = self.buildNodePackage {
+    name = "is-binary-path-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz";
+      name = "is-binary-path-1.0.1.tgz";
+      sha1 = "75f16642b480f187a711c814161fd3a4a7655898";
+    };
+    deps = {
+      "binary-extensions-1.4.0" = self.by-version."binary-extensions"."1.4.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-buffer"."^1.0.2" =
+    self.by-version."is-buffer"."1.1.3";
+  by-version."is-buffer"."1.1.3" = self.buildNodePackage {
+    name = "is-buffer-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.3.tgz";
+      name = "is-buffer-1.1.3.tgz";
+      sha1 = "db897fc3f7aca2d50de94b6c8c2896a4771627af";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-buffer"."^1.1.0" =
+    self.by-version."is-buffer"."1.1.3";
+  by-spec."is-buffer"."~ 1.0.2" =
+    self.by-version."is-buffer"."1.0.2";
+  by-version."is-buffer"."1.0.2" = self.buildNodePackage {
+    name = "is-buffer-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.0.2.tgz";
+      name = "is-buffer-1.0.2.tgz";
+      sha1 = "f5c6c051d73f86f11b4ee14267cc1029fce261d0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-builtin-module"."^1.0.0" =
+    self.by-version."is-builtin-module"."1.0.0";
+  by-version."is-builtin-module"."1.0.0" = self.buildNodePackage {
+    name = "is-builtin-module-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.0.tgz";
-      name = "is-binary-path-1.0.0.tgz";
-      sha1 = "51a9ab34cc239e8e97d1cb1c874faf25d79d54e5";
+      url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
+      name = "is-builtin-module-1.0.0.tgz";
+      sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
     };
     deps = {
-      "binary-extensions-1.3.0" = self.by-version."binary-extensions"."1.3.0";
+      "builtin-modules-1.1.1" = self.by-version."builtin-modules"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -20049,15 +22483,15 @@
     cpu = [ ];
   };
   by-spec."is-dotfile"."^1.0.0" =
-    self.by-version."is-dotfile"."1.0.0";
-  by-version."is-dotfile"."1.0.0" = self.buildNodePackage {
-    name = "is-dotfile-1.0.0";
-    version = "1.0.0";
+    self.by-version."is-dotfile"."1.0.2";
+  by-version."is-dotfile"."1.0.2" = self.buildNodePackage {
+    name = "is-dotfile-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.0.tgz";
-      name = "is-dotfile-1.0.0.tgz";
-      sha1 = "cfb6c7d7ebcb99e97ea8a353230dd4eea3e72825";
+      url = "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.2.tgz";
+      name = "is-dotfile-1.0.2.tgz";
+      sha1 = "2c132383f39199f8edc268ca01b9b007d205cc4d";
     };
     deps = {
     };
@@ -20067,19 +22501,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-equal-shallow"."^0.1.1" =
-    self.by-version."is-equal-shallow"."0.1.2";
-  by-version."is-equal-shallow"."0.1.2" = self.buildNodePackage {
-    name = "is-equal-shallow-0.1.2";
-    version = "0.1.2";
+  by-spec."is-equal-shallow"."^0.1.3" =
+    self.by-version."is-equal-shallow"."0.1.3";
+  by-version."is-equal-shallow"."0.1.3" = self.buildNodePackage {
+    name = "is-equal-shallow-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz";
+      name = "is-equal-shallow-0.1.3.tgz";
+      sha1 = "2238098fc221de0bcfa5d9eac4c45d638aa1c534";
+    };
+    deps = {
+      "is-primitive-2.0.0" = self.by-version."is-primitive"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-extendable"."^0.1.1" =
+    self.by-version."is-extendable"."0.1.1";
+  by-version."is-extendable"."0.1.1" = self.buildNodePackage {
+    name = "is-extendable-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.2.tgz";
-      name = "is-equal-shallow-0.1.2.tgz";
-      sha1 = "89e619a1f9f1b37019a821c5fe23f93ad874f371";
+      url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz";
+      name = "is-extendable-0.1.1.tgz";
+      sha1 = "62b110e289a471418e3ec36a617d472e301dfc89";
     };
     deps = {
-      "is-primitive-1.0.0" = self.by-version."is-primitive"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -20094,7 +22547,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz";
+      url = "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz";
       name = "is-extglob-1.0.0.tgz";
       sha1 = "ac468177c4943405a092fc8f29760c6ffc6206c0";
     };
@@ -20107,17 +22560,38 @@
     cpu = [ ];
   };
   by-spec."is-finite"."^1.0.0" =
-    self.by-version."is-finite"."1.0.0";
-  by-version."is-finite"."1.0.0" = self.buildNodePackage {
-    name = "is-finite-1.0.0";
+    self.by-version."is-finite"."1.0.1";
+  by-version."is-finite"."1.0.1" = self.buildNodePackage {
+    name = "is-finite-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
+      name = "is-finite-1.0.1.tgz";
+      sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
+    };
+    deps = {
+      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-fullwidth-code-point"."^1.0.0" =
+    self.by-version."is-fullwidth-code-point"."1.0.0";
+  by-version."is-fullwidth-code-point"."1.0.0" = self.buildNodePackage {
+    name = "is-fullwidth-code-point-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.0.tgz";
-      name = "is-finite-1.0.0.tgz";
-      sha1 = "2b1dbad1162cdca6a4dc89f12b2f3dae12393282";
+      url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz";
+      name = "is-fullwidth-code-point-1.0.0.tgz";
+      sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb";
     };
     deps = {
+      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -20125,18 +22599,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-glob"."^1.1.1" =
-    self.by-version."is-glob"."1.1.3";
-  by-version."is-glob"."1.1.3" = self.buildNodePackage {
-    name = "is-glob-1.1.3";
-    version = "1.1.3";
+  by-spec."is-glob"."^2.0.0" =
+    self.by-version."is-glob"."2.0.1";
+  by-version."is-glob"."2.0.1" = self.buildNodePackage {
+    name = "is-glob-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-glob/-/is-glob-1.1.3.tgz";
-      name = "is-glob-1.1.3.tgz";
-      sha1 = "b4c64b8303d39114492a460d364ccfb0d3c0a045";
+      url = "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz";
+      name = "is-glob-2.0.1.tgz";
+      sha1 = "d096f926a3ded5600f3fdfd91198cb0888c2d863";
     };
     deps = {
+      "is-extglob-1.0.0" = self.by-version."is-extglob"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -20144,8 +22619,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-glob"."^1.1.3" =
-    self.by-version."is-glob"."1.1.3";
+  by-spec."is-glob"."^2.0.1" =
+    self.by-version."is-glob"."2.0.1";
   by-spec."is-ip"."^1.0.0" =
     self.by-version."is-ip"."1.0.0";
   by-version."is-ip"."1.0.0" = self.buildNodePackage {
@@ -20153,7 +22628,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz";
+      url = "https://registry.npmjs.org/is-ip/-/is-ip-1.0.0.tgz";
       name = "is-ip-1.0.0.tgz";
       sha1 = "2bb6959f797ccd6f9fdc812758bcbc87c4c59074";
     };
@@ -20167,21 +22642,21 @@
     cpu = [ ];
   };
   by-spec."is-my-json-valid"."^2.10.0" =
-    self.by-version."is-my-json-valid"."2.10.1";
-  by-version."is-my-json-valid"."2.10.1" = self.buildNodePackage {
-    name = "is-my-json-valid-2.10.1";
-    version = "2.10.1";
+    self.by-version."is-my-json-valid"."2.13.1";
+  by-version."is-my-json-valid"."2.13.1" = self.buildNodePackage {
+    name = "is-my-json-valid-2.13.1";
+    version = "2.13.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz";
-      name = "is-my-json-valid-2.10.1.tgz";
-      sha1 = "bf20ca7e71116302f8660ac812659f71e22ea2d0";
+      url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz";
+      name = "is-my-json-valid-2.13.1.tgz";
+      sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707";
     };
     deps = {
       "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
-      "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1";
-      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
+      "jsonpointer-2.0.0" = self.by-version."jsonpointer"."2.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -20189,6 +22664,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-my-json-valid"."^2.12.0" =
+    self.by-version."is-my-json-valid"."2.13.1";
+  by-spec."is-my-json-valid"."^2.12.4" =
+    self.by-version."is-my-json-valid"."2.13.1";
   by-spec."is-npm"."^1.0.0" =
     self.by-version."is-npm"."1.0.0";
   by-version."is-npm"."1.0.0" = self.buildNodePackage {
@@ -20196,7 +22675,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
+      url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
       name = "is-npm-1.0.0.tgz";
       sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4";
     };
@@ -20215,7 +22694,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz";
+      url = "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz";
       name = "is-number-0.1.1.tgz";
       sha1 = "69a7af116963d47206ec9bd9b48a14216f1e3806";
     };
@@ -20227,18 +22706,60 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-number"."^1.1.0" =
-    self.by-version."is-number"."1.1.2";
-  by-version."is-number"."1.1.2" = self.buildNodePackage {
-    name = "is-number-1.1.2";
-    version = "1.1.2";
+  by-spec."is-number"."^2.0.2" =
+    self.by-version."is-number"."2.1.0";
+  by-version."is-number"."2.1.0" = self.buildNodePackage {
+    name = "is-number-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz";
+      name = "is-number-2.1.0.tgz";
+      sha1 = "01fcbbb393463a548f2f466cce16dece49db908f";
+    };
+    deps = {
+      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-number"."^2.1.0" =
+    self.by-version."is-number"."2.1.0";
+  by-spec."is-path-cwd"."^1.0.0" =
+    self.by-version."is-path-cwd"."1.0.0";
+  by-version."is-path-cwd"."1.0.0" = self.buildNodePackage {
+    name = "is-path-cwd-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz";
+      name = "is-path-cwd-1.0.0.tgz";
+      sha1 = "d225ec23132e89edd38fda767472e62e65f1106d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-path-in-cwd"."^1.0.0" =
+    self.by-version."is-path-in-cwd"."1.0.0";
+  by-version."is-path-in-cwd"."1.0.0" = self.buildNodePackage {
+    name = "is-path-in-cwd-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-number/-/is-number-1.1.2.tgz";
-      name = "is-number-1.1.2.tgz";
-      sha1 = "9d82409f3a8a8beecf249b1bc7dada49829966e4";
+      url = "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz";
+      name = "is-path-in-cwd-1.0.0.tgz";
+      sha1 = "6477582b8214d602346094567003be8a9eac04dc";
     };
     deps = {
+      "is-path-inside-1.0.0" = self.by-version."is-path-inside"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -20246,18 +22767,55 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-number"."^1.1.2" =
-    self.by-version."is-number"."1.1.2";
-  by-spec."is-primitive"."^1.0.0" =
-    self.by-version."is-primitive"."1.0.0";
-  by-version."is-primitive"."1.0.0" = self.buildNodePackage {
-    name = "is-primitive-1.0.0";
+  by-spec."is-path-inside"."^1.0.0" =
+    self.by-version."is-path-inside"."1.0.0";
+  by-version."is-path-inside"."1.0.0" = self.buildNodePackage {
+    name = "is-path-inside-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-primitive/-/is-primitive-1.0.0.tgz";
-      name = "is-primitive-1.0.0.tgz";
-      sha1 = "c3677046fe11225017222204dd602503f7e5eb74";
+      url = "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz";
+      name = "is-path-inside-1.0.0.tgz";
+      sha1 = "fc06e5a1683fbda13de667aff717bbc10a48f37f";
+    };
+    deps = {
+      "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-plain-obj"."^1.0.0" =
+    self.by-version."is-plain-obj"."1.1.0";
+  by-version."is-plain-obj"."1.1.0" = self.buildNodePackage {
+    name = "is-plain-obj-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
+      name = "is-plain-obj-1.1.0.tgz";
+      sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-posix-bracket"."^0.1.0" =
+    self.by-version."is-posix-bracket"."0.1.1";
+  by-version."is-posix-bracket"."0.1.1" = self.buildNodePackage {
+    name = "is-posix-bracket-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz";
+      name = "is-posix-bracket-0.1.1.tgz";
+      sha1 = "3334dc79774368e92f016e6fbc0a88f5cd6e6bc4";
     };
     deps = {
     };
@@ -20274,7 +22832,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz";
+      url = "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz";
       name = "is-primitive-2.0.0.tgz";
       sha1 = "207bab91638499c07b2adf240a41a87210034575";
     };
@@ -20286,6 +22844,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-promise"."^2.0.0" =
+    self.by-version."is-promise"."2.1.0";
+  by-version."is-promise"."2.1.0" = self.buildNodePackage {
+    name = "is-promise-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz";
+      name = "is-promise-2.1.0.tgz";
+      sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."is-promise"."~1" =
     self.by-version."is-promise"."1.0.1";
   by-version."is-promise"."1.0.1" = self.buildNodePackage {
@@ -20293,7 +22870,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
+      url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz";
       name = "is-promise-1.0.1.tgz";
       sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5";
     };
@@ -20312,7 +22889,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
+      url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
       name = "is-property-1.0.2.tgz";
       sha1 = "57fe1c4e48474edd65b09911f26b1cd4095dda84";
     };
@@ -20324,18 +22901,57 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-root"."^1.0.0" =
-    self.by-version."is-root"."1.0.0";
-  by-version."is-root"."1.0.0" = self.buildNodePackage {
-    name = "is-root-1.0.0";
+  by-spec."is-redirect"."^1.0.0" =
+    self.by-version."is-redirect"."1.0.0";
+  by-version."is-redirect"."1.0.0" = self.buildNodePackage {
+    name = "is-redirect-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
+      name = "is-redirect-1.0.0.tgz";
+      sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-relative"."^0.1.0" =
+    self.by-version."is-relative"."0.1.3";
+  by-version."is-relative"."0.1.3" = self.buildNodePackage {
+    name = "is-relative-0.1.3";
+    version = "0.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz";
+      name = "is-relative-0.1.3.tgz";
+      sha1 = "905fee8ae86f45b3ec614bc3c15c869df0876e82";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-resolvable"."^1.0.0" =
+    self.by-version."is-resolvable"."1.0.0";
+  by-version."is-resolvable"."1.0.0" = self.buildNodePackage {
+    name = "is-resolvable-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz";
-      name = "is-root-1.0.0.tgz";
-      sha1 = "07b6c233bc394cd9d02ba15c966bd6660d6342d5";
+      url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz";
+      name = "is-resolvable-1.0.0.tgz";
+      sha1 = "8df57c61ea2e3c501408d100fb013cf8d6e0cc62";
     };
     deps = {
+      "tryit-1.0.2" = self.by-version."tryit"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -20350,7 +22966,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz";
+      url = "https://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz";
       name = "is-stream-1.0.1.tgz";
       sha1 = "b44ce45b1f0c3df583f6b5debf84dcf9743ac8b5";
     };
@@ -20362,16 +22978,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-utf8"."0.2.0" =
-    self.by-version."is-utf8"."0.2.0";
-  by-version."is-utf8"."0.2.0" = self.buildNodePackage {
-    name = "is-utf8-0.2.0";
-    version = "0.2.0";
+  by-spec."is-stream"."^1.0.1" =
+    self.by-version."is-stream"."1.0.1";
+  by-spec."is-typedarray"."~1.0.0" =
+    self.by-version."is-typedarray"."1.0.0";
+  by-version."is-typedarray"."1.0.0" = self.buildNodePackage {
+    name = "is-typedarray-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+      name = "is-typedarray-1.0.0.tgz";
+      sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."is-utf8"."0.2.1" =
+    self.by-version."is-utf8"."0.2.1";
+  by-version."is-utf8"."0.2.1" = self.buildNodePackage {
+    name = "is-utf8-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz";
-      name = "is-utf8-0.2.0.tgz";
-      sha1 = "b8aa54125ae626bfe4e3beb965f16a89c58a1137";
+      url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
+      name = "is-utf8-0.2.1.tgz";
+      sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
     };
     deps = {
     };
@@ -20382,7 +23019,7 @@
     cpu = [ ];
   };
   by-spec."is-utf8"."^0.2.0" =
-    self.by-version."is-utf8"."0.2.0";
+    self.by-version."is-utf8"."0.2.1";
   by-spec."isarray"."0.0.1" =
     self.by-version."isarray"."0.0.1";
   by-version."isarray"."0.0.1" = self.buildNodePackage {
@@ -20390,7 +23027,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
       name = "isarray-0.0.1.tgz";
       sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
     };
@@ -20402,18 +23039,39 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."isarray"."^1.0.0" =
+    self.by-version."isarray"."1.0.0";
+  by-version."isarray"."1.0.0" = self.buildNodePackage {
+    name = "isarray-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
+      name = "isarray-1.0.0.tgz";
+      sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."isarray"."~0.0.1" =
     self.by-version."isarray"."0.0.1";
-  by-spec."isobject"."^0.2.0" =
-    self.by-version."isobject"."0.2.0";
-  by-version."isobject"."0.2.0" = self.buildNodePackage {
-    name = "isobject-0.2.0";
-    version = "0.2.0";
+  by-spec."isarray"."~1.0.0" =
+    self.by-version."isarray"."1.0.0";
+  by-spec."isbinaryfile"."^3.0.0" =
+    self.by-version."isbinaryfile"."3.0.0";
+  by-version."isbinaryfile"."3.0.0" = self.buildNodePackage {
+    name = "isbinaryfile-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isobject/-/isobject-0.2.0.tgz";
-      name = "isobject-0.2.0.tgz";
-      sha1 = "a3432192f39b910b5f02cc989487836ec70aa85e";
+      url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.0.tgz";
+      name = "isbinaryfile-3.0.0.tgz";
+      sha1 = "e9382ebe16aa0f7c874848008d928020e42175f7";
     };
     deps = {
     };
@@ -20423,18 +23081,78 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."isobject"."^1.0.0" =
-    self.by-version."isobject"."1.0.0";
-  by-version."isobject"."1.0.0" = self.buildNodePackage {
-    name = "isobject-1.0.0";
-    version = "1.0.0";
+  by-spec."isemail"."1.x.x" =
+    self.by-version."isemail"."1.2.0";
+  by-version."isemail"."1.2.0" = self.buildNodePackage {
+    name = "isemail-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz";
+      name = "isemail-1.2.0.tgz";
+      sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isexe"."^1.1.1" =
+    self.by-version."isexe"."1.1.2";
+  by-version."isexe"."1.1.2" = self.buildNodePackage {
+    name = "isexe-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/isexe/-/isexe-1.1.2.tgz";
+      name = "isexe-1.1.2.tgz";
+      sha1 = "36f3e22e60750920f5e7241a476a8c6a42275ad0";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isobject"."^2.0.0" =
+    self.by-version."isobject"."2.0.0";
+  by-version."isobject"."2.0.0" = self.buildNodePackage {
+    name = "isobject-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/isobject/-/isobject-2.0.0.tgz";
+      name = "isobject-2.0.0.tgz";
+      sha1 = "208de872bd7378c2a92af9428a3f56eb91a122c4";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."isomorphic-fetch"."^2.1.1" =
+    self.by-version."isomorphic-fetch"."2.2.1";
+  by-version."isomorphic-fetch"."2.2.1" = self.buildNodePackage {
+    name = "isomorphic-fetch-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isobject/-/isobject-1.0.0.tgz";
-      name = "isobject-1.0.0.tgz";
-      sha1 = "97fa6e8007c8e1251276be7565ce34ae69c90083";
+      url = "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz";
+      name = "isomorphic-fetch-2.2.1.tgz";
+      sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
     };
     deps = {
+      "node-fetch-1.4.1" = self.by-version."node-fetch"."1.4.1";
+      "whatwg-fetch-0.11.0" = self.by-version."whatwg-fetch"."0.11.0";
     };
     optionalDependencies = {
     };
@@ -20449,7 +23167,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
+      url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
       name = "isstream-0.1.2.tgz";
       sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a";
     };
@@ -20463,32 +23181,197 @@
   };
   by-spec."isstream"."~0.1.1" =
     self.by-version."isstream"."0.1.2";
+  by-spec."isstream"."~0.1.2" =
+    self.by-version."isstream"."0.1.2";
   by-spec."istanbul"."*" =
-    self.by-version."istanbul"."0.3.13";
-  by-version."istanbul"."0.3.13" = self.buildNodePackage {
-    name = "istanbul-0.3.13";
-    version = "0.3.13";
+    self.by-version."istanbul"."1.0.0-alpha.2";
+  by-version."istanbul"."1.0.0-alpha.2" = self.buildNodePackage {
+    name = "istanbul-1.0.0-alpha.2";
+    version = "1.0.0-alpha.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.13.tgz";
-      name = "istanbul-0.3.13.tgz";
-      sha1 = "152dbcc195f01e9102fea48fe71084f583f6299c";
+      url = "https://registry.npmjs.org/istanbul/-/istanbul-1.0.0-alpha.2.tgz";
+      name = "istanbul-1.0.0-alpha.2.tgz";
+      sha1 = "06096bc08e98baad744aae46962d8df9fac63d08";
     };
     deps = {
-      "esprima-2.1.0" = self.by-version."esprima"."2.1.0";
-      "escodegen-1.6.1" = self.by-version."escodegen"."1.6.1";
-      "handlebars-3.0.0" = self.by-version."handlebars"."3.0.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "fileset-0.1.5" = self.by-version."fileset"."0.1.5";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
-      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
-      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "istanbul-api-1.0.0-aplha.1" = self.by-version."istanbul-api"."1.0.0-aplha.1";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "istanbul" = self.by-version."istanbul"."1.0.0-alpha.2";
+  by-spec."istanbul"."^0.4.0" =
+    self.by-version."istanbul"."0.4.2";
+  by-version."istanbul"."0.4.2" = self.buildNodePackage {
+    name = "istanbul-0.4.2";
+    version = "0.4.2";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.2.tgz";
+      name = "istanbul-0.4.2.tgz";
+      sha1 = "765e728b9455beddb6daa7b9cec4b9c3c3ede487";
+    };
+    deps = {
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "escodegen-1.7.1" = self.by-version."escodegen"."1.7.1";
+      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
+      "fileset-0.2.1" = self.by-version."fileset"."0.2.1";
+      "handlebars-4.0.5" = self.by-version."handlebars"."4.0.5";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
+      "supports-color-3.1.2" = self.by-version."supports-color"."3.1.2";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."istanbul-api"."^1.0.0-alpha" =
+    self.by-version."istanbul-api"."1.0.0-aplha.1";
+  by-version."istanbul-api"."1.0.0-aplha.1" = self.buildNodePackage {
+    name = "istanbul-api-1.0.0-aplha.1";
+    version = "1.0.0-aplha.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.0.0-aplha.1.tgz";
+      name = "istanbul-api-1.0.0-aplha.1.tgz";
+      sha1 = "3fa47f44acd58d52c6764218f5f7ef453fc50f5c";
+    };
+    deps = {
+      "istanbul-lib-coverage-1.0.0-alpha.4" = self.by-version."istanbul-lib-coverage"."1.0.0-alpha.4";
+      "istanbul-lib-instrument-1.0.0-alpha.6" = self.by-version."istanbul-lib-instrument"."1.0.0-alpha.6";
+      "istanbul-lib-report-1.0.0-alpha.3" = self.by-version."istanbul-lib-report"."1.0.0-alpha.3";
+      "istanbul-lib-hook-1.0.0-alpha.4" = self.by-version."istanbul-lib-hook"."1.0.0-alpha.4";
+      "istanbul-reports-1.0.0-alpha.4" = self.by-version."istanbul-reports"."1.0.0-alpha.4";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "fileset-0.2.1" = self.by-version."fileset"."0.2.1";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."istanbul-lib-coverage"."^1.0.0-alpha" =
+    self.by-version."istanbul-lib-coverage"."1.0.0-alpha.4";
+  by-version."istanbul-lib-coverage"."1.0.0-alpha.4" = self.buildNodePackage {
+    name = "istanbul-lib-coverage-1.0.0-alpha.4";
+    version = "1.0.0-alpha.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.0-alpha.4.tgz";
+      name = "istanbul-lib-coverage-1.0.0-alpha.4.tgz";
+      sha1 = "626f7fd9cf809b6e3bf7ed42a809f8e0b64ae976";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."istanbul-lib-hook"."^1.0.0-alpha" =
+    self.by-version."istanbul-lib-hook"."1.0.0-alpha.4";
+  by-version."istanbul-lib-hook"."1.0.0-alpha.4" = self.buildNodePackage {
+    name = "istanbul-lib-hook-1.0.0-alpha.4";
+    version = "1.0.0-alpha.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.0-alpha.4.tgz";
+      name = "istanbul-lib-hook-1.0.0-alpha.4.tgz";
+      sha1 = "8c5bb9f6fbd8526e0ae6cf639af28266906b938f";
+    };
+    deps = {
+      "append-transform-0.3.0" = self.by-version."append-transform"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."istanbul-lib-instrument"."^1.0.0-alpha" =
+    self.by-version."istanbul-lib-instrument"."1.0.0-alpha.6";
+  by-version."istanbul-lib-instrument"."1.0.0-alpha.6" = self.buildNodePackage {
+    name = "istanbul-lib-instrument-1.0.0-alpha.6";
+    version = "1.0.0-alpha.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.0.0-alpha.6.tgz";
+      name = "istanbul-lib-instrument-1.0.0-alpha.6.tgz";
+      sha1 = "5529ca5534d6a98fe038c3c3de7a97ed130df385";
+    };
+    deps = {
+      "escodegen-1.8.0" = self.by-version."escodegen"."1.8.0";
+      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
+      "istanbul-lib-coverage-1.0.0-alpha.4" = self.by-version."istanbul-lib-coverage"."1.0.0-alpha.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."istanbul-lib-report"."^1.0.0-alpha" =
+    self.by-version."istanbul-lib-report"."1.0.0-alpha.3";
+  by-version."istanbul-lib-report"."1.0.0-alpha.3" = self.buildNodePackage {
+    name = "istanbul-lib-report-1.0.0-alpha.3";
+    version = "1.0.0-alpha.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.0.0-alpha.3.tgz";
+      name = "istanbul-lib-report-1.0.0-alpha.3.tgz";
+      sha1 = "32d5f6ec7f33ca3a602209e278b2e6ff143498af";
+    };
+    deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "istanbul-lib-coverage-1.0.0-alpha.4" = self.by-version."istanbul-lib-coverage"."1.0.0-alpha.4";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "path-parse-1.0.5" = self.by-version."path-parse"."1.0.5";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "supports-color-3.1.2" = self.by-version."supports-color"."3.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."istanbul-reports"."^1.0.0-alpha" =
+    self.by-version."istanbul-reports"."1.0.0-alpha.4";
+  by-version."istanbul-reports"."1.0.0-alpha.4" = self.buildNodePackage {
+    name = "istanbul-reports-1.0.0-alpha.4";
+    version = "1.0.0-alpha.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.0.0-alpha.4.tgz";
+      name = "istanbul-reports-1.0.0-alpha.4.tgz";
+      sha1 = "5086d417b4bb97bf6870f3fb5cb55b7e703361b8";
+    };
+    deps = {
+      "handlebars-4.0.5" = self.by-version."handlebars"."4.0.5";
     };
     optionalDependencies = {
     };
@@ -20496,26 +23379,26 @@
     os = [ ];
     cpu = [ ];
   };
-  "istanbul" = self.by-version."istanbul"."0.3.13";
-  by-spec."istanbul"."~0.3.0" =
-    self.by-version."istanbul"."0.3.13";
   by-spec."jade"."*" =
-    self.by-version."jade"."1.9.2";
-  by-version."jade"."1.9.2" = self.buildNodePackage {
-    name = "jade-1.9.2";
-    version = "1.9.2";
+    self.by-version."jade"."1.11.0";
+  by-version."jade"."1.11.0" = self.buildNodePackage {
+    name = "jade-1.11.0";
+    version = "1.11.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jade/-/jade-1.9.2.tgz";
-      name = "jade-1.9.2.tgz";
-      sha1 = "0b89f9c60d4ead2738e826ba7b2ccac9a5702abe";
+      url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz";
+      name = "jade-1.11.0.tgz";
+      sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd";
     };
     deps = {
       "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1";
+      "clean-css-3.4.11" = self.by-version."clean-css"."3.4.11";
       "commander-2.6.0" = self.by-version."commander"."2.6.0";
-      "constantinople-3.0.1" = self.by-version."constantinople"."3.0.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "constantinople-3.0.2" = self.by-version."constantinople"."3.0.2";
+      "jstransformer-0.0.2" = self.by-version."jstransformer"."0.0.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
+      "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
       "void-elements-2.0.1" = self.by-version."void-elements"."2.0.1";
       "with-4.0.3" = self.by-version."with"."4.0.3";
     };
@@ -20525,7 +23408,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "jade" = self.by-version."jade"."1.9.2";
+  "jade" = self.by-version."jade"."1.11.0";
   by-spec."jade"."0.26.3" =
     self.by-version."jade"."0.26.3";
   by-version."jade"."0.26.3" = self.buildNodePackage {
@@ -20533,7 +23416,7 @@
     version = "0.26.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
+      url = "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz";
       name = "jade-0.26.3.tgz";
       sha1 = "8f10d7977d8d79f2f6ff862a81b0513ccb25686c";
     };
@@ -20554,7 +23437,7 @@
     version = "0.27.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
+      url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
       name = "jade-0.27.0.tgz";
       sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31";
     };
@@ -20568,25 +23451,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jade"."1.1.5" =
-    self.by-version."jade"."1.1.5";
-  by-version."jade"."1.1.5" = self.buildNodePackage {
-    name = "jade-1.1.5";
-    version = "1.1.5";
+  by-spec."jade".">= 0.0.1" =
+    self.by-version."jade"."1.11.0";
+  by-spec."jade"."^1.11.0" =
+    self.by-version."jade"."1.11.0";
+  by-spec."jayschema"."*" =
+    self.by-version."jayschema"."0.3.1";
+  by-version."jayschema"."0.3.1" = self.buildNodePackage {
+    name = "jayschema-0.3.1";
+    version = "0.3.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jade/-/jade-1.1.5.tgz";
-      name = "jade-1.1.5.tgz";
-      sha1 = "e884d3d3565807e280f5ba760f68addb176627a3";
+      url = "https://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
+      name = "jayschema-0.3.1.tgz";
+      sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
     };
     deps = {
-      "commander-2.1.0" = self.by-version."commander"."2.1.0";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
-      "character-parser-1.2.0" = self.by-version."character-parser"."1.2.0";
-      "monocle-1.1.51" = self.by-version."monocle"."1.1.51";
-      "with-2.0.0" = self.by-version."with"."2.0.0";
-      "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
+      "when-3.4.6" = self.by-version."when"."3.4.6";
     };
     optionalDependencies = {
     };
@@ -20594,27 +23475,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jade".">= 0.0.1" =
-    self.by-version."jade"."1.9.2";
-  by-spec."jade"."~0.35.0" =
-    self.by-version."jade"."0.35.0";
-  by-version."jade"."0.35.0" = self.buildNodePackage {
-    name = "jade-0.35.0";
-    version = "0.35.0";
-    bin = true;
+  "jayschema" = self.by-version."jayschema"."0.3.1";
+  by-spec."jfs"."*" =
+    self.by-version."jfs"."0.2.6";
+  by-version."jfs"."0.2.6" = self.buildNodePackage {
+    name = "jfs-0.2.6";
+    version = "0.2.6";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jade/-/jade-0.35.0.tgz";
-      name = "jade-0.35.0.tgz";
-      sha1 = "75ec1d966a1203733613e8c180e2aa8685c16da9";
+      url = "https://registry.npmjs.org/jfs/-/jfs-0.2.6.tgz";
+      name = "jfs-0.2.6.tgz";
+      sha1 = "851b728ee5cff449855cf9ad554f4a5e14ab6912";
     };
     deps = {
-      "commander-2.0.0" = self.by-version."commander"."2.0.0";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "transformers-2.1.0" = self.by-version."transformers"."2.1.0";
-      "character-parser-1.2.0" = self.by-version."character-parser"."1.2.0";
-      "monocle-1.1.50" = self.by-version."monocle"."1.1.50";
-      "with-1.1.1" = self.by-version."with"."1.1.1";
-      "constantinople-1.0.2" = self.by-version."constantinople"."1.0.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "async-1.2.1" = self.by-version."async"."1.2.1";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -20622,19 +23499,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jayschema"."*" =
-    self.by-version."jayschema"."0.3.1";
-  by-version."jayschema"."0.3.1" = self.buildNodePackage {
-    name = "jayschema-0.3.1";
-    version = "0.3.1";
-    bin = true;
+  "jfs" = self.by-version."jfs"."0.2.6";
+  by-spec."jju"."1.x" =
+    self.by-version."jju"."1.3.0";
+  by-version."jju"."1.3.0" = self.buildNodePackage {
+    name = "jju-1.3.0";
+    version = "1.3.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jayschema/-/jayschema-0.3.1.tgz";
-      name = "jayschema-0.3.1.tgz";
-      sha1 = "76f4769f9b172ef7d5dcde4875b49cb736179b58";
+      url = "https://registry.npmjs.org/jju/-/jju-1.3.0.tgz";
+      name = "jju-1.3.0.tgz";
+      sha1 = "dadd9ef01924bc728b03f2f7979bdbd62f7a2aaa";
     };
     deps = {
-      "when-3.4.6" = self.by-version."when"."3.4.6";
     };
     optionalDependencies = {
     };
@@ -20642,23 +23519,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "jayschema" = self.by-version."jayschema"."0.3.1";
-  by-spec."jfs"."*" =
-    self.by-version."jfs"."0.2.5";
-  by-version."jfs"."0.2.5" = self.buildNodePackage {
-    name = "jfs-0.2.5";
-    version = "0.2.5";
+  by-spec."jju"."^1.1.0" =
+    self.by-version."jju"."1.3.0";
+  by-spec."jmespath"."0.15.0" =
+    self.by-version."jmespath"."0.15.0";
+  by-version."jmespath"."0.15.0" = self.buildNodePackage {
+    name = "jmespath-0.15.0";
+    version = "0.15.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jfs/-/jfs-0.2.5.tgz";
-      name = "jfs-0.2.5.tgz";
-      sha1 = "c1ae4c89905724ae8caf79859783c0613254249f";
+      url = "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz";
+      name = "jmespath-0.15.0.tgz";
+      sha1 = "a3f222a9aae9f966f5d27c796510e28091764217";
     };
     deps = {
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "clone-0.2.0" = self.by-version."clone"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -20666,19 +23540,19 @@
     os = [ ];
     cpu = [ ];
   };
-  "jfs" = self.by-version."jfs"."0.2.5";
-  by-spec."jju"."1.x" =
-    self.by-version."jju"."1.2.0";
-  by-version."jju"."1.2.0" = self.buildNodePackage {
-    name = "jju-1.2.0";
-    version = "1.2.0";
+  by-spec."jodid25519".">=1.0.0 <2.0.0" =
+    self.by-version."jodid25519"."1.0.2";
+  by-version."jodid25519"."1.0.2" = self.buildNodePackage {
+    name = "jodid25519-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jju/-/jju-1.2.0.tgz";
-      name = "jju-1.2.0.tgz";
-      sha1 = "add5b586fec853b44929d78bf94864ab577c02e9";
+      url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
+      name = "jodid25519-1.0.2.tgz";
+      sha1 = "06d4912255093419477d425633606e0e90782967";
     };
     deps = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -20686,18 +23560,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jju"."^1.1.0" =
-    self.by-version."jju"."1.2.0";
-  by-spec."js-string-escape"."^1.0.0" =
-    self.by-version."js-string-escape"."1.0.0";
-  by-version."js-string-escape"."1.0.0" = self.buildNodePackage {
-    name = "js-string-escape-1.0.0";
-    version = "1.0.0";
+  by-spec."joi"."^6.4.3" =
+    self.by-version."joi"."6.10.1";
+  by-version."joi"."6.10.1" = self.buildNodePackage {
+    name = "joi-6.10.1";
+    version = "6.10.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/joi/-/joi-6.10.1.tgz";
+      name = "joi-6.10.1.tgz";
+      sha1 = "4d50c318079122000fe5f16af1ff8e1917b77e06";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "topo-1.1.0" = self.by-version."topo"."1.1.0";
+      "isemail-1.2.0" = self.by-version."isemail"."1.2.0";
+      "moment-2.12.0" = self.by-version."moment"."2.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."js-tokens"."^1.0.1" =
+    self.by-version."js-tokens"."1.0.3";
+  by-version."js-tokens"."1.0.3" = self.buildNodePackage {
+    name = "js-tokens-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.0.tgz";
-      name = "js-string-escape-1.0.0.tgz";
-      sha1 = "d2d2365fd2e6b3948b8374ac7628ac0e84d00002";
+      url = "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.3.tgz";
+      name = "js-tokens-1.0.3.tgz";
+      sha1 = "14e56eb68c8f1a92c43d59f5014ec29dc20f2ae1";
     };
     deps = {
     };
@@ -20708,19 +23603,19 @@
     cpu = [ ];
   };
   by-spec."js-yaml"."*" =
-    self.by-version."js-yaml"."3.2.7";
-  by-version."js-yaml"."3.2.7" = self.buildNodePackage {
-    name = "js-yaml-3.2.7";
-    version = "3.2.7";
+    self.by-version."js-yaml"."3.5.5";
+  by-version."js-yaml"."3.5.5" = self.buildNodePackage {
+    name = "js-yaml-3.5.5";
+    version = "3.5.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.7.tgz";
-      name = "js-yaml-3.2.7.tgz";
-      sha1 = "102790f265d986fe95a4d0f2a792e7a7bd886eec";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz";
+      name = "js-yaml-3.5.5.tgz";
+      sha1 = "0377c38017cabc7322b0d1fbcd25a491641f2fbe";
     };
     deps = {
-      "argparse-1.0.2" = self.by-version."argparse"."1.0.2";
-      "esprima-2.0.0" = self.by-version."esprima"."2.0.0";
+      "argparse-1.0.7" = self.by-version."argparse"."1.0.7";
+      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
     };
     optionalDependencies = {
     };
@@ -20728,7 +23623,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "js-yaml" = self.by-version."js-yaml"."3.2.7";
+  "js-yaml" = self.by-version."js-yaml"."3.5.5";
   by-spec."js-yaml"."0.3.x" =
     self.by-version."js-yaml"."0.3.7";
   by-version."js-yaml"."0.3.7" = self.buildNodePackage {
@@ -20736,7 +23631,7 @@
     version = "0.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-0.3.7.tgz";
       name = "js-yaml-0.3.7.tgz";
       sha1 = "d739d8ee86461e54b354d6a7d7d1f2ad9a167f62";
     };
@@ -20755,7 +23650,7 @@
     version = "2.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.1.0.tgz";
       name = "js-yaml-2.1.0.tgz";
       sha1 = "a55a6e4706b01d06326259a6f4bfc42e6ae38b1f";
     };
@@ -20776,7 +23671,7 @@
     version = "3.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.0.1.tgz";
       name = "js-yaml-3.0.1.tgz";
       sha1 = "76405fea5bce30fc8f405d48c6dca7f0a32c6afe";
     };
@@ -20791,13 +23686,13 @@
     cpu = [ ];
   };
   by-spec."js-yaml"."3.x" =
-    self.by-version."js-yaml"."3.2.7";
+    self.by-version."js-yaml"."3.5.5";
   by-spec."js-yaml"."3.x >=3.2" =
-    self.by-version."js-yaml"."3.2.7";
+    self.by-version."js-yaml"."3.5.5";
   by-spec."js-yaml".">=3.0.1 <4.0.0-0" =
-    self.by-version."js-yaml"."3.2.7";
-  by-spec."js-yaml"."^3.1.0" =
-    self.by-version."js-yaml"."3.2.7";
+    self.by-version."js-yaml"."3.5.5";
+  by-spec."js-yaml"."^3.5.1" =
+    self.by-version."js-yaml"."3.5.5";
   by-spec."js-yaml"."~2.0.5" =
     self.by-version."js-yaml"."2.0.5";
   by-version."js-yaml"."2.0.5" = self.buildNodePackage {
@@ -20805,7 +23700,7 @@
     version = "2.0.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
+      url = "https://registry.npmjs.org/js-yaml/-/js-yaml-2.0.5.tgz";
       name = "js-yaml-2.0.5.tgz";
       sha1 = "a25ae6509999e97df278c6719da11bd0687743a8";
     };
@@ -20819,25 +23714,54 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsdom"."^0.10.5" =
-    self.by-version."jsdom"."0.10.6";
-  by-version."jsdom"."0.10.6" = self.buildNodePackage {
-    name = "jsdom-0.10.6";
-    version = "0.10.6";
+  by-spec."js-yaml"."~3.5.2" =
+    self.by-version."js-yaml"."3.5.5";
+  by-spec."jsbn".">=0.1.0 <0.2.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-version."jsbn"."0.1.0" = self.buildNodePackage {
+    name = "jsbn-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsdom/-/jsdom-0.10.6.tgz";
-      name = "jsdom-0.10.6.tgz";
-      sha1 = "a3b1d875454ba0165575829679939ec006bf5ab8";
+      url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
+      name = "jsbn-0.1.0.tgz";
+      sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
     };
     deps = {
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
-      "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
-      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
-      "cssstyle-0.2.23" = self.by-version."cssstyle"."0.2.23";
-      "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsbn"."~0.1.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-spec."jsdom"."3.1.2" =
+    self.by-version."jsdom"."3.1.2";
+  by-version."jsdom"."3.1.2" = self.buildNodePackage {
+    name = "jsdom-3.1.2";
+    version = "3.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsdom/-/jsdom-3.1.2.tgz";
+      name = "jsdom-3.1.2.tgz";
+      sha1 = "88e5fe2d3b45b628a153011e2aa0ead7f395b19c";
+    };
+    deps = {
+      "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
+      "contextify-0.1.15" = self.by-version."contextify"."0.1.15";
+      "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
+      "cssstyle-0.2.34" = self.by-version."cssstyle"."0.2.34";
+      "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
+      "nwmatcher-1.3.7" = self.by-version."nwmatcher"."1.3.7";
+      "parse5-1.5.1" = self.by-version."parse5"."1.5.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "xml-name-validator-1.0.0" = self.by-version."xml-name-validator"."1.0.0";
+      "xmlhttprequest-1.8.0" = self.by-version."xmlhttprequest"."1.8.0";
+      "acorn-globals-1.0.9" = self.by-version."acorn-globals"."1.0.9";
+      "acorn-0.11.0" = self.by-version."acorn"."0.11.0";
+      "escodegen-1.8.0" = self.by-version."escodegen"."1.8.0";
     };
     optionalDependencies = {
     };
@@ -20852,18 +23776,18 @@
     version = "0.11.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz";
+      url = "https://registry.npmjs.org/jsdom/-/jsdom-0.11.1.tgz";
       name = "jsdom-0.11.1.tgz";
       sha1 = "f1a79756ebc2116932caef8c6bfde7022dacdbfb";
     };
     deps = {
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
-      "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
-      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
-      "cssstyle-0.2.23" = self.by-version."cssstyle"."0.2.23";
-      "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
+      "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
+      "nwmatcher-1.3.7" = self.by-version."nwmatcher"."1.3.7";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "xmlhttprequest-1.8.0" = self.by-version."xmlhttprequest"."1.8.0";
+      "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
+      "cssstyle-0.2.34" = self.by-version."cssstyle"."0.2.34";
+      "contextify-0.1.15" = self.by-version."contextify"."0.1.15";
     };
     optionalDependencies = {
     };
@@ -20878,18 +23802,18 @@
     version = "0.8.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsdom/-/jsdom-0.8.11.tgz";
+      url = "https://registry.npmjs.org/jsdom/-/jsdom-0.8.11.tgz";
       name = "jsdom-0.8.11.tgz";
       sha1 = "2a065f72863ac491137d19bd762ce9be1955527b";
     };
     deps = {
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
-      "nwmatcher-1.3.4" = self.by-version."nwmatcher"."1.3.4";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "xmlhttprequest-1.7.0" = self.by-version."xmlhttprequest"."1.7.0";
-      "cssom-0.3.0" = self.by-version."cssom"."0.3.0";
-      "cssstyle-0.2.23" = self.by-version."cssstyle"."0.2.23";
-      "contextify-0.1.13" = self.by-version."contextify"."0.1.13";
+      "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
+      "nwmatcher-1.3.7" = self.by-version."nwmatcher"."1.3.7";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "xmlhttprequest-1.8.0" = self.by-version."xmlhttprequest"."1.8.0";
+      "cssom-0.3.1" = self.by-version."cssom"."0.3.1";
+      "cssstyle-0.2.34" = self.by-version."cssstyle"."0.2.34";
+      "contextify-0.1.15" = self.by-version."contextify"."0.1.15";
     };
     optionalDependencies = {
     };
@@ -20904,7 +23828,7 @@
     version = "0.4.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz";
+      url = "https://registry.npmjs.org/jsesc/-/jsesc-0.4.3.tgz";
       name = "jsesc-0.4.3.tgz";
       sha1 = "a9c7f90afd5a1bf2ee64df6c416dab61672d2ae9";
     };
@@ -20919,25 +23843,25 @@
   by-spec."jsesc"."~0.4.3" =
     self.by-version."jsesc"."0.4.3";
   by-spec."jshint"."*" =
-    self.by-version."jshint"."2.7.0";
-  by-version."jshint"."2.7.0" = self.buildNodePackage {
-    name = "jshint-2.7.0";
-    version = "2.7.0";
+    self.by-version."jshint"."2.9.1";
+  by-version."jshint"."2.9.1" = self.buildNodePackage {
+    name = "jshint-2.9.1";
+    version = "2.9.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jshint/-/jshint-2.7.0.tgz";
-      name = "jshint-2.7.0.tgz";
-      sha1 = "d512bb14731dac09e49f212e6b2f1b0fdbabbc4f";
+      url = "https://registry.npmjs.org/jshint/-/jshint-2.9.1.tgz";
+      name = "jshint-2.9.1.tgz";
+      sha1 = "3136b68f8b6fa37423aacb8ec5e18a1ada7a2638";
     };
     deps = {
       "cli-0.6.6" = self.by-version."cli"."0.6.6";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
       "exit-0.1.2" = self.by-version."exit"."0.1.2";
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
+      "htmlparser2-3.8.3" = self.by-version."htmlparser2"."3.8.3";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
       "shelljs-0.3.0" = self.by-version."shelljs"."0.3.0";
-      "strip-json-comments-1.0.2" = self.by-version."strip-json-comments"."1.0.2";
-      "lodash-3.6.0" = self.by-version."lodash"."3.6.0";
+      "strip-json-comments-1.0.4" = self.by-version."strip-json-comments"."1.0.4";
+      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
     };
     optionalDependencies = {
     };
@@ -20945,9 +23869,9 @@
     os = [ ];
     cpu = [ ];
   };
-  "jshint" = self.by-version."jshint"."2.7.0";
-  by-spec."jshint"."^2.6.0" =
-    self.by-version."jshint"."2.7.0";
+  "jshint" = self.by-version."jshint"."2.9.1";
+  by-spec."jshint"."~2.9.1" =
+    self.by-version."jshint"."2.9.1";
   by-spec."json"."*" =
     self.by-version."json"."9.0.3";
   by-version."json"."9.0.3" = self.buildNodePackage {
@@ -20955,7 +23879,7 @@
     version = "9.0.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json/-/json-9.0.3.tgz";
+      url = "https://registry.npmjs.org/json/-/json-9.0.3.tgz";
       name = "json-9.0.3.tgz";
       sha1 = "08dd0eda9dda30a40d978cc8823c2ce72df5d4f1";
     };
@@ -20975,7 +23899,7 @@
     version = "1.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-middleware/-/json-middleware-1.0.2.tgz";
+      url = "https://registry.npmjs.org/json-middleware/-/json-middleware-1.0.2.tgz";
       name = "json-middleware-1.0.2.tgz";
       sha1 = "bc55c6d43231df6846df6ba880f72454e2a32596";
     };
@@ -20994,12 +23918,12 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
+      url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
       name = "json-parse-helpfulerror-1.0.3.tgz";
       sha1 = "13f14ce02eed4e981297b64eb9e3b932e2dd13dc";
     };
     deps = {
-      "jju-1.2.0" = self.by-version."jju"."1.2.0";
+      "jju-1.3.0" = self.by-version."jju"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -21007,6 +23931,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."json-parse-helpfulerror"."^1.0.3" =
+    self.by-version."json-parse-helpfulerror"."1.0.3";
   by-spec."json-schema"."0.2.2" =
     self.by-version."json-schema"."0.2.2";
   by-version."json-schema"."0.2.2" = self.buildNodePackage {
@@ -21014,7 +23940,7 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+      url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
       name = "json-schema-0.2.2.tgz";
       sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
     };
@@ -21026,6 +23952,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."json-stable-stringify"."^1.0.0" =
+    self.by-version."json-stable-stringify"."1.0.1";
+  by-version."json-stable-stringify"."1.0.1" = self.buildNodePackage {
+    name = "json-stable-stringify-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz";
+      name = "json-stable-stringify-1.0.1.tgz";
+      sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af";
+    };
+    deps = {
+      "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."json-stable-stringify"."~0.0.0" =
     self.by-version."json-stable-stringify"."0.0.1";
   by-version."json-stable-stringify"."0.0.1" = self.buildNodePackage {
@@ -21033,7 +23979,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
+      url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-0.0.1.tgz";
       name = "json-stable-stringify-0.0.1.tgz";
       sha1 = "611c23e814db375527df851193db59dd2af27f45";
     };
@@ -21053,7 +23999,7 @@
     version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
+      url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-3.0.0.tgz";
       name = "json-stringify-safe-3.0.0.tgz";
       sha1 = "9db7b0e530c7f289c5e8c8432af191c2ff75a5b3";
     };
@@ -21065,16 +24011,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."json-stringify-safe"."~4.0.0" =
-    self.by-version."json-stringify-safe"."4.0.0";
-  by-version."json-stringify-safe"."4.0.0" = self.buildNodePackage {
-    name = "json-stringify-safe-4.0.0";
-    version = "4.0.0";
+  by-spec."json-stringify-safe"."~5.0.0" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
+    name = "json-stringify-safe-5.0.1";
+    version = "5.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-4.0.0.tgz";
-      name = "json-stringify-safe-4.0.0.tgz";
-      sha1 = "77c271aaea54302e68efeaccb56abbf06a9b1a54";
+      url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+      name = "json-stringify-safe-5.0.1.tgz";
+      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
     };
     deps = {
     };
@@ -21084,16 +24030,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."json-stringify-safe"."~5.0.0" =
-    self.by-version."json-stringify-safe"."5.0.0";
-  by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage {
-    name = "json-stringify-safe-5.0.0";
-    version = "5.0.0";
+  by-spec."json-stringify-safe"."~5.0.1" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-spec."json3"."3.2.6" =
+    self.by-version."json3"."3.2.6";
+  by-version."json3"."3.2.6" = self.buildNodePackage {
+    name = "json3-3.2.6";
+    version = "3.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
-      name = "json-stringify-safe-5.0.0.tgz";
-      sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
+      url = "https://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
+      name = "json3-3.2.6.tgz";
+      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
     };
     deps = {
     };
@@ -21103,16 +24051,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."json3"."3.2.6" =
-    self.by-version."json3"."3.2.6";
-  by-version."json3"."3.2.6" = self.buildNodePackage {
-    name = "json3-3.2.6";
-    version = "3.2.6";
+  by-spec."json3"."3.3.2" =
+    self.by-version."json3"."3.3.2";
+  by-version."json3"."3.3.2" = self.buildNodePackage {
+    name = "json3-3.3.2";
+    version = "3.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
-      name = "json3-3.2.6.tgz";
-      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+      url = "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+      name = "json3-3.3.2.tgz";
+      sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
     };
     deps = {
     };
@@ -21122,6 +24070,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."json3"."^3.3.2" =
+    self.by-version."json3"."3.3.2";
   by-spec."json5"."^0.2.0" =
     self.by-version."json5"."0.2.0";
   by-version."json5"."0.2.0" = self.buildNodePackage {
@@ -21129,7 +24079,7 @@
     version = "0.2.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz";
+      url = "https://registry.npmjs.org/json5/-/json5-0.2.0.tgz";
       name = "json5-0.2.0.tgz";
       sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343";
     };
@@ -21141,16 +24091,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsonfile"."^2.0.0" =
-    self.by-version."jsonfile"."2.0.0";
-  by-version."jsonfile"."2.0.0" = self.buildNodePackage {
-    name = "jsonfile-2.0.0";
-    version = "2.0.0";
+  by-spec."json5"."^0.4.0" =
+    self.by-version."json5"."0.4.0";
+  by-version."json5"."0.4.0" = self.buildNodePackage {
+    name = "json5-0.4.0";
+    version = "0.4.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz";
+      name = "json5-0.4.0.tgz";
+      sha1 = "054352e4c4c80c86c0923877d449de176a732c8d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsonfile"."^2.1.0" =
+    self.by-version."jsonfile"."2.2.3";
+  by-version."jsonfile"."2.2.3" = self.buildNodePackage {
+    name = "jsonfile-2.2.3";
+    version = "2.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz";
-      name = "jsonfile-2.0.0.tgz";
-      sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b";
+      url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.2.3.tgz";
+      name = "jsonfile-2.2.3.tgz";
+      sha1 = "e252b99a6af901d3ec41f332589c90509a7bc605";
     };
     deps = {
     };
@@ -21167,7 +24136,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
+      url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.0.1.tgz";
       name = "jsonfile-1.0.1.tgz";
       sha1 = "ea5efe40b83690b98667614a7392fc60e842c0dd";
     };
@@ -21186,7 +24155,7 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz";
+      url = "https://registry.npmjs.org/jsonfile/-/jsonfile-1.1.1.tgz";
       name = "jsonfile-1.1.1.tgz";
       sha1 = "da4fd6ad77f1a255203ea63c7bc32dc31ef64433";
     };
@@ -21205,7 +24174,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
+      url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz";
       name = "jsonify-0.0.0.tgz";
       sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73";
     };
@@ -21224,7 +24193,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz";
+      url = "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz";
       name = "jsonparse-0.0.5.tgz";
       sha1 = "330542ad3f0a654665b778f3eb2d9a9fa507ac64";
     };
@@ -21236,16 +24205,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsonpointer"."^1.1.0" =
-    self.by-version."jsonpointer"."1.1.0";
-  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
-    name = "jsonpointer-1.1.0";
-    version = "1.1.0";
+  by-spec."jsonparse"."^1.1.0" =
+    self.by-version."jsonparse"."1.2.0";
+  by-version."jsonparse"."1.2.0" = self.buildNodePackage {
+    name = "jsonparse-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
-      name = "jsonpointer-1.1.0.tgz";
-      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
+      url = "https://registry.npmjs.org/jsonparse/-/jsonparse-1.2.0.tgz";
+      name = "jsonparse-1.2.0.tgz";
+      sha1 = "5c0c5685107160e72fe7489bddea0b44c2bc67bd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsonpointer"."2.0.0" =
+    self.by-version."jsonpointer"."2.0.0";
+  by-version."jsonpointer"."2.0.0" = self.buildNodePackage {
+    name = "jsonpointer-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
+      name = "jsonpointer-2.0.0.tgz";
+      sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
     };
     deps = {
     };
@@ -21262,7 +24250,7 @@
     version = "7.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
+      url = "https://registry.npmjs.org/jsontool/-/jsontool-7.0.2.tgz";
       name = "jsontool-7.0.2.tgz";
       sha1 = "e29d3d1b0766ba4e179a18a96578b904dca43207";
     };
@@ -21275,19 +24263,20 @@
     cpu = [ ];
   };
   "jsontool" = self.by-version."jsontool"."7.0.2";
-  by-spec."jsonwebtoken"."^1.1.1" =
-    self.by-version."jsonwebtoken"."1.3.0";
-  by-version."jsonwebtoken"."1.3.0" = self.buildNodePackage {
-    name = "jsonwebtoken-1.3.0";
-    version = "1.3.0";
+  by-spec."jsonwebtoken"."5.4.x" =
+    self.by-version."jsonwebtoken"."5.4.1";
+  by-version."jsonwebtoken"."5.4.1" = self.buildNodePackage {
+    name = "jsonwebtoken-5.4.1";
+    version = "5.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-1.3.0.tgz";
-      name = "jsonwebtoken-1.3.0.tgz";
-      sha1 = "683ceee1bbe09a92d9e026ab25e67f97bcf3c3e2";
+      url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-5.4.1.tgz";
+      name = "jsonwebtoken-5.4.1.tgz";
+      sha1 = "2055c639195ffe56314fa6a51df02468186a9695";
     };
     deps = {
-      "jws-0.2.6" = self.by-version."jws"."0.2.6";
+      "jws-3.1.3" = self.by-version."jws"."3.1.3";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
     };
     optionalDependencies = {
     };
@@ -21295,21 +24284,65 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsprim"."0.3.0" =
-    self.by-version."jsprim"."0.3.0";
-  by-version."jsprim"."0.3.0" = self.buildNodePackage {
-    name = "jsprim-0.3.0";
-    version = "0.3.0";
+  by-spec."jsonwebtoken".">=1.0.0" =
+    self.by-version."jsonwebtoken"."5.7.0";
+  by-version."jsonwebtoken"."5.7.0" = self.buildNodePackage {
+    name = "jsonwebtoken-5.7.0";
+    version = "5.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
-      name = "jsprim-0.3.0.tgz";
-      sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
+      url = "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-5.7.0.tgz";
+      name = "jsonwebtoken-5.7.0.tgz";
+      sha1 = "1c90f9a86ce5b748f5f979c12b70402b4afcddb4";
     };
     deps = {
-      "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
-      "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
-      "verror-1.3.3" = self.by-version."verror"."1.3.3";
+      "jws-3.1.3" = self.by-version."jws"."3.1.3";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsprim"."0.3.0" =
+    self.by-version."jsprim"."0.3.0";
+  by-version."jsprim"."0.3.0" = self.buildNodePackage {
+    name = "jsprim-0.3.0";
+    version = "0.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsprim/-/jsprim-0.3.0.tgz";
+      name = "jsprim-0.3.0.tgz";
+      sha1 = "cd13466ea2480dbd8396a570d47d31dda476f8b1";
+    };
+    deps = {
+      "extsprintf-1.0.0" = self.by-version."extsprintf"."1.0.0";
+      "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
+      "verror-1.3.3" = self.by-version."verror"."1.3.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsprim"."^1.2.2" =
+    self.by-version."jsprim"."1.2.2";
+  by-version."jsprim"."1.2.2" = self.buildNodePackage {
+    name = "jsprim-1.2.2";
+    version = "1.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz";
+      name = "jsprim-1.2.2.tgz";
+      sha1 = "f20c906ac92abd58e3b79ac8bc70a48832512da1";
+    };
+    deps = {
+      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+      "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
+      "verror-1.3.6" = self.by-version."verror"."1.3.6";
     };
     optionalDependencies = {
     };
@@ -21324,7 +24357,7 @@
     version = "10.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz";
+      url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz";
       name = "jstransform-10.1.0.tgz";
       sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
     };
@@ -21339,20 +24372,44 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jstransform"."^10.1.0" =
-    self.by-version."jstransform"."10.1.0";
-  by-spec."junk"."^1.0.0" =
-    self.by-version."junk"."1.0.1";
-  by-version."junk"."1.0.1" = self.buildNodePackage {
-    name = "junk-1.0.1";
-    version = "1.0.1";
+  by-spec."jstransform"."^11.0.0" =
+    self.by-version."jstransform"."11.0.3";
+  by-version."jstransform"."11.0.3" = self.buildNodePackage {
+    name = "jstransform-11.0.3";
+    version = "11.0.3";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jstransform/-/jstransform-11.0.3.tgz";
+      name = "jstransform-11.0.3.tgz";
+      sha1 = "09a78993e0ae4d4ef4487f6155a91f6190cb4223";
+    };
+    deps = {
+      "base62-1.1.0" = self.by-version."base62"."1.1.0";
+      "commoner-0.10.4" = self.by-version."commoner"."0.10.4";
+      "esprima-fb-15001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1.0-dev-harmony-fb";
+      "object-assign-2.1.1" = self.by-version."object-assign"."2.1.1";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jstransformer"."0.0.2" =
+    self.by-version."jstransformer"."0.0.2";
+  by-version."jstransformer"."0.0.2" = self.buildNodePackage {
+    name = "jstransformer-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/junk/-/junk-1.0.1.tgz";
-      name = "junk-1.0.1.tgz";
-      sha1 = "824ef8925f02026f61bc6e6fa346b25fa8f3938b";
+      url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz";
+      name = "jstransformer-0.0.2.tgz";
+      sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab";
     };
     deps = {
+      "is-promise-2.1.0" = self.by-version."is-promise"."2.1.0";
+      "promise-6.1.0" = self.by-version."promise"."6.1.0";
     };
     optionalDependencies = {
     };
@@ -21360,19 +24417,43 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jwa"."0.0.1" =
-    self.by-version."jwa"."0.0.1";
-  by-version."jwa"."0.0.1" = self.buildNodePackage {
-    name = "jwa-0.0.1";
-    version = "0.0.1";
+  by-spec."jwa"."^1.1.2" =
+    self.by-version."jwa"."1.1.3";
+  by-version."jwa"."1.1.3" = self.buildNodePackage {
+    name = "jwa-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jwa/-/jwa-0.0.1.tgz";
-      name = "jwa-0.0.1.tgz";
-      sha1 = "2d05f54d68f170648c30fe45944731a388cd07cc";
+      url = "https://registry.npmjs.org/jwa/-/jwa-1.1.3.tgz";
+      name = "jwa-1.1.3.tgz";
+      sha1 = "fa9f2f005ff0c630e7c41526a31f37f79733cd6d";
+    };
+    deps = {
+      "base64url-1.0.6" = self.by-version."base64url"."1.0.6";
+      "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
+      "ecdsa-sig-formatter-1.0.5" = self.by-version."ecdsa-sig-formatter"."1.0.5";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jwa"."~1.0.0" =
+    self.by-version."jwa"."1.0.2";
+  by-version."jwa"."1.0.2" = self.buildNodePackage {
+    name = "jwa-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/jwa/-/jwa-1.0.2.tgz";
+      name = "jwa-1.0.2.tgz";
+      sha1 = "fd79609f1e772e299dce8ddb76d00659dd83511f";
     };
     deps = {
       "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
+      "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
+      "ecdsa-sig-formatter-1.0.5" = self.by-version."ecdsa-sig-formatter"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -21380,20 +24461,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jws"."0.0.2" =
-    self.by-version."jws"."0.0.2";
-  by-version."jws"."0.0.2" = self.buildNodePackage {
-    name = "jws-0.0.2";
-    version = "0.0.2";
+  by-spec."jws"."^3.0.0" =
+    self.by-version."jws"."3.1.3";
+  by-version."jws"."3.1.3" = self.buildNodePackage {
+    name = "jws-3.1.3";
+    version = "3.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jws/-/jws-0.0.2.tgz";
-      name = "jws-0.0.2.tgz";
-      sha1 = "8c6916977183cce3361da48c8c2e0c606e7a95c6";
+      url = "https://registry.npmjs.org/jws/-/jws-3.1.3.tgz";
+      name = "jws-3.1.3.tgz";
+      sha1 = "b88f1b4581a2c5ee8813c06b3fdf90ea9b5c7e6c";
     };
     deps = {
-      "tap-0.3.3" = self.by-version."tap"."0.3.3";
-      "base64url-0.0.3" = self.by-version."base64url"."0.0.3";
+      "base64url-1.0.6" = self.by-version."base64url"."1.0.6";
+      "jwa-1.1.3" = self.by-version."jwa"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -21401,20 +24482,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jws"."~0.2.6" =
-    self.by-version."jws"."0.2.6";
-  by-version."jws"."0.2.6" = self.buildNodePackage {
-    name = "jws-0.2.6";
-    version = "0.2.6";
+  by-spec."jws"."~3.0.0" =
+    self.by-version."jws"."3.0.0";
+  by-version."jws"."3.0.0" = self.buildNodePackage {
+    name = "jws-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jws/-/jws-0.2.6.tgz";
-      name = "jws-0.2.6.tgz";
-      sha1 = "e9b7e9ac8d2ac1067413233bc6c20fbd8868e9ba";
+      url = "https://registry.npmjs.org/jws/-/jws-3.0.0.tgz";
+      name = "jws-3.0.0.tgz";
+      sha1 = "da5f267897dd4e9cf8137979db33fc54a3c05418";
     };
     deps = {
-      "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
-      "jwa-0.0.1" = self.by-version."jwa"."0.0.1";
+      "jwa-1.0.2" = self.by-version."jwa"."1.0.2";
+      "base64url-1.0.6" = self.by-version."base64url"."1.0.6";
     };
     optionalDependencies = {
     };
@@ -21429,7 +24510,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jwt-simple/-/jwt-simple-0.1.0.tgz";
+      url = "https://registry.npmjs.org/jwt-simple/-/jwt-simple-0.1.0.tgz";
       name = "jwt-simple-0.1.0.tgz";
       sha1 = "546b34aab02e3cd49c43a4279498b34d940041e3";
     };
@@ -21441,16 +24522,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."k-bucket"."^0.4.2" =
-    self.by-version."k-bucket"."0.4.2";
-  by-version."k-bucket"."0.4.2" = self.buildNodePackage {
-    name = "k-bucket-0.4.2";
-    version = "0.4.2";
+  by-spec."k-bucket"."^0.5.0" =
+    self.by-version."k-bucket"."0.5.0";
+  by-version."k-bucket"."0.5.0" = self.buildNodePackage {
+    name = "k-bucket-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/k-bucket/-/k-bucket-0.4.2.tgz";
-      name = "k-bucket-0.4.2.tgz";
-      sha1 = "150ab92307e9ec818a9c4e39a5f930eb3aaaa23a";
+      url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.5.0.tgz";
+      name = "k-bucket-0.5.0.tgz";
+      sha1 = "31d462d86cdb2e8d245528acfe5e71382f552e1d";
     };
     deps = {
       "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
@@ -21461,16 +24542,79 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kareem"."0.0.4" =
-    self.by-version."kareem"."0.0.4";
-  by-version."kareem"."0.0.4" = self.buildNodePackage {
-    name = "kareem-0.0.4";
-    version = "0.0.4";
+  by-spec."k-bucket"."^0.6.0" =
+    self.by-version."k-bucket"."0.6.0";
+  by-version."k-bucket"."0.6.0" = self.buildNodePackage {
+    name = "k-bucket-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kareem/-/kareem-0.0.4.tgz";
-      name = "kareem-0.0.4.tgz";
-      sha1 = "a8475defd74cf829b0071d20e6971bf15d911d2b";
+      url = "https://registry.npmjs.org/k-bucket/-/k-bucket-0.6.0.tgz";
+      name = "k-bucket-0.6.0.tgz";
+      sha1 = "afc532545f69d466293e887b00d5fc73377c3abb";
+    };
+    deps = {
+      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."k-rpc"."^3.6.0" =
+    self.by-version."k-rpc"."3.6.1";
+  by-version."k-rpc"."3.6.1" = self.buildNodePackage {
+    name = "k-rpc-3.6.1";
+    version = "3.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/k-rpc/-/k-rpc-3.6.1.tgz";
+      name = "k-rpc-3.6.1.tgz";
+      sha1 = "b26ff19be82abc4d3c0cc34de4cd5282f4ed5450";
+    };
+    deps = {
+      "buffer-equals-1.0.3" = self.by-version."buffer-equals"."1.0.3";
+      "k-bucket-0.6.0" = self.by-version."k-bucket"."0.6.0";
+      "k-rpc-socket-1.5.1" = self.by-version."k-rpc-socket"."1.5.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."k-rpc-socket"."^1.5.0" =
+    self.by-version."k-rpc-socket"."1.5.1";
+  by-version."k-rpc-socket"."1.5.1" = self.buildNodePackage {
+    name = "k-rpc-socket-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.5.1.tgz";
+      name = "k-rpc-socket-1.5.1.tgz";
+      sha1 = "0349823046a395bbb3d4d03c74f6a024fcb14ce4";
+    };
+    deps = {
+      "bencode-0.9.0" = self.by-version."bencode"."0.9.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."kareem"."1.0.1" =
+    self.by-version."kareem"."1.0.1";
+  by-version."kareem"."1.0.1" = self.buildNodePackage {
+    name = "kareem-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/kareem/-/kareem-1.0.1.tgz";
+      name = "kareem-1.0.1.tgz";
+      sha1 = "7805d215bb53214ec3af969a1d0b1f17e3e7b95c";
     };
     deps = {
     };
@@ -21481,36 +24625,40 @@
     cpu = [ ];
   };
   by-spec."karma"."*" =
-    self.by-version."karma"."0.12.32";
-  by-version."karma"."0.12.32" = self.buildNodePackage {
-    name = "karma-0.12.32";
-    version = "0.12.32";
+    self.by-version."karma"."0.13.22";
+  by-version."karma"."0.13.22" = self.buildNodePackage {
+    name = "karma-0.13.22";
+    version = "0.13.22";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma/-/karma-0.12.32.tgz";
-      name = "karma-0.12.32.tgz";
-      sha1 = "8d8277482bf6b29b13cf2d024ad9bbae18742a9a";
+      url = "https://registry.npmjs.org/karma/-/karma-0.13.22.tgz";
+      name = "karma-0.13.22.tgz";
+      sha1 = "07750b1bd063d7e7e7b91bcd2e6354d8f2aa8744";
     };
     deps = {
+      "batch-0.5.3" = self.by-version."batch"."0.5.3";
+      "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
+      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
+      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "connect-3.4.1" = self.by-version."connect"."3.4.1";
+      "core-js-2.2.1" = self.by-version."core-js"."2.2.1";
       "di-0.0.1" = self.by-version."di"."0.0.1";
-      "socket.io-1.3.5" = self.by-version."socket.io"."1.3.5";
-      "chokidar-1.0.1" = self.by-version."chokidar"."1.0.1";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
-      "expand-braces-0.1.1" = self.by-version."expand-braces"."0.1.1";
-      "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4";
+      "dom-serialize-2.2.1" = self.by-version."dom-serialize"."2.2.1";
+      "expand-braces-0.1.2" = self.by-version."expand-braces"."0.1.2";
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "http-proxy-1.13.2" = self.by-version."http-proxy"."1.13.2";
+      "isbinaryfile-3.0.0" = self.by-version."isbinaryfile"."3.0.0";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "log4js-0.6.33" = self.by-version."log4js"."0.6.33";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "q-0.9.7" = self.by-version."q"."0.9.7";
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "log4js-0.6.24" = self.by-version."log4js"."0.6.24";
-      "useragent-2.0.10" = self.by-version."useragent"."2.0.10";
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "connect-2.26.6" = self.by-version."connect"."2.26.6";
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
-      "memoizee-0.3.8" = self.by-version."memoizee"."0.3.8";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "socket.io-1.4.5" = self.by-version."socket.io"."1.4.5";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "useragent-2.1.9" = self.by-version."useragent"."2.1.9";
     };
     optionalDependencies = {
     };
@@ -21518,162 +24666,181 @@
     os = [ ];
     cpu = [ ];
   };
-  "karma" = self.by-version."karma"."0.12.32";
-  by-spec."karma".">=0.11.11" =
-    self.by-version."karma"."0.12.32";
-  by-spec."karma".">=0.12.8" =
-    self.by-version."karma"."0.12.32";
+  "karma" = self.by-version."karma"."0.13.22";
   by-spec."karma".">=0.9" =
-    self.by-version."karma"."0.12.32";
-  by-spec."karma".">=0.9.3" =
-    self.by-version."karma"."0.12.32";
-  by-spec."karma"."~0.12.0" =
-    self.by-version."karma"."0.12.32";
+    self.by-version."karma"."0.13.22";
+  by-spec."karma"."^0.13.0 || >= 0.14.0-rc.0" =
+    self.by-version."karma"."0.13.22";
   by-spec."karma-chrome-launcher"."*" =
-    self.by-version."karma-chrome-launcher"."0.1.8";
-  by-version."karma-chrome-launcher"."0.1.8" = self.buildNodePackage {
-    name = "karma-chrome-launcher-0.1.8";
-    version = "0.1.8";
+    self.by-version."karma-chrome-launcher"."0.2.3";
+  by-version."karma-chrome-launcher"."0.2.3" = self.buildNodePackage {
+    name = "karma-chrome-launcher-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.8.tgz";
-      name = "karma-chrome-launcher-0.1.8.tgz";
-      sha1 = "5ba43f821f64f531e4ff1e7d86caf95df9ac9142";
+      url = "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.2.3.tgz";
+      name = "karma-chrome-launcher-0.2.3.tgz";
+      sha1 = "4c6d700d163a9d34c618efd87918be49e7a4a8c9";
     };
     deps = {
-      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "fs-access-1.0.0" = self.by-version."fs-access"."1.0.0";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
     };
     optionalDependencies = {
     };
-    peerDependencies = [
-      self.by-version."karma"."0.12.32"];
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.8";
+  "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.2.3";
   by-spec."karma-coverage"."*" =
-    self.by-version."karma-coverage"."0.3.1";
-  by-version."karma-coverage"."0.3.1" = self.buildNodePackage {
-    name = "karma-coverage-0.3.1";
-    version = "0.3.1";
+    self.by-version."karma-coverage"."0.5.5";
+  by-version."karma-coverage"."0.5.5" = self.buildNodePackage {
+    name = "karma-coverage-0.5.5";
+    version = "0.5.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-coverage/-/karma-coverage-0.3.1.tgz";
-      name = "karma-coverage-0.3.1.tgz";
-      sha1 = "05c8861aec457b4857b827a10f5fec32cc11a4ae";
+      url = "https://registry.npmjs.org/karma-coverage/-/karma-coverage-0.5.5.tgz";
+      name = "karma-coverage-0.5.5.tgz";
+      sha1 = "b0d58b1025d59d5c6620263186f1d58f5d5348c5";
     };
     deps = {
-      "istanbul-0.3.13" = self.by-version."istanbul"."0.3.13";
-      "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11";
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+      "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2";
+      "dateformat-1.0.12" = self.by-version."dateformat"."1.0.12";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
     };
     optionalDependencies = {
     };
-    peerDependencies = [
-      self.by-version."karma"."0.12.32"];
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "karma-coverage" = self.by-version."karma-coverage"."0.3.1";
+  "karma-coverage" = self.by-version."karma-coverage"."0.5.5";
   by-spec."karma-junit-reporter"."*" =
-    self.by-version."karma-junit-reporter"."0.2.2";
-  by-version."karma-junit-reporter"."0.2.2" = self.buildNodePackage {
-    name = "karma-junit-reporter-0.2.2";
-    version = "0.2.2";
+    self.by-version."karma-junit-reporter"."0.4.1";
+  by-version."karma-junit-reporter"."0.4.1" = self.buildNodePackage {
+    name = "karma-junit-reporter-0.4.1";
+    version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.2.2.tgz";
-      name = "karma-junit-reporter-0.2.2.tgz";
-      sha1 = "4cdd4e21affd3e090e7ba73e3c766ea9e13c45ba";
+      url = "https://registry.npmjs.org/karma-junit-reporter/-/karma-junit-reporter-0.4.1.tgz";
+      name = "karma-junit-reporter-0.4.1.tgz";
+      sha1 = "d69477bc044e04f093fb1d61b2e4e694fb03c2d9";
     };
     deps = {
-      "xmlbuilder-0.4.2" = self.by-version."xmlbuilder"."0.4.2";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "xmlbuilder-3.1.0" = self.by-version."xmlbuilder"."3.1.0";
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.32"];
+      self.by-version."karma"."0.13.22"];
     os = [ ];
     cpu = [ ];
   };
-  "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2";
+  "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.4.1";
   by-spec."karma-mocha"."*" =
-    self.by-version."karma-mocha"."0.1.10";
-  by-version."karma-mocha"."0.1.10" = self.buildNodePackage {
-    name = "karma-mocha-0.1.10";
-    version = "0.1.10";
+    self.by-version."karma-mocha"."0.2.2";
+  by-version."karma-mocha"."0.2.2" = self.buildNodePackage {
+    name = "karma-mocha-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz";
-      name = "karma-mocha-0.1.10.tgz";
-      sha1 = "29ed51d4b121af1373444ec555b20a905bf42b92";
+      url = "https://registry.npmjs.org/karma-mocha/-/karma-mocha-0.2.2.tgz";
+      name = "karma-mocha-0.2.2.tgz";
+      sha1 = "388ed917da15dcb196d1b915c1934ef803193f8e";
     };
     deps = {
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.32"
-      self.by-version."mocha"."2.2.4"];
+      self.by-version."mocha"."2.4.5"];
     os = [ ];
     cpu = [ ];
   };
-  "karma-mocha" = self.by-version."karma-mocha"."0.1.10";
+  "karma-mocha" = self.by-version."karma-mocha"."0.2.2";
   by-spec."karma-requirejs"."*" =
-    self.by-version."karma-requirejs"."0.2.2";
-  by-version."karma-requirejs"."0.2.2" = self.buildNodePackage {
-    name = "karma-requirejs-0.2.2";
-    version = "0.2.2";
+    self.by-version."karma-requirejs"."0.2.6";
+  by-version."karma-requirejs"."0.2.6" = self.buildNodePackage {
+    name = "karma-requirejs-0.2.6";
+    version = "0.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.2.tgz";
-      name = "karma-requirejs-0.2.2.tgz";
-      sha1 = "e497ca0868e2e09a9b8e3f646745c31a935fe8b6";
+      url = "https://registry.npmjs.org/karma-requirejs/-/karma-requirejs-0.2.6.tgz";
+      name = "karma-requirejs-0.2.6.tgz";
+      sha1 = "1a770c64f901320a389c65b4944746326372def8";
     };
     deps = {
     };
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."karma"."0.12.32"
-      self.by-version."requirejs"."2.1.17"];
+      self.by-version."karma"."0.13.22"
+      self.by-version."requirejs"."2.2.0"];
     os = [ ];
     cpu = [ ];
   };
-  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.2";
+  "karma-requirejs" = self.by-version."karma-requirejs"."0.2.6";
   by-spec."karma-sauce-launcher"."*" =
-    self.by-version."karma-sauce-launcher"."0.2.10";
-  by-version."karma-sauce-launcher"."0.2.10" = self.buildNodePackage {
-    name = "karma-sauce-launcher-0.2.10";
-    version = "0.2.10";
+    self.by-version."karma-sauce-launcher"."0.3.1";
+  by-version."karma-sauce-launcher"."0.3.1" = self.buildNodePackage {
+    name = "karma-sauce-launcher-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.2.10.tgz";
-      name = "karma-sauce-launcher-0.2.10.tgz";
-      sha1 = "9aed0df47934c630d2ceb7faa954f5c454deddb0";
+      url = "https://registry.npmjs.org/karma-sauce-launcher/-/karma-sauce-launcher-0.3.1.tgz";
+      name = "karma-sauce-launcher-0.3.1.tgz";
+      sha1 = "fa41f6afd1ad6cb7610885da83cbc9921a4d334c";
     };
     deps = {
-      "wd-0.3.11" = self.by-version."wd"."0.3.11";
-      "sauce-connect-launcher-0.6.1" = self.by-version."sauce-connect-launcher"."0.6.1";
-      "q-0.9.7" = self.by-version."q"."0.9.7";
-      "saucelabs-0.1.1" = self.by-version."saucelabs"."0.1.1";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "sauce-connect-launcher-0.13.0" = self.by-version."sauce-connect-launcher"."0.13.0";
+      "saucelabs-1.2.0" = self.by-version."saucelabs"."1.2.0";
+      "wd-0.3.12" = self.by-version."wd"."0.3.12";
     };
     optionalDependencies = {
     };
-    peerDependencies = [
-      self.by-version."karma"."0.12.32"];
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.2.10";
-  by-spec."keen.io"."^0.1.2" =
+  "karma-sauce-launcher" = self.by-version."karma-sauce-launcher"."0.3.1";
+  by-spec."keen-js"."^3.2.4" =
+    self.by-version."keen-js"."3.4.0";
+  by-version."keen-js"."3.4.0" = self.buildNodePackage {
+    name = "keen-js-3.4.0";
+    version = "3.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/keen-js/-/keen-js-3.4.0.tgz";
+      name = "keen-js-3.4.0.tgz";
+      sha1 = "e3a8b10d4c98858793b78d77898cc5bccc8a014b";
+    };
+    deps = {
+      "JSON2-0.1.0" = self.by-version."JSON2"."0.1.0";
+      "browserify-versionify-1.0.3" = self.by-version."browserify-versionify"."1.0.3";
+      "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0";
+      "domready-0.3.0" = self.by-version."domready"."0.3.0";
+      "json3-3.3.2" = self.by-version."json3"."3.3.2";
+      "spin.js-2.3.2" = self.by-version."spin.js"."2.3.2";
+      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."keen.io"."~0.1.3" =
     self.by-version."keen.io"."0.1.3";
   by-version."keen.io"."0.1.3" = self.buildNodePackage {
     name = "keen.io-0.1.3";
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
+      url = "https://registry.npmjs.org/keen.io/-/keen.io-0.1.3.tgz";
       name = "keen.io-0.1.3.tgz";
       sha1 = "5056f5c989ab14ccf62fc20ed7598115ae7d09e3";
     };
@@ -21687,8 +24854,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."keen.io"."~0.1.3" =
-    self.by-version."keen.io"."0.1.3";
   by-spec."keep-alive-agent"."^0.0.1" =
     self.by-version."keep-alive-agent"."0.0.1";
   by-version."keep-alive-agent"."0.0.1" = self.buildNodePackage {
@@ -21696,7 +24861,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
+      url = "https://registry.npmjs.org/keep-alive-agent/-/keep-alive-agent-0.0.1.tgz";
       name = "keep-alive-agent-0.0.1.tgz";
       sha1 = "44847ca394ce8d6b521ae85816bd64509942b385";
     };
@@ -21715,7 +24880,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
+      url = "https://registry.npmjs.org/kerberos/-/kerberos-0.0.3.tgz";
       name = "kerberos-0.0.3.tgz";
       sha1 = "4285d92a0748db2784062f5adcec9f5956cb818a";
     };
@@ -21727,58 +24892,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kerberos"."0.0.4" =
-    self.by-version."kerberos"."0.0.4";
-  by-version."kerberos"."0.0.4" = self.buildNodePackage {
-    name = "kerberos-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.4.tgz";
-      name = "kerberos-0.0.4.tgz";
-      sha1 = "11836638f729a2f6c5bae056a7d7a15898c9ba7c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."kerberos"."0.0.9" =
-    self.by-version."kerberos"."0.0.9";
-  by-version."kerberos"."0.0.9" = self.buildNodePackage {
-    name = "kerberos-0.0.9";
-    version = "0.0.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.9.tgz";
-      name = "kerberos-0.0.9.tgz";
-      sha1 = "595bf97e7e8aae5401ae313aea57bbf402e799c5";
-    };
-    deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."kerberos"."~0.0" =
-    self.by-version."kerberos"."0.0.10";
-  by-version."kerberos"."0.0.10" = self.buildNodePackage {
-    name = "kerberos-0.0.10";
-    version = "0.0.10";
+    self.by-version."kerberos"."0.0.19";
+  by-version."kerberos"."0.0.19" = self.buildNodePackage {
+    name = "kerberos-0.0.19";
+    version = "0.0.19";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.10.tgz";
-      name = "kerberos-0.0.10.tgz";
-      sha1 = "bd4a9daa5f7b19dcd30038101d121e92bb8d3934";
+      url = "https://registry.npmjs.org/kerberos/-/kerberos-0.0.19.tgz";
+      name = "kerberos-0.0.19.tgz";
+      sha1 = "49cf60bf49f60bdbf23f0e54b359ce45293a1302";
     };
     deps = {
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nan-2.0.9" = self.by-version."nan"."2.0.9";
     };
     optionalDependencies = {
     };
@@ -21786,16 +24912,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kew"."0.4.0" =
-    self.by-version."kew"."0.4.0";
-  by-version."kew"."0.4.0" = self.buildNodePackage {
-    name = "kew-0.4.0";
-    version = "0.4.0";
+  by-spec."kew"."~0.1.7" =
+    self.by-version."kew"."0.1.7";
+  by-version."kew"."0.1.7" = self.buildNodePackage {
+    name = "kew-0.1.7";
+    version = "0.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kew/-/kew-0.4.0.tgz";
-      name = "kew-0.4.0.tgz";
-      sha1 = "da97484f1b06502146f3c60cec05ac6012cd993f";
+      url = "https://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
+      name = "kew-0.1.7.tgz";
+      sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
     };
     deps = {
     };
@@ -21805,16 +24931,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kew"."~0.1.7" =
-    self.by-version."kew"."0.1.7";
-  by-version."kew"."0.1.7" = self.buildNodePackage {
-    name = "kew-0.1.7";
-    version = "0.1.7";
+  by-spec."kew"."~0.7.0" =
+    self.by-version."kew"."0.7.0";
+  by-version."kew"."0.7.0" = self.buildNodePackage {
+    name = "kew-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kew/-/kew-0.1.7.tgz";
-      name = "kew-0.1.7.tgz";
-      sha1 = "0a32a817ff1a9b3b12b8c9bacf4bc4d679af8e72";
+      url = "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz";
+      name = "kew-0.7.0.tgz";
+      sha1 = "79d93d2d33363d6fdd2970b335d9141ad591d79b";
     };
     deps = {
     };
@@ -21831,7 +24957,7 @@
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keygrip/-/keygrip-0.2.4.tgz";
+      url = "https://registry.npmjs.org/keygrip/-/keygrip-0.2.4.tgz";
       name = "keygrip-0.2.4.tgz";
       sha1 = "9dd1b2e485a1162c9d4e6f787de87fc50f87bc58";
     };
@@ -21850,7 +24976,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
+      url = "https://registry.npmjs.org/keygrip/-/keygrip-1.0.1.tgz";
       name = "keygrip-1.0.1.tgz";
       sha1 = "b02fa4816eef21a8c4b35ca9e52921ffc89a30e9";
     };
@@ -21869,7 +24995,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
+      url = "https://registry.npmjs.org/keypress/-/keypress-0.1.0.tgz";
       name = "keypress-0.1.0.tgz";
       sha1 = "4a3188d4291b66b4f65edb99f806aa9ae293592a";
     };
@@ -21888,7 +25014,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
+      url = "https://registry.npmjs.org/keypress/-/keypress-0.2.1.tgz";
       name = "keypress-0.2.1.tgz";
       sha1 = "1e80454250018dbad4c3fe94497d6e67b6269c77";
     };
@@ -21902,23 +25028,19 @@
   };
   by-spec."keypress"."~0.2.1" =
     self.by-version."keypress"."0.2.1";
-  by-spec."kibana-authentication-proxy"."git://github.com/fangli/kibana-authentication-proxy.git" =
-    self.by-version."kibana-authentication-proxy"."1.1.0";
-  by-version."kibana-authentication-proxy"."1.1.0" = self.buildNodePackage {
-    name = "kibana-authentication-proxy-1.1.0";
-    version = "1.1.0";
+  by-spec."kind-of"."^3.0.2" =
+    self.by-version."kind-of"."3.0.2";
+  by-version."kind-of"."3.0.2" = self.buildNodePackage {
+    name = "kind-of-3.0.2";
+    version = "3.0.2";
     bin = false;
-    src = fetchgit {
-      url = "git://github.com/fangli/kibana-authentication-proxy.git";
-      rev = "0c0173b0cb51b392b7fc04d0cc728ffb64671ef3";
-      sha256 = "dd2e42da959c359bf48d16993c6caf1d810241f7f37dfa4da911dd284571236f";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz";
+      name = "kind-of-3.0.2.tgz";
+      sha1 = "187db427046e7e90945692e6768668bd6900dea0";
     };
     deps = {
-      "express-3.20.2" = self.by-version."express"."3.20.2";
-      "passport-0.2.1" = self.by-version."passport"."0.2.1";
-      "passport-google-oauth-0.2.0" = self.by-version."passport-google-oauth"."0.2.0";
-      "connect-restreamer-1.0.2" = self.by-version."connect-restreamer"."1.0.2";
-      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
+      "is-buffer-1.1.3" = self.by-version."is-buffer"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -21926,17 +25048,16 @@
     os = [ ];
     cpu = [ ];
   };
-  "kibana-authentication-proxy" = self.by-version."kibana-authentication-proxy"."1.1.0";
-  by-spec."kind-of"."^1.0.0" =
-    self.by-version."kind-of"."1.1.0";
-  by-version."kind-of"."1.1.0" = self.buildNodePackage {
-    name = "kind-of-1.1.0";
-    version = "1.1.0";
+  by-spec."klaw"."^1.0.0" =
+    self.by-version."klaw"."1.1.3";
+  by-version."klaw"."1.1.3" = self.buildNodePackage {
+    name = "klaw-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz";
-      name = "kind-of-1.1.0.tgz";
-      sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44";
+      url = "https://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz";
+      name = "klaw-1.1.3.tgz";
+      sha1 = "7da33c6b42f9b3dc9cec00d17f13af017fcc2721";
     };
     deps = {
     };
@@ -21946,18 +25067,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kind-of"."^1.1.0" =
-    self.by-version."kind-of"."1.1.0";
-  by-spec."knockout"."~3.3.0" =
-    self.by-version."knockout"."3.3.0";
-  by-version."knockout"."3.3.0" = self.buildNodePackage {
-    name = "knockout-3.3.0";
-    version = "3.3.0";
+  by-spec."knockout"."~3.4.0" =
+    self.by-version."knockout"."3.4.0";
+  by-version."knockout"."3.4.0" = self.buildNodePackage {
+    name = "knockout-3.4.0";
+    version = "3.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/knockout/-/knockout-3.3.0.tgz";
-      name = "knockout-3.3.0.tgz";
-      sha1 = "50502a4e2f1fe2bdfa0e52843cdfcbbd43bc374c";
+      url = "https://registry.npmjs.org/knockout/-/knockout-3.4.0.tgz";
+      name = "knockout-3.4.0.tgz";
+      sha1 = "59d7261815a11eb7c1a3f3c7077ca898a44caadb";
     };
     deps = {
     };
@@ -21974,16 +25093,16 @@
     version = "0.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/knox/-/knox-0.9.2.tgz";
+      url = "https://registry.npmjs.org/knox/-/knox-0.9.2.tgz";
       name = "knox-0.9.2.tgz";
       sha1 = "3736593669e24f024fdaf723b6a1dc4afd839a71";
     };
     deps = {
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
+      "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
       "debug-1.0.4" = self.by-version."debug"."1.0.4";
       "stream-counter-1.0.0" = self.by-version."stream-counter"."1.0.0";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -21993,27 +25112,27 @@
   };
   "knox" = self.by-version."knox"."0.9.2";
   by-spec."kue"."*" =
-    self.by-version."kue"."0.8.12";
-  by-version."kue"."0.8.12" = self.buildNodePackage {
-    name = "kue-0.8.12";
-    version = "0.8.12";
+    self.by-version."kue"."0.10.5";
+  by-version."kue"."0.10.5" = self.buildNodePackage {
+    name = "kue-0.10.5";
+    version = "0.10.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kue/-/kue-0.8.12.tgz";
-      name = "kue-0.8.12.tgz";
-      sha1 = "93cd035487289640b8f1e77e09dc62d2c6658918";
+      url = "https://registry.npmjs.org/kue/-/kue-0.10.5.tgz";
+      name = "kue-0.10.5.tgz";
+      sha1 = "5473efb83c55a08d5149cd24ba11d6135fe7468e";
     };
     deps = {
-      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
-      "express-3.1.2" = self.by-version."express"."3.1.2";
-      "jade-1.1.5" = self.by-version."jade"."1.1.5";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
+      "express-4.13.4" = self.by-version."express"."4.13.4";
+      "jade-1.11.0" = self.by-version."jade"."1.11.0";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
       "lodash-deep-1.6.0" = self.by-version."lodash-deep"."1.6.0";
-      "nib-0.5.0" = self.by-version."nib"."0.5.0";
-      "redis-0.12.1" = self.by-version."redis"."0.12.1";
+      "nib-1.1.0" = self.by-version."nib"."1.1.0";
+      "node-redis-warlock-0.1.4" = self.by-version."node-redis-warlock"."0.1.4";
+      "redis-2.5.3" = self.by-version."redis"."2.5.3";
       "reds-0.2.5" = self.by-version."reds"."0.2.5";
-      "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
-      "stylus-0.42.2" = self.by-version."stylus"."0.42.2";
+      "stylus-0.52.4" = self.by-version."stylus"."0.52.4";
     };
     optionalDependencies = {
     };
@@ -22021,7 +25140,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "kue" = self.by-version."kue"."0.8.12";
+  "kue" = self.by-version."kue"."0.10.5";
   by-spec."labeled-stream-splicer"."^1.0.0" =
     self.by-version."labeled-stream-splicer"."1.0.2";
   by-version."labeled-stream-splicer"."1.0.2" = self.buildNodePackage {
@@ -22029,14 +25148,36 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz";
+      url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-1.0.2.tgz";
       name = "labeled-stream-splicer-1.0.2.tgz";
       sha1 = "4615331537784981e8fd264e1f3a434c4e0ddd65";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "stream-splicer-1.3.1" = self.by-version."stream-splicer"."1.3.1";
+      "stream-splicer-1.3.2" = self.by-version."stream-splicer"."1.3.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."labeled-stream-splicer"."^2.0.0" =
+    self.by-version."labeled-stream-splicer"."2.0.0";
+  by-version."labeled-stream-splicer"."2.0.0" = self.buildNodePackage {
+    name = "labeled-stream-splicer-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.0.tgz";
+      name = "labeled-stream-splicer-2.0.0.tgz";
+      sha1 = "a52e1d138024c00b86b1c0c91f677918b8ae0a59";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "stream-splicer-2.0.0" = self.by-version."stream-splicer"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -22045,18 +25186,18 @@
     cpu = [ ];
   };
   by-spec."latest-version"."^1.0.0" =
-    self.by-version."latest-version"."1.0.0";
-  by-version."latest-version"."1.0.0" = self.buildNodePackage {
-    name = "latest-version-1.0.0";
-    version = "1.0.0";
+    self.by-version."latest-version"."1.0.1";
+  by-version."latest-version"."1.0.1" = self.buildNodePackage {
+    name = "latest-version-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz";
-      name = "latest-version-1.0.0.tgz";
-      sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9";
+      url = "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz";
+      name = "latest-version-1.0.1.tgz";
+      sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
     };
     deps = {
-      "package-json-1.1.0" = self.by-version."package-json"."1.1.0";
+      "package-json-1.2.0" = self.by-version."package-json"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -22071,7 +25212,7 @@
     version = "1.0.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
+      url = "https://registry.npmjs.org/lazy/-/lazy-1.0.11.tgz";
       name = "lazy-1.0.11.tgz";
       sha1 = "daa068206282542c088288e975c297c1ae77b690";
     };
@@ -22083,6 +25224,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lazy-cache"."^1.0.3" =
+    self.by-version."lazy-cache"."1.0.3";
+  by-version."lazy-cache"."1.0.3" = self.buildNodePackage {
+    name = "lazy-cache-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.3.tgz";
+      name = "lazy-cache-1.0.3.tgz";
+      sha1 = "e97754618f9c886bb999b2ff69c78b82453d6674";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lazystream"."~0.1.0" =
     self.by-version."lazystream"."0.1.0";
   by-version."lazystream"."0.1.0" = self.buildNodePackage {
@@ -22090,7 +25250,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
+      url = "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz";
       name = "lazystream-0.1.0.tgz";
       sha1 = "1b25d63c772a4c20f0a5ed0a9d77f484b6e16920";
     };
@@ -22103,6 +25263,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lcid"."^1.0.0" =
+    self.by-version."lcid"."1.0.0";
+  by-version."lcid"."1.0.0" = self.buildNodePackage {
+    name = "lcid-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
+      name = "lcid-1.0.0.tgz";
+      sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835";
+    };
+    deps = {
+      "invert-kv-1.0.0" = self.by-version."invert-kv"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lcov-parse"."0.0.6" =
     self.by-version."lcov-parse"."0.0.6";
   by-version."lcov-parse"."0.0.6" = self.buildNodePackage {
@@ -22110,7 +25290,7 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
+      url = "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.6.tgz";
       name = "lcov-parse-0.0.6.tgz";
       sha1 = "819e5da8bf0791f9d3f39eea5ed1868187f11175";
     };
@@ -22129,14 +25309,14 @@
     version = "1.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.2.tgz";
+      url = "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-1.0.2.tgz";
       name = "lcov-result-merger-1.0.2.tgz";
       sha1 = "a7a1cf861daf32deb39949c2eee8c9a9ed475c18";
     };
     deps = {
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
-      "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13";
+      "vinyl-fs-0.3.14" = self.by-version."vinyl-fs"."0.3.14";
     };
     optionalDependencies = {
     };
@@ -22152,7 +25332,7 @@
     version = "0.7.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ldapjs/-/ldapjs-0.7.1.tgz";
+      url = "https://registry.npmjs.org/ldapjs/-/ldapjs-0.7.1.tgz";
       name = "ldapjs-0.7.1.tgz";
       sha1 = "684798a687640bab1afbd802cf532f30492dfb56";
     };
@@ -22171,60 +25351,35 @@
     cpu = [ ];
   };
   by-spec."less"."*" =
-    self.by-version."less"."2.5.0";
-  by-version."less"."2.5.0" = self.buildNodePackage {
-    name = "less-2.5.0";
-    version = "2.5.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/less/-/less-2.5.0.tgz";
-      name = "less-2.5.0.tgz";
-      sha1 = "11d6d611586de6d5f808220649bc9bbfe7ad5e17";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-      "errno-0.1.2" = self.by-version."errno"."0.1.2";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "image-size-0.3.5" = self.by-version."image-size"."0.3.5";
-      "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "promise-6.1.0" = self.by-version."promise"."6.1.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "less" = self.by-version."less"."2.5.0";
-  by-spec."less"."~2.4.0" =
-    self.by-version."less"."2.4.0";
-  by-version."less"."2.4.0" = self.buildNodePackage {
-    name = "less-2.4.0";
-    version = "2.4.0";
+    self.by-version."less"."2.6.1";
+  by-version."less"."2.6.1" = self.buildNodePackage {
+    name = "less-2.6.1";
+    version = "2.6.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/less/-/less-2.4.0.tgz";
-      name = "less-2.4.0.tgz";
-      sha1 = "ce51b38f1c05a0cdd47982fac40dd0a39cec2031";
+      url = "https://registry.npmjs.org/less/-/less-2.6.1.tgz";
+      name = "less-2.6.1.tgz";
+      sha1 = "658e01ec9ac3149959c6b6dfbcfbc0a170afda7a";
     };
     deps = {
     };
     optionalDependencies = {
-      "errno-0.1.2" = self.by-version."errno"."0.1.2";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "image-size-0.3.5" = self.by-version."image-size"."0.3.5";
+      "errno-0.1.4" = self.by-version."errno"."0.1.4";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "image-size-0.4.0" = self.by-version."image-size"."0.4.0";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "promise-6.1.0" = self.by-version."promise"."6.1.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "source-map-0.2.0" = self.by-version."source-map"."0.2.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "promise-7.1.1" = self.by-version."promise"."7.1.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
+  "less" = self.by-version."less"."2.6.1";
+  by-spec."less"."~2.6.0" =
+    self.by-version."less"."2.6.1";
   by-spec."level"."^0.18.0" =
     self.by-version."level"."0.18.0";
   by-version."level"."0.18.0" = self.buildNodePackage {
@@ -22232,12 +25387,12 @@
     version = "0.18.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/level/-/level-0.18.0.tgz";
+      url = "https://registry.npmjs.org/level/-/level-0.18.0.tgz";
       name = "level-0.18.0.tgz";
       sha1 = "e1a3f4cad65fc02e25070a47d63d7b527361c1cf";
     };
     deps = {
-      "leveldown-0.10.4" = self.by-version."leveldown"."0.10.4";
+      "leveldown-0.10.6" = self.by-version."leveldown"."0.10.6";
       "level-packager-0.18.0" = self.by-version."level-packager"."0.18.0";
     };
     optionalDependencies = {
@@ -22253,7 +25408,7 @@
     version = "0.18.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz";
+      url = "https://registry.npmjs.org/level-packager/-/level-packager-0.18.0.tgz";
       name = "level-packager-0.18.0.tgz";
       sha1 = "c076b087646f1d7dedcc3442f58800dd0a0b45f5";
     };
@@ -22267,22 +25422,22 @@
     cpu = [ ];
   };
   by-spec."level-sublevel"."^6.3.15" =
-    self.by-version."level-sublevel"."6.4.6";
-  by-version."level-sublevel"."6.4.6" = self.buildNodePackage {
-    name = "level-sublevel-6.4.6";
-    version = "6.4.6";
+    self.by-version."level-sublevel"."6.5.4";
+  by-version."level-sublevel"."6.5.4" = self.buildNodePackage {
+    name = "level-sublevel-6.5.4";
+    version = "6.5.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/level-sublevel/-/level-sublevel-6.4.6.tgz";
-      name = "level-sublevel-6.4.6.tgz";
-      sha1 = "fdf5f65d1355b8a92a6792ede3a4f214b2594e9e";
+      url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.5.4.tgz";
+      name = "level-sublevel-6.5.4.tgz";
+      sha1 = "92e6534e7ac3fa35c8bdb121b8a8094a8d1c0826";
     };
     deps = {
       "pull-stream-2.21.0" = self.by-version."pull-stream"."2.21.0";
-      "ltgt-2.0.0" = self.by-version."ltgt"."2.0.0";
-      "levelup-0.19.0" = self.by-version."levelup"."0.19.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
-      "bytewise-0.7.1" = self.by-version."bytewise"."0.7.1";
+      "ltgt-2.1.2" = self.by-version."ltgt"."2.1.2";
+      "levelup-0.19.1" = self.by-version."levelup"."0.19.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+      "bytewise-1.1.0" = self.by-version."bytewise"."1.1.0";
       "typewiselite-1.0.0" = self.by-version."typewiselite"."1.0.0";
     };
     optionalDependencies = {
@@ -22292,19 +25447,19 @@
     cpu = [ ];
   };
   by-spec."leveldown"."^0.10.2" =
-    self.by-version."leveldown"."0.10.4";
-  by-version."leveldown"."0.10.4" = self.buildNodePackage {
-    name = "leveldown-0.10.4";
-    version = "0.10.4";
+    self.by-version."leveldown"."0.10.6";
+  by-version."leveldown"."0.10.6" = self.buildNodePackage {
+    name = "leveldown-0.10.6";
+    version = "0.10.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/leveldown/-/leveldown-0.10.4.tgz";
-      name = "leveldown-0.10.4.tgz";
-      sha1 = "a35a18e20dd9754a53683d1a4851ff1b46bd2de7";
+      url = "https://registry.npmjs.org/leveldown/-/leveldown-0.10.6.tgz";
+      name = "leveldown-0.10.6.tgz";
+      sha1 = "a1bb751c95263ff60f41bde0f973ff8c1e98bbe9";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-2.1.0" = self.by-version."nan"."2.1.0";
     };
     optionalDependencies = {
     };
@@ -22313,7 +25468,7 @@
     cpu = [ ];
   };
   by-spec."leveldown"."~0.10.0" =
-    self.by-version."leveldown"."0.10.4";
+    self.by-version."leveldown"."0.10.6";
   by-spec."levelup"."^0.18.5" =
     self.by-version."levelup"."0.18.6";
   by-version."levelup"."0.18.6" = self.buildNodePackage {
@@ -22321,14 +25476,14 @@
     version = "0.18.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz";
+      url = "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz";
       name = "levelup-0.18.6.tgz";
       sha1 = "e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb";
     };
     deps = {
       "bl-0.8.2" = self.by-version."bl"."0.8.2";
       "deferred-leveldown-0.2.0" = self.by-version."deferred-leveldown"."0.2.0";
-      "errno-0.1.2" = self.by-version."errno"."0.1.2";
+      "errno-0.1.4" = self.by-version."errno"."0.1.4";
       "prr-0.0.0" = self.by-version."prr"."0.0.0";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
       "semver-2.3.2" = self.by-version."semver"."2.3.2";
@@ -22343,23 +25498,23 @@
   by-spec."levelup"."~0.18.0" =
     self.by-version."levelup"."0.18.6";
   by-spec."levelup"."~0.19.0" =
-    self.by-version."levelup"."0.19.0";
-  by-version."levelup"."0.19.0" = self.buildNodePackage {
-    name = "levelup-0.19.0";
-    version = "0.19.0";
+    self.by-version."levelup"."0.19.1";
+  by-version."levelup"."0.19.1" = self.buildNodePackage {
+    name = "levelup-0.19.1";
+    version = "0.19.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/levelup/-/levelup-0.19.0.tgz";
-      name = "levelup-0.19.0.tgz";
-      sha1 = "f6b60a168c86c2fe5d5953476cbe9786ccf0a3f7";
+      url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz";
+      name = "levelup-0.19.1.tgz";
+      sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b";
     };
     deps = {
       "bl-0.8.2" = self.by-version."bl"."0.8.2";
       "deferred-leveldown-0.2.0" = self.by-version."deferred-leveldown"."0.2.0";
-      "errno-0.1.2" = self.by-version."errno"."0.1.2";
+      "errno-0.1.4" = self.by-version."errno"."0.1.4";
       "prr-0.0.0" = self.by-version."prr"."0.0.0";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "xtend-3.0.0" = self.by-version."xtend"."3.0.0";
     };
     optionalDependencies = {
@@ -22368,20 +25523,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."levn"."~0.2.5" =
-    self.by-version."levn"."0.2.5";
-  by-version."levn"."0.2.5" = self.buildNodePackage {
-    name = "levn-0.2.5";
-    version = "0.2.5";
-    bin = false;
+  by-spec."leven"."^1.0.0" =
+    self.by-version."leven"."1.0.2";
+  by-version."leven"."1.0.2" = self.buildNodePackage {
+    name = "leven-1.0.2";
+    version = "1.0.2";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
-      name = "levn-0.2.5.tgz";
-      sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
+      url = "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz";
+      name = "leven-1.0.2.tgz";
+      sha1 = "9144b6eebca5f1d0680169f1a6770dcea60b75c3";
     };
     deps = {
-      "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
-      "type-check-0.3.1" = self.by-version."type-check"."0.3.1";
     };
     optionalDependencies = {
     };
@@ -22389,19 +25542,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lexical-scope"."~0.0.14" =
-    self.by-version."lexical-scope"."0.0.15";
-  by-version."lexical-scope"."0.0.15" = self.buildNodePackage {
-    name = "lexical-scope-0.0.15";
-    version = "0.0.15";
+  by-spec."levn"."~0.2.5" =
+    self.by-version."levn"."0.2.5";
+  by-version."levn"."0.2.5" = self.buildNodePackage {
+    name = "levn-0.2.5";
+    version = "0.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.0.15.tgz";
-      name = "lexical-scope-0.0.15.tgz";
-      sha1 = "ca595997aaed87b155cb041f48dc0438f48a04dc";
+      url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
+      name = "levn-0.2.5.tgz";
+      sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
     };
     deps = {
-      "astw-0.0.0" = self.by-version."astw"."0.0.0";
+      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
+      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
     };
     optionalDependencies = {
     };
@@ -22409,19 +25563,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lexical-scope"."~0.1.0" =
-    self.by-version."lexical-scope"."0.1.0";
-  by-version."lexical-scope"."0.1.0" = self.buildNodePackage {
-    name = "lexical-scope-0.1.0";
-    version = "0.1.0";
+  by-spec."levn"."~0.3.0" =
+    self.by-version."levn"."0.3.0";
+  by-version."levn"."0.3.0" = self.buildNodePackage {
+    name = "levn-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-0.1.0.tgz";
-      name = "lexical-scope-0.1.0.tgz";
-      sha1 = "8f30004c80234ffac083b990079d7b267e18441b";
+      url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
+      name = "levn-0.3.0.tgz";
+      sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee";
     };
     deps = {
-      "astw-0.1.0" = self.by-version."astw"."0.1.0";
+      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
+      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
     };
     optionalDependencies = {
     };
@@ -22429,19 +25584,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lexical-scope"."~1.1.0" =
-    self.by-version."lexical-scope"."1.1.0";
-  by-version."lexical-scope"."1.1.0" = self.buildNodePackage {
-    name = "lexical-scope-1.1.0";
-    version = "1.1.0";
+  by-spec."lexical-scope"."^1.2.0" =
+    self.by-version."lexical-scope"."1.2.0";
+  by-version."lexical-scope"."1.2.0" = self.buildNodePackage {
+    name = "lexical-scope-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lexical-scope/-/lexical-scope-1.1.0.tgz";
-      name = "lexical-scope-1.1.0.tgz";
-      sha1 = "899f36c4ec9c5af19736361aae290a6ef2af0800";
+      url = "https://registry.npmjs.org/lexical-scope/-/lexical-scope-1.2.0.tgz";
+      name = "lexical-scope-1.2.0.tgz";
+      sha1 = "fcea5edc704a4b3a8796cdca419c3a0afaf22df4";
     };
     deps = {
-      "astw-1.1.0" = self.by-version."astw"."1.1.0";
+      "astw-2.0.0" = self.by-version."astw"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -22456,7 +25611,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz";
+      url = "https://registry.npmjs.org/lexicographic-integer/-/lexicographic-integer-1.1.0.tgz";
       name = "lexicographic-integer-1.1.0.tgz";
       sha1 = "52ca6d998a572e6322b515f5b80e396c6043e9b8";
     };
@@ -22468,14 +25623,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libbase64"."^0.1.0" =
+  by-spec."libbase64"."0.1.0" =
     self.by-version."libbase64"."0.1.0";
   by-version."libbase64"."0.1.0" = self.buildNodePackage {
     name = "libbase64-0.1.0";
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz";
+      url = "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz";
       name = "libbase64-0.1.0.tgz";
       sha1 = "62351a839563ac5ff5bd26f12f60e9830bb751e6";
     };
@@ -22487,21 +25642,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libmime"."^0.1.5" =
-    self.by-version."libmime"."0.1.7";
-  by-version."libmime"."0.1.7" = self.buildNodePackage {
-    name = "libmime-0.1.7";
-    version = "0.1.7";
+  by-spec."libbase64"."^0.1.0" =
+    self.by-version."libbase64"."0.1.0";
+  by-spec."libmime"."2.0.3" =
+    self.by-version."libmime"."2.0.3";
+  by-version."libmime"."2.0.3" = self.buildNodePackage {
+    name = "libmime-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libmime/-/libmime-0.1.7.tgz";
-      name = "libmime-0.1.7.tgz";
-      sha1 = "827b8d4df349e08c6cff1bc6d6b51ec57d349cb2";
+      url = "https://registry.npmjs.org/libmime/-/libmime-2.0.3.tgz";
+      name = "libmime-2.0.3.tgz";
+      sha1 = "55751aa832d31492363df3dd810580dfd59d080c";
     };
     deps = {
-      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
       "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
-      "libqp-0.1.1" = self.by-version."libqp"."0.1.1";
+      "libqp-1.1.0" = self.by-version."libqp"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -22510,20 +25667,20 @@
     cpu = [ ];
   };
   by-spec."libmime"."^1.0.0" =
-    self.by-version."libmime"."1.0.0";
-  by-version."libmime"."1.0.0" = self.buildNodePackage {
-    name = "libmime-1.0.0";
-    version = "1.0.0";
+    self.by-version."libmime"."1.2.0";
+  by-version."libmime"."1.2.0" = self.buildNodePackage {
+    name = "libmime-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libmime/-/libmime-1.0.0.tgz";
-      name = "libmime-1.0.0.tgz";
-      sha1 = "d3351e4a7e402f34804eaf1a6558a8c985dabd31";
+      url = "https://registry.npmjs.org/libmime/-/libmime-1.2.0.tgz";
+      name = "libmime-1.2.0.tgz";
+      sha1 = "8d84b4f3b225b3704410236ef494906436ba742b";
     };
     deps = {
-      "iconv-lite-0.4.8" = self.by-version."iconv-lite"."0.4.8";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
       "libbase64-0.1.0" = self.by-version."libbase64"."0.1.0";
-      "libqp-1.0.0" = self.by-version."libqp"."1.0.0";
+      "libqp-1.1.0" = self.by-version."libqp"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -22531,16 +25688,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libqp"."^0.1.1" =
-    self.by-version."libqp"."0.1.1";
-  by-version."libqp"."0.1.1" = self.buildNodePackage {
-    name = "libqp-0.1.1";
-    version = "0.1.1";
+  by-spec."libmime"."^1.2.0" =
+    self.by-version."libmime"."1.2.0";
+  by-spec."libqp"."1.1.0" =
+    self.by-version."libqp"."1.1.0";
+  by-version."libqp"."1.1.0" = self.buildNodePackage {
+    name = "libqp-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libqp/-/libqp-0.1.1.tgz";
-      name = "libqp-0.1.1.tgz";
-      sha1 = "2d10cabb96b14fe9649f4ae353a39baa90063b01";
+      url = "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz";
+      name = "libqp-1.1.0.tgz";
+      sha1 = "f5e6e06ad74b794fb5b5b66988bf728ef1dedbe8";
     };
     deps = {
     };
@@ -22550,18 +25709,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libqp"."^1.0.0" =
-    self.by-version."libqp"."1.0.0";
-  by-version."libqp"."1.0.0" = self.buildNodePackage {
-    name = "libqp-1.0.0";
-    version = "1.0.0";
+  by-spec."libqp"."^1.1.0" =
+    self.by-version."libqp"."1.1.0";
+  by-spec."libxmljs"."^0.17.1" =
+    self.by-version."libxmljs"."0.17.1";
+  by-version."libxmljs"."0.17.1" = self.buildNodePackage {
+    name = "libxmljs-0.17.1";
+    version = "0.17.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libqp/-/libqp-1.0.0.tgz";
-      name = "libqp-1.0.0.tgz";
-      sha1 = "aded044d83970c152de5b983d39c3b2d291f9a74";
+      url = "https://registry.npmjs.org/libxmljs/-/libxmljs-0.17.1.tgz";
+      name = "libxmljs-0.17.1.tgz";
+      sha1 = "1f77e529b5bd1c0e49936726daed95577092ee8a";
     };
     deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-2.0.7" = self.by-version."nan"."2.0.7";
     };
     optionalDependencies = {
     };
@@ -22569,20 +25732,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."libxmljs"."^0.13.0" =
-    self.by-version."libxmljs"."0.13.0";
-  by-version."libxmljs"."0.13.0" = self.buildNodePackage {
-    name = "libxmljs-0.13.0";
-    version = "0.13.0";
+  by-spec."liftoff"."^2.1.0" =
+    self.by-version."liftoff"."2.2.1";
+  by-version."liftoff"."2.2.1" = self.buildNodePackage {
+    name = "liftoff-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libxmljs/-/libxmljs-0.13.0.tgz";
-      name = "libxmljs-0.13.0.tgz";
-      sha1 = "04df28df57a0927452f860148e5f462cbaed08ff";
+      url = "https://registry.npmjs.org/liftoff/-/liftoff-2.2.1.tgz";
+      name = "liftoff-2.2.1.tgz";
+      sha1 = "8dfef848d3f441921c4a311fc3203ae9c34c41a7";
     };
     deps = {
-      "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
-      "nan-1.5.1" = self.by-version."nan"."1.5.1";
+      "extend-2.0.1" = self.by-version."extend"."2.0.1";
+      "findup-sync-0.3.0" = self.by-version."findup-sync"."0.3.0";
+      "flagged-respawn-0.3.2" = self.by-version."flagged-respawn"."0.3.2";
+      "rechoir-0.6.2" = self.by-version."rechoir"."0.6.2";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
     };
     optionalDependencies = {
     };
@@ -22590,23 +25756,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."liftoff"."^2.0.1" =
-    self.by-version."liftoff"."2.0.3";
-  by-version."liftoff"."2.0.3" = self.buildNodePackage {
-    name = "liftoff-2.0.3";
-    version = "2.0.3";
+  by-spec."linkify-it"."~1.2.0" =
+    self.by-version."linkify-it"."1.2.0";
+  by-version."linkify-it"."1.2.0" = self.buildNodePackage {
+    name = "linkify-it-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/liftoff/-/liftoff-2.0.3.tgz";
-      name = "liftoff-2.0.3.tgz";
-      sha1 = "fbab25362a506ac28a3db0c55cde9562fbd70456";
+      url = "https://registry.npmjs.org/linkify-it/-/linkify-it-1.2.0.tgz";
+      name = "linkify-it-1.2.0.tgz";
+      sha1 = "fd71021cfb3dca1c28fe09385ef5c10bbead8206";
     };
     deps = {
-      "extend-2.0.0" = self.by-version."extend"."2.0.0";
-      "findup-sync-0.2.1" = self.by-version."findup-sync"."0.2.1";
-      "flagged-respawn-0.3.1" = self.by-version."flagged-respawn"."0.3.1";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
-      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
+      "uc.micro-1.0.0" = self.by-version."uc.micro"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -22614,19 +25776,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."linkify-it"."~1.0.1" =
-    self.by-version."linkify-it"."1.0.1";
-  by-version."linkify-it"."1.0.1" = self.buildNodePackage {
-    name = "linkify-it-1.0.1";
-    version = "1.0.1";
+  by-spec."load-json-file"."^1.0.0" =
+    self.by-version."load-json-file"."1.1.0";
+  by-version."load-json-file"."1.1.0" = self.buildNodePackage {
+    name = "load-json-file-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
+      name = "load-json-file-1.1.0.tgz";
+      sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
+    };
+    deps = {
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0";
+      "pify-2.3.0" = self.by-version."pify"."2.3.0";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."loader-runner"."^2.1.0" =
+    self.by-version."loader-runner"."2.1.1";
+  by-version."loader-runner"."2.1.1" = self.buildNodePackage {
+    name = "loader-runner-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/linkify-it/-/linkify-it-1.0.1.tgz";
-      name = "linkify-it-1.0.1.tgz";
-      sha1 = "73b32a4854d52438f59c6e09b6ded5be0abdd94a";
+      url = "https://registry.npmjs.org/loader-runner/-/loader-runner-2.1.1.tgz";
+      name = "loader-runner-2.1.1.tgz";
+      sha1 = "60a30f2a7c8eae79f0805b5848fee134f8ade519";
     };
     deps = {
-      "uc.micro-1.0.0" = self.by-version."uc.micro"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -22634,18 +25819,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lockfile"."^1.0.0" =
-    self.by-version."lockfile"."1.0.0";
-  by-version."lockfile"."1.0.0" = self.buildNodePackage {
-    name = "lockfile-1.0.0";
-    version = "1.0.0";
+  by-spec."loader-utils"."^0.2.11" =
+    self.by-version."loader-utils"."0.2.13";
+  by-version."loader-utils"."0.2.13" = self.buildNodePackage {
+    name = "loader-utils-0.2.13";
+    version = "0.2.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lockfile/-/lockfile-1.0.0.tgz";
-      name = "lockfile-1.0.0.tgz";
-      sha1 = "b3a7609dda6012060083bacb0ab0ecbca58e9203";
+      url = "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.13.tgz";
+      name = "loader-utils-0.2.13.tgz";
+      sha1 = "ea0de320be919056362c9972d5072b4596ae9eec";
     };
     deps = {
+      "big.js-3.1.3" = self.by-version."big.js"."3.1.3";
+      "json5-0.4.0" = self.by-version."json5"."0.4.0";
     };
     optionalDependencies = {
     };
@@ -22653,16 +25840,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lockfile"."~0.4.0" =
-    self.by-version."lockfile"."0.4.3";
-  by-version."lockfile"."0.4.3" = self.buildNodePackage {
-    name = "lockfile-0.4.3";
-    version = "0.4.3";
+  by-spec."lockfile"."~1.0.1" =
+    self.by-version."lockfile"."1.0.1";
+  by-version."lockfile"."1.0.1" = self.buildNodePackage {
+    name = "lockfile-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lockfile/-/lockfile-0.4.3.tgz";
-      name = "lockfile-0.4.3.tgz";
-      sha1 = "79b965ee9b32d9dd24b59cf81205e6dcb6d3b224";
+      url = "https://registry.npmjs.org/lockfile/-/lockfile-1.0.1.tgz";
+      name = "lockfile-1.0.1.tgz";
+      sha1 = "9d353ecfe3f54d150bb57f89d51746935a39c4f5";
     };
     deps = {
     };
@@ -22672,18 +25859,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lockfile"."~1.0.0" =
-    self.by-version."lockfile"."1.0.0";
   by-spec."lodash"."*" =
-    self.by-version."lodash"."3.7.0";
-  by-version."lodash"."3.7.0" = self.buildNodePackage {
-    name = "lodash-3.7.0";
-    version = "3.7.0";
+    self.by-version."lodash"."4.8.2";
+  by-version."lodash"."4.8.2" = self.buildNodePackage {
+    name = "lodash-4.8.2";
+    version = "4.8.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
-      name = "lodash-3.7.0.tgz";
-      sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
+      url = "https://registry.npmjs.org/lodash/-/lodash-4.8.2.tgz";
+      name = "lodash-4.8.2.tgz";
+      sha1 = "478ad7ff648c3c71a2f6108e032c5c0cc40747df";
     };
     deps = {
     };
@@ -22693,16 +25878,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash"."2.4.1" =
-    self.by-version."lodash"."2.4.1";
-  by-version."lodash"."2.4.1" = self.buildNodePackage {
-    name = "lodash-2.4.1";
-    version = "2.4.1";
+  by-spec."lodash"."3.10.1" =
+    self.by-version."lodash"."3.10.1";
+  by-version."lodash"."3.10.1" = self.buildNodePackage {
+    name = "lodash-3.10.1";
+    version = "3.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-2.4.1.tgz";
-      name = "lodash-2.4.1.tgz";
-      sha1 = "5b7723034dda4d262e5a46fb2c58d7cc22f71420";
+      url = "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz";
+      name = "lodash-3.10.1.tgz";
+      sha1 = "5bf45e8e49ba4189e17d482789dfd15bd140b7b6";
     };
     deps = {
     };
@@ -22712,18 +25897,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash"."2.4.x" =
-    self.by-version."lodash"."2.4.1";
-  by-spec."lodash"."3.6.x" =
-    self.by-version."lodash"."3.6.0";
-  by-version."lodash"."3.6.0" = self.buildNodePackage {
-    name = "lodash-3.6.0";
-    version = "3.6.0";
+  by-spec."lodash"."3.7.x" =
+    self.by-version."lodash"."3.7.0";
+  by-version."lodash"."3.7.0" = self.buildNodePackage {
+    name = "lodash-3.7.0";
+    version = "3.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.6.0.tgz";
-      name = "lodash-3.6.0.tgz";
-      sha1 = "5266a8f49dd989be4f9f681b6f2a0c55285d0d9a";
+      url = "https://registry.npmjs.org/lodash/-/lodash-3.7.0.tgz";
+      name = "lodash-3.7.0.tgz";
+      sha1 = "3678bd8ab995057c07ade836ed2ef087da811d45";
     };
     deps = {
     };
@@ -22733,16 +25916,47 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash".">= 3.2.0 < 4.0.0" =
-    self.by-version."lodash"."3.7.0";
+  by-spec."lodash".">= 4.0.0 < 5.0.0" =
+    self.by-version."lodash"."4.8.2";
   by-spec."lodash".">=2.4.1" =
-    self.by-version."lodash"."3.7.0";
+    self.by-version."lodash"."4.8.2";
   by-spec."lodash"."^2.4.1" =
-    self.by-version."lodash"."2.4.1";
+    self.by-version."lodash"."2.4.2";
+  by-version."lodash"."2.4.2" = self.buildNodePackage {
+    name = "lodash-2.4.2";
+    version = "2.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz";
+      name = "lodash-2.4.2.tgz";
+      sha1 = "fadd834b9683073da179b3eae6d9c0d15053f73e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."^3.10.1" =
+    self.by-version."lodash"."3.10.1";
   by-spec."lodash"."^3.2.0" =
-    self.by-version."lodash"."3.7.0";
+    self.by-version."lodash"."3.10.1";
   by-spec."lodash"."^3.3.1" =
-    self.by-version."lodash"."3.7.0";
+    self.by-version."lodash"."3.10.1";
+  by-spec."lodash"."^3.5.0" =
+    self.by-version."lodash"."3.10.1";
+  by-spec."lodash"."^3.8.0" =
+    self.by-version."lodash"."3.10.1";
+  by-spec."lodash"."^4.0.0" =
+    self.by-version."lodash"."4.8.2";
+  by-spec."lodash"."^4.0.1" =
+    self.by-version."lodash"."4.8.2";
+  by-spec."lodash"."^4.2.0" =
+    self.by-version."lodash"."4.8.2";
+  by-spec."lodash"."^4.3.0" =
+    self.by-version."lodash"."4.8.2";
   by-spec."lodash"."~0.9.2" =
     self.by-version."lodash"."0.9.2";
   by-version."lodash"."0.9.2" = self.buildNodePackage {
@@ -22750,7 +25964,7 @@
     version = "0.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
+      url = "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz";
       name = "lodash-0.9.2.tgz";
       sha1 = "8f3499c5245d346d682e5b0d3b40767e09f1a92c";
     };
@@ -22769,7 +25983,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
+      url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz";
       name = "lodash-1.0.2.tgz";
       sha1 = "8f57560c83b59fc270bd3d561b690043430e2551";
     };
@@ -22788,7 +26002,7 @@
     version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
+      url = "https://registry.npmjs.org/lodash/-/lodash-1.3.1.tgz";
       name = "lodash-1.3.1.tgz";
       sha1 = "a4663b53686b895ff074e2ba504dfb76a8e2b770";
     };
@@ -22801,7 +26015,28 @@
     cpu = [ ];
   };
   by-spec."lodash"."~2.4.1" =
-    self.by-version."lodash"."2.4.1";
+    self.by-version."lodash"."2.4.2";
+  by-spec."lodash"."~3.10.1" =
+    self.by-version."lodash"."3.10.1";
+  by-spec."lodash"."~3.2.0" =
+    self.by-version."lodash"."3.2.0";
+  by-version."lodash"."3.2.0" = self.buildNodePackage {
+    name = "lodash-3.2.0";
+    version = "3.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash/-/lodash-3.2.0.tgz";
+      name = "lodash-3.2.0.tgz";
+      sha1 = "4bf50a3243f9aeb0bac41a55d3d5990675a462fb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lodash"."~3.5.0" =
     self.by-version."lodash"."3.5.0";
   by-version."lodash"."3.5.0" = self.buildNodePackage {
@@ -22809,7 +26044,7 @@
     version = "3.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz";
+      url = "https://registry.npmjs.org/lodash/-/lodash-3.5.0.tgz";
       name = "lodash-3.5.0.tgz";
       sha1 = "19bb3f4d51278f0b8c818ed145c74ecf9fe40e6d";
     };
@@ -22821,8 +26056,63 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash"."~3.6.0" =
-    self.by-version."lodash"."3.6.0";
+  by-spec."lodash"."~3.9.3" =
+    self.by-version."lodash"."3.9.3";
+  by-version."lodash"."3.9.3" = self.buildNodePackage {
+    name = "lodash-3.9.3";
+    version = "3.9.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash/-/lodash-3.9.3.tgz";
+      name = "lodash-3.9.3.tgz";
+      sha1 = "0159e86832feffc6d61d852b12a953b99496bd32";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."~4.2.1" =
+    self.by-version."lodash"."4.2.1";
+  by-version."lodash"."4.2.1" = self.buildNodePackage {
+    name = "lodash-4.2.1";
+    version = "4.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz";
+      name = "lodash-4.2.1.tgz";
+      sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash"."~4.3.0" =
+    self.by-version."lodash"."4.3.0";
+  by-version."lodash"."4.3.0" = self.buildNodePackage {
+    name = "lodash-4.3.0";
+    version = "4.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash/-/lodash-4.3.0.tgz";
+      name = "lodash-4.3.0.tgz";
+      sha1 = "efd9c4a6ec53f3b05412429915c3e4824e4d25a4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lodash-deep"."^1.1.0" =
     self.by-version."lodash-deep"."1.6.0";
   by-version."lodash-deep"."1.6.0" = self.buildNodePackage {
@@ -22830,12 +26120,12 @@
     version = "1.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash-deep/-/lodash-deep-1.6.0.tgz";
+      url = "https://registry.npmjs.org/lodash-deep/-/lodash-deep-1.6.0.tgz";
       name = "lodash-deep-1.6.0.tgz";
       sha1 = "a7ce672759472b91d12b193c69d8a24a02d8428d";
     };
     deps = {
-      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
     };
     optionalDependencies = {
     };
@@ -22843,16 +26133,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash-node"."~2.4.1" =
-    self.by-version."lodash-node"."2.4.1";
-  by-version."lodash-node"."2.4.1" = self.buildNodePackage {
-    name = "lodash-node-2.4.1";
-    version = "2.4.1";
+  by-spec."lodash._baseassign"."^3.0.0" =
+    self.by-version."lodash._baseassign"."3.2.0";
+  by-version."lodash._baseassign"."3.2.0" = self.buildNodePackage {
+    name = "lodash._baseassign-3.2.0";
+    version = "3.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash-node/-/lodash-node-2.4.1.tgz";
-      name = "lodash-node-2.4.1.tgz";
-      sha1 = "ea82f7b100c733d1a42af76801e506105e2a80ec";
+      url = "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz";
+      name = "lodash._baseassign-3.2.0.tgz";
+      sha1 = "8c38a099500f215ad09e59f1722fd0c52bfe0a4e";
+    };
+    deps = {
+      "lodash._basecopy-3.0.1" = self.by-version."lodash._basecopy"."3.0.1";
+      "lodash.keys-3.1.2" = self.by-version."lodash.keys"."3.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._baseclone"."~4.5.0" =
+    self.by-version."lodash._baseclone"."4.5.4";
+  by-version."lodash._baseclone"."4.5.4" = self.buildNodePackage {
+    name = "lodash._baseclone-4.5.4";
+    version = "4.5.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-4.5.4.tgz";
+      name = "lodash._baseclone-4.5.4.tgz";
+      sha1 = "71ebdc3f5483eb5fd21b11738e583f9017a3882e";
     };
     deps = {
     };
@@ -22869,7 +26180,7 @@
     version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz";
+      url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz";
       name = "lodash._basecopy-3.0.1.tgz";
       sha1 = "8da0e6a876cf344c0ad8a54882111dd3c5c7ca36";
     };
@@ -22881,18 +26192,97 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lodash._basedifference"."~4.4.0" =
+    self.by-version."lodash._basedifference"."4.4.1";
+  by-version."lodash._basedifference"."4.4.1" = self.buildNodePackage {
+    name = "lodash._basedifference-4.4.1";
+    version = "4.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-4.4.1.tgz";
+      name = "lodash._basedifference-4.4.1.tgz";
+      sha1 = "537bde6fd0f3eeec28e37288dd51459765181b4d";
+    };
+    deps = {
+      "lodash._setcache-4.1.2" = self.by-version."lodash._setcache"."4.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._baseflatten"."~4.1.0" =
+    self.by-version."lodash._baseflatten"."4.1.1";
+  by-version."lodash._baseflatten"."4.1.1" = self.buildNodePackage {
+    name = "lodash._baseflatten-4.1.1";
+    version = "4.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-4.1.1.tgz";
+      name = "lodash._baseflatten-4.1.1.tgz";
+      sha1 = "5c87403b88f3687a88d26424faadf3aa054aab0d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._baseindexof"."*" =
+    self.by-version."lodash._baseindexof"."3.1.0";
+  by-version."lodash._baseindexof"."3.1.0" = self.buildNodePackage {
+    name = "lodash._baseindexof-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz";
+      name = "lodash._baseindexof-3.1.0.tgz";
+      sha1 = "fe52b53a1c6761e42618d654e4a25789ed61822c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lodash._basetostring"."^3.0.0" =
-    self.by-version."lodash._basetostring"."3.0.0";
-  by-version."lodash._basetostring"."3.0.0" = self.buildNodePackage {
-    name = "lodash._basetostring-3.0.0";
-    version = "3.0.0";
+    self.by-version."lodash._basetostring"."3.0.1";
+  by-version."lodash._basetostring"."3.0.1" = self.buildNodePackage {
+    name = "lodash._basetostring-3.0.1";
+    version = "3.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz";
+      name = "lodash._basetostring-3.0.1.tgz";
+      sha1 = "d1861d877f824a52f669832dcaf3ee15566a07d5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._baseuniq"."~4.5.0" =
+    self.by-version."lodash._baseuniq"."4.5.1";
+  by-version."lodash._baseuniq"."4.5.1" = self.buildNodePackage {
+    name = "lodash._baseuniq-4.5.1";
+    version = "4.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.0.tgz";
-      name = "lodash._basetostring-3.0.0.tgz";
-      sha1 = "75a9a4aaaa2b2a8761111ff5431e7d83c1daf0e2";
+      url = "https://registry.npmjs.org/lodash._baseuniq/-/lodash._baseuniq-4.5.1.tgz";
+      name = "lodash._baseuniq-4.5.1.tgz";
+      sha1 = "1980430c2e64ee86df6dd35794e1a301b2ab74de";
     };
     deps = {
+      "lodash._createset-4.0.1" = self.by-version."lodash._createset"."4.0.1";
+      "lodash._setcache-4.1.2" = self.by-version."lodash._setcache"."4.1.2";
     };
     optionalDependencies = {
     };
@@ -22900,6 +26290,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lodash._baseuniq"."~4.5.1" =
+    self.by-version."lodash._baseuniq"."4.5.1";
   by-spec."lodash._basevalues"."^3.0.0" =
     self.by-version."lodash._basevalues"."3.0.0";
   by-version."lodash._basevalues"."3.0.0" = self.buildNodePackage {
@@ -22907,7 +26299,7 @@
     version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz";
+      url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz";
       name = "lodash._basevalues-3.0.0.tgz";
       sha1 = "5b775762802bde3d3297503e26300820fdf661b7";
     };
@@ -22919,19 +26311,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash._createpadding"."^3.0.0" =
-    self.by-version."lodash._createpadding"."3.6.0";
-  by-version."lodash._createpadding"."3.6.0" = self.buildNodePackage {
-    name = "lodash._createpadding-3.6.0";
-    version = "3.6.0";
+  by-spec."lodash._bindcallback"."*" =
+    self.by-version."lodash._bindcallback"."3.0.1";
+  by-version."lodash._bindcallback"."3.0.1" = self.buildNodePackage {
+    name = "lodash._bindcallback-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._createpadding/-/lodash._createpadding-3.6.0.tgz";
-      name = "lodash._createpadding-3.6.0.tgz";
-      sha1 = "c466850dd1a05e6bfec54fd0cf0db28b68332d5e";
+      url = "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz";
+      name = "lodash._bindcallback-3.0.1.tgz";
+      sha1 = "e531c27644cf8b57a99e17ed95b35c748789392e";
     };
     deps = {
-      "lodash.repeat-3.0.0" = self.by-version."lodash.repeat"."3.0.0";
     };
     optionalDependencies = {
     };
@@ -22939,16 +26330,119 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lodash._bindcallback"."^3.0.0" =
+    self.by-version."lodash._bindcallback"."3.0.1";
+  by-spec."lodash._cacheindexof"."*" =
+    self.by-version."lodash._cacheindexof"."3.0.2";
+  by-version."lodash._cacheindexof"."3.0.2" = self.buildNodePackage {
+    name = "lodash._cacheindexof-3.0.2";
+    version = "3.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz";
+      name = "lodash._cacheindexof-3.0.2.tgz";
+      sha1 = "3dc69ac82498d2ee5e3ce56091bafd2adc7bde92";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._createassigner"."^3.0.0" =
+    self.by-version."lodash._createassigner"."3.1.1";
+  by-version."lodash._createassigner"."3.1.1" = self.buildNodePackage {
+    name = "lodash._createassigner-3.1.1";
+    version = "3.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz";
+      name = "lodash._createassigner-3.1.1.tgz";
+      sha1 = "838a5bae2fdaca63ac22dee8e19fa4e6d6970b11";
+    };
+    deps = {
+      "lodash._bindcallback-3.0.1" = self.by-version."lodash._bindcallback"."3.0.1";
+      "lodash._isiterateecall-3.0.9" = self.by-version."lodash._isiterateecall"."3.0.9";
+      "lodash.restparam-3.6.1" = self.by-version."lodash.restparam"."3.6.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._createcache"."*" =
+    self.by-version."lodash._createcache"."3.1.2";
+  by-version."lodash._createcache"."3.1.2" = self.buildNodePackage {
+    name = "lodash._createcache-3.1.2";
+    version = "3.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz";
+      name = "lodash._createcache-3.1.2.tgz";
+      sha1 = "56d6a064017625e79ebca6b8018e17440bdcf093";
+    };
+    deps = {
+      "lodash._getnative-3.9.1" = self.by-version."lodash._getnative"."3.9.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._createset"."~4.0.0" =
+    self.by-version."lodash._createset"."4.0.1";
+  by-version."lodash._createset"."4.0.1" = self.buildNodePackage {
+    name = "lodash._createset-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._createset/-/lodash._createset-4.0.1.tgz";
+      name = "lodash._createset-4.0.1.tgz";
+      sha1 = "00e891e3dd386c4512fcb1f49060dfa4d02a9819";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._getnative"."*" =
+    self.by-version."lodash._getnative"."3.9.1";
+  by-version."lodash._getnative"."3.9.1" = self.buildNodePackage {
+    name = "lodash._getnative-3.9.1";
+    version = "3.9.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz";
+      name = "lodash._getnative-3.9.1.tgz";
+      sha1 = "570bc7dede46d61cdcde687d65d3eecbaa3aaff5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._getnative"."^3.0.0" =
+    self.by-version."lodash._getnative"."3.9.1";
   by-spec."lodash._isiterateecall"."^3.0.0" =
-    self.by-version."lodash._isiterateecall"."3.0.6";
-  by-version."lodash._isiterateecall"."3.0.6" = self.buildNodePackage {
-    name = "lodash._isiterateecall-3.0.6";
-    version = "3.0.6";
+    self.by-version."lodash._isiterateecall"."3.0.9";
+  by-version."lodash._isiterateecall"."3.0.9" = self.buildNodePackage {
+    name = "lodash._isiterateecall-3.0.9";
+    version = "3.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.6.tgz";
-      name = "lodash._isiterateecall-3.0.6.tgz";
-      sha1 = "1dd246f647750123cba90f6826acf3eeb673ad41";
+      url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz";
+      name = "lodash._isiterateecall-3.0.9.tgz";
+      sha1 = "5203ad7ba425fae842460e696db9cf3e6aac057c";
     };
     deps = {
     };
@@ -22965,7 +26459,7 @@
     version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz";
+      url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz";
       name = "lodash._reescape-3.0.0.tgz";
       sha1 = "2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a";
     };
@@ -22984,7 +26478,7 @@
     version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz";
+      url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz";
       name = "lodash._reevaluate-3.0.0.tgz";
       sha1 = "58bc74c40664953ae0b124d806996daca431e2ed";
     };
@@ -23003,7 +26497,7 @@
     version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz";
+      url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz";
       name = "lodash._reinterpolate-3.0.0.tgz";
       sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d";
     };
@@ -23015,19 +26509,123 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.debounce"."^3.0.1" =
-    self.by-version."lodash.debounce"."3.0.3";
-  by-version."lodash.debounce"."3.0.3" = self.buildNodePackage {
-    name = "lodash.debounce-3.0.3";
-    version = "3.0.3";
+  by-spec."lodash._root"."^3.0.0" =
+    self.by-version."lodash._root"."3.0.1";
+  by-version."lodash._root"."3.0.1" = self.buildNodePackage {
+    name = "lodash._root-3.0.1";
+    version = "3.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz";
+      name = "lodash._root-3.0.1.tgz";
+      sha1 = "fba1c4524c19ee9a5f8136b4609f017cf4ded692";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash._setcache"."~4.1.0" =
+    self.by-version."lodash._setcache"."4.1.2";
+  by-version."lodash._setcache"."4.1.2" = self.buildNodePackage {
+    name = "lodash._setcache-4.1.2";
+    version = "4.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash._setcache/-/lodash._setcache-4.1.2.tgz";
+      name = "lodash._setcache-4.1.2.tgz";
+      sha1 = "90941f81b2ef907e3f8c63bfd22ba3b7b70d88aa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.assign"."4.0.1" =
+    self.by-version."lodash.assign"."4.0.1";
+  by-version."lodash.assign"."4.0.1" = self.buildNodePackage {
+    name = "lodash.assign-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.1.tgz";
+      name = "lodash.assign-4.0.1.tgz";
+      sha1 = "8e7ff0206897a99dca32fc8123309f5c4c2c731e";
+    };
+    deps = {
+      "lodash.keys-4.0.6" = self.by-version."lodash.keys"."4.0.6";
+      "lodash.rest-4.0.2" = self.by-version."lodash.rest"."4.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.assign"."^3.0.0" =
+    self.by-version."lodash.assign"."3.2.0";
+  by-version."lodash.assign"."3.2.0" = self.buildNodePackage {
+    name = "lodash.assign-3.2.0";
+    version = "3.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz";
+      name = "lodash.assign-3.2.0.tgz";
+      sha1 = "3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa";
+    };
+    deps = {
+      "lodash._baseassign-3.2.0" = self.by-version."lodash._baseassign"."3.2.0";
+      "lodash._createassigner-3.1.1" = self.by-version."lodash._createassigner"."3.1.1";
+      "lodash.keys-3.1.2" = self.by-version."lodash.keys"."3.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.assign"."^3.2.0" =
+    self.by-version."lodash.assign"."3.2.0";
+  by-spec."lodash.clonedeep"."~4.3.2" =
+    self.by-version."lodash.clonedeep"."4.3.2";
+  by-version."lodash.clonedeep"."4.3.2" = self.buildNodePackage {
+    name = "lodash.clonedeep-4.3.2";
+    version = "4.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.debounce/-/lodash.debounce-3.0.3.tgz";
-      name = "lodash.debounce-3.0.3.tgz";
-      sha1 = "f696762aedfa649c937c05a64e8a013ffd219c67";
+      url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.3.2.tgz";
+      name = "lodash.clonedeep-4.3.2.tgz";
+      sha1 = "d0112c02c76b5223833aebc6a4b6e334f0d057de";
     };
     deps = {
-      "lodash.isnative-3.0.2" = self.by-version."lodash.isnative"."3.0.2";
+      "lodash._baseclone-4.5.4" = self.by-version."lodash._baseclone"."4.5.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.defaults"."^3.1.2" =
+    self.by-version."lodash.defaults"."3.1.2";
+  by-version."lodash.defaults"."3.1.2" = self.buildNodePackage {
+    name = "lodash.defaults-3.1.2";
+    version = "3.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-3.1.2.tgz";
+      name = "lodash.defaults-3.1.2.tgz";
+      sha1 = "c7308b18dbf8bc9372d701a73493c61192bd2e2c";
+    };
+    deps = {
+      "lodash.assign-3.2.0" = self.by-version."lodash.assign"."3.2.0";
+      "lodash.restparam-3.6.1" = self.by-version."lodash.restparam"."3.6.1";
     };
     optionalDependencies = {
     };
@@ -23036,18 +26634,18 @@
     cpu = [ ];
   };
   by-spec."lodash.escape"."^3.0.0" =
-    self.by-version."lodash.escape"."3.0.0";
-  by-version."lodash.escape"."3.0.0" = self.buildNodePackage {
-    name = "lodash.escape-3.0.0";
-    version = "3.0.0";
+    self.by-version."lodash.escape"."3.2.0";
+  by-version."lodash.escape"."3.2.0" = self.buildNodePackage {
+    name = "lodash.escape-3.2.0";
+    version = "3.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz";
-      name = "lodash.escape-3.0.0.tgz";
-      sha1 = "fb294c99a7bfb586039f66d6b9c27ed874cb7b51";
+      url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz";
+      name = "lodash.escape-3.2.0.tgz";
+      sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698";
     };
     deps = {
-      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
+      "lodash._root-3.0.1" = self.by-version."lodash._root"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -23056,15 +26654,15 @@
     cpu = [ ];
   };
   by-spec."lodash.isarguments"."^3.0.0" =
-    self.by-version."lodash.isarguments"."3.0.1";
-  by-version."lodash.isarguments"."3.0.1" = self.buildNodePackage {
-    name = "lodash.isarguments-3.0.1";
-    version = "3.0.1";
+    self.by-version."lodash.isarguments"."3.0.8";
+  by-version."lodash.isarguments"."3.0.8" = self.buildNodePackage {
+    name = "lodash.isarguments-3.0.8";
+    version = "3.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.1.tgz";
-      name = "lodash.isarguments-3.0.1.tgz";
-      sha1 = "06fbbff019b5627837af7212f17f58c9f4f90e20";
+      url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.8.tgz";
+      name = "lodash.isarguments-3.0.8.tgz";
+      sha1 = "5bf8da887f01f2a9e49c0a175cdaeb318a0e43dc";
     };
     deps = {
     };
@@ -23075,15 +26673,15 @@
     cpu = [ ];
   };
   by-spec."lodash.isarray"."^3.0.0" =
-    self.by-version."lodash.isarray"."3.0.2";
-  by-version."lodash.isarray"."3.0.2" = self.buildNodePackage {
-    name = "lodash.isarray-3.0.2";
-    version = "3.0.2";
+    self.by-version."lodash.isarray"."3.0.4";
+  by-version."lodash.isarray"."3.0.4" = self.buildNodePackage {
+    name = "lodash.isarray-3.0.4";
+    version = "3.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.2.tgz";
-      name = "lodash.isarray-3.0.2.tgz";
-      sha1 = "e12e08059abd32a640e024d2c8a0f673264326a8";
+      url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz";
+      name = "lodash.isarray-3.0.4.tgz";
+      sha1 = "79e4eb88c36a8122af86f844aa9bcd851b5fbb55";
     };
     deps = {
     };
@@ -23093,16 +26691,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.isnative"."^3.0.0" =
-    self.by-version."lodash.isnative"."3.0.2";
-  by-version."lodash.isnative"."3.0.2" = self.buildNodePackage {
-    name = "lodash.isnative-3.0.2";
-    version = "3.0.2";
+  by-spec."lodash.isarray"."~4.0.0" =
+    self.by-version."lodash.isarray"."4.0.0";
+  by-version."lodash.isarray"."4.0.0" = self.buildNodePackage {
+    name = "lodash.isarray-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.isnative/-/lodash.isnative-3.0.2.tgz";
-      name = "lodash.isnative-3.0.2.tgz";
-      sha1 = "7fefcd1af13f1bd2bcb6b45a4597337a22b32ce1";
+      url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-4.0.0.tgz";
+      name = "lodash.isarray-4.0.0.tgz";
+      sha1 = "2aca496b28c4ca6d726715313590c02e6ea34403";
     };
     deps = {
     };
@@ -23113,20 +26711,20 @@
     cpu = [ ];
   };
   by-spec."lodash.keys"."^3.0.0" =
-    self.by-version."lodash.keys"."3.0.6";
-  by-version."lodash.keys"."3.0.6" = self.buildNodePackage {
-    name = "lodash.keys-3.0.6";
-    version = "3.0.6";
+    self.by-version."lodash.keys"."3.1.2";
+  by-version."lodash.keys"."3.1.2" = self.buildNodePackage {
+    name = "lodash.keys-3.1.2";
+    version = "3.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.keys/-/lodash.keys-3.0.6.tgz";
-      name = "lodash.keys-3.0.6.tgz";
-      sha1 = "8865dd881571c08484f4b6e0e8dede1bd2daf81e";
+      url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz";
+      name = "lodash.keys-3.1.2.tgz";
+      sha1 = "4dbc0472b156be50a0b286855d1bd0b0c656098a";
     };
     deps = {
-      "lodash.isarguments-3.0.1" = self.by-version."lodash.isarguments"."3.0.1";
-      "lodash.isarray-3.0.2" = self.by-version."lodash.isarray"."3.0.2";
-      "lodash.isnative-3.0.2" = self.by-version."lodash.isnative"."3.0.2";
+      "lodash._getnative-3.9.1" = self.by-version."lodash._getnative"."3.9.1";
+      "lodash.isarguments-3.0.8" = self.by-version."lodash.isarguments"."3.0.8";
+      "lodash.isarray-3.0.4" = self.by-version."lodash.isarray"."3.0.4";
     };
     optionalDependencies = {
     };
@@ -23134,20 +26732,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.pad"."^3.0.0" =
-    self.by-version."lodash.pad"."3.1.0";
-  by-version."lodash.pad"."3.1.0" = self.buildNodePackage {
-    name = "lodash.pad-3.1.0";
-    version = "3.1.0";
+  by-spec."lodash.keys"."^4.0.0" =
+    self.by-version."lodash.keys"."4.0.6";
+  by-version."lodash.keys"."4.0.6" = self.buildNodePackage {
+    name = "lodash.keys-4.0.6";
+    version = "4.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.pad/-/lodash.pad-3.1.0.tgz";
-      name = "lodash.pad-3.1.0.tgz";
-      sha1 = "9f18b1f3749a95e197b5ff2ae752ea9851ada965";
+      url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.6.tgz";
+      name = "lodash.keys-4.0.6.tgz";
+      sha1 = "2087692c58b0e44e88658108da8ad66f417867ac";
     };
     deps = {
-      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
-      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -23155,20 +26751,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.padleft"."^3.0.0" =
-    self.by-version."lodash.padleft"."3.1.0";
-  by-version."lodash.padleft"."3.1.0" = self.buildNodePackage {
-    name = "lodash.padleft-3.1.0";
-    version = "3.1.0";
+  by-spec."lodash.keys"."~4.0.5" =
+    self.by-version."lodash.keys"."4.0.6";
+  by-spec."lodash.memoize"."~3.0.3" =
+    self.by-version."lodash.memoize"."3.0.4";
+  by-version."lodash.memoize"."3.0.4" = self.buildNodePackage {
+    name = "lodash.memoize-3.0.4";
+    version = "3.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.padleft/-/lodash.padleft-3.1.0.tgz";
-      name = "lodash.padleft-3.1.0.tgz";
-      sha1 = "ac94eeeb3ec4df6394b893c6f4f7faa5cb96a5c1";
+      url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-3.0.4.tgz";
+      name = "lodash.memoize-3.0.4.tgz";
+      sha1 = "2dcbd2c287cbc0a55cc42328bd0c736150d53e3f";
     };
     deps = {
-      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
-      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -23176,20 +26772,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.padright"."^3.0.0" =
-    self.by-version."lodash.padright"."3.1.0";
-  by-version."lodash.padright"."3.1.0" = self.buildNodePackage {
-    name = "lodash.padright-3.1.0";
-    version = "3.1.0";
+  by-spec."lodash.noop"."~3.0.0" =
+    self.by-version."lodash.noop"."3.0.1";
+  by-version."lodash.noop"."3.0.1" = self.buildNodePackage {
+    name = "lodash.noop-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.padright/-/lodash.padright-3.1.0.tgz";
-      name = "lodash.padright-3.1.0.tgz";
-      sha1 = "155aa4ed10f4103829031a14516dcb5f3f6c777f";
+      url = "https://registry.npmjs.org/lodash.noop/-/lodash.noop-3.0.1.tgz";
+      name = "lodash.noop-3.0.1.tgz";
+      sha1 = "38188f4d650a3a474258439b96ec45b32617133c";
     };
     deps = {
-      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
-      "lodash._createpadding-3.6.0" = self.by-version."lodash._createpadding"."3.6.0";
     };
     optionalDependencies = {
     };
@@ -23197,19 +26791,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.repeat"."^3.0.0" =
-    self.by-version."lodash.repeat"."3.0.0";
-  by-version."lodash.repeat"."3.0.0" = self.buildNodePackage {
-    name = "lodash.repeat-3.0.0";
-    version = "3.0.0";
+  by-spec."lodash.pad"."^4.1.0" =
+    self.by-version."lodash.pad"."4.2.0";
+  by-version."lodash.pad"."4.2.0" = self.buildNodePackage {
+    name = "lodash.pad-4.2.0";
+    version = "4.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.repeat/-/lodash.repeat-3.0.0.tgz";
-      name = "lodash.repeat-3.0.0.tgz";
-      sha1 = "c340f4136c99dc5b2e397b3fd50cffbd172a94b0";
+      url = "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.2.0.tgz";
+      name = "lodash.pad-4.2.0.tgz";
+      sha1 = "743e1adf26534d3e8cf3fba52a68aa4f48c38cd6";
     };
     deps = {
-      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
+      "lodash.tostring-4.1.2" = self.by-version."lodash.tostring"."4.1.2";
     };
     optionalDependencies = {
     };
@@ -23217,14 +26811,73 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.restparam"."^3.0.0" =
+  by-spec."lodash.padend"."^4.1.0" =
+    self.by-version."lodash.padend"."4.3.0";
+  by-version."lodash.padend"."4.3.0" = self.buildNodePackage {
+    name = "lodash.padend-4.3.0";
+    version = "4.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.3.0.tgz";
+      name = "lodash.padend-4.3.0.tgz";
+      sha1 = "5333dccbcd88cdd651a05ba6e05f483ae287119f";
+    };
+    deps = {
+      "lodash.tostring-4.1.2" = self.by-version."lodash.tostring"."4.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.padstart"."^4.1.0" =
+    self.by-version."lodash.padstart"."4.3.0";
+  by-version."lodash.padstart"."4.3.0" = self.buildNodePackage {
+    name = "lodash.padstart-4.3.0";
+    version = "4.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.3.0.tgz";
+      name = "lodash.padstart-4.3.0.tgz";
+      sha1 = "7044f6c4a3544165d2b5b3c2203834809fac692e";
+    };
+    deps = {
+      "lodash.tostring-4.1.2" = self.by-version."lodash.tostring"."4.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.rest"."^4.0.0" =
+    self.by-version."lodash.rest"."4.0.2";
+  by-version."lodash.rest"."4.0.2" = self.buildNodePackage {
+    name = "lodash.rest-4.0.2";
+    version = "4.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.2.tgz";
+      name = "lodash.rest-4.0.2.tgz";
+      sha1 = "a15a7daa9cbd45e223ef5ba5d38e87dd02eac6bd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.restparam"."*" =
     self.by-version."lodash.restparam"."3.6.1";
   by-version."lodash.restparam"."3.6.1" = self.buildNodePackage {
     name = "lodash.restparam-3.6.1";
     version = "3.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz";
+      url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz";
       name = "lodash.restparam-3.6.1.tgz";
       sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805";
     };
@@ -23236,28 +26889,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lodash.restparam"."^3.0.0" =
+    self.by-version."lodash.restparam"."3.6.1";
   by-spec."lodash.template"."^3.0.0" =
-    self.by-version."lodash.template"."3.5.0";
-  by-version."lodash.template"."3.5.0" = self.buildNodePackage {
-    name = "lodash.template-3.5.0";
-    version = "3.5.0";
+    self.by-version."lodash.template"."3.6.2";
+  by-version."lodash.template"."3.6.2" = self.buildNodePackage {
+    name = "lodash.template-3.6.2";
+    version = "3.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.template/-/lodash.template-3.5.0.tgz";
-      name = "lodash.template-3.5.0.tgz";
-      sha1 = "79a4fa335599e7ab649db8d1637b3ecaeed07aef";
+      url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz";
+      name = "lodash.template-3.6.2.tgz";
+      sha1 = "f8cdecc6169a255be9098ae8b0c53d378931d14f";
     };
     deps = {
       "lodash._basecopy-3.0.1" = self.by-version."lodash._basecopy"."3.0.1";
-      "lodash._basetostring-3.0.0" = self.by-version."lodash._basetostring"."3.0.0";
+      "lodash._basetostring-3.0.1" = self.by-version."lodash._basetostring"."3.0.1";
       "lodash._basevalues-3.0.0" = self.by-version."lodash._basevalues"."3.0.0";
-      "lodash._isiterateecall-3.0.6" = self.by-version."lodash._isiterateecall"."3.0.6";
+      "lodash._isiterateecall-3.0.9" = self.by-version."lodash._isiterateecall"."3.0.9";
       "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
-      "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0";
-      "lodash.isnative-3.0.2" = self.by-version."lodash.isnative"."3.0.2";
-      "lodash.keys-3.0.6" = self.by-version."lodash.keys"."3.0.6";
+      "lodash.escape-3.2.0" = self.by-version."lodash.escape"."3.2.0";
+      "lodash.keys-3.1.2" = self.by-version."lodash.keys"."3.1.2";
       "lodash.restparam-3.6.1" = self.by-version."lodash.restparam"."3.6.1";
-      "lodash.templatesettings-3.1.0" = self.by-version."lodash.templatesettings"."3.1.0";
+      "lodash.templatesettings-3.1.1" = self.by-version."lodash.templatesettings"."3.1.1";
     };
     optionalDependencies = {
     };
@@ -23266,19 +26920,101 @@
     cpu = [ ];
   };
   by-spec."lodash.templatesettings"."^3.0.0" =
-    self.by-version."lodash.templatesettings"."3.1.0";
-  by-version."lodash.templatesettings"."3.1.0" = self.buildNodePackage {
-    name = "lodash.templatesettings-3.1.0";
-    version = "3.1.0";
+    self.by-version."lodash.templatesettings"."3.1.1";
+  by-version."lodash.templatesettings"."3.1.1" = self.buildNodePackage {
+    name = "lodash.templatesettings-3.1.1";
+    version = "3.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz";
-      name = "lodash.templatesettings-3.1.0.tgz";
-      sha1 = "53852fd832b920605a2eb61919bcbbfb8f385bb6";
+      url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz";
+      name = "lodash.templatesettings-3.1.1.tgz";
+      sha1 = "fb307844753b66b9f1afa54e262c745307dba8e5";
     };
     deps = {
       "lodash._reinterpolate-3.0.0" = self.by-version."lodash._reinterpolate"."3.0.0";
-      "lodash.escape-3.0.0" = self.by-version."lodash.escape"."3.0.0";
+      "lodash.escape-3.2.0" = self.by-version."lodash.escape"."3.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.tostring"."^4.0.0" =
+    self.by-version."lodash.tostring"."4.1.2";
+  by-version."lodash.tostring"."4.1.2" = self.buildNodePackage {
+    name = "lodash.tostring-4.1.2";
+    version = "4.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz";
+      name = "lodash.tostring-4.1.2.tgz";
+      sha1 = "7d326a5cf64da4298f2fd35b688d848267535288";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.union"."~4.2.1" =
+    self.by-version."lodash.union"."4.2.1";
+  by-version."lodash.union"."4.2.1" = self.buildNodePackage {
+    name = "lodash.union-4.2.1";
+    version = "4.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.2.1.tgz";
+      name = "lodash.union-4.2.1.tgz";
+      sha1 = "6871017b9b1ff71952c1e2bb2e25b1046a7e2842";
+    };
+    deps = {
+      "lodash._baseflatten-4.1.1" = self.by-version."lodash._baseflatten"."4.1.1";
+      "lodash._baseuniq-4.5.1" = self.by-version."lodash._baseuniq"."4.5.1";
+      "lodash.rest-4.0.2" = self.by-version."lodash.rest"."4.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.uniq"."~4.2.1" =
+    self.by-version."lodash.uniq"."4.2.1";
+  by-version."lodash.uniq"."4.2.1" = self.buildNodePackage {
+    name = "lodash.uniq-4.2.1";
+    version = "4.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.2.1.tgz";
+      name = "lodash.uniq-4.2.1.tgz";
+      sha1 = "4210d4b90647ee24211b469aed0ef84902069743";
+    };
+    deps = {
+      "lodash._baseuniq-4.5.1" = self.by-version."lodash._baseuniq"."4.5.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lodash.without"."~4.1.2" =
+    self.by-version."lodash.without"."4.1.2";
+  by-version."lodash.without"."4.1.2" = self.buildNodePackage {
+    name = "lodash.without-4.1.2";
+    version = "4.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lodash.without/-/lodash.without-4.1.2.tgz";
+      name = "lodash.without-4.1.2.tgz";
+      sha1 = "c68b1981e1b001bd87eef7487dba0af267846229";
+    };
+    deps = {
+      "lodash._basedifference-4.4.1" = self.by-version."lodash._basedifference"."4.4.1";
+      "lodash.rest-4.0.2" = self.by-version."lodash.rest"."4.0.2";
     };
     optionalDependencies = {
     };
@@ -23293,7 +27029,7 @@
     version = "1.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
+      url = "https://registry.npmjs.org/log-driver/-/log-driver-1.2.4.tgz";
       name = "log-driver-1.2.4.tgz";
       sha1 = "2d62d7faef45d8a71341961a04b0761eca99cfa3";
     };
@@ -23305,22 +27041,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."log4js"."~0.6.3" =
-    self.by-version."log4js"."0.6.24";
-  by-version."log4js"."0.6.24" = self.buildNodePackage {
-    name = "log4js-0.6.24";
-    version = "0.6.24";
+  by-spec."log4js"."^0.6.31" =
+    self.by-version."log4js"."0.6.33";
+  by-version."log4js"."0.6.33" = self.buildNodePackage {
+    name = "log4js-0.6.33";
+    version = "0.6.33";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/log4js/-/log4js-0.6.24.tgz";
-      name = "log4js-0.6.24.tgz";
-      sha1 = "33cb11f14d3a48834867037aff292a046f6aae50";
+      url = "https://registry.npmjs.org/log4js/-/log4js-0.6.33.tgz";
+      name = "log4js-0.6.33.tgz";
+      sha1 = "53f1bf825dac7cdfeadca6787624fa824ccf5b7e";
     };
     deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "underscore-1.8.2" = self.by-version."underscore"."1.8.2";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
     };
     optionalDependencies = {
     };
@@ -23328,20 +27062,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."loggly"."0.3.x >=0.3.7" =
-    self.by-version."loggly"."0.3.11";
-  by-version."loggly"."0.3.11" = self.buildNodePackage {
-    name = "loggly-0.3.11";
-    version = "0.3.11";
+  by-spec."lolex"."1.3.2" =
+    self.by-version."lolex"."1.3.2";
+  by-version."lolex"."1.3.2" = self.buildNodePackage {
+    name = "lolex-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/loggly/-/loggly-0.3.11.tgz";
-      name = "loggly-0.3.11.tgz";
-      sha1 = "62c1ec3436772f0954598f26b957d2ad2986b611";
+      url = "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz";
+      name = "lolex-1.3.2.tgz";
+      sha1 = "7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31";
     };
     deps = {
-      "request-2.9.203" = self.by-version."request"."2.9.203";
-      "timespan-2.3.0" = self.by-version."timespan"."2.3.0";
     };
     optionalDependencies = {
     };
@@ -23349,16 +27081,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lolex"."1.1.0" =
-    self.by-version."lolex"."1.1.0";
-  by-version."lolex"."1.1.0" = self.buildNodePackage {
-    name = "lolex-1.1.0";
-    version = "1.1.0";
+  by-spec."long"."~2 >=2.2.3" =
+    self.by-version."long"."2.4.0";
+  by-version."long"."2.4.0" = self.buildNodePackage {
+    name = "long-2.4.0";
+    version = "2.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lolex/-/lolex-1.1.0.tgz";
-      name = "lolex-1.1.0.tgz";
-      sha1 = "5dbbbc850395e7523c74b3586f7fbd2626d25b1b";
+      url = "https://registry.npmjs.org/long/-/long-2.4.0.tgz";
+      name = "long-2.4.0.tgz";
+      sha1 = "9fa180bb1d9500cdc29c4156766a1995e1f4524f";
     };
     deps = {
     };
@@ -23368,16 +27100,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."long"."~2 >=2.2.3" =
-    self.by-version."long"."2.2.3";
-  by-version."long"."2.2.3" = self.buildNodePackage {
-    name = "long-2.2.3";
-    version = "2.2.3";
+  by-spec."longest"."^1.0.1" =
+    self.by-version."longest"."1.0.1";
+  by-version."longest"."1.0.1" = self.buildNodePackage {
+    name = "longest-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/long/-/long-2.2.3.tgz";
-      name = "long-2.2.3.tgz";
-      sha1 = "635f5b530b3bd3ecb000a2ffb11281583c7f1e07";
+      url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz";
+      name = "longest-1.0.1.tgz";
+      sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097";
     };
     deps = {
     };
@@ -23387,18 +27119,60 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."longjohn"."~0.2.2" =
-    self.by-version."longjohn"."0.2.4";
-  by-version."longjohn"."0.2.4" = self.buildNodePackage {
-    name = "longjohn-0.2.4";
-    version = "0.2.4";
+  by-spec."longjohn"."0.2.9" =
+    self.by-version."longjohn"."0.2.9";
+  by-version."longjohn"."0.2.9" = self.buildNodePackage {
+    name = "longjohn-0.2.9";
+    version = "0.2.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/longjohn/-/longjohn-0.2.9.tgz";
+      name = "longjohn-0.2.9.tgz";
+      sha1 = "db1bf175fcfffcfce099132d1470f52f41a31519";
+    };
+    deps = {
+      "source-map-support-0.3.2" = self.by-version."source-map-support"."0.3.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."loose-envify"."^1.0.0" =
+    self.by-version."loose-envify"."1.1.0";
+  by-version."loose-envify"."1.1.0" = self.buildNodePackage {
+    name = "loose-envify-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/loose-envify/-/loose-envify-1.1.0.tgz";
+      name = "loose-envify-1.1.0.tgz";
+      sha1 = "527582d62cff4e04da3f9976c7110d3392ec7e0c";
+    };
+    deps = {
+      "js-tokens-1.0.3" = self.by-version."js-tokens"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."loud-rejection"."^1.0.0" =
+    self.by-version."loud-rejection"."1.3.0";
+  by-version."loud-rejection"."1.3.0" = self.buildNodePackage {
+    name = "loud-rejection-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/longjohn/-/longjohn-0.2.4.tgz";
-      name = "longjohn-0.2.4.tgz";
-      sha1 = "48436a1f359e7666f678e2170ee1f43bba8f8b4c";
+      url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.3.0.tgz";
+      name = "loud-rejection-1.3.0.tgz";
+      sha1 = "f289a392f17d2baacf194d0a673004394433b115";
     };
     deps = {
+      "array-find-index-1.0.1" = self.by-version."array-find-index"."1.0.1";
+      "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2";
     };
     optionalDependencies = {
     };
@@ -23413,7 +27187,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
+      url = "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz";
       name = "lowercase-keys-1.0.0.tgz";
       sha1 = "4e3366b39e7f5457e35f1324bdf6f88d0bfc7306";
     };
@@ -23425,16 +27199,36 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lru"."^2.0.0" =
+    self.by-version."lru"."2.0.1";
+  by-version."lru"."2.0.1" = self.buildNodePackage {
+    name = "lru-2.0.1";
+    version = "2.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lru/-/lru-2.0.1.tgz";
+      name = "lru-2.0.1.tgz";
+      sha1 = "f979871e162e3f5ca254be46844c53d4c5364544";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."lru-cache"."2" =
-    self.by-version."lru-cache"."2.6.1";
-  by-version."lru-cache"."2.6.1" = self.buildNodePackage {
-    name = "lru-cache-2.6.1";
-    version = "2.6.1";
+    self.by-version."lru-cache"."2.7.3";
+  by-version."lru-cache"."2.7.3" = self.buildNodePackage {
+    name = "lru-cache-2.7.3";
+    version = "2.7.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.6.1.tgz";
-      name = "lru-cache-2.6.1.tgz";
-      sha1 = "9933eff15453fae1d27096365143c724e85c6cbd";
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+      name = "lru-cache-2.7.3.tgz";
+      sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
     };
     deps = {
     };
@@ -23451,7 +27245,7 @@
     version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.0.tgz";
       name = "lru-cache-2.2.0.tgz";
       sha1 = "ec2bba603f4c5bb3e7a1bf62ce1c1dbc1d474e08";
     };
@@ -23470,7 +27264,7 @@
     version = "2.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz";
       name = "lru-cache-2.2.4.tgz";
       sha1 = "6c658619becf14031d0d0b594b16042ce4dc063d";
     };
@@ -23489,7 +27283,7 @@
     version = "2.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz";
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz";
       name = "lru-cache-2.5.2.tgz";
       sha1 = "1fddad938aae1263ce138680be1b3f591c0ab41c";
     };
@@ -23502,17 +27296,38 @@
     cpu = [ ];
   };
   by-spec."lru-cache"."^2.5.0" =
-    self.by-version."lru-cache"."2.6.1";
-  by-spec."lru-cache"."~2.3.0" =
-    self.by-version."lru-cache"."2.3.1";
-  by-version."lru-cache"."2.3.1" = self.buildNodePackage {
-    name = "lru-cache-2.3.1";
-    version = "2.3.1";
+    self.by-version."lru-cache"."2.7.3";
+  by-spec."lru-cache"."^4.0.0" =
+    self.by-version."lru-cache"."4.0.1";
+  by-version."lru-cache"."4.0.1" = self.buildNodePackage {
+    name = "lru-cache-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
+      name = "lru-cache-4.0.1.tgz";
+      sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
+    };
+    deps = {
+      "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2";
+      "yallist-2.0.0" = self.by-version."yallist"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."lru-cache"."~1.0.2" =
+    self.by-version."lru-cache"."1.0.6";
+  by-version."lru-cache"."1.0.6" = self.buildNodePackage {
+    name = "lru-cache-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz";
-      name = "lru-cache-2.3.1.tgz";
-      sha1 = "b3adf6b3d856e954e2c390e6cef22081245a53d6";
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-1.0.6.tgz";
+      name = "lru-cache-1.0.6.tgz";
+      sha1 = "aa50f97047422ac72543bda177a9c9d018d98452";
     };
     deps = {
     };
@@ -23524,21 +27339,19 @@
   };
   by-spec."lru-cache"."~2.5.0" =
     self.by-version."lru-cache"."2.5.2";
-  by-spec."lru-cache"."~2.6.1" =
-    self.by-version."lru-cache"."2.6.1";
-  by-spec."lru-queue"."0.1" =
-    self.by-version."lru-queue"."0.1.0";
-  by-version."lru-queue"."0.1.0" = self.buildNodePackage {
-    name = "lru-queue-0.1.0";
-    version = "0.1.0";
+  by-spec."lru-cache"."~3.2.0" =
+    self.by-version."lru-cache"."3.2.0";
+  by-version."lru-cache"."3.2.0" = self.buildNodePackage {
+    name = "lru-cache-3.2.0";
+    version = "3.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz";
-      name = "lru-queue-0.1.0.tgz";
-      sha1 = "2738bd9f0d3cf4f84490c5736c48699ac632cda3";
+      url = "https://registry.npmjs.org/lru-cache/-/lru-cache-3.2.0.tgz";
+      name = "lru-cache-3.2.0.tgz";
+      sha1 = "71789b3b7f5399bec8565dda38aa30d2a097efee";
     };
     deps = {
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
+      "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -23553,7 +27366,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
+      url = "https://registry.npmjs.org/lsmod/-/lsmod-0.0.3.tgz";
       name = "lsmod-0.0.3.tgz";
       sha1 = "17e13d4e1ae91750ea5653548cd89e7147ad0244";
     };
@@ -23572,7 +27385,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz";
+      url = "https://registry.npmjs.org/ltgt/-/ltgt-1.0.2.tgz";
       name = "ltgt-1.0.2.tgz";
       sha1 = "e6817eb29ad204fc0c9e96ef8b0fee98ef6b9aa3";
     };
@@ -23584,16 +27397,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ltgt"."~2.0.0" =
-    self.by-version."ltgt"."2.0.0";
-  by-version."ltgt"."2.0.0" = self.buildNodePackage {
-    name = "ltgt-2.0.0";
-    version = "2.0.0";
+  by-spec."ltgt"."~2.1.1" =
+    self.by-version."ltgt"."2.1.2";
+  by-version."ltgt"."2.1.2" = self.buildNodePackage {
+    name = "ltgt-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ltgt/-/ltgt-2.0.0.tgz";
-      name = "ltgt-2.0.0.tgz";
-      sha1 = "b40ed1e337caf577c0a963f9cffbc680318009c2";
+      url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.2.tgz";
+      name = "ltgt-2.1.2.tgz";
+      sha1 = "e7472324fee690afc0d5ecf900403ce5788a311d";
     };
     deps = {
     };
@@ -23604,19 +27417,18 @@
     cpu = [ ];
   };
   by-spec."ltx"."*" =
-    self.by-version."ltx"."0.9.0";
-  by-version."ltx"."0.9.0" = self.buildNodePackage {
-    name = "ltx-0.9.0";
-    version = "0.9.0";
+    self.by-version."ltx"."2.3.0";
+  by-version."ltx"."2.3.0" = self.buildNodePackage {
+    name = "ltx-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ltx/-/ltx-0.9.0.tgz";
-      name = "ltx-0.9.0.tgz";
-      sha1 = "09055d4791b074d58c7d81d7ef0d91a71ef3c8a3";
+      url = "https://registry.npmjs.org/ltx/-/ltx-2.3.0.tgz";
+      name = "ltx-2.3.0.tgz";
+      sha1 = "0d86d7366b866ad718b1c545f71c137884db2186";
     };
     deps = {
-      "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -23624,23 +27436,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "ltx" = self.by-version."ltx"."0.9.0";
-  by-spec."ltx"."0.x" =
-    self.by-version."ltx"."0.9.0";
-  by-spec."ltx"."^0.5.2" =
-    self.by-version."ltx"."0.5.2";
-  by-version."ltx"."0.5.2" = self.buildNodePackage {
-    name = "ltx-0.5.2";
-    version = "0.5.2";
+  "ltx" = self.by-version."ltx"."2.3.0";
+  by-spec."ltx"."^0.9.0" =
+    self.by-version."ltx"."0.9.1";
+  by-version."ltx"."0.9.1" = self.buildNodePackage {
+    name = "ltx-0.9.1";
+    version = "0.9.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ltx/-/ltx-0.5.2.tgz";
-      name = "ltx-0.5.2.tgz";
-      sha1 = "3a049fc30ab8982c227803a74b26c02fe225cef8";
+      url = "https://registry.npmjs.org/ltx/-/ltx-0.9.1.tgz";
+      name = "ltx-0.9.1.tgz";
+      sha1 = "56393ba7798c2cd18fce781a4ed7d83deb6daae6";
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
+      "node-expat-2.3.13" = self.by-version."node-expat"."2.3.13";
     };
     optionalDependencies = {
     };
@@ -23648,22 +27458,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ltx"."^0.9.0" =
-    self.by-version."ltx"."0.9.0";
+  by-spec."ltx"."^2.0.1" =
+    self.by-version."ltx"."2.3.0";
+  by-spec."ltx"."^2.2.0" =
+    self.by-version."ltx"."2.3.0";
   by-spec."ltx"."~0.9.0" =
-    self.by-version."ltx"."0.9.0";
-  by-spec."ltx"."~0.x" =
-    self.by-version."ltx"."0.9.0";
+    self.by-version."ltx"."0.9.1";
   by-spec."lunr".">=0.5.2 <1.0.0-0" =
-    self.by-version."lunr"."0.5.8";
-  by-version."lunr"."0.5.8" = self.buildNodePackage {
-    name = "lunr-0.5.8";
-    version = "0.5.8";
+    self.by-version."lunr"."0.7.0";
+  by-version."lunr"."0.7.0" = self.buildNodePackage {
+    name = "lunr-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/lunr/-/lunr-0.5.8.tgz";
-      name = "lunr-0.5.8.tgz";
-      sha1 = "1e491cdce223fcea988ea117acdf3f6bd628f9ec";
+      url = "https://registry.npmjs.org/lunr/-/lunr-0.7.0.tgz";
+      name = "lunr-0.7.0.tgz";
+      sha1 = "e7d279a273c4ab42ff584b61ce32a3513a2d3859";
     };
     deps = {
     };
@@ -23673,18 +27483,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."m8".">= 0.4.3" =
-    self.by-version."m8"."0.4.4";
-  by-version."m8"."0.4.4" = self.buildNodePackage {
-    name = "m8-0.4.4";
-    version = "0.4.4";
+  by-spec."magnet-uri"."^2.0.1" =
+    self.by-version."magnet-uri"."2.0.1";
+  by-version."magnet-uri"."2.0.1" = self.buildNodePackage {
+    name = "magnet-uri-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/m8/-/m8-0.4.4.tgz";
-      name = "m8-0.4.4.tgz";
-      sha1 = "59df914d9bee2829ceac4346026abe945abed5b8";
+      url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
+      name = "magnet-uri-2.0.1.tgz";
+      sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209";
     };
     deps = {
+      "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2";
     };
     optionalDependencies = {
     };
@@ -23692,19 +27503,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."magnet-uri"."^2.0.1" =
-    self.by-version."magnet-uri"."2.0.1";
-  by-version."magnet-uri"."2.0.1" = self.buildNodePackage {
-    name = "magnet-uri-2.0.1";
-    version = "2.0.1";
+  by-spec."magnet-uri"."^4.0.0" =
+    self.by-version."magnet-uri"."4.2.3";
+  by-version."magnet-uri"."4.2.3" = self.buildNodePackage {
+    name = "magnet-uri-4.2.3";
+    version = "4.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-2.0.1.tgz";
-      name = "magnet-uri-2.0.1.tgz";
-      sha1 = "d331d3dfcd3836565ade0fc3ca315e39217bb209";
+      url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.3.tgz";
+      name = "magnet-uri-4.2.3.tgz";
+      sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8";
     };
     deps = {
+      "flatten-0.0.1" = self.by-version."flatten"."0.0.1";
       "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -23712,21 +27525,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."magnet-uri"."^4.0.0" =
-    self.by-version."magnet-uri"."4.2.2";
-  by-version."magnet-uri"."4.2.2" = self.buildNodePackage {
-    name = "magnet-uri-4.2.2";
-    version = "4.2.2";
+  by-spec."magnet-uri"."^5.1.3" =
+    self.by-version."magnet-uri"."5.1.3";
+  by-version."magnet-uri"."5.1.3" = self.buildNodePackage {
+    name = "magnet-uri-5.1.3";
+    version = "5.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/magnet-uri/-/magnet-uri-4.2.2.tgz";
-      name = "magnet-uri-4.2.2.tgz";
-      sha1 = "26a445b7d9acb3da29ba8cda85cf0fc0dbf07d24";
+      url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.1.3.tgz";
+      name = "magnet-uri-5.1.3.tgz";
+      sha1 = "02dee3b07b639363afa991f44a3fe2bb06d6342d";
     };
     deps = {
-      "flatten-0.0.1" = self.by-version."flatten"."0.0.1";
-      "thirty-two-0.0.2" = self.by-version."thirty-two"."0.0.2";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "thirty-two-1.0.1" = self.by-version."thirty-two"."1.0.1";
+      "uniq-1.0.1" = self.by-version."uniq"."1.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -23737,19 +27550,19 @@
   by-spec."magnet-uri"."~2.0.0" =
     self.by-version."magnet-uri"."2.0.1";
   by-spec."mailchimp".">=1.1.0" =
-    self.by-version."mailchimp"."1.1.0";
-  by-version."mailchimp"."1.1.0" = self.buildNodePackage {
-    name = "mailchimp-1.1.0";
-    version = "1.1.0";
+    self.by-version."mailchimp"."1.1.5";
+  by-version."mailchimp"."1.1.5" = self.buildNodePackage {
+    name = "mailchimp-1.1.5";
+    version = "1.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mailchimp/-/mailchimp-1.1.0.tgz";
-      name = "mailchimp-1.1.0.tgz";
-      sha1 = "253220f0091724b1033fadcf9f8aaad68dcad309";
+      url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.5.tgz";
+      name = "mailchimp-1.1.5.tgz";
+      sha1 = "63d560056179301c41bb6f7cadc584944312909c";
     };
     deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "qs-0.5.6" = self.by-version."qs"."0.5.6";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "qs-1.2.2" = self.by-version."qs"."1.2.2";
     };
     optionalDependencies = {
     };
@@ -23758,13 +27571,34 @@
     cpu = [ ];
   };
   by-spec."mailcomposer".">= 0.1.27" =
+    self.by-version."mailcomposer"."3.7.0";
+  by-version."mailcomposer"."3.7.0" = self.buildNodePackage {
+    name = "mailcomposer-3.7.0";
+    version = "3.7.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-3.7.0.tgz";
+      name = "mailcomposer-3.7.0.tgz";
+      sha1 = "6f328613e972df8b5035c0834c65ea992d81433c";
+    };
+    deps = {
+      "buildmail-3.6.0" = self.by-version."buildmail"."3.6.0";
+      "libmime-2.0.3" = self.by-version."libmime"."2.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mailcomposer"."~0.2.10" =
     self.by-version."mailcomposer"."0.2.12";
   by-version."mailcomposer"."0.2.12" = self.buildNodePackage {
     name = "mailcomposer-0.2.12";
     version = "0.2.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz";
+      url = "https://registry.npmjs.org/mailcomposer/-/mailcomposer-0.2.12.tgz";
       name = "mailcomposer-0.2.12.tgz";
       sha1 = "4d02a604616adcb45fb36d37513f4c1bd0b75681";
     };
@@ -23781,8 +27615,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mailcomposer"."~0.2.10" =
-    self.by-version."mailcomposer"."0.2.12";
   by-spec."mailgun-js"."^0.6.7" =
     self.by-version."mailgun-js"."0.6.9";
   by-version."mailgun-js"."0.6.9" = self.buildNodePackage {
@@ -23790,7 +27622,7 @@
     version = "0.6.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mailgun-js/-/mailgun-js-0.6.9.tgz";
+      url = "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.6.9.tgz";
       name = "mailgun-js-0.6.9.tgz";
       sha1 = "1bdc22b636a249b6870e920695b8338370b2cf98";
     };
@@ -23798,7 +27630,7 @@
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
       "inflection-1.5.3" = self.by-version."inflection"."1.5.3";
       "path-proxy-1.0.0" = self.by-version."path-proxy"."1.0.0";
-      "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0";
+      "proxy-agent-1.1.1" = self.by-version."proxy-agent"."1.1.1";
       "q-1.1.2" = self.by-version."q"."1.1.2";
       "scmp-1.0.0" = self.by-version."scmp"."1.0.0";
       "debug-2.1.3" = self.by-version."debug"."2.1.3";
@@ -23810,15 +27642,36 @@
     cpu = [ ];
   };
   by-spec."map-obj"."^1.0.0" =
-    self.by-version."map-obj"."1.0.0";
-  by-version."map-obj"."1.0.0" = self.buildNodePackage {
-    name = "map-obj-1.0.0";
-    version = "1.0.0";
+    self.by-version."map-obj"."1.0.1";
+  by-version."map-obj"."1.0.1" = self.buildNodePackage {
+    name = "map-obj-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
+      name = "map-obj-1.0.1.tgz";
+      sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."map-obj"."^1.0.1" =
+    self.by-version."map-obj"."1.0.1";
+  by-spec."map-stream"."~0.1.0" =
+    self.by-version."map-stream"."0.1.0";
+  by-version."map-stream"."0.1.0" = self.buildNodePackage {
+    name = "map-stream-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.0.tgz";
-      name = "map-obj-1.0.0.tgz";
-      sha1 = "bcbdf6756758763c182daf79e18094a2f1c85766";
+      url = "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
+      name = "map-stream-0.1.0.tgz";
+      sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
     };
     deps = {
     };
@@ -23829,21 +27682,21 @@
     cpu = [ ];
   };
   by-spec."markdown-it"."4.x" =
-    self.by-version."markdown-it"."4.1.2";
-  by-version."markdown-it"."4.1.2" = self.buildNodePackage {
-    name = "markdown-it-4.1.2";
-    version = "4.1.2";
+    self.by-version."markdown-it"."4.4.0";
+  by-version."markdown-it"."4.4.0" = self.buildNodePackage {
+    name = "markdown-it-4.4.0";
+    version = "4.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/markdown-it/-/markdown-it-4.1.2.tgz";
-      name = "markdown-it-4.1.2.tgz";
-      sha1 = "f6fe57e03618f36f49bc6312928c83cedf77c6ac";
+      url = "https://registry.npmjs.org/markdown-it/-/markdown-it-4.4.0.tgz";
+      name = "markdown-it-4.4.0.tgz";
+      sha1 = "3df373dbea587a9a7fef3e56311b68908f75c414";
     };
     deps = {
-      "argparse-1.0.2" = self.by-version."argparse"."1.0.2";
+      "argparse-1.0.7" = self.by-version."argparse"."1.0.7";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
-      "linkify-it-1.0.1" = self.by-version."linkify-it"."1.0.1";
-      "mdurl-1.0.0" = self.by-version."mdurl"."1.0.0";
+      "linkify-it-1.2.0" = self.by-version."linkify-it"."1.2.0";
+      "mdurl-1.0.1" = self.by-version."mdurl"."1.0.1";
       "uc.micro-1.0.0" = self.by-version."uc.micro"."1.0.0";
     };
     optionalDependencies = {
@@ -23853,15 +27706,15 @@
     cpu = [ ];
   };
   by-spec."marked"."*" =
-    self.by-version."marked"."0.3.3";
-  by-version."marked"."0.3.3" = self.buildNodePackage {
-    name = "marked-0.3.3";
-    version = "0.3.3";
+    self.by-version."marked"."0.3.5";
+  by-version."marked"."0.3.5" = self.buildNodePackage {
+    name = "marked-0.3.5";
+    version = "0.3.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz";
-      name = "marked-0.3.3.tgz";
-      sha1 = "08bad9cac13736f6cceddc202344f1b0bf255390";
+      url = "https://registry.npmjs.org/marked/-/marked-0.3.5.tgz";
+      name = "marked-0.3.5.tgz";
+      sha1 = "4113a15ac5d7bca158a5aae07224587b9fa15b94";
     };
     deps = {
     };
@@ -23871,11 +27724,11 @@
     os = [ ];
     cpu = [ ];
   };
-  "marked" = self.by-version."marked"."0.3.3";
+  "marked" = self.by-version."marked"."0.3.5";
   by-spec."marked".">=0.2.9" =
-    self.by-version."marked"."0.3.3";
+    self.by-version."marked"."0.3.5";
   by-spec."marked"."^0.3.2" =
-    self.by-version."marked"."0.3.3";
+    self.by-version."marked"."0.3.5";
   by-spec."mathjs"."~0.19.0" =
     self.by-version."mathjs"."0.19.0";
   by-version."mathjs"."0.19.0" = self.buildNodePackage {
@@ -23883,7 +27736,7 @@
     version = "0.19.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mathjs/-/mathjs-0.19.0.tgz";
+      url = "https://registry.npmjs.org/mathjs/-/mathjs-0.19.0.tgz";
       name = "mathjs-0.19.0.tgz";
       sha1 = "35f7bdfcca1431dac5438cbf095eefce4e1aae78";
     };
@@ -23896,20 +27749,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."maxmin"."^1.0.0" =
+  by-spec."maxmin"."^1.1.0" =
     self.by-version."maxmin"."1.1.0";
   by-version."maxmin"."1.1.0" = self.buildNodePackage {
     name = "maxmin-1.1.0";
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz";
+      url = "https://registry.npmjs.org/maxmin/-/maxmin-1.1.0.tgz";
       name = "maxmin-1.1.0.tgz";
       sha1 = "71365e84a99dd8f8b3f7d5fde2f00d1e7f73be61";
     };
     deps = {
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "figures-1.3.5" = self.by-version."figures"."1.3.5";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "figures-1.5.0" = self.by-version."figures"."1.5.0";
       "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0";
       "pretty-bytes-1.0.4" = self.by-version."pretty-bytes"."1.0.4";
     };
@@ -23919,21 +27772,43 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."md5"."~2.0.0" =
+    self.by-version."md5"."2.0.0";
+  by-version."md5"."2.0.0" = self.buildNodePackage {
+    name = "md5-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/md5/-/md5-2.0.0.tgz";
+      name = "md5-2.0.0.tgz";
+      sha1 = "75e392e0ebd5a9b88dc7cb7a93875137b87c8a33";
+    };
+    deps = {
+      "charenc-0.0.1" = self.by-version."charenc"."0.0.1";
+      "crypt-0.0.1" = self.by-version."crypt"."0.0.1";
+      "is-buffer-1.0.2" = self.by-version."is-buffer"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."mdns-js"."*" =
-    self.by-version."mdns-js"."0.3.1";
-  by-version."mdns-js"."0.3.1" = self.buildNodePackage {
-    name = "mdns-js-0.3.1";
-    version = "0.3.1";
+    self.by-version."mdns-js"."0.5.0";
+  by-version."mdns-js"."0.5.0" = self.buildNodePackage {
+    name = "mdns-js-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mdns-js/-/mdns-js-0.3.1.tgz";
-      name = "mdns-js-0.3.1.tgz";
-      sha1 = "a2bcf301d23f271a9432505fff22103352510ae3";
+      url = "https://registry.npmjs.org/mdns-js/-/mdns-js-0.5.0.tgz";
+      name = "mdns-js-0.5.0.tgz";
+      sha1 = "4c8abb6ba7cabdc892d39228c3faa2556e09cf87";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "mdns-js-packet-0.2.0" = self.by-version."mdns-js-packet"."0.2.0";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
     };
@@ -23941,19 +27816,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mdns-js-packet"."0.1.x" =
-    self.by-version."mdns-js-packet"."0.1.8";
-  by-version."mdns-js-packet"."0.1.8" = self.buildNodePackage {
-    name = "mdns-js-packet-0.1.8";
-    version = "0.1.8";
+  by-spec."mdns-js-packet"."~0.2.0" =
+    self.by-version."mdns-js-packet"."0.2.0";
+  by-version."mdns-js-packet"."0.2.0" = self.buildNodePackage {
+    name = "mdns-js-packet-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz";
-      name = "mdns-js-packet-0.1.8.tgz";
-      sha1 = "e5a205c6e26e22a1df58e5f38057e80a6f84ee26";
+      url = "https://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.2.0.tgz";
+      name = "mdns-js-packet-0.2.0.tgz";
+      sha1 = "642409e8183c7561cc60615bbd1420ec2fad7616";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "qap-3.1.3" = self.by-version."qap"."3.1.3";
     };
     optionalDependencies = {
@@ -23963,15 +27838,15 @@
     cpu = [ ];
   };
   by-spec."mdurl"."~1.0.0" =
-    self.by-version."mdurl"."1.0.0";
-  by-version."mdurl"."1.0.0" = self.buildNodePackage {
-    name = "mdurl-1.0.0";
-    version = "1.0.0";
+    self.by-version."mdurl"."1.0.1";
+  by-version."mdurl"."1.0.1" = self.buildNodePackage {
+    name = "mdurl-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mdurl/-/mdurl-1.0.0.tgz";
-      name = "mdurl-1.0.0.tgz";
-      sha1 = "307f6d36dbf2777bf0c6278a7101e6f5b05cb2b3";
+      url = "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz";
+      name = "mdurl-1.0.1.tgz";
+      sha1 = "fe85b2ec75a59037f2adfec100fd6c601761152e";
     };
     deps = {
     };
@@ -23982,15 +27857,15 @@
     cpu = [ ];
   };
   by-spec."meat"."*" =
-    self.by-version."meat"."0.3.3";
-  by-version."meat"."0.3.3" = self.buildNodePackage {
-    name = "meat-0.3.3";
-    version = "0.3.3";
+    self.by-version."meat"."0.3.4";
+  by-version."meat"."0.3.4" = self.buildNodePackage {
+    name = "meat-0.3.4";
+    version = "0.3.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/meat/-/meat-0.3.3.tgz";
-      name = "meat-0.3.3.tgz";
-      sha1 = "45e670184553efe7dda25ce6446f1e6a0fca7571";
+      url = "https://registry.npmjs.org/meat/-/meat-0.3.4.tgz";
+      name = "meat-0.3.4.tgz";
+      sha1 = "e2b6b721014096e30de9c97114e1dd6696135d13";
     };
     deps = {
       "express-2.5.11" = self.by-version."express"."2.5.11";
@@ -24006,7 +27881,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "meat" = self.by-version."meat"."0.3.3";
+  "meat" = self.by-version."meat"."0.3.4";
   by-spec."media-typer"."0.2.0" =
     self.by-version."media-typer"."0.2.0";
   by-version."media-typer"."0.2.0" = self.buildNodePackage {
@@ -24014,7 +27889,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
+      url = "https://registry.npmjs.org/media-typer/-/media-typer-0.2.0.tgz";
       name = "media-typer-0.2.0.tgz";
       sha1 = "d8a065213adfeaa2e76321a2b6dda36ff6335984";
     };
@@ -24033,7 +27908,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
+      url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz";
       name = "media-typer-0.3.0.tgz";
       sha1 = "8710d7af0aa626f8fffa1ce00168545263255748";
     };
@@ -24052,7 +27927,7 @@
     version = "0.10.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz";
+      url = "https://registry.npmjs.org/memdown/-/memdown-0.10.2.tgz";
       name = "memdown-0.10.2.tgz";
       sha1 = "a15ed0b6a8f216848d80a75c0fe8dd0bad89b608";
     };
@@ -24067,25 +27942,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."memoizee"."~0.3.8" =
-    self.by-version."memoizee"."0.3.8";
-  by-version."memoizee"."0.3.8" = self.buildNodePackage {
-    name = "memoizee-0.3.8";
-    version = "0.3.8";
+  by-spec."memory-fs"."^0.2.0" =
+    self.by-version."memory-fs"."0.2.0";
+  by-version."memory-fs"."0.2.0" = self.buildNodePackage {
+    name = "memory-fs-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/memoizee/-/memoizee-0.3.8.tgz";
-      name = "memoizee-0.3.8.tgz";
-      sha1 = "b5faf419f02fafe3c2cc1cf5d3907c210fc7efdc";
+      url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz";
+      name = "memory-fs-0.2.0.tgz";
+      sha1 = "f2bb25368bc121e391c2520de92969caee0a0290";
     };
     deps = {
-      "d-0.1.1" = self.by-version."d"."0.1.1";
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
-      "es6-weak-map-0.1.4" = self.by-version."es6-weak-map"."0.1.4";
-      "event-emitter-0.3.3" = self.by-version."event-emitter"."0.3.3";
-      "lru-queue-0.1.0" = self.by-version."lru-queue"."0.1.0";
-      "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2";
-      "timers-ext-0.1.0" = self.by-version."timers-ext"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -24093,18 +27961,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."memory-fs"."^0.2.0" =
-    self.by-version."memory-fs"."0.2.0";
-  by-version."memory-fs"."0.2.0" = self.buildNodePackage {
-    name = "memory-fs-0.2.0";
-    version = "0.2.0";
+  by-spec."memory-fs"."^0.3.0" =
+    self.by-version."memory-fs"."0.3.0";
+  by-version."memory-fs"."0.3.0" = self.buildNodePackage {
+    name = "memory-fs-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz";
-      name = "memory-fs-0.2.0.tgz";
-      sha1 = "f2bb25368bc121e391c2520de92969caee0a0290";
+      url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
+      name = "memory-fs-0.3.0.tgz";
+      sha1 = "7bcc6b629e3a43e871d7e29aca6ae8a7f15cbb20";
     };
     deps = {
+      "errno-0.1.4" = self.by-version."errno"."0.1.4";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -24112,20 +27982,30 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."memory-fs"."~0.2.0" =
-    self.by-version."memory-fs"."0.2.0";
-  by-spec."memwatch"."^0.2.2" =
-    self.by-version."memwatch"."0.2.2";
-  by-version."memwatch"."0.2.2" = self.buildNodePackage {
-    name = "memwatch-0.2.2";
-    version = "0.2.2";
+  by-spec."memory-fs"."~0.3.0" =
+    self.by-version."memory-fs"."0.3.0";
+  by-spec."meow"."^3.1.0" =
+    self.by-version."meow"."3.7.0";
+  by-version."meow"."3.7.0" = self.buildNodePackage {
+    name = "meow-3.7.0";
+    version = "3.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/memwatch/-/memwatch-0.2.2.tgz";
-      name = "memwatch-0.2.2.tgz";
-      sha1 = "779e8cd982532b6221b6ed1c1269098bee16f92c";
+      url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz";
+      name = "meow-3.7.0.tgz";
+      sha1 = "72cb668b425228290abbfa856892587308a801fb";
     };
     deps = {
+      "camelcase-keys-2.1.0" = self.by-version."camelcase-keys"."2.1.0";
+      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+      "loud-rejection-1.3.0" = self.by-version."loud-rejection"."1.3.0";
+      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1";
+      "redent-1.0.0" = self.by-version."redent"."1.0.0";
+      "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -24133,22 +28013,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."meow"."*" =
-    self.by-version."meow"."3.1.0";
-  by-version."meow"."3.1.0" = self.buildNodePackage {
-    name = "meow-3.1.0";
-    version = "3.1.0";
+  by-spec."meow"."^3.3.0" =
+    self.by-version."meow"."3.7.0";
+  by-spec."meow"."~2.0.0" =
+    self.by-version."meow"."2.0.0";
+  by-version."meow"."2.0.0" = self.buildNodePackage {
+    name = "meow-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/meow/-/meow-3.1.0.tgz";
-      name = "meow-3.1.0.tgz";
-      sha1 = "5974708a0fe0dcbf27e0e6a49120b4c5e82c3cea";
+      url = "https://registry.npmjs.org/meow/-/meow-2.0.0.tgz";
+      name = "meow-2.0.0.tgz";
+      sha1 = "8f530a8ecf5d40d3f4b4df93c3472900fba2a8f1";
     };
     deps = {
       "camelcase-keys-1.0.0" = self.by-version."camelcase-keys"."1.0.0";
-      "indent-string-1.2.1" = self.by-version."indent-string"."1.2.1";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
-      "object-assign-2.0.0" = self.by-version."object-assign"."2.0.0";
+      "indent-string-1.2.2" = self.by-version."indent-string"."1.2.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -24156,10 +28038,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."meow"."^3.0.0" =
-    self.by-version."meow"."3.1.0";
-  by-spec."meow"."^3.1.0" =
-    self.by-version."meow"."3.1.0";
   by-spec."merge-descriptors"."0.0.2" =
     self.by-version."merge-descriptors"."0.0.2";
   by-version."merge-descriptors"."0.0.2" = self.buildNodePackage {
@@ -24167,7 +28045,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
+      url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-0.0.2.tgz";
       name = "merge-descriptors-0.0.2.tgz";
       sha1 = "c36a52a781437513c57275f39dd9d317514ac8c7";
     };
@@ -24186,7 +28064,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
+      url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz";
       name = "merge-descriptors-1.0.0.tgz";
       sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864";
     };
@@ -24198,6 +28076,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."merge-descriptors"."1.0.1" =
+    self.by-version."merge-descriptors"."1.0.1";
+  by-version."merge-descriptors"."1.0.1" = self.buildNodePackage {
+    name = "merge-descriptors-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz";
+      name = "merge-descriptors-1.0.1.tgz";
+      sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."method-override"."1.0.0" =
     self.by-version."method-override"."1.0.0";
   by-version."method-override"."1.0.0" = self.buildNodePackage {
@@ -24205,12 +28102,12 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
+      url = "https://registry.npmjs.org/method-override/-/method-override-1.0.0.tgz";
       name = "method-override-1.0.0.tgz";
       sha1 = "9e5bfbd80f3b9e043801dd3fe60bbab0f15b5f61";
     };
     deps = {
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -24225,7 +28122,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/method-override/-/method-override-1.0.2.tgz";
+      url = "https://registry.npmjs.org/method-override/-/method-override-1.0.2.tgz";
       name = "method-override-1.0.2.tgz";
       sha1 = "d6f80275db23a23380028c9215b97470be01d689";
     };
@@ -24238,45 +28135,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."method-override"."~2.2.0" =
-    self.by-version."method-override"."2.2.0";
-  by-version."method-override"."2.2.0" = self.buildNodePackage {
-    name = "method-override-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/method-override/-/method-override-2.2.0.tgz";
-      name = "method-override-2.2.0.tgz";
-      sha1 = "177e852b6add3b4f9177033a9446b01e7801a0c0";
-    };
-    deps = {
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "methods-1.1.0" = self.by-version."methods"."1.1.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."method-override"."~2.3.2" =
-    self.by-version."method-override"."2.3.2";
-  by-version."method-override"."2.3.2" = self.buildNodePackage {
-    name = "method-override-2.3.2";
-    version = "2.3.2";
+  by-spec."method-override"."~2.3.5" =
+    self.by-version."method-override"."2.3.5";
+  by-version."method-override"."2.3.5" = self.buildNodePackage {
+    name = "method-override-2.3.5";
+    version = "2.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/method-override/-/method-override-2.3.2.tgz";
-      name = "method-override-2.3.2.tgz";
-      sha1 = "f2433fb27b6c087efb8812628727fb8cfd93a793";
+      url = "https://registry.npmjs.org/method-override/-/method-override-2.3.5.tgz";
+      name = "method-override-2.3.5.tgz";
+      sha1 = "2cd5cdbff00c3673d7ae345119a812a5d95b8c8e";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "vary-1.0.0" = self.by-version."vary"."1.0.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "vary-1.0.1" = self.by-version."vary"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -24285,15 +28159,15 @@
     cpu = [ ];
   };
   by-spec."methods"."*" =
-    self.by-version."methods"."1.1.1";
-  by-version."methods"."1.1.1" = self.buildNodePackage {
-    name = "methods-1.1.1";
-    version = "1.1.1";
+    self.by-version."methods"."1.1.2";
+  by-version."methods"."1.1.2" = self.buildNodePackage {
+    name = "methods-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.1.1.tgz";
-      name = "methods-1.1.1.tgz";
-      sha1 = "17ea6366066d00c58e375b8ec7dfd0453c89822a";
+      url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz";
+      name = "methods-1.1.2.tgz";
+      sha1 = "5529a4d67654134edcc5266656835b0f851afcee";
     };
     deps = {
     };
@@ -24310,7 +28184,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
+      url = "https://registry.npmjs.org/methods/-/methods-0.0.1.tgz";
       name = "methods-0.0.1.tgz";
       sha1 = "277c90f8bef39709645a8371c51c3b6c648e068c";
     };
@@ -24329,7 +28203,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
+      url = "https://registry.npmjs.org/methods/-/methods-0.1.0.tgz";
       name = "methods-0.1.0.tgz";
       sha1 = "335d429eefd21b7bacf2e9c922a8d2bd14a30e4f";
     };
@@ -24348,7 +28222,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
+      url = "https://registry.npmjs.org/methods/-/methods-1.0.0.tgz";
       name = "methods-1.0.0.tgz";
       sha1 = "9a73d86375dfcef26ef61ca3e4b8a2e2538a80e3";
     };
@@ -24367,7 +28241,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
+      url = "https://registry.npmjs.org/methods/-/methods-1.0.1.tgz";
       name = "methods-1.0.1.tgz";
       sha1 = "75bc91943dffd7da037cf3eeb0ed73a0037cd14b";
     };
@@ -24386,7 +28260,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
+      url = "https://registry.npmjs.org/methods/-/methods-1.1.0.tgz";
       name = "methods-1.1.0.tgz";
       sha1 = "5dca4ee12df52ff3b056145986a8f01cbc86436f";
     };
@@ -24398,10 +28272,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."methods"."1.x" =
-    self.by-version."methods"."1.1.1";
   by-spec."methods"."~1.1.1" =
-    self.by-version."methods"."1.1.1";
+    self.by-version."methods"."1.1.2";
+  by-spec."methods"."~1.1.2" =
+    self.by-version."methods"."1.1.2";
   by-spec."microee"."0.0.2" =
     self.by-version."microee"."0.0.2";
   by-version."microee"."0.0.2" = self.buildNodePackage {
@@ -24409,7 +28283,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/microee/-/microee-0.0.2.tgz";
+      url = "https://registry.npmjs.org/microee/-/microee-0.0.2.tgz";
       name = "microee-0.0.2.tgz";
       sha1 = "72e80d477075e5e799470f5defea96d1dd121587";
     };
@@ -24421,28 +28295,31 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."micromatch"."^2.1.0" =
-    self.by-version."micromatch"."2.1.6";
-  by-version."micromatch"."2.1.6" = self.buildNodePackage {
-    name = "micromatch-2.1.6";
-    version = "2.1.6";
+  by-spec."micromatch"."^2.1.5" =
+    self.by-version."micromatch"."2.3.7";
+  by-version."micromatch"."2.3.7" = self.buildNodePackage {
+    name = "micromatch-2.3.7";
+    version = "2.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/micromatch/-/micromatch-2.1.6.tgz";
-      name = "micromatch-2.1.6.tgz";
-      sha1 = "51a65a9dcbfb92113292a071e04da35a81e9050e";
+      url = "https://registry.npmjs.org/micromatch/-/micromatch-2.3.7.tgz";
+      name = "micromatch-2.3.7.tgz";
+      sha1 = "2f2e85ef46140dbea6cb55e739b6b11b30eaa509";
     };
     deps = {
-      "arr-diff-1.0.1" = self.by-version."arr-diff"."1.0.1";
-      "braces-1.8.0" = self.by-version."braces"."1.8.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "expand-brackets-0.1.1" = self.by-version."expand-brackets"."0.1.1";
+      "arr-diff-2.0.0" = self.by-version."arr-diff"."2.0.0";
+      "array-unique-0.2.1" = self.by-version."array-unique"."0.2.1";
+      "braces-1.8.3" = self.by-version."braces"."1.8.3";
+      "expand-brackets-0.1.5" = self.by-version."expand-brackets"."0.1.5";
+      "extglob-0.3.2" = self.by-version."extglob"."0.3.2";
       "filename-regex-2.0.0" = self.by-version."filename-regex"."2.0.0";
-      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
-      "kind-of-1.1.0" = self.by-version."kind-of"."1.1.0";
-      "object.omit-0.2.1" = self.by-version."object.omit"."0.2.1";
-      "parse-glob-3.0.1" = self.by-version."parse-glob"."3.0.1";
-      "regex-cache-0.4.2" = self.by-version."regex-cache"."0.4.2";
+      "is-extglob-1.0.0" = self.by-version."is-extglob"."1.0.0";
+      "is-glob-2.0.1" = self.by-version."is-glob"."2.0.1";
+      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
+      "normalize-path-2.0.1" = self.by-version."normalize-path"."2.0.1";
+      "object.omit-2.0.0" = self.by-version."object.omit"."2.0.0";
+      "parse-glob-3.0.4" = self.by-version."parse-glob"."3.0.4";
+      "regex-cache-0.4.3" = self.by-version."regex-cache"."0.4.3";
     };
     optionalDependencies = {
     };
@@ -24450,19 +28327,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."miller-rabin"."^1.1.2" =
-    self.by-version."miller-rabin"."1.1.5";
-  by-version."miller-rabin"."1.1.5" = self.buildNodePackage {
-    name = "miller-rabin-1.1.5";
-    version = "1.1.5";
-    bin = false;
+  by-spec."miller-rabin"."^4.0.0" =
+    self.by-version."miller-rabin"."4.0.0";
+  by-version."miller-rabin"."4.0.0" = self.buildNodePackage {
+    name = "miller-rabin-4.0.0";
+    version = "4.0.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/miller-rabin/-/miller-rabin-1.1.5.tgz";
-      name = "miller-rabin-1.1.5.tgz";
-      sha1 = "41f506bed994b97e7c184a658ae107dad980526e";
+      url = "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz";
+      name = "miller-rabin-4.0.0.tgz";
+      sha1 = "4a62fb1d42933c05583982f4c716f6fb9e6c6d3d";
     };
     deps = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
       "brorand-1.0.5" = self.by-version."brorand"."1.0.5";
     };
     optionalDependencies = {
@@ -24478,7 +28355,7 @@
     version = "1.3.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
+      url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz";
       name = "mime-1.3.4.tgz";
       sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53";
     };
@@ -24497,7 +28374,7 @@
     version = "1.2.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
+      url = "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz";
       name = "mime-1.2.11.tgz";
       sha1 = "58203eed86e3a5ef17aed2b7d9ebd47f0a60dd10";
     };
@@ -24516,7 +28393,7 @@
     version = "1.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
+      url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
       name = "mime-1.2.4.tgz";
       sha1 = "11b5fdaf29c2509255176b80ad520294f5de92b7";
     };
@@ -24535,7 +28412,7 @@
     version = "1.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
+      url = "https://registry.npmjs.org/mime/-/mime-1.2.6.tgz";
       name = "mime-1.2.6.tgz";
       sha1 = "b1f86c768c025fa87b48075f1709f28aeaf20365";
     };
@@ -24559,6 +28436,8 @@
     self.by-version."mime"."1.3.4";
   by-spec."mime"."^1.2.11" =
     self.by-version."mime"."1.3.4";
+  by-spec."mime"."^1.3.4" =
+    self.by-version."mime"."1.3.4";
   by-spec."mime"."~1.2.11" =
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.2" =
@@ -24567,16 +28446,16 @@
     self.by-version."mime"."1.2.11";
   by-spec."mime"."~1.2.9" =
     self.by-version."mime"."1.2.11";
-  by-spec."mime-db".">= 1.1.2 < 2" =
-    self.by-version."mime-db"."1.9.1";
-  by-version."mime-db"."1.9.1" = self.buildNodePackage {
-    name = "mime-db-1.9.1";
-    version = "1.9.1";
+  by-spec."mime-db".">= 1.21.0 < 2" =
+    self.by-version."mime-db"."1.22.0";
+  by-version."mime-db"."1.22.0" = self.buildNodePackage {
+    name = "mime-db-1.22.0";
+    version = "1.22.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.9.1.tgz";
-      name = "mime-db-1.9.1.tgz";
-      sha1 = "1431049a71791482c29f37bafc8ea2cb3a6dd3e8";
+      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz";
+      name = "mime-db-1.22.0.tgz";
+      sha1 = "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a";
     };
     deps = {
     };
@@ -24586,16 +28465,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-db"."~1.8.0" =
-    self.by-version."mime-db"."1.8.0";
-  by-version."mime-db"."1.8.0" = self.buildNodePackage {
-    name = "mime-db-1.8.0";
-    version = "1.8.0";
+  by-spec."mime-db"."~1.12.0" =
+    self.by-version."mime-db"."1.12.0";
+  by-version."mime-db"."1.12.0" = self.buildNodePackage {
+    name = "mime-db-1.12.0";
+    version = "1.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz";
-      name = "mime-db-1.8.0.tgz";
-      sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25";
+      url = "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
+      name = "mime-db-1.12.0.tgz";
+      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
     };
     deps = {
     };
@@ -24605,19 +28484,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-types"."^2.0.3" =
-    self.by-version."mime-types"."2.0.10";
-  by-version."mime-types"."2.0.10" = self.buildNodePackage {
-    name = "mime-types-2.0.10";
-    version = "2.0.10";
+  by-spec."mime-db"."~1.22.0" =
+    self.by-version."mime-db"."1.22.0";
+  by-spec."mime-types"."^2.1.10" =
+    self.by-version."mime-types"."2.1.10";
+  by-version."mime-types"."2.1.10" = self.buildNodePackage {
+    name = "mime-types-2.1.10";
+    version = "2.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz";
-      name = "mime-types-2.0.10.tgz";
-      sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d";
+      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz";
+      name = "mime-types-2.1.10.tgz";
+      sha1 = "b93c7cb4362e16d41072a7e54538fb4d43070837";
     };
     deps = {
-      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
+      "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0";
     };
     optionalDependencies = {
     };
@@ -24625,6 +28506,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mime-types"."^2.1.7" =
+    self.by-version."mime-types"."2.1.10";
   by-spec."mime-types"."~1.0.0" =
     self.by-version."mime-types"."1.0.2";
   by-version."mime-types"."1.0.2" = self.buildNodePackage {
@@ -24632,7 +28515,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
+      url = "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz";
       name = "mime-types-1.0.2.tgz";
       sha1 = "995ae1392ab8affcbfcb2641dd054e943c0d5dce";
     };
@@ -24647,29 +28530,18 @@
   by-spec."mime-types"."~1.0.1" =
     self.by-version."mime-types"."1.0.2";
   by-spec."mime-types"."~2.0.1" =
-    self.by-version."mime-types"."2.0.10";
-  by-spec."mime-types"."~2.0.10" =
-    self.by-version."mime-types"."2.0.10";
-  by-spec."mime-types"."~2.0.3" =
-    self.by-version."mime-types"."2.0.10";
-  by-spec."mime-types"."~2.0.4" =
-    self.by-version."mime-types"."2.0.10";
-  by-spec."mime-types"."~2.0.9" =
-    self.by-version."mime-types"."2.0.10";
-  by-spec."mimelib"."~0.2.15" =
-    self.by-version."mimelib"."0.2.19";
-  by-version."mimelib"."0.2.19" = self.buildNodePackage {
-    name = "mimelib-0.2.19";
-    version = "0.2.19";
+    self.by-version."mime-types"."2.0.14";
+  by-version."mime-types"."2.0.14" = self.buildNodePackage {
+    name = "mime-types-2.0.14";
+    version = "2.0.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz";
-      name = "mimelib-0.2.19.tgz";
-      sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee";
+      url = "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
+      name = "mime-types-2.0.14.tgz";
+      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
     };
     deps = {
-      "encoding-0.1.11" = self.by-version."encoding"."0.1.11";
-      "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2";
+      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
     };
     optionalDependencies = {
     };
@@ -24677,18 +28549,36 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mine"."~0.0.1" =
-    self.by-version."mine"."0.0.2";
-  by-version."mine"."0.0.2" = self.buildNodePackage {
-    name = "mine-0.0.2";
-    version = "0.0.2";
+  by-spec."mime-types"."~2.0.3" =
+    self.by-version."mime-types"."2.0.14";
+  by-spec."mime-types"."~2.0.4" =
+    self.by-version."mime-types"."2.0.14";
+  by-spec."mime-types"."~2.0.9" =
+    self.by-version."mime-types"."2.0.14";
+  by-spec."mime-types"."~2.1.10" =
+    self.by-version."mime-types"."2.1.10";
+  by-spec."mime-types"."~2.1.2" =
+    self.by-version."mime-types"."2.1.10";
+  by-spec."mime-types"."~2.1.6" =
+    self.by-version."mime-types"."2.1.10";
+  by-spec."mime-types"."~2.1.7" =
+    self.by-version."mime-types"."2.1.10";
+  by-spec."mime-types"."~2.1.9" =
+    self.by-version."mime-types"."2.1.10";
+  by-spec."mimelib"."~0.2.15" =
+    self.by-version."mimelib"."0.2.19";
+  by-version."mimelib"."0.2.19" = self.buildNodePackage {
+    name = "mimelib-0.2.19";
+    version = "0.2.19";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mine/-/mine-0.0.2.tgz";
-      name = "mine-0.0.2.tgz";
-      sha1 = "77c2d327f8357352e69fc3e618f7476539fa0c40";
+      url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.19.tgz";
+      name = "mimelib-0.2.19.tgz";
+      sha1 = "37ec90a6ac7d00954851d0b2c31618f0a49da0ee";
     };
     deps = {
+      "encoding-0.1.12" = self.by-version."encoding"."0.1.12";
+      "addressparser-0.3.2" = self.by-version."addressparser"."0.3.2";
     };
     optionalDependencies = {
     };
@@ -24697,15 +28587,15 @@
     cpu = [ ];
   };
   by-spec."minilog"."~2.0.2" =
-    self.by-version."minilog"."2.0.7";
-  by-version."minilog"."2.0.7" = self.buildNodePackage {
-    name = "minilog-2.0.7";
-    version = "2.0.7";
+    self.by-version."minilog"."2.0.8";
+  by-version."minilog"."2.0.8" = self.buildNodePackage {
+    name = "minilog-2.0.8";
+    version = "2.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minilog/-/minilog-2.0.7.tgz";
-      name = "minilog-2.0.7.tgz";
-      sha1 = "4f6d258a5e5fbe30afaccc641c2a5c3b726d3dc5";
+      url = "https://registry.npmjs.org/minilog/-/minilog-2.0.8.tgz";
+      name = "minilog-2.0.8.tgz";
+      sha1 = "21ffdc429be2b50cb361df990a40a7731288e935";
     };
     deps = {
       "microee-0.0.2" = self.by-version."microee"."0.0.2";
@@ -24723,7 +28613,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
+      url = "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
       name = "minimalistic-assert-1.0.0.tgz";
       sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
     };
@@ -24735,20 +28625,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."minimatch"."0" =
-    self.by-version."minimatch"."0.4.0";
-  by-version."minimatch"."0.4.0" = self.buildNodePackage {
-    name = "minimatch-0.4.0";
-    version = "0.4.0";
+  by-spec."minimatch"."0.0.x" =
+    self.by-version."minimatch"."0.0.5";
+  by-version."minimatch"."0.0.5" = self.buildNodePackage {
+    name = "minimatch-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.4.0.tgz";
-      name = "minimatch-0.4.0.tgz";
-      sha1 = "bd2c7d060d2c8c8fd7cde7f1f2ed2d5b270fdb1b";
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-0.0.5.tgz";
+      name = "minimatch-0.0.5.tgz";
+      sha1 = "96bb490bbd3ba6836bbfac111adf75301b1584de";
     };
     deps = {
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+      "lru-cache-1.0.6" = self.by-version."lru-cache"."1.0.6";
     };
     optionalDependencies = {
     };
@@ -24763,13 +28652,13 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz";
       name = "minimatch-0.3.0.tgz";
       sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd";
     };
     deps = {
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -24777,8 +28666,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."minimatch"."0.x" =
-    self.by-version."minimatch"."0.4.0";
   by-spec."minimatch"."1" =
     self.by-version."minimatch"."1.0.0";
   by-version."minimatch"."1.0.0" = self.buildNodePackage {
@@ -24786,13 +28673,33 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz";
       name = "minimatch-1.0.0.tgz";
       sha1 = "e0dd2120b49e1b724ce8d714c520822a9438576d";
     };
     deps = {
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."minimatch"."2 || 3" =
+    self.by-version."minimatch"."3.0.0";
+  by-version."minimatch"."3.0.0" = self.buildNodePackage {
+    name = "minimatch-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz";
+      name = "minimatch-3.0.0.tgz";
+      sha1 = "5236157a51e4f004c177fb3c527ff7dd78f0ef83";
+    };
+    deps = {
+      "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -24801,18 +28708,18 @@
     cpu = [ ];
   };
   by-spec."minimatch"."2.0.x" =
-    self.by-version."minimatch"."2.0.4";
-  by-version."minimatch"."2.0.4" = self.buildNodePackage {
-    name = "minimatch-2.0.4";
-    version = "2.0.4";
+    self.by-version."minimatch"."2.0.10";
+  by-version."minimatch"."2.0.10" = self.buildNodePackage {
+    name = "minimatch-2.0.10";
+    version = "2.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz";
-      name = "minimatch-2.0.4.tgz";
-      sha1 = "83bea115803e7a097a78022427287edb762fafed";
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
+      name = "minimatch-2.0.10.tgz";
+      sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
     };
     deps = {
-      "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
+      "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -24820,28 +28727,32 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."minimatch"."2.x" =
+    self.by-version."minimatch"."2.0.10";
   by-spec."minimatch".">=0.2.14 <2.0.0-0" =
     self.by-version."minimatch"."1.0.0";
-  by-spec."minimatch".">=0.2.4" =
-    self.by-version."minimatch"."2.0.4";
   by-spec."minimatch"."^1.0.0" =
     self.by-version."minimatch"."1.0.0";
   by-spec."minimatch"."^2.0.1" =
-    self.by-version."minimatch"."2.0.4";
-  by-spec."minimatch"."~0.2" =
+    self.by-version."minimatch"."2.0.10";
+  by-spec."minimatch"."^2.0.10" =
+    self.by-version."minimatch"."2.0.10";
+  by-spec."minimatch"."^3.0.0" =
+    self.by-version."minimatch"."3.0.0";
+  by-spec."minimatch"."~0.2.11" =
     self.by-version."minimatch"."0.2.14";
   by-version."minimatch"."0.2.14" = self.buildNodePackage {
     name = "minimatch-0.2.14";
     version = "0.2.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
       name = "minimatch-0.2.14.tgz";
       sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
     };
     deps = {
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "sigmund-1.0.0" = self.by-version."sigmund"."1.0.0";
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -24849,20 +28760,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."minimatch"."~0.2.0" =
-    self.by-version."minimatch"."0.2.14";
-  by-spec."minimatch"."~0.2.11" =
-    self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.12" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.9" =
     self.by-version."minimatch"."0.2.14";
-  by-spec."minimatch"."~0.3.0" =
-    self.by-version."minimatch"."0.3.0";
-  by-spec."minimatch"."~1.0.0" =
-    self.by-version."minimatch"."1.0.0";
-  by-spec."minimatch"."~2.0.4" =
-    self.by-version."minimatch"."2.0.4";
+  by-spec."minimatch"."~2.0.0" =
+    self.by-version."minimatch"."2.0.10";
+  by-spec."minimatch"."~3.0.0" =
+    self.by-version."minimatch"."3.0.0";
   by-spec."minimist"."0.0.8" =
     self.by-version."minimist"."0.0.8";
   by-version."minimist"."0.0.8" = self.buildNodePackage {
@@ -24870,7 +28775,7 @@
     version = "0.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+      url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
       name = "minimist-0.0.8.tgz";
       sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d";
     };
@@ -24882,16 +28787,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."minimist"."1.1.0" =
-    self.by-version."minimist"."1.1.0";
-  by-version."minimist"."1.1.0" = self.buildNodePackage {
-    name = "minimist-1.1.0";
-    version = "1.1.0";
+  by-spec."minimist"."1.2.0" =
+    self.by-version."minimist"."1.2.0";
+  by-version."minimist"."1.2.0" = self.buildNodePackage {
+    name = "minimist-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.0.tgz";
-      name = "minimist-1.1.0.tgz";
-      sha1 = "cdf225e8898f840a258ded44fc91776770afdc93";
+      url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+      name = "minimist-1.2.0.tgz";
+      sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
     };
     deps = {
     };
@@ -24908,7 +28813,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
+      url = "https://registry.npmjs.org/minimist/-/minimist-0.2.0.tgz";
       name = "minimist-0.2.0.tgz";
       sha1 = "4dffe525dae2b864c66c2e23c6271d7afdecefce";
     };
@@ -24921,24 +28826,13 @@
     cpu = [ ];
   };
   by-spec."minimist"."^1.1.0" =
-    self.by-version."minimist"."1.1.1";
-  by-version."minimist"."1.1.1" = self.buildNodePackage {
-    name = "minimist-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
-      name = "minimist-1.1.1.tgz";
-      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."minimist"."1.2.0";
+  by-spec."minimist"."^1.1.1" =
+    self.by-version."minimist"."1.2.0";
+  by-spec."minimist"."^1.1.3" =
+    self.by-version."minimist"."1.2.0";
+  by-spec."minimist"."^1.2.0" =
+    self.by-version."minimist"."1.2.0";
   by-spec."minimist"."~0.0.1" =
     self.by-version."minimist"."0.0.10";
   by-version."minimist"."0.0.10" = self.buildNodePackage {
@@ -24946,7 +28840,7 @@
     version = "0.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
+      url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz";
       name = "minimist-0.0.10.tgz";
       sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf";
     };
@@ -24958,14 +28852,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."minimist"."~0.0.5" =
-    self.by-version."minimist"."0.0.10";
   by-spec."minimist"."~0.0.7" =
     self.by-version."minimist"."0.0.10";
-  by-spec."minimist"."~0.2.0" =
-    self.by-version."minimist"."0.2.0";
-  by-spec."minimist"."~1.1.0" =
-    self.by-version."minimist"."1.1.1";
   by-spec."ministyle"."~0.1.3" =
     self.by-version."ministyle"."0.1.4";
   by-version."ministyle"."0.1.4" = self.buildNodePackage {
@@ -24973,7 +28861,7 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
+      url = "https://registry.npmjs.org/ministyle/-/ministyle-0.1.4.tgz";
       name = "ministyle-0.1.4.tgz";
       sha1 = "b10481eb16aa8f7b6cd983817393a44da0e5a0cd";
     };
@@ -24992,7 +28880,7 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz";
+      url = "https://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz";
       name = "miniwrite-0.1.4.tgz";
       sha1 = "72f02385c0ac37d542efe27dc6764b31908725ce";
     };
@@ -25006,15 +28894,15 @@
     cpu = [ ];
   };
   by-spec."mkdirp"."*" =
-    self.by-version."mkdirp"."0.5.0";
-  by-version."mkdirp"."0.5.0" = self.buildNodePackage {
-    name = "mkdirp-0.5.0";
-    version = "0.5.0";
+    self.by-version."mkdirp"."0.5.1";
+  by-version."mkdirp"."0.5.1" = self.buildNodePackage {
+    name = "mkdirp-0.5.1";
+    version = "0.5.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
-      name = "mkdirp-0.5.0.tgz";
-      sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
+      url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
+      name = "mkdirp-0.5.1.tgz";
+      sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
     };
     deps = {
       "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
@@ -25025,9 +28913,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "mkdirp" = self.by-version."mkdirp"."0.5.0";
-  by-spec."mkdirp"."0" =
-    self.by-version."mkdirp"."0.5.0";
+  "mkdirp" = self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp"."0.0.x" =
     self.by-version."mkdirp"."0.0.7";
   by-version."mkdirp"."0.0.7" = self.buildNodePackage {
@@ -25035,7 +28921,7 @@
     version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz";
+      url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.0.7.tgz";
       name = "mkdirp-0.0.7.tgz";
       sha1 = "d89b4f0e4c3e5e5ca54235931675e094fe1a5072";
     };
@@ -25054,7 +28940,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
+      url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz";
       name = "mkdirp-0.3.0.tgz";
       sha1 = "1bbf5ab1ba827af23575143490426455f481fe1e";
     };
@@ -25073,7 +28959,7 @@
     version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
+      url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz";
       name = "mkdirp-0.3.5.tgz";
       sha1 = "de3e5f8961c88c787ee1368df849ac4413eca8d7";
     };
@@ -25094,7 +28980,7 @@
     version = "0.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz";
+      url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.4.0.tgz";
       name = "mkdirp-0.4.0.tgz";
       sha1 = "291ac2a2d43a19c478662577b5be846fe83b5923";
     };
@@ -25107,25 +28993,45 @@
     cpu = [ ];
   };
   by-spec."mkdirp"."0.5" =
-    self.by-version."mkdirp"."0.5.0";
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp"."0.5.0" =
     self.by-version."mkdirp"."0.5.0";
+  by-version."mkdirp"."0.5.0" = self.buildNodePackage {
+    name = "mkdirp-0.5.0";
+    version = "0.5.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+      name = "mkdirp-0.5.0.tgz";
+      sha1 = "1d73076a6df986cd9344e15e71fcc05a4c9abf12";
+    };
+    deps = {
+      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mkdirp"."0.5.1" =
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp"."0.5.x" =
-    self.by-version."mkdirp"."0.5.0";
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp"."0.x.x" =
-    self.by-version."mkdirp"."0.5.0";
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp".">=0.3.5" =
-    self.by-version."mkdirp"."0.5.0";
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp".">=0.3.5 <1.0.0-0" =
-    self.by-version."mkdirp"."0.5.0";
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp".">=0.5 0" =
-    self.by-version."mkdirp"."0.5.0";
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp"."^0.3.5" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."^0.5.0" =
-    self.by-version."mkdirp"."0.5.0";
-  by-spec."mkdirp"."~0.3" =
-    self.by-version."mkdirp"."0.3.5";
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."mkdirp"."^0.5.1" =
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mkdirp"."~0.3.3" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.3.4" =
@@ -25133,47 +29039,30 @@
   by-spec."mkdirp"."~0.3.5" =
     self.by-version."mkdirp"."0.3.5";
   by-spec."mkdirp"."~0.5.0" =
-    self.by-version."mkdirp"."0.5.0";
-  by-spec."mkpath"."^0.1.0" =
-    self.by-version."mkpath"."0.1.0";
-  by-version."mkpath"."0.1.0" = self.buildNodePackage {
-    name = "mkpath-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz";
-      name = "mkpath-0.1.0.tgz";
-      sha1 = "7554a6f8d871834cc97b5462b122c4c124d6de91";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."mkdirp"."0.5.1";
+  by-spec."mkdirp"."~0.5.1" =
+    self.by-version."mkdirp"."0.5.1";
   by-spec."mocha"."*" =
-    self.by-version."mocha"."2.2.4";
-  by-version."mocha"."2.2.4" = self.buildNodePackage {
-    name = "mocha-2.2.4";
-    version = "2.2.4";
+    self.by-version."mocha"."2.4.5";
+  by-version."mocha"."2.4.5" = self.buildNodePackage {
+    name = "mocha-2.4.5";
+    version = "2.4.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mocha/-/mocha-2.2.4.tgz";
-      name = "mocha-2.2.4.tgz";
-      sha1 = "192b0edc0e17e56613bc66e5fc7e81c00413a98d";
+      url = "https://registry.npmjs.org/mocha/-/mocha-2.4.5.tgz";
+      name = "mocha-2.4.5.tgz";
+      sha1 = "151768dd2875eb51bc8295e9800026e9f2bb398f";
     };
     deps = {
       "commander-2.3.0" = self.by-version."commander"."2.3.0";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "diff-1.0.8" = self.by-version."diff"."1.0.8";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "diff-1.4.0" = self.by-version."diff"."1.4.0";
       "escape-string-regexp-1.0.2" = self.by-version."escape-string-regexp"."1.0.2";
       "glob-3.2.3" = self.by-version."glob"."3.2.3";
       "growl-1.8.1" = self.by-version."growl"."1.8.1";
       "jade-0.26.3" = self.by-version."jade"."0.26.3";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "supports-color-1.2.1" = self.by-version."supports-color"."1.2.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "supports-color-1.2.0" = self.by-version."supports-color"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -25181,26 +29070,22 @@
     os = [ ];
     cpu = [ ];
   };
-  "mocha" = self.by-version."mocha"."2.2.4";
-  by-spec."mocha"."~1.20.1" =
-    self.by-version."mocha"."1.20.1";
-  by-version."mocha"."1.20.1" = self.buildNodePackage {
-    name = "mocha-1.20.1";
-    version = "1.20.1";
+  "mocha" = self.by-version."mocha"."2.4.5";
+  by-spec."mocha-phantomjs"."*" =
+    self.by-version."mocha-phantomjs"."4.0.2";
+  by-version."mocha-phantomjs"."4.0.2" = self.buildNodePackage {
+    name = "mocha-phantomjs-4.0.2";
+    version = "4.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mocha/-/mocha-1.20.1.tgz";
-      name = "mocha-1.20.1.tgz";
-      sha1 = "f343832d9fe0c7d97c64fc70448f5136df9fed5b";
+      url = "https://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-4.0.2.tgz";
+      name = "mocha-phantomjs-4.0.2.tgz";
+      sha1 = "808e43e01f3250201660c52cf441e6992d89dd9b";
     };
     deps = {
-      "commander-2.0.0" = self.by-version."commander"."2.0.0";
-      "growl-1.7.0" = self.by-version."growl"."1.7.0";
-      "jade-0.26.3" = self.by-version."jade"."0.26.3";
-      "diff-1.0.7" = self.by-version."diff"."1.0.7";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "glob-3.2.3" = self.by-version."glob"."3.2.3";
+      "phantomjs-1.9.7-15" = self.by-version."phantomjs"."1.9.7-15";
+      "mocha-phantomjs-core-1.3.0" = self.by-version."mocha-phantomjs-core"."1.3.0";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
     };
     optionalDependencies = {
     };
@@ -25208,29 +29093,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mocha-phantomjs"."*" =
-    self.by-version."mocha-phantomjs"."3.5.3";
-  by-version."mocha-phantomjs"."3.5.3" = self.buildNodePackage {
-    name = "mocha-phantomjs-3.5.3";
-    version = "3.5.3";
-    bin = true;
+  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."4.0.2";
+  by-spec."mocha-phantomjs-core"."^1.1.0" =
+    self.by-version."mocha-phantomjs-core"."1.3.0";
+  by-version."mocha-phantomjs-core"."1.3.0" = self.buildNodePackage {
+    name = "mocha-phantomjs-core-1.3.0";
+    version = "1.3.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.3.tgz";
-      name = "mocha-phantomjs-3.5.3.tgz";
-      sha1 = "bc0e654972d883ce11367f3f011f9e88f0a8de14";
+      url = "https://registry.npmjs.org/mocha-phantomjs-core/-/mocha-phantomjs-core-1.3.0.tgz";
+      name = "mocha-phantomjs-core-1.3.0.tgz";
+      sha1 = "fa991c9b13e3ba34fa0a0fe4c3f567da84882eb0";
     };
     deps = {
-      "mocha-1.20.1" = self.by-version."mocha"."1.20.1";
-      "commander-2.0.0" = self.by-version."commander"."2.0.0";
     };
     optionalDependencies = {
     };
-    peerDependencies = [
-      self.by-version."phantomjs"."1.9.16"];
+    peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.3";
   by-spec."mocha-unfunk-reporter"."*" =
     self.by-version."mocha-unfunk-reporter"."0.4.0";
   by-version."mocha-unfunk-reporter"."0.4.0" = self.buildNodePackage {
@@ -25238,7 +29120,7 @@
     version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz";
+      url = "https://registry.npmjs.org/mocha-unfunk-reporter/-/mocha-unfunk-reporter-0.4.0.tgz";
       name = "mocha-unfunk-reporter-0.4.0.tgz";
       sha1 = "59eda97aec6ae6e26d7af4173490a65b7b082d20";
     };
@@ -25255,34 +29137,32 @@
     cpu = [ ];
   };
   "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0";
-  by-spec."module-deps"."^3.6.3" =
-    self.by-version."module-deps"."3.7.6";
-  by-version."module-deps"."3.7.6" = self.buildNodePackage {
-    name = "module-deps-3.7.6";
-    version = "3.7.6";
+  by-spec."module-deps"."^3.7.11" =
+    self.by-version."module-deps"."3.9.1";
+  by-version."module-deps"."3.9.1" = self.buildNodePackage {
+    name = "module-deps-3.9.1";
+    version = "3.9.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/module-deps/-/module-deps-3.7.6.tgz";
-      name = "module-deps-3.7.6.tgz";
-      sha1 = "c1e596de260a26e78b9399ec32a989cdff71c1a0";
+      url = "https://registry.npmjs.org/module-deps/-/module-deps-3.9.1.tgz";
+      name = "module-deps-3.9.1.tgz";
+      sha1 = "ea75caf9199090d25b0d5512b5acacb96e7f87f3";
     };
     deps = {
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "browser-resolve-1.8.2" = self.by-version."browser-resolve"."1.8.2";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "detective-4.0.0" = self.by-version."detective"."4.0.0";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
+      "concat-stream-1.4.10" = self.by-version."concat-stream"."1.4.10";
+      "defined-1.0.0" = self.by-version."defined"."1.0.0";
+      "detective-4.3.1" = self.by-version."detective"."4.3.1";
       "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimist-0.2.0" = self.by-version."minimist"."0.2.0";
       "parents-1.0.1" = self.by-version."parents"."1.0.1";
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "resolve-1.1.6" = self.by-version."resolve"."1.1.6";
-      "shallow-copy-0.0.1" = self.by-version."shallow-copy"."0.0.1";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
       "stream-combiner2-1.0.2" = self.by-version."stream-combiner2"."1.0.2";
-      "subarg-0.0.1" = self.by-version."subarg"."0.0.1";
-      "through2-0.4.2" = self.by-version."through2"."0.4.2";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
+      "through2-1.1.1" = self.by-version."through2"."1.1.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -25290,28 +29170,32 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."module-deps"."^3.7.0" =
-    self.by-version."module-deps"."3.7.6";
-  by-spec."module-deps"."~1.2.2" =
-    self.by-version."module-deps"."1.2.2";
-  by-version."module-deps"."1.2.2" = self.buildNodePackage {
-    name = "module-deps-1.2.2";
-    version = "1.2.2";
+  by-spec."module-deps"."^4.0.2" =
+    self.by-version."module-deps"."4.0.5";
+  by-version."module-deps"."4.0.5" = self.buildNodePackage {
+    name = "module-deps-4.0.5";
+    version = "4.0.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/module-deps/-/module-deps-1.2.2.tgz";
-      name = "module-deps-1.2.2.tgz";
-      sha1 = "6e73959b7973af964de33a02437b76a8edfb2fc5";
+      url = "https://registry.npmjs.org/module-deps/-/module-deps-4.0.5.tgz";
+      name = "module-deps-4.0.5.tgz";
+      sha1 = "67c5fad02e1c8720a56ec3182d624bf97d18bd9c";
     };
     deps = {
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
-      "resolve-0.6.3" = self.by-version."resolve"."0.6.3";
-      "detective-2.1.2" = self.by-version."detective"."2.1.2";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "parents-0.0.2" = self.by-version."parents"."0.0.2";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "browser-resolve-1.11.1" = self.by-version."browser-resolve"."1.11.1";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "defined-1.0.0" = self.by-version."defined"."1.0.0";
+      "detective-4.3.1" = self.by-version."detective"."4.3.1";
+      "duplexer2-0.1.4" = self.by-version."duplexer2"."0.1.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "parents-1.0.1" = self.by-version."parents"."1.0.1";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
+      "stream-combiner2-1.1.1" = self.by-version."stream-combiner2"."1.1.1";
+      "subarg-1.0.0" = self.by-version."subarg"."1.0.0";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -25319,26 +29203,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."module-deps"."~1.4.0" =
-    self.by-version."module-deps"."1.4.2";
-  by-version."module-deps"."1.4.2" = self.buildNodePackage {
-    name = "module-deps-1.4.2";
-    version = "1.4.2";
-    bin = true;
+  by-spec."moment"."2.1.0" =
+    self.by-version."moment"."2.1.0";
+  by-version."moment"."2.1.0" = self.buildNodePackage {
+    name = "moment-2.1.0";
+    version = "2.1.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/module-deps/-/module-deps-1.4.2.tgz";
-      name = "module-deps-1.4.2.tgz";
-      sha1 = "cc48c5f88a087c6d9ec1973167c2c9fee2f80314";
+      url = "https://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
+      name = "moment-2.1.0.tgz";
+      sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
     };
     deps = {
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4";
-      "browser-resolve-1.2.4" = self.by-version."browser-resolve"."1.2.4";
-      "resolve-0.6.3" = self.by-version."resolve"."0.6.3";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "parents-0.0.2" = self.by-version."parents"."0.0.2";
-      "mine-0.0.2" = self.by-version."mine"."0.0.2";
     };
     optionalDependencies = {
     };
@@ -25346,16 +29222,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."moment"."2.1.0" =
-    self.by-version."moment"."2.1.0";
-  by-version."moment"."2.1.0" = self.buildNodePackage {
-    name = "moment-2.1.0";
-    version = "2.1.0";
+  by-spec."moment"."2.10.6" =
+    self.by-version."moment"."2.10.6";
+  by-version."moment"."2.10.6" = self.buildNodePackage {
+    name = "moment-2.10.6";
+    version = "2.10.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.1.0.tgz";
-      name = "moment-2.1.0.tgz";
-      sha1 = "1fd7b1134029a953c6ea371dbaee37598ac03567";
+      url = "https://registry.npmjs.org/moment/-/moment-2.10.6.tgz";
+      name = "moment-2.10.6.tgz";
+      sha1 = "6cb21967c79cba7b0ca5e66644f173662b3efa77";
     };
     deps = {
     };
@@ -25365,16 +29241,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."moment".">= 2.1.0" =
-    self.by-version."moment"."2.10.2";
-  by-version."moment"."2.10.2" = self.buildNodePackage {
-    name = "moment-2.10.2";
-    version = "2.10.2";
+  by-spec."moment"."2.x.x" =
+    self.by-version."moment"."2.12.0";
+  by-version."moment"."2.12.0" = self.buildNodePackage {
+    name = "moment-2.12.0";
+    version = "2.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.10.2.tgz";
-      name = "moment-2.10.2.tgz";
-      sha1 = "faf8c09ca82f03f94962e3b5a7239263ea50d087";
+      url = "https://registry.npmjs.org/moment/-/moment-2.12.0.tgz";
+      name = "moment-2.12.0.tgz";
+      sha1 = "dc2560d19838d6c0731b1a6afa04675264d360d6";
     };
     deps = {
     };
@@ -25385,23 +29261,25 @@
     cpu = [ ];
   };
   by-spec."moment".">= 2.6.0" =
-    self.by-version."moment"."2.10.2";
+    self.by-version."moment"."2.12.0";
   by-spec."moment".">=2.4.0" =
-    self.by-version."moment"."2.10.2";
+    self.by-version."moment"."2.12.0";
   by-spec."moment".">=2.5.0" =
-    self.by-version."moment"."2.10.2";
+    self.by-version."moment"."2.12.0";
+  by-spec."moment"."^2.10.6" =
+    self.by-version."moment"."2.12.0";
   by-spec."moment"."^2.8.4" =
-    self.by-version."moment"."2.10.2";
-  by-spec."moment"."~2.4.0" =
-    self.by-version."moment"."2.4.0";
-  by-version."moment"."2.4.0" = self.buildNodePackage {
-    name = "moment-2.4.0";
-    version = "2.4.0";
+    self.by-version."moment"."2.12.0";
+  by-spec."moment"."~2.11.2" =
+    self.by-version."moment"."2.11.2";
+  by-version."moment"."2.11.2" = self.buildNodePackage {
+    name = "moment-2.11.2";
+    version = "2.11.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.4.0.tgz";
-      name = "moment-2.4.0.tgz";
-      sha1 = "06dd8dfbbfdb53a03510080ac788163c9490e75d";
+      url = "https://registry.npmjs.org/moment/-/moment-2.11.2.tgz";
+      name = "moment-2.11.2.tgz";
+      sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901";
     };
     deps = {
     };
@@ -25418,7 +29296,7 @@
     version = "2.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.5.1.tgz";
+      url = "https://registry.npmjs.org/moment/-/moment-2.5.1.tgz";
       name = "moment-2.5.1.tgz";
       sha1 = "7146a3900533064ca799d5e792f4e480ee0e82bc";
     };
@@ -25432,58 +29310,19 @@
   };
   by-spec."moment"."~2.5.1" =
     self.by-version."moment"."2.5.1";
-  by-spec."moment"."~2.9.0" =
-    self.by-version."moment"."2.9.0";
-  by-version."moment"."2.9.0" = self.buildNodePackage {
-    name = "moment-2.9.0";
-    version = "2.9.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.9.0.tgz";
-      name = "moment-2.9.0.tgz";
-      sha1 = "77ec1175fa294f42627f10c8e6de6302c036f6d5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."moment-timezone"."0.0.3" =
-    self.by-version."moment-timezone"."0.0.3";
-  by-version."moment-timezone"."0.0.3" = self.buildNodePackage {
-    name = "moment-timezone-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.0.3.tgz";
-      name = "moment-timezone-0.0.3.tgz";
-      sha1 = "ebbd95f9220eba1c1b5e562d078db6c7d971e7ac";
-    };
-    deps = {
-      "moment-2.10.2" = self.by-version."moment"."2.10.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."moment-timezone"."0.2.4" =
-    self.by-version."moment-timezone"."0.2.4";
-  by-version."moment-timezone"."0.2.4" = self.buildNodePackage {
-    name = "moment-timezone-0.2.4";
-    version = "0.2.4";
+  by-spec."moment-timezone".">=0.0.3" =
+    self.by-version."moment-timezone"."0.5.3";
+  by-version."moment-timezone"."0.5.3" = self.buildNodePackage {
+    name = "moment-timezone-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.2.4.tgz";
-      name = "moment-timezone-0.2.4.tgz";
-      sha1 = "331a9dbecf965a8fb185ee30a6ed3fe32ee93012";
+      url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.3.tgz";
+      name = "moment-timezone-0.5.3.tgz";
+      sha1 = "34ba53bd719677975bee9d0e8ba799ad9373f082";
     };
     deps = {
-      "moment-2.10.2" = self.by-version."moment"."2.10.2";
+      "moment-2.12.0" = self.by-version."moment"."2.12.0";
     };
     optionalDependencies = {
     };
@@ -25491,19 +29330,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."moment-timezone"."^0.3.0" =
+  by-spec."moment-timezone".">=0.3.0" =
+    self.by-version."moment-timezone"."0.5.3";
+  by-spec."moment-timezone"."~0.3.0" =
     self.by-version."moment-timezone"."0.3.1";
   by-version."moment-timezone"."0.3.1" = self.buildNodePackage {
     name = "moment-timezone-0.3.1";
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment-timezone/-/moment-timezone-0.3.1.tgz";
+      url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.3.1.tgz";
       name = "moment-timezone-0.3.1.tgz";
       sha1 = "3ef47856b02d53b718a10a5ec2023aa299e07bf5";
     };
     deps = {
-      "moment-2.10.2" = self.by-version."moment"."2.10.2";
+      "moment-2.12.0" = self.by-version."moment"."2.12.0";
     };
     optionalDependencies = {
     };
@@ -25511,8 +29352,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."moment-timezone"."~0.3.0" =
-    self.by-version."moment-timezone"."0.3.1";
   by-spec."mongodb"."1.2.14" =
     self.by-version."mongodb"."1.2.14";
   by-version."mongodb"."1.2.14" = self.buildNodePackage {
@@ -25520,7 +29359,7 @@
     version = "1.2.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-1.2.14.tgz";
       name = "mongodb-1.2.14.tgz";
       sha1 = "269665552066437308d0942036646e6795c3a9a3";
     };
@@ -25540,7 +29379,7 @@
     version = "1.3.19";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-1.3.19.tgz";
       name = "mongodb-1.3.19.tgz";
       sha1 = "f229db24098f019d86d135aaf8a1ab5f2658b1d4";
     };
@@ -25554,64 +29393,66 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mongodb"."1.4.12" =
-    self.by-version."mongodb"."1.4.12";
-  by-version."mongodb"."1.4.12" = self.buildNodePackage {
-    name = "mongodb-1.4.12";
-    version = "1.4.12";
+  by-spec."mongodb"."2.0.46" =
+    self.by-version."mongodb"."2.0.46";
+  by-version."mongodb"."2.0.46" = self.buildNodePackage {
+    name = "mongodb-2.0.46";
+    version = "2.0.46";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.12.tgz";
-      name = "mongodb-1.4.12.tgz";
-      sha1 = "65cdd46ec127861e941168fdccf82bf17ad71c4d";
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.0.46.tgz";
+      name = "mongodb-2.0.46.tgz";
+      sha1 = "b1b857465e45e259b1e0e033698341a64cb93559";
     };
     deps = {
-      "bson-0.2.21" = self.by-version."bson"."0.2.21";
+      "mongodb-core-1.2.19" = self.by-version."mongodb-core"."1.2.19";
+      "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
+      "es6-promise-2.1.1" = self.by-version."es6-promise"."2.1.1";
     };
     optionalDependencies = {
-      "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mongodb"."1.4.32" =
-    self.by-version."mongodb"."1.4.32";
-  by-version."mongodb"."1.4.32" = self.buildNodePackage {
-    name = "mongodb-1.4.32";
-    version = "1.4.32";
+  by-spec."mongodb"."2.1.14" =
+    self.by-version."mongodb"."2.1.14";
+  by-version."mongodb"."2.1.14" = self.buildNodePackage {
+    name = "mongodb-2.1.14";
+    version = "2.1.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.32.tgz";
-      name = "mongodb-1.4.32.tgz";
-      sha1 = "23043d743e507e73e37c3eef03916af5ba0333b8";
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.14.tgz";
+      name = "mongodb-2.1.14.tgz";
+      sha1 = "d78e9d70e0966ed56aba87abd15a1f1ab9478c85";
     };
     deps = {
-      "bson-0.2.21" = self.by-version."bson"."0.2.21";
+      "es6-promise-3.0.2" = self.by-version."es6-promise"."3.0.2";
+      "mongodb-core-1.3.13" = self.by-version."mongodb-core"."1.3.13";
+      "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
     };
     optionalDependencies = {
-      "kerberos-0.0.9" = self.by-version."kerberos"."0.0.9";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."mongodb".">= 1.2.0 <2.1.0" =
-    self.by-version."mongodb"."2.0.27";
-  by-version."mongodb"."2.0.27" = self.buildNodePackage {
-    name = "mongodb-2.0.27";
-    version = "2.0.27";
+    self.by-version."mongodb"."2.0.55";
+  by-version."mongodb"."2.0.55" = self.buildNodePackage {
+    name = "mongodb-2.0.55";
+    version = "2.0.55";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb/-/mongodb-2.0.27.tgz";
-      name = "mongodb-2.0.27.tgz";
-      sha1 = "12f70e98286d0f5cfd2fc2fc2c99963e3bd408f5";
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.0.55.tgz";
+      name = "mongodb-2.0.55.tgz";
+      sha1 = "a09dd77259f6bba69f7dd592a011c11aa5761097";
     };
     deps = {
-      "mongodb-core-1.1.21" = self.by-version."mongodb-core"."1.1.21";
+      "mongodb-core-1.2.31" = self.by-version."mongodb-core"."1.2.31";
       "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
+      "es6-promise-2.1.1" = self.by-version."es6-promise"."2.1.1";
+      "kerberos-0.0.19" = self.by-version."kerberos"."0.0.19";
     };
     optionalDependencies = {
     };
@@ -25619,26 +29460,99 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."mongodb".">= 1.2.0 <2.2.0" =
+    self.by-version."mongodb"."2.1.14";
   by-spec."mongodb"."~2.0" =
-    self.by-version."mongodb"."2.0.27";
-  by-spec."mongodb-core"."1.1.21" =
-    self.by-version."mongodb-core"."1.1.21";
-  by-version."mongodb-core"."1.1.21" = self.buildNodePackage {
-    name = "mongodb-core-1.1.21";
-    version = "1.1.21";
+    self.by-version."mongodb"."2.0.55";
+  by-spec."mongodb-core"."1.2.19" =
+    self.by-version."mongodb-core"."1.2.19";
+  by-version."mongodb-core"."1.2.19" = self.buildNodePackage {
+    name = "mongodb-core-1.2.19";
+    version = "1.2.19";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongodb-core/-/mongodb-core-1.1.21.tgz";
-      name = "mongodb-core-1.1.21.tgz";
-      sha1 = "11c313f0474315e8a200c4dbb89b5fc6442c8f7c";
+      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.2.19.tgz";
+      name = "mongodb-core-1.2.19.tgz";
+      sha1 = "fcb35f6b6abc5c3de1f1a4a5db526b9e306f3eb7";
     };
     deps = {
-      "bson-0.3.1" = self.by-version."bson"."0.3.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rimraf-2.2.6" = self.by-version."rimraf"."2.2.6";
+      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+    };
+    optionalDependencies = {
+      "kerberos-0.0.19" = self.by-version."kerberos"."0.0.19";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mongodb-core"."1.2.31" =
+    self.by-version."mongodb-core"."1.2.31";
+  by-version."mongodb-core"."1.2.31" = self.buildNodePackage {
+    name = "mongodb-core-1.2.31";
+    version = "1.2.31";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.2.31.tgz";
+      name = "mongodb-core-1.2.31.tgz";
+      sha1 = "f1e6405f03d40846fdb838a702507affa3cb2c39";
+    };
+    deps = {
+      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [
+      self.by-version."kerberos"."0.0.19"];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mongodb-core"."1.3.13" =
+    self.by-version."mongodb-core"."1.3.13";
+  by-version."mongodb-core"."1.3.13" = self.buildNodePackage {
+    name = "mongodb-core-1.3.13";
+    version = "1.3.13";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.13.tgz";
+      name = "mongodb-core-1.3.13.tgz";
+      sha1 = "0a8e8719461ed98f36ed981ae00fa65d8b97781d";
+    };
+    deps = {
+      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "require_optional-1.0.0" = self.by-version."require_optional"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mongoose"."*" =
+    self.by-version."mongoose"."4.4.11";
+  by-version."mongoose"."4.4.11" = self.buildNodePackage {
+    name = "mongoose-4.4.11";
+    version = "4.4.11";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mongoose/-/mongoose-4.4.11.tgz";
+      name = "mongoose-4.4.11.tgz";
+      sha1 = "ea67e1cf819d180f96dbd4e205675596d55b9d68";
+    };
+    deps = {
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0";
+      "kareem-1.0.1" = self.by-version."kareem"."1.0.1";
+      "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14";
+      "mpath-0.2.1" = self.by-version."mpath"."0.2.1";
+      "mpromise-0.5.5" = self.by-version."mpromise"."0.5.5";
+      "mquery-1.10.0" = self.by-version."mquery"."1.10.0";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "muri-1.1.0" = self.by-version."muri"."1.1.0";
+      "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+      "sliced-1.0.1" = self.by-version."sliced"."1.0.1";
     };
     optionalDependencies = {
-      "kerberos-0.0.10" = self.by-version."kerberos"."0.0.10";
     };
     peerDependencies = [];
     os = [ ];
@@ -25651,7 +29565,7 @@
     version = "3.6.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
+      url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.7.tgz";
       name = "mongoose-3.6.7.tgz";
       sha1 = "aa6c9f4dfb740c7721dbe734fbb97714e5ab0ebc";
     };
@@ -25677,7 +29591,7 @@
     version = "3.6.20";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz";
+      url = "https://registry.npmjs.org/mongoose/-/mongoose-3.6.20.tgz";
       name = "mongoose-3.6.20.tgz";
       sha1 = "47263843e6b812ea207eec104c40a36c8d215f53";
     };
@@ -25698,57 +29612,30 @@
     cpu = [ ];
   };
   "mongoose" = self.by-version."mongoose"."3.6.20";
-  by-spec."mongoose"."3.8.x" =
-    self.by-version."mongoose"."3.8.26";
-  by-version."mongoose"."3.8.26" = self.buildNodePackage {
-    name = "mongoose-3.8.26";
-    version = "3.8.26";
+  by-spec."mongoose"."4.2.3" =
+    self.by-version."mongoose"."4.2.3";
+  by-version."mongoose"."4.2.3" = self.buildNodePackage {
+    name = "mongoose-4.2.3";
+    version = "4.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.26.tgz";
-      name = "mongoose-3.8.26.tgz";
-      sha1 = "28ba382c9b37dd5555c06632f1d8fd1d4c5dca1f";
+      url = "https://registry.npmjs.org/mongoose/-/mongoose-4.2.3.tgz";
+      name = "mongoose-4.2.3.tgz";
+      sha1 = "a6781998d11f7d0f18d496ee035d76bf9f6b99ed";
     };
     deps = {
-      "mongodb-1.4.32" = self.by-version."mongodb"."1.4.32";
-      "hooks-0.2.1" = self.by-version."hooks"."0.2.1";
-      "ms-0.1.0" = self.by-version."ms"."0.1.0";
-      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
-      "muri-0.3.1" = self.by-version."muri"."0.3.1";
-      "mpromise-0.4.3" = self.by-version."mpromise"."0.4.3";
+      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0";
+      "kareem-1.0.1" = self.by-version."kareem"."1.0.1";
+      "mongodb-2.0.46" = self.by-version."mongodb"."2.0.46";
       "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
-      "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
-      "mquery-1.4.0" = self.by-version."mquery"."1.4.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mongoose"."3.9.7" =
-    self.by-version."mongoose"."3.9.7";
-  by-version."mongoose"."3.9.7" = self.buildNodePackage {
-    name = "mongoose-3.9.7";
-    version = "3.9.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mongoose/-/mongoose-3.9.7.tgz";
-      name = "mongoose-3.9.7.tgz";
-      sha1 = "b315e6ebe5cefcce3843504b791f038828048da6";
-    };
-    deps = {
-      "hooks-0.3.2" = self.by-version."hooks"."0.3.2";
-      "mongodb-1.4.12" = self.by-version."mongodb"."1.4.12";
-      "ms-0.1.0" = self.by-version."ms"."0.1.0";
-      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
-      "muri-0.3.1" = self.by-version."muri"."0.3.1";
       "mpromise-0.5.4" = self.by-version."mpromise"."0.5.4";
-      "mpath-0.1.1" = self.by-version."mpath"."0.1.1";
-      "kareem-0.0.4" = self.by-version."kareem"."0.0.4";
+      "mquery-1.6.3" = self.by-version."mquery"."1.6.3";
+      "ms-0.1.0" = self.by-version."ms"."0.1.0";
+      "muri-1.0.0" = self.by-version."muri"."1.0.0";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
-      "mquery-1.0.0" = self.by-version."mquery"."1.0.0";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
     };
     optionalDependencies = {
     };
@@ -25763,7 +29650,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
+      url = "https://registry.npmjs.org/mongoose-lifecycle/-/mongoose-lifecycle-1.0.0.tgz";
       name = "mongoose-lifecycle-1.0.0.tgz";
       sha1 = "3bac3f3924a845d147784fc6558dee900b0151e2";
     };
@@ -25776,17 +29663,18 @@
     cpu = [ ];
   };
   by-spec."mongoose-schema-extend"."*" =
-    self.by-version."mongoose-schema-extend"."0.1.7";
-  by-version."mongoose-schema-extend"."0.1.7" = self.buildNodePackage {
-    name = "mongoose-schema-extend-0.1.7";
-    version = "0.1.7";
+    self.by-version."mongoose-schema-extend"."0.2.2";
+  by-version."mongoose-schema-extend"."0.2.2" = self.buildNodePackage {
+    name = "mongoose-schema-extend-0.2.2";
+    version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.1.7.tgz";
-      name = "mongoose-schema-extend-0.1.7.tgz";
-      sha1 = "50dc366ba63227d00c4cd3db9bb8bf95e9629910";
+      url = "https://registry.npmjs.org/mongoose-schema-extend/-/mongoose-schema-extend-0.2.2.tgz";
+      name = "mongoose-schema-extend-0.2.2.tgz";
+      sha1 = "f63dd313c422a3871f5569e36b0d28ca1a224631";
     };
     deps = {
+      "harmony-reflect-1.4.4" = self.by-version."harmony-reflect"."1.4.4";
       "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4";
     };
     optionalDependencies = {
@@ -25795,47 +29683,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.1.7";
-  by-spec."monocle"."1.1.50" =
-    self.by-version."monocle"."1.1.50";
-  by-version."monocle"."1.1.50" = self.buildNodePackage {
-    name = "monocle-1.1.50";
-    version = "1.1.50";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/monocle/-/monocle-1.1.50.tgz";
-      name = "monocle-1.1.50.tgz";
-      sha1 = "e21b059d99726d958371f36240c106b8a067fa7d";
-    };
-    deps = {
-      "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."monocle"."1.1.51" =
-    self.by-version."monocle"."1.1.51";
-  by-version."monocle"."1.1.51" = self.buildNodePackage {
-    name = "monocle-1.1.51";
-    version = "1.1.51";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/monocle/-/monocle-1.1.51.tgz";
-      name = "monocle-1.1.51.tgz";
-      sha1 = "22ed16e112e9b056769c5ccac920e375249d89c0";
-    };
-    deps = {
-      "readdirp-0.2.5" = self.by-version."readdirp"."0.2.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  "mongoose-schema-extend" = self.by-version."mongoose-schema-extend"."0.2.2";
   by-spec."morgan"."1.0.0" =
     self.by-version."morgan"."1.0.0";
   by-version."morgan"."1.0.0" = self.buildNodePackage {
@@ -25843,7 +29691,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
+      url = "https://registry.npmjs.org/morgan/-/morgan-1.0.0.tgz";
       name = "morgan-1.0.0.tgz";
       sha1 = "83cf74b9f2d841901f1a9a6b8fa7a468d2e47a8d";
     };
@@ -25863,7 +29711,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/morgan/-/morgan-1.2.0.tgz";
+      url = "https://registry.npmjs.org/morgan/-/morgan-1.2.0.tgz";
       name = "morgan-1.2.0.tgz";
       sha1 = "8dc17a57599598f80cd7a7e1e3b54e72c689910d";
     };
@@ -25879,46 +29727,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."morgan"."~1.3.1" =
-    self.by-version."morgan"."1.3.2";
-  by-version."morgan"."1.3.2" = self.buildNodePackage {
-    name = "morgan-1.3.2";
-    version = "1.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/morgan/-/morgan-1.3.2.tgz";
-      name = "morgan-1.3.2.tgz";
-      sha1 = "ac41aa15221ee4e5f2ac843896b6918139a18efd";
-    };
-    deps = {
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
-      "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."morgan"."~1.3.2" =
-    self.by-version."morgan"."1.3.2";
-  by-spec."morgan"."~1.5.2" =
-    self.by-version."morgan"."1.5.2";
-  by-version."morgan"."1.5.2" = self.buildNodePackage {
-    name = "morgan-1.5.2";
-    version = "1.5.2";
+  by-spec."morgan"."~1.6.1" =
+    self.by-version."morgan"."1.6.1";
+  by-version."morgan"."1.6.1" = self.buildNodePackage {
+    name = "morgan-1.6.1";
+    version = "1.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/morgan/-/morgan-1.5.2.tgz";
-      name = "morgan-1.5.2.tgz";
-      sha1 = "34c1a0e7c2d5ad3ed78f0ef3257b8ac7c35d7cff";
+      url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz";
+      name = "morgan-1.6.1.tgz";
+      sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2";
     };
     deps = {
-      "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "basic-auth-1.0.3" = self.by-version."basic-auth"."1.0.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -25926,19 +29751,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mount-point"."^1.0.0" =
-    self.by-version."mount-point"."1.0.3";
-  by-version."mount-point"."1.0.3" = self.buildNodePackage {
-    name = "mount-point-1.0.3";
-    version = "1.0.3";
+  by-spec."mpath"."0.1.1" =
+    self.by-version."mpath"."0.1.1";
+  by-version."mpath"."0.1.1" = self.buildNodePackage {
+    name = "mpath-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz";
-      name = "mount-point-1.0.3.tgz";
-      sha1 = "43adac2467a9dc8abf4b784a0d7b7453ab58df4d";
+      url = "https://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
+      name = "mpath-0.1.1.tgz";
+      sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
     };
     deps = {
-      "node-df-0.1.1" = self.by-version."node-df"."0.1.1";
     };
     optionalDependencies = {
     };
@@ -25946,16 +29770,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mout"."^0.11.0" =
-    self.by-version."mout"."0.11.0";
-  by-version."mout"."0.11.0" = self.buildNodePackage {
-    name = "mout-0.11.0";
-    version = "0.11.0";
+  by-spec."mpath"."0.2.1" =
+    self.by-version."mpath"."0.2.1";
+  by-version."mpath"."0.2.1" = self.buildNodePackage {
+    name = "mpath-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mout/-/mout-0.11.0.tgz";
-      name = "mout-0.11.0.tgz";
-      sha1 = "93cdf0791ac8a24873ceeb42a5b016b7c867abee";
+      url = "https://registry.npmjs.org/mpath/-/mpath-0.2.1.tgz";
+      name = "mpath-0.2.1.tgz";
+      sha1 = "3a4e829359801de96309c27a6b2e102e89f9e96e";
     };
     deps = {
     };
@@ -25965,18 +29789,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mout"."~0.9.0" =
-    self.by-version."mout"."0.9.1";
-  by-version."mout"."0.9.1" = self.buildNodePackage {
-    name = "mout-0.9.1";
-    version = "0.9.1";
+  by-spec."mpromise"."0.2.1" =
+    self.by-version."mpromise"."0.2.1";
+  by-version."mpromise"."0.2.1" = self.buildNodePackage {
+    name = "mpromise-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mout/-/mout-0.9.1.tgz";
-      name = "mout-0.9.1.tgz";
-      sha1 = "84f0f3fd6acc7317f63de2affdcc0cee009b0477";
+      url = "https://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
+      name = "mpromise-0.2.1.tgz";
+      sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
     };
     deps = {
+      "sliced-0.0.4" = self.by-version."sliced"."0.0.4";
     };
     optionalDependencies = {
     };
@@ -25984,16 +29809,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mpath"."0.1.1" =
-    self.by-version."mpath"."0.1.1";
-  by-version."mpath"."0.1.1" = self.buildNodePackage {
-    name = "mpath-0.1.1";
-    version = "0.1.1";
+  by-spec."mpromise"."0.5.4" =
+    self.by-version."mpromise"."0.5.4";
+  by-version."mpromise"."0.5.4" = self.buildNodePackage {
+    name = "mpromise-0.5.4";
+    version = "0.5.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mpath/-/mpath-0.1.1.tgz";
-      name = "mpath-0.1.1.tgz";
-      sha1 = "23da852b7c232ee097f4759d29c0ee9cd22d5e46";
+      url = "https://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz";
+      name = "mpromise-0.5.4.tgz";
+      sha1 = "b610613ec6de37419f944b35f0783b4de9f5dc75";
     };
     deps = {
     };
@@ -26003,19 +29828,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mpromise"."0.2.1" =
-    self.by-version."mpromise"."0.2.1";
-  by-version."mpromise"."0.2.1" = self.buildNodePackage {
-    name = "mpromise-0.2.1";
-    version = "0.2.1";
+  by-spec."mpromise"."0.5.5" =
+    self.by-version."mpromise"."0.5.5";
+  by-version."mpromise"."0.5.5" = self.buildNodePackage {
+    name = "mpromise-0.5.5";
+    version = "0.5.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mpromise/-/mpromise-0.2.1.tgz";
-      name = "mpromise-0.2.1.tgz";
-      sha1 = "fbbdc28cb0207e49b8a4eb1a4c0cea6c2de794c8";
+      url = "https://registry.npmjs.org/mpromise/-/mpromise-0.5.5.tgz";
+      name = "mpromise-0.5.5.tgz";
+      sha1 = "f5b24259d763acc2257b0a0c8c6d866fd51732e6";
     };
     deps = {
-      "sliced-0.0.4" = self.by-version."sliced"."0.0.4";
     };
     optionalDependencies = {
     };
@@ -26023,18 +29847,30 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mpromise"."0.4.3" =
-    self.by-version."mpromise"."0.4.3";
-  by-version."mpromise"."0.4.3" = self.buildNodePackage {
-    name = "mpromise-0.4.3";
-    version = "0.4.3";
-    bin = false;
+  by-spec."mqtt"."1.7.4" =
+    self.by-version."mqtt"."1.7.4";
+  by-version."mqtt"."1.7.4" = self.buildNodePackage {
+    name = "mqtt-1.7.4";
+    version = "1.7.4";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mpromise/-/mpromise-0.4.3.tgz";
-      name = "mpromise-0.4.3.tgz";
-      sha1 = "edc47a75a2a177b0e9382735db52dbec3808cc33";
+      url = "https://registry.npmjs.org/mqtt/-/mqtt-1.7.4.tgz";
+      name = "mqtt-1.7.4.tgz";
+      sha1 = "bda47e1f6f0cfbd8b861bcfd60012ac39b563f16";
     };
     deps = {
+      "commist-1.0.0" = self.by-version."commist"."1.0.0";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
+      "help-me-0.1.0" = self.by-version."help-me"."0.1.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "mqtt-connection-2.1.1" = self.by-version."mqtt-connection"."2.1.1";
+      "mqtt-packet-3.4.6" = self.by-version."mqtt-packet"."3.4.6";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "reinterval-1.0.2" = self.by-version."reinterval"."1.0.2";
+      "websocket-stream-3.1.0" = self.by-version."websocket-stream"."3.1.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -26042,18 +29878,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mpromise"."0.5.4" =
-    self.by-version."mpromise"."0.5.4";
-  by-version."mpromise"."0.5.4" = self.buildNodePackage {
-    name = "mpromise-0.5.4";
-    version = "0.5.4";
+  by-spec."mqtt-connection"."^2.0.0" =
+    self.by-version."mqtt-connection"."2.1.1";
+  by-version."mqtt-connection"."2.1.1" = self.buildNodePackage {
+    name = "mqtt-connection-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mpromise/-/mpromise-0.5.4.tgz";
-      name = "mpromise-0.5.4.tgz";
-      sha1 = "b610613ec6de37419f944b35f0783b4de9f5dc75";
+      url = "https://registry.npmjs.org/mqtt-connection/-/mqtt-connection-2.1.1.tgz";
+      name = "mqtt-connection-2.1.1.tgz";
+      sha1 = "7b2e985a74e196619430bebd35da162c34c4e56a";
     };
     deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "mqtt-packet-3.4.6" = self.by-version."mqtt-packet"."3.4.6";
+      "reduplexer-1.1.0" = self.by-version."reduplexer"."1.1.0";
+      "through2-0.6.5" = self.by-version."through2"."0.6.5";
     };
     optionalDependencies = {
     };
@@ -26061,19 +29901,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mqtt"."0.3.x" =
-    self.by-version."mqtt"."0.3.13";
-  by-version."mqtt"."0.3.13" = self.buildNodePackage {
-    name = "mqtt-0.3.13";
-    version = "0.3.13";
-    bin = true;
+  by-spec."mqtt-packet"."^3.0.0" =
+    self.by-version."mqtt-packet"."3.4.6";
+  by-version."mqtt-packet"."3.4.6" = self.buildNodePackage {
+    name = "mqtt-packet-3.4.6";
+    version = "3.4.6";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mqtt/-/mqtt-0.3.13.tgz";
-      name = "mqtt-0.3.13.tgz";
-      sha1 = "f65fbe323901b664427b471658428dcfa1d5bee4";
+      url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-3.4.6.tgz";
+      name = "mqtt-packet-3.4.6.tgz";
+      sha1 = "644ae77638fd3814151112bc67b9fc7f36d650e3";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -26081,21 +29922,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mquery"."1.0.0" =
-    self.by-version."mquery"."1.0.0";
-  by-version."mquery"."1.0.0" = self.buildNodePackage {
-    name = "mquery-1.0.0";
-    version = "1.0.0";
+  by-spec."mqtt-packet"."^3.2.0" =
+    self.by-version."mqtt-packet"."3.4.6";
+  by-spec."mquery"."1.10.0" =
+    self.by-version."mquery"."1.10.0";
+  by-version."mquery"."1.10.0" = self.buildNodePackage {
+    name = "mquery-1.10.0";
+    version = "1.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mquery/-/mquery-1.0.0.tgz";
-      name = "mquery-1.0.0.tgz";
-      sha1 = "6940a46d643368fe8e5abddeb94bd8dd32013f5b";
+      url = "https://registry.npmjs.org/mquery/-/mquery-1.10.0.tgz";
+      name = "mquery-1.10.0.tgz";
+      sha1 = "8603f02b0b524d17ac0539a85996124ee17b7cb3";
     };
     deps = {
-      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
+      "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
     };
     optionalDependencies = {
     };
@@ -26103,20 +29947,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mquery"."1.4.0" =
-    self.by-version."mquery"."1.4.0";
-  by-version."mquery"."1.4.0" = self.buildNodePackage {
-    name = "mquery-1.4.0";
-    version = "1.4.0";
+  by-spec."mquery"."1.6.3" =
+    self.by-version."mquery"."1.6.3";
+  by-version."mquery"."1.6.3" = self.buildNodePackage {
+    name = "mquery-1.6.3";
+    version = "1.6.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mquery/-/mquery-1.4.0.tgz";
-      name = "mquery-1.4.0.tgz";
-      sha1 = "d49b1c1ca89d1a06ebb6f000316fadba56c2469d";
+      url = "https://registry.npmjs.org/mquery/-/mquery-1.6.3.tgz";
+      name = "mquery-1.6.3.tgz";
+      sha1 = "7c02bfb7e49c8012cece1556c5e65fef61f3c8e5";
     };
     deps = {
-      "bluebird-2.3.2" = self.by-version."bluebird"."2.3.2";
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "bluebird-2.9.26" = self.by-version."bluebird"."2.9.26";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "regexp-clone-0.0.1" = self.by-version."regexp-clone"."0.0.1";
       "sliced-0.0.5" = self.by-version."sliced"."0.0.5";
     };
@@ -26133,7 +29977,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
+      url = "https://registry.npmjs.org/ms/-/ms-0.1.0.tgz";
       name = "ms-0.1.0.tgz";
       sha1 = "f21fac490daf1d7667fd180fe9077389cc9442b2";
     };
@@ -26152,7 +29996,7 @@
     version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
+      url = "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";
       name = "ms-0.6.2.tgz";
       sha1 = "d89c2124c6fdc1353d65a8b77bf1aac4b193708c";
     };
@@ -26171,7 +30015,7 @@
     version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
+      url = "https://registry.npmjs.org/ms/-/ms-0.7.0.tgz";
       name = "ms-0.7.0.tgz";
       sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83";
     };
@@ -26183,19 +30027,40 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ms"."0.7.1" =
+    self.by-version."ms"."0.7.1";
+  by-version."ms"."0.7.1" = self.buildNodePackage {
+    name = "ms-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+      name = "ms-0.7.1.tgz";
+      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms"."^0.7.1" =
+    self.by-version."ms"."0.7.1";
   by-spec."msgpack".">= 0.0.1" =
-    self.by-version."msgpack"."0.2.6";
-  by-version."msgpack"."0.2.6" = self.buildNodePackage {
-    name = "msgpack-0.2.6";
-    version = "0.2.6";
+    self.by-version."msgpack"."1.0.2";
+  by-version."msgpack"."1.0.2" = self.buildNodePackage {
+    name = "msgpack-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/msgpack/-/msgpack-0.2.6.tgz";
-      name = "msgpack-0.2.6.tgz";
-      sha1 = "e0eda501c43972efabb48eb34ee9daaeffd8eb4c";
+      url = "https://registry.npmjs.org/msgpack/-/msgpack-1.0.2.tgz";
+      name = "msgpack-1.0.2.tgz";
+      sha1 = "923e2c5cffa65c8418e9b228d1124793969c429c";
     };
     deps = {
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -26203,19 +30068,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."multer".">=0.0.6" =
+  by-spec."multer"."0.1.8" =
     self.by-version."multer"."0.1.8";
   by-version."multer"."0.1.8" = self.buildNodePackage {
     name = "multer-0.1.8";
     version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/multer/-/multer-0.1.8.tgz";
+      url = "https://registry.npmjs.org/multer/-/multer-0.1.8.tgz";
       name = "multer-0.1.8.tgz";
       sha1 = "551b8a6015093701bcacc964916b1ae06578f37b";
     };
     deps = {
-      "busboy-0.2.9" = self.by-version."busboy"."0.2.9";
+      "busboy-0.2.13" = self.by-version."busboy"."0.2.13";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
       "type-is-1.5.7" = self.by-version."type-is"."1.5.7";
@@ -26226,16 +30091,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."multicast-dns"."^2.0.0" =
-    self.by-version."multicast-dns"."2.1.0";
-  by-version."multicast-dns"."2.1.0" = self.buildNodePackage {
-    name = "multicast-dns-2.1.0";
-    version = "2.1.0";
+  by-spec."multicast-dns"."^4.0.0" =
+    self.by-version."multicast-dns"."4.0.1";
+  by-version."multicast-dns"."4.0.1" = self.buildNodePackage {
+    name = "multicast-dns-4.0.1";
+    version = "4.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/multicast-dns/-/multicast-dns-2.1.0.tgz";
-      name = "multicast-dns-2.1.0.tgz";
-      sha1 = "f0f93e7584bb4e0f59d8f838b2ded055ff77f535";
+      url = "https://registry.npmjs.org/multicast-dns/-/multicast-dns-4.0.1.tgz";
+      name = "multicast-dns-4.0.1.tgz";
+      sha1 = "abf022fc866727055a9e0c2bc98097f5ebad97a2";
     };
     deps = {
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
@@ -26253,7 +30118,7 @@
     version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
+      url = "https://registry.npmjs.org/multiparty/-/multiparty-2.2.0.tgz";
       name = "multiparty-2.2.0.tgz";
       sha1 = "a567c2af000ad22dc8f2a653d91978ae1f5316f4";
     };
@@ -26274,7 +30139,7 @@
     version = "3.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
+      url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz";
       name = "multiparty-3.3.2.tgz";
       sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f";
     };
@@ -26297,7 +30162,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
+      url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
       name = "multipipe-0.1.2.tgz";
       sha1 = "2a8f2ddf70eed564dff2d57f1e1a137d9f05078b";
     };
@@ -26317,7 +30182,7 @@
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
+      url = "https://registry.npmjs.org/muri/-/muri-0.3.1.tgz";
       name = "muri-0.3.1.tgz";
       sha1 = "861889c5c857f1a43700bee85d50731f61727c9a";
     };
@@ -26329,6 +30194,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."muri"."1.0.0" =
+    self.by-version."muri"."1.0.0";
+  by-version."muri"."1.0.0" = self.buildNodePackage {
+    name = "muri-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/muri/-/muri-1.0.0.tgz";
+      name = "muri-1.0.0.tgz";
+      sha1 = "de3bf6bd71d67eae71d76689b950d2de118695c6";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."muri"."1.1.0" =
+    self.by-version."muri"."1.1.0";
+  by-version."muri"."1.1.0" = self.buildNodePackage {
+    name = "muri-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/muri/-/muri-1.1.0.tgz";
+      name = "muri-1.1.0.tgz";
+      sha1 = "a3a6d74e68a880f433a249a74969cbb665cc0add";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."murl"."0.4.x" =
     self.by-version."murl"."0.4.1";
   by-version."murl"."0.4.1" = self.buildNodePackage {
@@ -26336,7 +30239,7 @@
     version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/murl/-/murl-0.4.1.tgz";
+      url = "https://registry.npmjs.org/murl/-/murl-0.4.1.tgz";
       name = "murl-0.4.1.tgz";
       sha1 = "489fbcc7f1b2b77e689c84120a51339c3849c939";
     };
@@ -26348,16 +30251,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mustache"."1.0.0" =
-    self.by-version."mustache"."1.0.0";
-  by-version."mustache"."1.0.0" = self.buildNodePackage {
-    name = "mustache-1.0.0";
-    version = "1.0.0";
-    bin = false;
+  by-spec."mustache"."2.2.1" =
+    self.by-version."mustache"."2.2.1";
+  by-version."mustache"."2.2.1" = self.buildNodePackage {
+    name = "mustache-2.2.1";
+    version = "2.2.1";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mustache/-/mustache-1.0.0.tgz";
-      name = "mustache-1.0.0.tgz";
-      sha1 = "8f5b8f68041dbead10997e0ba1d024771a03e15a";
+      url = "https://registry.npmjs.org/mustache/-/mustache-2.2.1.tgz";
+      name = "mustache-2.2.1.tgz";
+      sha1 = "2c40ca21c278f53150682bcf9090e41a3339b876";
     };
     deps = {
     };
@@ -26374,7 +30277,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz";
+      url = "https://registry.npmjs.org/mutate.js/-/mutate.js-0.2.0.tgz";
       name = "mutate.js-0.2.0.tgz";
       sha1 = "2e5cb1ac64c937dae28296e8f42af5eafd9bc7ef";
     };
@@ -26393,7 +30296,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
+      url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
       name = "mute-stream-0.0.4.tgz";
       sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
     };
@@ -26405,18 +30308,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mute-stream"."~0.0.4" =
-    self.by-version."mute-stream"."0.0.4";
-  by-spec."mv"."0.0.5" =
-    self.by-version."mv"."0.0.5";
-  by-version."mv"."0.0.5" = self.buildNodePackage {
-    name = "mv-0.0.5";
+  by-spec."mute-stream"."0.0.5" =
+    self.by-version."mute-stream"."0.0.5";
+  by-version."mute-stream"."0.0.5" = self.buildNodePackage {
+    name = "mute-stream-0.0.5";
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
-      name = "mv-0.0.5.tgz";
-      sha1 = "15eac759479884df1131d6de56bce20b654f5391";
+      url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
+      name = "mute-stream-0.0.5.tgz";
+      sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0";
     };
     deps = {
     };
@@ -26426,43 +30327,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mv"."~2" =
-    self.by-version."mv"."2.0.3";
-  by-version."mv"."2.0.3" = self.buildNodePackage {
-    name = "mv-2.0.3";
-    version = "2.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mv/-/mv-2.0.3.tgz";
-      name = "mv-2.0.3.tgz";
-      sha1 = "e9ab707d71dc38de24edcc637a8e2f5f480c7f32";
-    };
-    deps = {
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "ncp-0.6.0" = self.by-version."ncp"."0.6.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mz"."1" =
-    self.by-version."mz"."1.3.0";
-  by-version."mz"."1.3.0" = self.buildNodePackage {
-    name = "mz-1.3.0";
-    version = "1.3.0";
+  by-spec."mute-stream"."~0.0.4" =
+    self.by-version."mute-stream"."0.0.6";
+  by-version."mute-stream"."0.0.6" = self.buildNodePackage {
+    name = "mute-stream-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mz/-/mz-1.3.0.tgz";
-      name = "mz-1.3.0.tgz";
-      sha1 = "06f093fdd9956a06d37e1b1e81344e27478c42f0";
+      url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.6.tgz";
+      name = "mute-stream-0.0.6.tgz";
+      sha1 = "48962b19e169fd1dfc240b3f1e7317627bbc47db";
     };
     deps = {
-      "native-or-bluebird-1.2.0" = self.by-version."native-or-bluebird"."1.2.0";
-      "thenify-3.1.0" = self.by-version."thenify"."3.1.0";
-      "thenify-all-1.6.0" = self.by-version."thenify-all"."1.6.0";
     };
     optionalDependencies = {
     };
@@ -26470,16 +30346,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."*" =
-    self.by-version."nan"."1.7.0";
-  by-version."nan"."1.7.0" = self.buildNodePackage {
-    name = "nan-1.7.0";
-    version = "1.7.0";
+  by-spec."mv"."0.0.5" =
+    self.by-version."mv"."0.0.5";
+  by-version."mv"."0.0.5" = self.buildNodePackage {
+    name = "mv-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.7.0.tgz";
-      name = "nan-1.7.0.tgz";
-      sha1 = "755b997404e83cbe7bc08bc3c5c56291bce87438";
+      url = "https://registry.npmjs.org/mv/-/mv-0.0.5.tgz";
+      name = "mv-0.0.5.tgz";
+      sha1 = "15eac759479884df1131d6de56bce20b654f5391";
     };
     deps = {
     };
@@ -26489,20 +30365,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1 >=1.6.2" =
-    self.by-version."nan"."1.7.0";
-  by-spec."nan"."1.4.x" =
-    self.by-version."nan"."1.4.3";
-  by-version."nan"."1.4.3" = self.buildNodePackage {
-    name = "nan-1.4.3";
-    version = "1.4.3";
+  by-spec."mv"."~2" =
+    self.by-version."mv"."2.1.1";
+  by-version."mv"."2.1.1" = self.buildNodePackage {
+    name = "mv-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.4.3.tgz";
-      name = "nan-1.4.3.tgz";
-      sha1 = "c56b5404698063696f597435f9163c312aea5009";
+      url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz";
+      name = "mv-2.1.1.tgz";
+      sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2";
     };
     deps = {
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "ncp-2.0.0" = self.by-version."ncp"."2.0.0";
+      "rimraf-2.4.5" = self.by-version."rimraf"."2.4.5";
     };
     optionalDependencies = {
     };
@@ -26510,16 +30387,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.5.0" =
-    self.by-version."nan"."1.5.0";
-  by-version."nan"."1.5.0" = self.buildNodePackage {
-    name = "nan-1.5.0";
-    version = "1.5.0";
+  by-spec."nan"."2" =
+    self.by-version."nan"."2.2.1";
+  by-version."nan"."2.2.1" = self.buildNodePackage {
+    name = "nan-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.5.0.tgz";
-      name = "nan-1.5.0.tgz";
-      sha1 = "2b3c05bc361f52e50aea2c49077783aa67c5b7fb";
+      url = "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz";
+      name = "nan-2.2.1.tgz";
+      sha1 = "d68693f6b34bb41d66bc68b3a4f9defc79d7149b";
     };
     deps = {
     };
@@ -26529,16 +30406,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.5.1" =
-    self.by-version."nan"."1.5.1";
-  by-version."nan"."1.5.1" = self.buildNodePackage {
-    name = "nan-1.5.1";
-    version = "1.5.1";
+  by-spec."nan"."2.0.*" =
+    self.by-version."nan"."2.0.9";
+  by-version."nan"."2.0.9" = self.buildNodePackage {
+    name = "nan-2.0.9";
+    version = "2.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.5.1.tgz";
-      name = "nan-1.5.1.tgz";
-      sha1 = "a565e4d4143cb49afdd3fe07e4c8aeaa1e7e0603";
+      url = "https://registry.npmjs.org/nan/-/nan-2.0.9.tgz";
+      name = "nan-2.0.9.tgz";
+      sha1 = "d02a770f46778842cceb94e17cab31ffc7234a05";
     };
     deps = {
     };
@@ -26548,16 +30425,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.5.x" =
-    self.by-version."nan"."1.5.3";
-  by-version."nan"."1.5.3" = self.buildNodePackage {
-    name = "nan-1.5.3";
-    version = "1.5.3";
+  by-spec."nan"."2.0.5" =
+    self.by-version."nan"."2.0.5";
+  by-version."nan"."2.0.5" = self.buildNodePackage {
+    name = "nan-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.5.3.tgz";
-      name = "nan-1.5.3.tgz";
-      sha1 = "4cd0ecc133b7b0700a492a646add427ae8a318eb";
+      url = "https://registry.npmjs.org/nan/-/nan-2.0.5.tgz";
+      name = "nan-2.0.5.tgz";
+      sha1 = "365888014be1fd178db0cbfa258edf7b0cb1c408";
     };
     deps = {
     };
@@ -26567,16 +30444,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.6.2" =
-    self.by-version."nan"."1.6.2";
-  by-version."nan"."1.6.2" = self.buildNodePackage {
-    name = "nan-1.6.2";
-    version = "1.6.2";
+  by-spec."nan"."2.0.7" =
+    self.by-version."nan"."2.0.7";
+  by-version."nan"."2.0.7" = self.buildNodePackage {
+    name = "nan-2.0.7";
+    version = "2.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.6.2.tgz";
-      name = "nan-1.6.2.tgz";
-      sha1 = "2657d1c43b00f1e847e083832285b7d8f5ba8ec8";
+      url = "https://registry.npmjs.org/nan/-/nan-2.0.7.tgz";
+      name = "nan-2.0.7.tgz";
+      sha1 = "c726ce45dbd863b46234e4dfe5bf02d0cb309cd8";
     };
     deps = {
     };
@@ -26586,18 +30463,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."1.6.x" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."1.7.0" =
-    self.by-version."nan"."1.7.0";
-  by-spec."nan".">=1.3.0" =
-    self.by-version."nan"."1.7.0";
-  by-spec."nan"."^1.3.0" =
-    self.by-version."nan"."1.7.0";
-  by-spec."nan"."^1.5.1" =
-    self.by-version."nan"."1.7.0";
-  by-spec."nan"."^1.6.2" =
-    self.by-version."nan"."1.7.0";
+  by-spec."nan"."2.0.9" =
+    self.by-version."nan"."2.0.9";
+  by-spec."nan"."2.0.x" =
+    self.by-version."nan"."2.0.9";
+  by-spec."nan".">=2.0.0" =
+    self.by-version."nan"."2.2.1";
+  by-spec."nan"."^2.0" =
+    self.by-version."nan"."2.2.1";
+  by-spec."nan"."^2.0.4" =
+    self.by-version."nan"."2.2.1";
+  by-spec."nan"."^2.0.5" =
+    self.by-version."nan"."2.2.1";
+  by-spec."nan"."^2.0.8" =
+    self.by-version."nan"."2.2.1";
+  by-spec."nan"."^2.0.9" =
+    self.by-version."nan"."2.2.1";
+  by-spec."nan"."^2.1.0" =
+    self.by-version."nan"."2.2.1";
+  by-spec."nan"."^2.2.0" =
+    self.by-version."nan"."2.2.1";
   by-spec."nan"."~0.3.0" =
     self.by-version."nan"."0.3.2";
   by-version."nan"."0.3.2" = self.buildNodePackage {
@@ -26605,7 +30490,7 @@
     version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
+      url = "https://registry.npmjs.org/nan/-/nan-0.3.2.tgz";
       name = "nan-0.3.2.tgz";
       sha1 = "0df1935cab15369075ef160ad2894107aa14dc2d";
     };
@@ -26624,7 +30509,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
+      url = "https://registry.npmjs.org/nan/-/nan-1.0.0.tgz";
       name = "nan-1.0.0.tgz";
       sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38";
     };
@@ -26636,35 +30521,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."~1.2.0" =
-    self.by-version."nan"."1.2.0";
-  by-version."nan"."1.2.0" = self.buildNodePackage {
-    name = "nan-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.2.0.tgz";
-      name = "nan-1.2.0.tgz";
-      sha1 = "9c4d63ce9e4f8e95de2d574e18f7925554a8a8ef";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."nan"."~1.3.0" =
-    self.by-version."nan"."1.3.0";
-  by-version."nan"."1.3.0" = self.buildNodePackage {
-    name = "nan-1.3.0";
-    version = "1.3.0";
+  by-spec."nan"."~1.8.4" =
+    self.by-version."nan"."1.8.4";
+  by-version."nan"."1.8.4" = self.buildNodePackage {
+    name = "nan-1.8.4";
+    version = "1.8.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nan/-/nan-1.3.0.tgz";
-      name = "nan-1.3.0.tgz";
-      sha1 = "9a5b8d5ef97a10df3050e59b2c362d3baf779742";
+      url = "https://registry.npmjs.org/nan/-/nan-1.8.4.tgz";
+      name = "nan-1.8.4.tgz";
+      sha1 = "3c76b5382eab33e44b758d2813ca9d92e9342f34";
     };
     deps = {
     };
@@ -26674,32 +30540,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nan"."~1.5.0" =
-    self.by-version."nan"."1.5.3";
-  by-spec."nan"."~1.5.1" =
-    self.by-version."nan"."1.5.3";
-  by-spec."nan"."~1.5.3" =
-    self.by-version."nan"."1.5.3";
-  by-spec."nan"."~1.6" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."~1.6.2" =
-    self.by-version."nan"."1.6.2";
-  by-spec."nan"."~1.7.0" =
-    self.by-version."nan"."1.7.0";
-  by-spec."native-buffer-browserify"."~2.0.0" =
-    self.by-version."native-buffer-browserify"."2.0.17";
-  by-version."native-buffer-browserify"."2.0.17" = self.buildNodePackage {
-    name = "native-buffer-browserify-2.0.17";
-    version = "2.0.17";
+  by-spec."nan"."~2.0" =
+    self.by-version."nan"."2.0.9";
+  by-spec."nan"."~2.0.0" =
+    self.by-version."nan"."2.0.9";
+  by-spec."nan"."~2.0.5" =
+    self.by-version."nan"."2.0.9";
+  by-spec."nan"."~2.1.0" =
+    self.by-version."nan"."2.1.0";
+  by-version."nan"."2.1.0" = self.buildNodePackage {
+    name = "nan-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/native-buffer-browserify/-/native-buffer-browserify-2.0.17.tgz";
-      name = "native-buffer-browserify-2.0.17.tgz";
-      sha1 = "980577018c4884d169da40b47958ffac6c327d15";
+      url = "https://registry.npmjs.org/nan/-/nan-2.1.0.tgz";
+      name = "nan-2.1.0.tgz";
+      sha1 = "020a7ccedc63fdee85f85967d5607849e74abbe8";
     };
     deps = {
-      "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
-      "ieee754-1.1.4" = self.by-version."ieee754"."1.1.4";
     };
     optionalDependencies = {
     };
@@ -26707,8 +30565,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."native-buffer-browserify"."~2.0.15" =
-    self.by-version."native-buffer-browserify"."2.0.17";
   by-spec."native-dns"."0.6.1" =
     self.by-version."native-dns"."0.6.1";
   by-version."native-dns"."0.6.1" = self.buildNodePackage {
@@ -26716,12 +30572,12 @@
     version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/native-dns/-/native-dns-0.6.1.tgz";
+      url = "https://registry.npmjs.org/native-dns/-/native-dns-0.6.1.tgz";
       name = "native-dns-0.6.1.tgz";
       sha1 = "f7d2a3c5464bb6f09d9167e35a7350bd7ffe9b82";
     };
     deps = {
-      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
+      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
       "native-dns-cache-0.0.2" = self.by-version."native-dns-cache"."0.0.2";
       "native-dns-packet-0.1.1" = self.by-version."native-dns-packet"."0.1.1";
     };
@@ -26738,7 +30594,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/native-dns-cache/-/native-dns-cache-0.0.2.tgz";
+      url = "https://registry.npmjs.org/native-dns-cache/-/native-dns-cache-0.0.2.tgz";
       name = "native-dns-cache-0.0.2.tgz";
       sha1 = "ce0998f7fdf6c7990970a33190624b0e98ee959b";
     };
@@ -26759,13 +30615,13 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
+      url = "https://registry.npmjs.org/native-dns-packet/-/native-dns-packet-0.1.1.tgz";
       name = "native-dns-packet-0.1.1.tgz";
       sha1 = "97da90570b8438a00194701ce24d011fd3cc109a";
     };
     deps = {
       "buffercursor-0.0.12" = self.by-version."buffercursor"."0.0.12";
-      "ipaddr.js-1.0.1" = self.by-version."ipaddr.js"."1.0.1";
+      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -26775,44 +30631,6 @@
   };
   by-spec."native-dns-packet".">= 0.0.4" =
     self.by-version."native-dns-packet"."0.1.1";
-  by-spec."native-or-bluebird"."1" =
-    self.by-version."native-or-bluebird"."1.2.0";
-  by-version."native-or-bluebird"."1.2.0" = self.buildNodePackage {
-    name = "native-or-bluebird-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.2.0.tgz";
-      name = "native-or-bluebird-1.2.0.tgz";
-      sha1 = "39c47bfd7825d1fb9ffad32210ae25daadf101c9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."native-or-bluebird"."~1.1.2" =
-    self.by-version."native-or-bluebird"."1.1.2";
-  by-version."native-or-bluebird"."1.1.2" = self.buildNodePackage {
-    name = "native-or-bluebird-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/native-or-bluebird/-/native-or-bluebird-1.1.2.tgz";
-      name = "native-or-bluebird-1.1.2.tgz";
-      sha1 = "3921e110232d1eb790f3dac61bb370531c7d356e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."natural"."^0.2.0" =
     self.by-version."natural"."0.2.1";
   by-version."natural"."0.2.1" = self.buildNodePackage {
@@ -26820,7 +30638,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/natural/-/natural-0.2.1.tgz";
+      url = "https://registry.npmjs.org/natural/-/natural-0.2.1.tgz";
       name = "natural-0.2.1.tgz";
       sha1 = "1eb5156a9d90b4591949e20e94ebc77bb2339eda";
     };
@@ -26836,20 +30654,21 @@
     cpu = [ ];
   };
   by-spec."nconf"."*" =
-    self.by-version."nconf"."0.7.1";
-  by-version."nconf"."0.7.1" = self.buildNodePackage {
-    name = "nconf-0.7.1";
-    version = "0.7.1";
+    self.by-version."nconf"."0.8.4";
+  by-version."nconf"."0.8.4" = self.buildNodePackage {
+    name = "nconf-0.8.4";
+    version = "0.8.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nconf/-/nconf-0.7.1.tgz";
-      name = "nconf-0.7.1.tgz";
-      sha1 = "ee4b561dd979a3c58db122e38f196d49d61aeb5b";
+      url = "https://registry.npmjs.org/nconf/-/nconf-0.8.4.tgz";
+      name = "nconf-0.8.4.tgz";
+      sha1 = "9502234f7ad6238cab7f92d7c068c20434d3ff93";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
+      "secure-keys-1.0.0" = self.by-version."secure-keys"."1.0.0";
+      "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
     };
     optionalDependencies = {
     };
@@ -26857,7 +30676,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "nconf" = self.by-version."nconf"."0.7.1";
+  "nconf" = self.by-version."nconf"."0.8.4";
   by-spec."nconf"."0.6.9" =
     self.by-version."nconf"."0.6.9";
   by-version."nconf"."0.6.9" = self.buildNodePackage {
@@ -26865,13 +30684,13 @@
     version = "0.6.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
+      url = "https://registry.npmjs.org/nconf/-/nconf-0.6.9.tgz";
       name = "nconf-0.6.9.tgz";
       sha1 = "9570ef15ed6f9ae6b2b3c8d5e71b66d3193cd661";
     };
     deps = {
       "async-0.2.9" = self.by-version."async"."0.2.9";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
       "optimist-0.6.0" = self.by-version."optimist"."0.6.0";
     };
     optionalDependencies = {
@@ -26882,14 +30701,33 @@
   };
   by-spec."nconf"."~0.6.9" =
     self.by-version."nconf"."0.6.9";
-  by-spec."ncp"."0.4.x" =
+  by-spec."ncp"."0.2.x" =
+    self.by-version."ncp"."0.2.7";
+  by-version."ncp"."0.2.7" = self.buildNodePackage {
+    name = "ncp-0.2.7";
+    version = "0.2.7";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ncp/-/ncp-0.2.7.tgz";
+      name = "ncp-0.2.7.tgz";
+      sha1 = "46fac2b7dda2560a4cb7e628677bd5f64eac5be1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ncp"."0.4.2" =
     self.by-version."ncp"."0.4.2";
   by-version."ncp"."0.4.2" = self.buildNodePackage {
     name = "ncp-0.4.2";
     version = "0.4.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
+      url = "https://registry.npmjs.org/ncp/-/ncp-0.4.2.tgz";
       name = "ncp-0.4.2.tgz";
       sha1 = "abcc6cbd3ec2ed2a729ff6e7c1fa8f01784a8574";
     };
@@ -26901,18 +30739,20 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ncp"."0.4.x" =
+    self.by-version."ncp"."0.4.2";
   by-spec."ncp"."~0.4.2" =
     self.by-version."ncp"."0.4.2";
-  by-spec."ncp"."~0.6.0" =
-    self.by-version."ncp"."0.6.0";
-  by-version."ncp"."0.6.0" = self.buildNodePackage {
-    name = "ncp-0.6.0";
-    version = "0.6.0";
+  by-spec."ncp"."~2.0.0" =
+    self.by-version."ncp"."2.0.0";
+  by-version."ncp"."2.0.0" = self.buildNodePackage {
+    name = "ncp-2.0.0";
+    version = "2.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz";
-      name = "ncp-0.6.0.tgz";
-      sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d";
+      url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz";
+      name = "ncp-2.0.0.tgz";
+      sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3";
     };
     deps = {
     };
@@ -26923,19 +30763,20 @@
     cpu = [ ];
   };
   by-spec."ndjson"."^1.2.3" =
-    self.by-version."ndjson"."1.3.0";
-  by-version."ndjson"."1.3.0" = self.buildNodePackage {
-    name = "ndjson-1.3.0";
-    version = "1.3.0";
-    bin = false;
+    self.by-version."ndjson"."1.4.3";
+  by-version."ndjson"."1.4.3" = self.buildNodePackage {
+    name = "ndjson-1.4.3";
+    version = "1.4.3";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ndjson/-/ndjson-1.3.0.tgz";
-      name = "ndjson-1.3.0.tgz";
-      sha1 = "84f4d197986919620a763aa36c7058cbbdcf7351";
+      url = "https://registry.npmjs.org/ndjson/-/ndjson-1.4.3.tgz";
+      name = "ndjson-1.4.3.tgz";
+      sha1 = "7aa026fe3ab38a7da1a2b4ad07b1008e733eb239";
     };
     deps = {
       "split2-0.2.1" = self.by-version."split2"."0.2.1";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -26950,7 +30791,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.3.0.tgz";
       name = "negotiator-0.3.0.tgz";
       sha1 = "706d692efeddf574d57ea9fb1ab89a4fa7ee8f60";
     };
@@ -26969,7 +30810,7 @@
     version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.2.tgz";
       name = "negotiator-0.4.2.tgz";
       sha1 = "8c43ea7e4c40ddfe40c3c0234c4ef77500b8fd37";
     };
@@ -26988,7 +30829,7 @@
     version = "0.4.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz";
       name = "negotiator-0.4.7.tgz";
       sha1 = "a4160f7177ec806738631d0d3052325da42abdc8";
     };
@@ -27007,7 +30848,7 @@
     version = "0.4.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
       name = "negotiator-0.4.9.tgz";
       sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
     };
@@ -27019,16 +30860,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."negotiator"."0.5.1" =
-    self.by-version."negotiator"."0.5.1";
-  by-version."negotiator"."0.5.1" = self.buildNodePackage {
-    name = "negotiator-0.5.1";
-    version = "0.5.1";
+  by-spec."negotiator"."0.5.3" =
+    self.by-version."negotiator"."0.5.3";
+  by-version."negotiator"."0.5.3" = self.buildNodePackage {
+    name = "negotiator-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.5.1.tgz";
-      name = "negotiator-0.5.1.tgz";
-      sha1 = "498f661c522470153c6086ac83019cb3eb66f61c";
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz";
+      name = "negotiator-0.5.3.tgz";
+      sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8";
     };
     deps = {
     };
@@ -27038,20 +30879,40 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."negotiator"."^0.4.5" =
-    self.by-version."negotiator"."0.4.9";
+  by-spec."negotiator"."0.6.0" =
+    self.by-version."negotiator"."0.6.0";
+  by-version."negotiator"."0.6.0" = self.buildNodePackage {
+    name = "negotiator-0.6.0";
+    version = "0.6.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.0.tgz";
+      name = "negotiator-0.6.0.tgz";
+      sha1 = "33593a5a2b0ce30c985840c6f56b6fb1ea9e3a55";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."negotiator"."^0.5.1" =
+    self.by-version."negotiator"."0.5.3";
   by-spec."nested-error-stacks"."^1.0.0" =
-    self.by-version."nested-error-stacks"."1.0.0";
-  by-version."nested-error-stacks"."1.0.0" = self.buildNodePackage {
-    name = "nested-error-stacks-1.0.0";
-    version = "1.0.0";
+    self.by-version."nested-error-stacks"."1.0.2";
+  by-version."nested-error-stacks"."1.0.2" = self.buildNodePackage {
+    name = "nested-error-stacks-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.0.tgz";
-      name = "nested-error-stacks-1.0.0.tgz";
-      sha1 = "3bd2785bb1fa9ebbf608e293e9ccb9ea765254c7";
+      url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz";
+      name = "nested-error-stacks-1.0.2.tgz";
+      sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf";
     };
     deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -27066,12 +30927,12 @@
     version = "1.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
+      url = "https://registry.npmjs.org/net-ping/-/net-ping-1.1.7.tgz";
       name = "net-ping-1.1.7.tgz";
       sha1 = "49f5bca55a30a3726d69253557f231135a637075";
     };
     deps = {
-      "raw-socket-1.2.2" = self.by-version."raw-socket"."1.2.2";
+      "raw-socket-1.4.0" = self.by-version."raw-socket"."1.4.0";
     };
     optionalDependencies = {
     };
@@ -27086,7 +30947,7 @@
     version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/netmask/-/netmask-1.0.5.tgz";
+      url = "https://registry.npmjs.org/netmask/-/netmask-1.0.5.tgz";
       name = "netmask-1.0.5.tgz";
       sha1 = "84851218294b88e0ac5a008ec46401e2a5c767d2";
     };
@@ -27105,7 +30966,7 @@
     version = "0.0.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz";
+      url = "https://registry.npmjs.org/network-address/-/network-address-0.0.5.tgz";
       name = "network-address-0.0.5.tgz";
       sha1 = "a400225438cacb67cd6108e8e826d5920a705dcc";
     };
@@ -27120,34 +30981,15 @@
   by-spec."network-address"."0.0.x" =
     self.by-version."network-address"."0.0.5";
   by-spec."network-address"."^1.0.0" =
-    self.by-version."network-address"."1.0.0";
-  by-version."network-address"."1.0.0" = self.buildNodePackage {
-    name = "network-address-1.0.0";
-    version = "1.0.0";
+    self.by-version."network-address"."1.1.0";
+  by-version."network-address"."1.1.0" = self.buildNodePackage {
+    name = "network-address-1.1.0";
+    version = "1.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/network-address/-/network-address-1.0.0.tgz";
-      name = "network-address-1.0.0.tgz";
-      sha1 = "246e82910c9e49d8842f1515d8341973a8db642f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."next-tick"."~0.2.2" =
-    self.by-version."next-tick"."0.2.2";
-  by-version."next-tick"."0.2.2" = self.buildNodePackage {
-    name = "next-tick-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz";
-      name = "next-tick-0.2.2.tgz";
-      sha1 = "75da4a927ee5887e39065880065b7336413b310d";
+      url = "https://registry.npmjs.org/network-address/-/network-address-1.1.0.tgz";
+      name = "network-address-1.1.0.tgz";
+      sha1 = "74d577b0dea652284659079fc8d7010b72f01092";
     };
     deps = {
     };
@@ -27164,7 +31006,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nib/-/nib-1.1.0.tgz";
+      url = "https://registry.npmjs.org/nib/-/nib-1.1.0.tgz";
       name = "nib-1.1.0.tgz";
       sha1 = "527c19662a10a2b565fe85e9b309d622aa7557d3";
     };
@@ -27178,25 +31020,8 @@
     cpu = [ ];
   };
   "nib" = self.by-version."nib"."1.1.0";
-  by-spec."nib"."0.5.0" =
-    self.by-version."nib"."0.5.0";
-  by-version."nib"."0.5.0" = self.buildNodePackage {
-    name = "nib-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nib/-/nib-0.5.0.tgz";
-      name = "nib-0.5.0.tgz";
-      sha1 = "ad0a7dfa2bca8680c8cb8adaa6ab68c80e5221e5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."nib"."~1.1.0" =
+    self.by-version."nib"."1.1.0";
   by-spec."nijs"."*" =
     self.by-version."nijs"."0.0.23";
   by-version."nijs"."0.0.23" = self.buildNodePackage {
@@ -27204,7 +31029,7 @@
     version = "0.0.23";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
+      url = "https://registry.npmjs.org/nijs/-/nijs-0.0.23.tgz";
       name = "nijs-0.0.23.tgz";
       sha1 = "dbf8f4a0acafbe3b8d9b71c24cbd1d851de6c31a";
     };
@@ -27219,30 +31044,51 @@
     cpu = [ ];
   };
   "nijs" = self.by-version."nijs"."0.0.23";
-  by-spec."node-appc"."0.2.26" =
-    self.by-version."node-appc"."0.2.26";
-  by-version."node-appc"."0.2.26" = self.buildNodePackage {
-    name = "node-appc-0.2.26";
-    version = "0.2.26";
+  by-spec."node-alias"."^1.0.3" =
+    self.by-version."node-alias"."1.0.4";
+  by-version."node-alias"."1.0.4" = self.buildNodePackage {
+    name = "node-alias-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-alias/-/node-alias-1.0.4.tgz";
+      name = "node-alias-1.0.4.tgz";
+      sha1 = "1f1b916b56b9ea241c0135f97ced6940f556f292";
+    };
+    deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-appc"."0.2.31" =
+    self.by-version."node-appc"."0.2.31";
+  by-version."node-appc"."0.2.31" = self.buildNodePackage {
+    name = "node-appc-0.2.31";
+    version = "0.2.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-appc/-/node-appc-0.2.26.tgz";
-      name = "node-appc-0.2.26.tgz";
-      sha1 = "7744e585d10a69b090ce6d983efda6131d8c3e31";
+      url = "https://registry.npmjs.org/node-appc/-/node-appc-0.2.31.tgz";
+      name = "node-appc-0.2.31.tgz";
+      sha1 = "8d8d0052fd8b8ce4bc44f06883009f7c950bc8c2";
     };
     deps = {
       "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "diff-1.0.8" = self.by-version."diff"."1.0.8";
+      "async-1.4.2" = self.by-version."async"."1.4.2";
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "diff-2.1.0" = self.by-version."diff"."2.1.0";
       "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "request-2.40.0" = self.by-version."request"."2.40.0";
-      "semver-3.0.1" = self.by-version."semver"."3.0.1";
+      "request-2.61.0" = self.by-version."request"."2.61.0";
+      "semver-5.0.1" = self.by-version."semver"."5.0.1";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
-      "temp-0.8.1" = self.by-version."temp"."0.8.1";
+      "temp-0.8.3" = self.by-version."temp"."0.8.3";
       "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
-      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
+      "uglify-js-2.4.24" = self.by-version."uglify-js"."2.4.24";
       "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
     optionalDependencies = {
@@ -27252,15 +31098,15 @@
     cpu = [ ];
   };
   by-spec."node-craigslist"."^0.1.7" =
-    self.by-version."node-craigslist"."0.1.8";
-  by-version."node-craigslist"."0.1.8" = self.buildNodePackage {
-    name = "node-craigslist-0.1.8";
-    version = "0.1.8";
+    self.by-version."node-craigslist"."0.1.9";
+  by-version."node-craigslist"."0.1.9" = self.buildNodePackage {
+    name = "node-craigslist-0.1.9";
+    version = "0.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-craigslist/-/node-craigslist-0.1.8.tgz";
-      name = "node-craigslist-0.1.8.tgz";
-      sha1 = "2c69ba5869a2461070cd296dcf3b1dd2e3032227";
+      url = "https://registry.npmjs.org/node-craigslist/-/node-craigslist-0.1.9.tgz";
+      name = "node-craigslist-0.1.9.tgz";
+      sha1 = "d33d9d18337e6d1002f3a417d66a6b8b33dcbe98";
     };
     deps = {
       "cheerio-0.17.0" = self.by-version."cheerio"."0.17.0";
@@ -27271,19 +31117,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-df"."^0.1.1" =
-    self.by-version."node-df"."0.1.1";
-  by-version."node-df"."0.1.1" = self.buildNodePackage {
-    name = "node-df-0.1.1";
-    version = "0.1.1";
+  by-spec."node-expat"."*" =
+    self.by-version."node-expat"."2.3.13";
+  by-version."node-expat"."2.3.13" = self.buildNodePackage {
+    name = "node-expat-2.3.13";
+    version = "2.3.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz";
-      name = "node-df-0.1.1.tgz";
-      sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea";
+      url = "https://registry.npmjs.org/node-expat/-/node-expat-2.3.13.tgz";
+      name = "node-expat-2.3.13.tgz";
+      sha1 = "e32494308d14f451e2b8efa4464f52e1e8a59532";
     };
     deps = {
-      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -27291,22 +31138,50 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-expat"."*" =
-    self.by-version."node-expat"."2.3.7";
-  by-version."node-expat"."2.3.7" = self.buildNodePackage {
-    name = "node-expat-2.3.7";
-    version = "2.3.7";
+  "node-expat" = self.by-version."node-expat"."2.3.13";
+  by-spec."node-expat"."^2.3.0" =
+    self.by-version."node-expat"."2.3.13";
+  by-spec."node-expat"."^2.3.9" =
+    self.by-version."node-expat"."2.3.13";
+  by-spec."node-expat"."~2.3.0" =
+    self.by-version."node-expat"."2.3.13";
+  by-spec."node-expat"."~2.3.7" =
+    self.by-version."node-expat"."2.3.13";
+  by-spec."node-expat"."~2.3.8" =
+    self.by-version."node-expat"."2.3.13";
+  by-spec."node-fetch"."^1.0.1" =
+    self.by-version."node-fetch"."1.4.1";
+  by-version."node-fetch"."1.4.1" = self.buildNodePackage {
+    name = "node-fetch-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.7.tgz";
-      name = "node-expat-2.3.7.tgz";
-      sha1 = "7d8811989c52c90578a70d8ea6335692a7f14c8a";
+      url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.4.1.tgz";
+      name = "node-fetch-1.4.1.tgz";
+      sha1 = "f50a3a98a586c434e9a63984c97127eb33c09145";
+    };
+    deps = {
+      "encoding-0.1.12" = self.by-version."encoding"."0.1.12";
+      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-forge"."^0.6.33" =
+    self.by-version."node-forge"."0.6.39";
+  by-version."node-forge"."0.6.39" = self.buildNodePackage {
+    name = "node-forge-0.6.39";
+    version = "0.6.39";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-forge/-/node-forge-0.6.39.tgz";
+      name = "node-forge-0.6.39.tgz";
+      sha1 = "2184e89dba9b44b3aa54cd4bf1e7334f247cf9ce";
     };
     deps = {
-      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "iconv-2.1.6" = self.by-version."iconv"."2.1.6";
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
     };
     optionalDependencies = {
     };
@@ -27314,17 +31189,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-expat" = self.by-version."node-expat"."2.3.7";
-  by-spec."node-expat".">=1.4.1" =
-    self.by-version."node-expat"."2.3.7";
-  by-spec."node-expat"."^2.3.0" =
-    self.by-version."node-expat"."2.3.7";
-  by-spec."node-expat"."^2.3.6" =
-    self.by-version."node-expat"."2.3.7";
-  by-spec."node-expat"."~2.3.0" =
-    self.by-version."node-expat"."2.3.7";
-  by-spec."node-expat"."~2.3.7" =
-    self.by-version."node-expat"."2.3.7";
   by-spec."node-fs"."^0.1.7" =
     self.by-version."node-fs"."0.1.7";
   by-version."node-fs"."0.1.7" = self.buildNodePackage {
@@ -27332,7 +31196,7 @@
     version = "0.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz";
+      url = "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz";
       name = "node-fs-0.1.7.tgz";
       sha1 = "32323cccb46c9fbf0fc11812d45021cc31d325bb";
     };
@@ -27345,30 +31209,31 @@
     cpu = [ ];
   };
   by-spec."node-gyp"."*" =
-    self.by-version."node-gyp"."1.0.3";
-  by-version."node-gyp"."1.0.3" = self.buildNodePackage {
-    name = "node-gyp-1.0.3";
-    version = "1.0.3";
+    self.by-version."node-gyp"."3.3.1";
+  by-version."node-gyp"."3.3.1" = self.buildNodePackage {
+    name = "node-gyp-3.3.1";
+    version = "3.3.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-gyp/-/node-gyp-1.0.3.tgz";
-      name = "node-gyp-1.0.3.tgz";
-      sha1 = "a2f63f2df0b1f6cc69fa54bce3cc298aa769cbd8";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz";
+      name = "node-gyp-3.3.1.tgz";
+      sha1 = "80f7b6d7c2f9c0495ba42c518a670c99bdf6e4a0";
     };
     deps = {
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
+      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
       "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "tar-1.0.3" = self.by-version."tar"."1.0.3";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
+      "path-array-1.0.1" = self.by-version."path-array"."1.0.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "tar-2.2.1" = self.by-version."tar"."2.2.1";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
     };
     optionalDependencies = {
     };
@@ -27376,32 +31241,36 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-gyp" = self.by-version."node-gyp"."1.0.3";
-  by-spec."node-gyp"."~0.10.6" =
-    self.by-version."node-gyp"."0.10.10";
-  by-version."node-gyp"."0.10.10" = self.buildNodePackage {
-    name = "node-gyp-0.10.10";
-    version = "0.10.10";
+  "node-gyp" = self.by-version."node-gyp"."3.3.1";
+  by-spec."node-gyp"."~3.3.1" =
+    self.by-version."node-gyp"."3.3.1";
+  by-spec."node-inspector"."*" =
+    self.by-version."node-inspector"."0.12.7";
+  by-version."node-inspector"."0.12.7" = self.buildNodePackage {
+    name = "node-inspector-0.12.7";
+    version = "0.12.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.10.10.tgz";
-      name = "node-gyp-0.10.10.tgz";
-      sha1 = "74290b46b72046d648d301fae3813feb0d07edd9";
+      url = "https://registry.npmjs.org/node-inspector/-/node-inspector-0.12.7.tgz";
+      name = "node-inspector-0.12.7.tgz";
+      sha1 = "99289f6a15826c01d7cd15d8f54b2fc9cef2d3c5";
     };
     deps = {
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
-      "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
-      "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "semver-2.1.0" = self.by-version."semver"."2.1.0";
-      "tar-0.1.20" = self.by-version."tar"."0.1.20";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "biased-opener-0.2.8" = self.by-version."biased-opener"."0.2.8";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "express-4.13.4" = self.by-version."express"."4.13.4";
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "rc-1.1.6" = self.by-version."rc"."1.1.6";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
+      "serve-favicon-2.3.0" = self.by-version."serve-favicon"."2.3.0";
+      "strong-data-uri-1.0.3" = self.by-version."strong-data-uri"."1.0.3";
+      "v8-debug-0.7.1" = self.by-version."v8-debug"."0.7.1";
+      "v8-profiler-5.6.0" = self.by-version."v8-profiler"."5.6.0";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "ws-0.8.1" = self.by-version."ws"."0.8.1";
+      "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
     };
     optionalDependencies = {
     };
@@ -27409,18 +31278,17 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-gyp"."~1.0.3" =
-    self.by-version."node-gyp"."1.0.3";
-  by-spec."node-icu-charset-detector"."0.0.7" =
-    self.by-version."node-icu-charset-detector"."0.0.7";
-  by-version."node-icu-charset-detector"."0.0.7" = self.buildNodePackage {
-    name = "node-icu-charset-detector-0.0.7";
-    version = "0.0.7";
+  "node-inspector" = self.by-version."node-inspector"."0.12.7";
+  by-spec."node-int64"."~0.3.0" =
+    self.by-version."node-int64"."0.3.3";
+  by-version."node-int64"."0.3.3" = self.buildNodePackage {
+    name = "node-int64-0.3.3";
+    version = "0.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-icu-charset-detector/-/node-icu-charset-detector-0.0.7.tgz";
-      name = "node-icu-charset-detector-0.0.7.tgz";
-      sha1 = "832867d4e70cc666a616339ff6637bad039c7d1f";
+      url = "https://registry.npmjs.org/node-int64/-/node-int64-0.3.3.tgz";
+      name = "node-int64-0.3.3.tgz";
+      sha1 = "2d6e6b2ece5de8588b43d88d1bc41b26cd1fa84d";
     };
     deps = {
     };
@@ -27430,32 +31298,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-inspector"."*" =
-    self.by-version."node-inspector"."0.9.2";
-  by-version."node-inspector"."0.9.2" = self.buildNodePackage {
-    name = "node-inspector-0.9.2";
-    version = "0.9.2";
-    bin = true;
+  by-spec."node-libs-browser".">= 0.4.0 <=0.6.0" =
+    self.by-version."node-libs-browser"."0.5.3";
+  by-version."node-libs-browser"."0.5.3" = self.buildNodePackage {
+    name = "node-libs-browser-0.5.3";
+    version = "0.5.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.9.2.tgz";
-      name = "node-inspector-0.9.2.tgz";
-      sha1 = "f25e2be0dbd672f7f09b50af01ef81da3157ae7c";
+      url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.5.3.tgz";
+      name = "node-libs-browser-0.5.3.tgz";
+      sha1 = "55efa888ec907acdb8cffc4e7a51712780e13b6a";
     };
     deps = {
-      "express-4.12.3" = self.by-version."express"."4.12.3";
-      "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "rc-0.5.5" = self.by-version."rc"."0.5.5";
-      "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
-      "ws-0.4.32" = self.by-version."ws"."0.4.32";
-      "biased-opener-0.2.5" = self.by-version."biased-opener"."0.2.5";
-      "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
-      "v8-debug-0.4.2" = self.by-version."v8-debug"."0.4.2";
-      "v8-profiler-5.2.4" = self.by-version."v8-profiler"."5.2.4";
-      "semver-3.0.1" = self.by-version."semver"."3.0.1";
+      "assert-1.3.0" = self.by-version."assert"."1.3.0";
+      "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
+      "buffer-3.6.0" = self.by-version."buffer"."3.6.0";
+      "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
+      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
+      "crypto-browserify-3.2.8" = self.by-version."crypto-browserify"."3.2.8";
+      "domain-browser-1.1.7" = self.by-version."domain-browser"."1.1.7";
+      "events-1.1.0" = self.by-version."events"."1.1.0";
+      "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
+      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
+      "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
+      "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
+      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
+      "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "timers-browserify-1.4.2" = self.by-version."timers-browserify"."1.4.2";
+      "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
+      "url-0.10.3" = self.by-version."url"."0.10.3";
+      "util-0.10.3" = self.by-version."util"."0.10.3";
+      "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
     };
     optionalDependencies = {
     };
@@ -27463,40 +31340,39 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-inspector" = self.by-version."node-inspector"."0.9.2";
-  by-spec."node-libs-browser"."~0.4.0" =
-    self.by-version."node-libs-browser"."0.4.3";
-  by-version."node-libs-browser"."0.4.3" = self.buildNodePackage {
-    name = "node-libs-browser-0.4.3";
-    version = "0.4.3";
+  by-spec."node-libs-browser"."^1.0.0" =
+    self.by-version."node-libs-browser"."1.0.0";
+  by-version."node-libs-browser"."1.0.0" = self.buildNodePackage {
+    name = "node-libs-browser-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-libs-browser/-/node-libs-browser-0.4.3.tgz";
-      name = "node-libs-browser-0.4.3.tgz";
-      sha1 = "4c6f784411ecc1b383c8d5fb6c2490ae5a546099";
+      url = "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-1.0.0.tgz";
+      name = "node-libs-browser-1.0.0.tgz";
+      sha1 = "ff8ad6c2cfa78043bdd0091ec07f0aaa581620fc";
     };
     deps = {
       "assert-1.3.0" = self.by-version."assert"."1.3.0";
       "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4";
-      "buffer-3.1.2" = self.by-version."buffer"."3.1.2";
+      "buffer-4.5.1" = self.by-version."buffer"."4.5.1";
       "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0";
-      "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1";
-      "crypto-browserify-3.2.8" = self.by-version."crypto-browserify"."3.2.8";
-      "domain-browser-1.1.4" = self.by-version."domain-browser"."1.1.4";
-      "events-1.0.2" = self.by-version."events"."1.0.2";
+      "constants-browserify-1.0.0" = self.by-version."constants-browserify"."1.0.0";
+      "crypto-browserify-3.11.0" = self.by-version."crypto-browserify"."3.11.0";
+      "domain-browser-1.1.7" = self.by-version."domain-browser"."1.1.7";
+      "events-1.1.0" = self.by-version."events"."1.1.0";
       "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0";
-      "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0";
-      "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2";
+      "https-browserify-0.0.1" = self.by-version."https-browserify"."0.0.1";
+      "os-browserify-0.2.1" = self.by-version."os-browserify"."0.2.1";
       "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0";
-      "process-0.10.1" = self.by-version."process"."0.10.1";
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
+      "process-0.11.2" = self.by-version."process"."0.11.2";
+      "punycode-1.4.1" = self.by-version."punycode"."1.4.1";
       "querystring-es3-0.2.1" = self.by-version."querystring-es3"."0.2.1";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "stream-browserify-1.0.0" = self.by-version."stream-browserify"."1.0.0";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "stream-browserify-2.0.1" = self.by-version."stream-browserify"."2.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "timers-browserify-1.4.0" = self.by-version."timers-browserify"."1.4.0";
+      "timers-browserify-1.4.2" = self.by-version."timers-browserify"."1.4.2";
       "tty-browserify-0.0.0" = self.by-version."tty-browserify"."0.0.0";
-      "url-0.10.3" = self.by-version."url"."0.10.3";
+      "url-0.11.0" = self.by-version."url"."0.11.0";
       "util-0.10.3" = self.by-version."util"."0.10.3";
       "vm-browserify-0.0.4" = self.by-version."vm-browserify"."0.0.4";
     };
@@ -27513,7 +31389,7 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-options/-/node-options-0.0.6.tgz";
+      url = "https://registry.npmjs.org/node-options/-/node-options-0.0.6.tgz";
       name = "node-options-0.0.6.tgz";
       sha1 = "98721bd14fc4969a619e4d87666449f1f92477ed";
     };
@@ -27525,27 +31401,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-pre-gyp"."0.5.x" =
-    self.by-version."node-pre-gyp"."0.5.31";
-  by-version."node-pre-gyp"."0.5.31" = self.buildNodePackage {
-    name = "node-pre-gyp-0.5.31";
-    version = "0.5.31";
+  by-spec."node-pre-gyp"."0.6.x" =
+    self.by-version."node-pre-gyp"."0.6.25";
+  by-version."node-pre-gyp"."0.6.25" = self.buildNodePackage {
+    name = "node-pre-gyp-0.6.25";
+    version = "0.6.25";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz";
-      name = "node-pre-gyp-0.5.31.tgz";
-      sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.25.tgz";
+      name = "node-pre-gyp-0.6.25.tgz";
+      sha1 = "2c6818775e6f1df5e353ba8024f1c0118726545b";
     };
     deps = {
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "semver-4.1.1" = self.by-version."semver"."4.1.1";
-      "tar-1.0.3" = self.by-version."tar"."1.0.3";
-      "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rc-0.5.5" = self.by-version."rc"."0.5.5";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "tar-2.2.1" = self.by-version."tar"."2.2.1";
+      "tar-pack-3.1.3" = self.by-version."tar-pack"."3.1.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "rc-1.1.6" = self.by-version."rc"."1.1.6";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -27553,27 +31429,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-pre-gyp"."^0.6.4" =
-    self.by-version."node-pre-gyp"."0.6.4";
-  by-version."node-pre-gyp"."0.6.4" = self.buildNodePackage {
-    name = "node-pre-gyp-0.6.4";
-    version = "0.6.4";
+  by-spec."node-pre-gyp"."^0.6.25" =
+    self.by-version."node-pre-gyp"."0.6.25";
+  by-spec."node-pre-gyp"."^0.6.5" =
+    self.by-version."node-pre-gyp"."0.6.25";
+  by-spec."node-pre-gyp-github"."^1.1.0" =
+    self.by-version."node-pre-gyp-github"."1.1.2";
+  by-version."node-pre-gyp-github"."1.1.2" = self.buildNodePackage {
+    name = "node-pre-gyp-github-1.1.2";
+    version = "1.1.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.4.tgz";
-      name = "node-pre-gyp-0.6.4.tgz";
-      sha1 = "86a32ba4073b2735087f7eacb47979af6c70ce08";
+      url = "https://registry.npmjs.org/node-pre-gyp-github/-/node-pre-gyp-github-1.1.2.tgz";
+      name = "node-pre-gyp-github-1.1.2.tgz";
+      sha1 = "01454ef4079a44907596920c6051228124ff9042";
     };
     deps = {
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "npmlog-1.1.0" = self.by-version."npmlog"."1.1.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "tar-1.0.3" = self.by-version."tar"."1.0.3";
-      "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "rc-0.6.0" = self.by-version."rc"."0.6.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "github-0.2.4" = self.by-version."github"."0.2.4";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -27581,22 +31456,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-pre-gyp"."https://github.com/mongodb-js/node-pre-gyp/archive/v0.6.5-appveyor.tar.gz" =
-    self.by-version."node-pre-gyp"."0.6.4";
   by-spec."node-protobuf"."*" =
-    self.by-version."node-protobuf"."1.2.3";
-  by-version."node-protobuf"."1.2.3" = self.buildNodePackage {
-    name = "node-protobuf-1.2.3";
-    version = "1.2.3";
+    self.by-version."node-protobuf"."1.2.13";
+  by-version."node-protobuf"."1.2.13" = self.buildNodePackage {
+    name = "node-protobuf-1.2.13";
+    version = "1.2.13";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.3.tgz";
-      name = "node-protobuf-1.2.3.tgz";
-      sha1 = "a38cf84db610822aff0803db45a400de6ec80835";
+      url = "https://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.13.tgz";
+      name = "node-protobuf-1.2.13.tgz";
+      sha1 = "744601255c78384fbb1f2523bb3239e91df4f620";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -27604,76 +31477,76 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-protobuf" = self.by-version."node-protobuf"."1.2.3";
+  "node-protobuf" = self.by-version."node-protobuf"."1.2.13";
   by-spec."node-red"."*" =
-    self.by-version."node-red"."0.10.6";
-  by-version."node-red"."0.10.6" = self.buildNodePackage {
-    name = "node-red-0.10.6";
-    version = "0.10.6";
+    self.by-version."node-red"."0.13.4";
+  by-version."node-red"."0.13.4" = self.buildNodePackage {
+    name = "node-red-0.13.4";
+    version = "0.13.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-red/-/node-red-0.10.6.tgz";
-      name = "node-red-0.10.6.tgz";
-      sha1 = "42a8a8e609bedf1c2972c50bf7deeda3d89bed3c";
+      url = "https://registry.npmjs.org/node-red/-/node-red-0.13.4.tgz";
+      name = "node-red-0.13.4.tgz";
+      sha1 = "128a7e52129132d8fc5f0f7dc0ddd22b3de14bf1";
     };
     deps = {
-      "express-3.17.2" = self.by-version."express"."3.17.2";
-      "when-3.7.2" = self.by-version."when"."3.7.2";
-      "bcryptjs-2.1.0" = self.by-version."bcryptjs"."2.1.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "mqtt-0.3.13" = self.by-version."mqtt"."0.3.13";
-      "ws-0.7.1" = self.by-version."ws"."0.7.1";
-      "fs-extra-0.16.3" = self.by-version."fs-extra"."0.16.3";
-      "clone-0.2.0" = self.by-version."clone"."0.2.0";
-      "mustache-1.0.0" = self.by-version."mustache"."1.0.0";
-      "cron-1.0.6" = self.by-version."cron"."1.0.6";
-      "raw-body-1.3.2" = self.by-version."raw-body"."1.3.2";
-      "twitter-ng-0.6.2" = self.by-version."twitter-ng"."0.6.2";
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
-      "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
-      "sentiment-0.2.3" = self.by-version."sentiment"."0.2.3";
-      "irc-0.3.9" = self.by-version."irc"."0.3.9";
-      "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
-      "cors-2.5.3" = self.by-version."cors"."2.5.3";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "cheerio-0.18.0" = self.by-version."cheerio"."0.18.0";
-      "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16";
-      "nodemailer-1.3.0" = self.by-version."nodemailer"."1.3.0";
-      "imap-0.8.14" = self.by-version."imap"."0.8.14";
-      "request-2.42.0" = self.by-version."request"."2.42.0";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
-      "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0";
-      "serialport-1.4.10" = self.by-version."serialport"."1.4.10";
-      "feedparser-0.19.2" = self.by-version."feedparser"."0.19.2";
+      "basic-auth-1.0.3" = self.by-version."basic-auth"."1.0.3";
+      "bcryptjs-2.3.0" = self.by-version."bcryptjs"."2.3.0";
+      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
+      "cheerio-0.19.0" = self.by-version."cheerio"."0.19.0";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "cors-2.7.1" = self.by-version."cors"."2.7.1";
+      "cron-1.1.0" = self.by-version."cron"."1.1.0";
+      "express-4.13.4" = self.by-version."express"."4.13.4";
+      "follow-redirects-0.0.7" = self.by-version."follow-redirects"."0.0.7";
+      "fs-extra-0.26.7" = self.by-version."fs-extra"."0.26.7";
       "fs.notify-0.0.4" = self.by-version."fs.notify"."0.0.4";
-      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "i18next-1.10.6" = self.by-version."i18next"."1.10.6";
+      "is-utf8-0.2.1" = self.by-version."is-utf8"."0.2.1";
+      "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
+      "mqtt-1.7.4" = self.by-version."mqtt"."1.7.4";
+      "mustache-2.2.1" = self.by-version."mustache"."2.2.1";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "oauth2orize-1.2.2" = self.by-version."oauth2orize"."1.2.2";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
+      "passport-0.3.2" = self.by-version."passport"."0.3.2";
       "passport-http-bearer-1.0.1" = self.by-version."passport-http-bearer"."1.0.1";
       "passport-oauth2-client-password-0.1.2" = self.by-version."passport-oauth2-client-password"."0.1.2";
-      "oauth2orize-1.0.1" = self.by-version."oauth2orize"."1.0.1";
+      "raw-body-2.1.6" = self.by-version."raw-body"."2.1.6";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "sentiment-1.0.6" = self.by-version."sentiment"."1.0.6";
+      "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
+      "when-3.7.7" = self.by-version."when"."3.7.7";
+      "ws-0.8.1" = self.by-version."ws"."0.8.1";
+      "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
+      "node-red-node-feedparser-0.1.5" = self.by-version."node-red-node-feedparser"."0.1.5";
+      "node-red-node-email-0.1.3" = self.by-version."node-red-node-email"."0.1.3";
+      "node-red-node-twitter-0.1.6" = self.by-version."node-red-node-twitter"."0.1.6";
+      "node-red-node-rbe-0.1.5" = self.by-version."node-red-node-rbe"."0.1.5";
     };
     optionalDependencies = {
-      "bcrypt-0.8.1" = self.by-version."bcrypt"."0.8.1";
+      "node-red-node-serialport-0.1.2" = self.by-version."node-red-node-serialport"."0.1.2";
+      "bcrypt-0.8.5" = self.by-version."bcrypt"."0.8.5";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "node-red" = self.by-version."node-red"."0.10.6";
-  by-spec."node-stringprep"."*" =
-    self.by-version."node-stringprep"."0.7.0";
-  by-version."node-stringprep"."0.7.0" = self.buildNodePackage {
-    name = "node-stringprep-0.7.0";
-    version = "0.7.0";
+  "node-red" = self.by-version."node-red"."0.13.4";
+  by-spec."node-red-node-email"."0.1.*" =
+    self.by-version."node-red-node-email"."0.1.3";
+  by-version."node-red-node-email"."0.1.3" = self.buildNodePackage {
+    name = "node-red-node-email-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.7.0.tgz";
-      name = "node-stringprep-0.7.0.tgz";
-      sha1 = "c8a8deac9217db97ef3eb20dfa817d7e716f56b5";
+      url = "https://registry.npmjs.org/node-red-node-email/-/node-red-node-email-0.1.3.tgz";
+      name = "node-red-node-email-0.1.3.tgz";
+      sha1 = "4beade1fa54903e34be18766cceb525d76b27fe7";
     };
     deps = {
-      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nodemailer-1.3.4" = self.by-version."nodemailer"."1.3.4";
+      "imap-0.8.16" = self.by-version."imap"."0.8.16";
     };
     optionalDependencies = {
     };
@@ -27681,22 +31554,102 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-stringprep" = self.by-version."node-stringprep"."0.7.0";
-  by-spec."node-stringprep"."^0.5.2" =
-    self.by-version."node-stringprep"."0.5.4";
-  by-version."node-stringprep"."0.5.4" = self.buildNodePackage {
-    name = "node-stringprep-0.5.4";
-    version = "0.5.4";
+  by-spec."node-red-node-feedparser"."0.1.*" =
+    self.by-version."node-red-node-feedparser"."0.1.5";
+  by-version."node-red-node-feedparser"."0.1.5" = self.buildNodePackage {
+    name = "node-red-node-feedparser-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-stringprep/-/node-stringprep-0.5.4.tgz";
-      name = "node-stringprep-0.5.4.tgz";
-      sha1 = "dd03b3d8f6f83137754cc1ea1a55675447b0ab92";
+      url = "https://registry.npmjs.org/node-red-node-feedparser/-/node-red-node-feedparser-0.1.5.tgz";
+      name = "node-red-node-feedparser-0.1.5.tgz";
+      sha1 = "88f2b68b3c00d2cd95498436baf9ed13b552b8d0";
     };
     deps = {
-      "nan-1.2.0" = self.by-version."nan"."1.2.0";
-      "bindings-1.1.1" = self.by-version."bindings"."1.1.1";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
+      "feedparser-1.1.3" = self.by-version."feedparser"."1.1.3";
+      "request-2.65.0" = self.by-version."request"."2.65.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-red-node-rbe"."0.1.*" =
+    self.by-version."node-red-node-rbe"."0.1.5";
+  by-version."node-red-node-rbe"."0.1.5" = self.buildNodePackage {
+    name = "node-red-node-rbe-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-red-node-rbe/-/node-red-node-rbe-0.1.5.tgz";
+      name = "node-red-node-rbe-0.1.5.tgz";
+      sha1 = "9df9b13b8828c9396319a54ad7c0fbb1a4005e9d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-red-node-serialport"."0.1.*" =
+    self.by-version."node-red-node-serialport"."0.1.2";
+  by-version."node-red-node-serialport"."0.1.2" = self.buildNodePackage {
+    name = "node-red-node-serialport-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-red-node-serialport/-/node-red-node-serialport-0.1.2.tgz";
+      name = "node-red-node-serialport-0.1.2.tgz";
+      sha1 = "50ee3de46ef9b709fd110b22d9f7283955fa4b9b";
+    };
+    deps = {
+      "serialport-2.0.6" = self.by-version."serialport"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-red-node-twitter"."0.1.*" =
+    self.by-version."node-red-node-twitter"."0.1.6";
+  by-version."node-red-node-twitter"."0.1.6" = self.buildNodePackage {
+    name = "node-red-node-twitter-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-red-node-twitter/-/node-red-node-twitter-0.1.6.tgz";
+      name = "node-red-node-twitter-0.1.6.tgz";
+      sha1 = "ee1c65767db0325f316987bf155543864995e618";
+    };
+    deps = {
+      "twitter-ng-0.6.2" = self.by-version."twitter-ng"."0.6.2";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
+      "request-2.67.0" = self.by-version."request"."2.67.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-redis-scripty"."0.0.5" =
+    self.by-version."node-redis-scripty"."0.0.5";
+  by-version."node-redis-scripty"."0.0.5" = self.buildNodePackage {
+    name = "node-redis-scripty-0.0.5";
+    version = "0.0.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-redis-scripty/-/node-redis-scripty-0.0.5.tgz";
+      name = "node-redis-scripty-0.0.5.tgz";
+      sha1 = "4bf2d365ab6dab202cc08b7ac63f8f55aadc9625";
+    };
+    deps = {
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "extend-1.3.0" = self.by-version."extend"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -27704,12 +31657,54 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."node-redis-warlock"."^0.1.2" =
+    self.by-version."node-redis-warlock"."0.1.4";
+  by-version."node-redis-warlock"."0.1.4" = self.buildNodePackage {
+    name = "node-redis-warlock-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-redis-warlock/-/node-redis-warlock-0.1.4.tgz";
+      name = "node-redis-warlock-0.1.4.tgz";
+      sha1 = "a9050d0d257ff3498b6e51a097f15ed5e297479e";
+    };
+    deps = {
+      "node-redis-scripty-0.0.5" = self.by-version."node-redis-scripty"."0.0.5";
+      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-stringprep"."*" =
+    self.by-version."node-stringprep"."0.7.3";
+  by-version."node-stringprep"."0.7.3" = self.buildNodePackage {
+    name = "node-stringprep-0.7.3";
+    version = "0.7.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-stringprep/-/node-stringprep-0.7.3.tgz";
+      name = "node-stringprep-0.7.3.tgz";
+      sha1 = "78b93d29660b6eddec501f2b2fa3f5e2e09dc6fd";
+    };
+    deps = {
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "nan-1.8.4" = self.by-version."nan"."1.8.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "node-stringprep" = self.by-version."node-stringprep"."0.7.3";
   by-spec."node-stringprep"."^0.7.0" =
-    self.by-version."node-stringprep"."0.7.0";
+    self.by-version."node-stringprep"."0.7.3";
   by-spec."node-stringprep"."~0.7.0" =
-    self.by-version."node-stringprep"."0.7.0";
-  by-spec."node-stringprep"."~0.x" =
-    self.by-version."node-stringprep"."0.7.0";
+    self.by-version."node-stringprep"."0.7.3";
   by-spec."node-swt".">=0.1.1" =
     self.by-version."node-swt"."0.1.1";
   by-version."node-swt"."0.1.1" = self.buildNodePackage {
@@ -27717,7 +31712,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
+      url = "https://registry.npmjs.org/node-swt/-/node-swt-0.1.1.tgz";
       name = "node-swt-0.1.1.tgz";
       sha1 = "af0903825784be553b93dbae57d99d59060585dd";
     };
@@ -27729,23 +31724,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-syslog"."schamane/node-syslog#30d44555" =
-    self.by-version."node-syslog"."1.1.7";
-  by-version."node-syslog"."1.1.7" = self.buildNodePackage {
-    name = "node-syslog-1.1.7";
-    version = "1.1.7";
+  by-spec."node-txstatsd"."~0.1.5" =
+    self.by-version."node-txstatsd"."0.1.6";
+  by-version."node-txstatsd"."0.1.6" = self.buildNodePackage {
+    name = "node-txstatsd-0.1.6";
+    version = "0.1.6";
     bin = false;
-    src = fetchgit {
-      url = "git://github.com/schamane/node-syslog.git";
-      rev = "30d445559617d439714418cdc1e847efbb49c5a0";
-      sha256 = "d24a821603d8a4745839f5d90dc6bf63b5e286acf29a149ba3e412c5755a88ca";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-txstatsd/-/node-txstatsd-0.1.6.tgz";
+      name = "node-txstatsd-0.1.6.tgz";
+      sha1 = "924d22e5348c40156c2eb5ac29a5bb5609ca2a04";
     };
     deps = {
     };
     optionalDependencies = {
     };
     peerDependencies = [];
-    os = [ "!win32" ];
+    os = [ ];
     cpu = [ ];
   };
   by-spec."node-uptime"."https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" =
@@ -27783,15 +31778,15 @@
   };
   "node-uptime" = self.by-version."node-uptime"."3.2.0";
   by-spec."node-uuid"."*" =
-    self.by-version."node-uuid"."1.4.3";
-  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
-    name = "node-uuid-1.4.3";
-    version = "1.4.3";
+    self.by-version."node-uuid"."1.4.7";
+  by-version."node-uuid"."1.4.7" = self.buildNodePackage {
+    name = "node-uuid-1.4.7";
+    version = "1.4.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
-      name = "node-uuid-1.4.3.tgz";
-      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+      url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+      name = "node-uuid-1.4.7.tgz";
+      sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
     };
     deps = {
     };
@@ -27801,7 +31796,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-uuid" = self.by-version."node-uuid"."1.4.3";
+  "node-uuid" = self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."1.3.3" =
     self.by-version."node-uuid"."1.3.3";
   by-version."node-uuid"."1.3.3" = self.buildNodePackage {
@@ -27809,7 +31804,7 @@
     version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
+      url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.3.3.tgz";
       name = "node-uuid-1.3.3.tgz";
       sha1 = "d3db4d7b56810d9e4032342766282af07391729b";
     };
@@ -27828,7 +31823,7 @@
     version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
+      url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz";
       name = "node-uuid-1.4.1.tgz";
       sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048";
     };
@@ -27840,18 +31835,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-uuid"."^1.3.3" =
+  by-spec."node-uuid"."1.4.3" =
     self.by-version."node-uuid"."1.4.3";
+  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
+    name = "node-uuid-1.4.3";
+    version = "1.4.3";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
+      name = "node-uuid-1.4.3.tgz";
+      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."node-uuid"."^1.3.3" =
+    self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."^1.4.1" =
-    self.by-version."node-uuid"."1.4.3";
+    self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."~1.4.0" =
-    self.by-version."node-uuid"."1.4.3";
+    self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."~1.4.1" =
-    self.by-version."node-uuid"."1.4.3";
-  by-spec."node-uuid"."~1.4.2" =
-    self.by-version."node-uuid"."1.4.3";
+    self.by-version."node-uuid"."1.4.7";
   by-spec."node-uuid"."~1.4.3" =
-    self.by-version."node-uuid"."1.4.3";
+    self.by-version."node-uuid"."1.4.7";
+  by-spec."node-uuid"."~1.4.7" =
+    self.by-version."node-uuid"."1.4.7";
   by-spec."node-wsfederation".">=0.1.1" =
     self.by-version."node-wsfederation"."0.1.1";
   by-version."node-wsfederation"."0.1.1" = self.buildNodePackage {
@@ -27859,12 +31873,12 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
+      url = "https://registry.npmjs.org/node-wsfederation/-/node-wsfederation-0.1.1.tgz";
       name = "node-wsfederation-0.1.1.tgz";
       sha1 = "9abf1dd3b20a3ab0a38f899c882c218d734e8a7b";
     };
     deps = {
-      "xml2js-0.4.8" = self.by-version."xml2js"."0.4.8";
+      "xml2js-0.4.16" = self.by-version."xml2js"."0.4.16";
     };
     optionalDependencies = {
     };
@@ -27872,29 +31886,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp"."*" =
-    self.by-version."node-xmpp"."1.0.0-alpha2";
-  by-version."node-xmpp"."1.0.0-alpha2" = self.buildNodePackage {
-    name = "node-xmpp-1.0.0-alpha2";
-    version = "1.0.0-alpha2";
+  by-spec."node-xmpp-client"."*" =
+    self.by-version."node-xmpp-client"."3.0.0";
+  by-version."node-xmpp-client"."3.0.0" = self.buildNodePackage {
+    name = "node-xmpp-client-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp/-/node-xmpp-1.0.0-alpha2.tgz";
-      name = "node-xmpp-1.0.0-alpha2.tgz";
-      sha1 = "349041a9041d3bcc608cdbf57e60f5b301e7a8c0";
+      url = "https://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-3.0.0.tgz";
+      name = "node-xmpp-client-3.0.0.tgz";
+      sha1 = "52cc5d3bf7d1fc86d2776a582f7c7bcae802613a";
     };
     deps = {
-      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
-      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4";
-      "browserify-3.19.1" = self.by-version."browserify"."3.19.1";
-      "brfs-0.0.8" = self.by-version."brfs"."0.0.8";
-      "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1";
-      "node-xmpp-client-1.0.0-alpha20" = self.by-version."node-xmpp-client"."1.0.0-alpha20";
-      "node-xmpp-server-1.0.0-alpha12" = self.by-version."node-xmpp-server"."1.0.0-alpha12";
-      "node-xmpp-core-1.0.0-alpha14" = self.by-version."node-xmpp-core"."1.0.0-alpha14";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
+      "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "node-xmpp-core-4.2.0" = self.by-version."node-xmpp-core"."4.2.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -27902,27 +31912,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp" = self.by-version."node-xmpp"."1.0.0-alpha2";
-  by-spec."node-xmpp"."~1.0.0-alpha2" =
-    self.by-version."node-xmpp"."1.0.0-alpha2";
-  by-spec."node-xmpp-client"."*" =
-    self.by-version."node-xmpp-client"."1.0.0-alpha9";
-  by-version."node-xmpp-client"."1.0.0-alpha9" = self.buildNodePackage {
-    name = "node-xmpp-client-1.0.0-alpha9";
-    version = "1.0.0-alpha9";
+  "node-xmpp-client" = self.by-version."node-xmpp-client"."3.0.0";
+  by-spec."node-xmpp-component"."*" =
+    self.by-version."node-xmpp-component"."2.0.1";
+  by-version."node-xmpp-component"."2.0.1" = self.buildNodePackage {
+    name = "node-xmpp-component-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-client/-/node-xmpp-client-1.0.0-alpha9.tgz";
-      name = "node-xmpp-client-1.0.0-alpha9.tgz";
-      sha1 = "5e48ce59f9ea96ff7f80dc4fff2be252ace26f24";
+      url = "https://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-2.0.1.tgz";
+      name = "node-xmpp-component-2.0.1.tgz";
+      sha1 = "987f4928cbadb4542a0fbdd3c7c529778a89ef1c";
     };
     deps = {
-      "request-2.27.0" = self.by-version."request"."2.27.0";
-      "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3";
-      "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
-      "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "node-xmpp-core-5.0.1" = self.by-version."node-xmpp-core"."5.0.1";
     };
     optionalDependencies = {
     };
@@ -27930,25 +31933,27 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9";
-  by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" =
-    self.by-version."node-xmpp-client"."1.0.0-alpha20";
-  by-version."node-xmpp-client"."1.0.0-alpha20" = self.buildNodePackage {
-    name = "node-xmpp-client-1.0.0-alpha20";
-    version = "1.0.0-alpha20";
+  "node-xmpp-component" = self.by-version."node-xmpp-component"."2.0.1";
+  by-spec."node-xmpp-core"."*" =
+    self.by-version."node-xmpp-core"."5.0.1";
+  by-version."node-xmpp-core"."5.0.1" = self.buildNodePackage {
+    name = "node-xmpp-core-5.0.1";
+    version = "5.0.1";
     bin = false;
-    src = fetchgit {
-      url = "https://github.com/node-xmpp/node-xmpp-client.git";
-      rev = "15685d8ad8ae9767281c74939cbec1500d9b0745";
-      sha256 = "1e0cba0ec6b58a73533d723e9f5100676229d27c3fcb0799cc64bf79f97c687f";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-5.0.1.tgz";
+      name = "node-xmpp-core-5.0.1.tgz";
+      sha1 = "74098106652e17e2a2847ba82225e6504c595135";
     };
     deps = {
-      "request-2.48.0" = self.by-version."request"."2.48.0";
-      "faye-websocket-0.7.3" = self.by-version."faye-websocket"."0.7.3";
-      "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
-      "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
-      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "lodash.assign-3.2.0" = self.by-version."lodash.assign"."3.2.0";
+      "ltx-2.3.0" = self.by-version."ltx"."2.3.0";
+      "node-xmpp-jid-2.3.0" = self.by-version."node-xmpp-jid"."2.3.0";
+      "node-xmpp-stanza-1.1.0" = self.by-version."node-xmpp-stanza"."1.1.0";
+      "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
+      "node-xmpp-tls-connect-1.0.1" = self.by-version."node-xmpp-tls-connect"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -27956,20 +31961,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp-component"."*" =
-    self.by-version."node-xmpp-component"."1.0.0-alpha1";
-  by-version."node-xmpp-component"."1.0.0-alpha1" = self.buildNodePackage {
-    name = "node-xmpp-component-1.0.0-alpha1";
-    version = "1.0.0-alpha1";
+  "node-xmpp-core" = self.by-version."node-xmpp-core"."5.0.1";
+  by-spec."node-xmpp-core"."^4.1.0" =
+    self.by-version."node-xmpp-core"."4.2.0";
+  by-version."node-xmpp-core"."4.2.0" = self.buildNodePackage {
+    name = "node-xmpp-core-4.2.0";
+    version = "4.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-component/-/node-xmpp-component-1.0.0-alpha1.tgz";
-      name = "node-xmpp-component-1.0.0-alpha1.tgz";
-      sha1 = "3f85da00c05240bd48cc6c729d74875e6eb97877";
+      url = "https://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-4.2.0.tgz";
+      name = "node-xmpp-core-4.2.0.tgz";
+      sha1 = "7e2e040c1e5aa64be35013bdc34132ec376995ae";
     };
     deps = {
-      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "lodash.assign-3.2.0" = self.by-version."lodash.assign"."3.2.0";
+      "ltx-2.3.0" = self.by-version."ltx"."2.3.0";
+      "node-xmpp-jid-2.3.0" = self.by-version."node-xmpp-jid"."2.3.0";
+      "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
+      "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
     };
     optionalDependencies = {
     };
@@ -27977,26 +31988,27 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-component" = self.by-version."node-xmpp-component"."1.0.0-alpha1";
-  by-spec."node-xmpp-component"."git+https://github.com/node-xmpp/node-xmpp-component.git" =
-    self.by-version."node-xmpp-component"."1.0.0-alpha1";
-  by-spec."node-xmpp-core"."*" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-version."node-xmpp-core"."1.0.0-alpha9" = self.buildNodePackage {
-    name = "node-xmpp-core-1.0.0-alpha9";
-    version = "1.0.0-alpha9";
+  by-spec."node-xmpp-core"."^4.2.0" =
+    self.by-version."node-xmpp-core"."4.2.0";
+  by-spec."node-xmpp-core"."^5.0.1" =
+    self.by-version."node-xmpp-core"."5.0.1";
+  by-spec."node-xmpp-core"."~1.0.0-alpha14" =
+    self.by-version."node-xmpp-core"."1.0.0";
+  by-version."node-xmpp-core"."1.0.0" = self.buildNodePackage {
+    name = "node-xmpp-core-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha9.tgz";
-      name = "node-xmpp-core-1.0.0-alpha9.tgz";
-      sha1 = "64b2b41e9f59fc910c71fe648c6be2bc4ecef7f1";
+      url = "https://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0.tgz";
+      name = "node-xmpp-core-1.0.0.tgz";
+      sha1 = "6c96e7f5ce044fcc93ffb2cc45cb100e09af149f";
     };
     deps = {
-      "node-stringprep-0.5.4" = self.by-version."node-stringprep"."0.5.4";
+      "node-stringprep-0.7.3" = self.by-version."node-stringprep"."0.7.3";
       "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
       "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
-      "ltx-0.5.2" = self.by-version."ltx"."0.5.2";
-      "debug-0.8.1" = self.by-version."debug"."0.8.1";
+      "ltx-0.9.1" = self.by-version."ltx"."0.9.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -28004,24 +32016,18 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-core" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-spec."node-xmpp-core"."1.0.0-alpha1" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha1";
-  by-version."node-xmpp-core"."1.0.0-alpha1" = self.buildNodePackage {
-    name = "node-xmpp-core-1.0.0-alpha1";
-    version = "1.0.0-alpha1";
+  by-spec."node-xmpp-jid"."^2.0.0" =
+    self.by-version."node-xmpp-jid"."2.3.0";
+  by-version."node-xmpp-jid"."2.3.0" = self.buildNodePackage {
+    name = "node-xmpp-jid-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-core/-/node-xmpp-core-1.0.0-alpha1.tgz";
-      name = "node-xmpp-core-1.0.0-alpha1.tgz";
-      sha1 = "94b1b33a0ccb84427d8b290af80e29b8dec5545f";
+      url = "https://registry.npmjs.org/node-xmpp-jid/-/node-xmpp-jid-2.3.0.tgz";
+      name = "node-xmpp-jid-2.3.0.tgz";
+      sha1 = "60a3c950582a0cdcfda074494357a85178f38878";
     };
     deps = {
-      "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
-      "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
-      "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
-      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "debug-0.8.1" = self.by-version."debug"."0.8.1";
     };
     optionalDependencies = {
     };
@@ -28029,31 +32035,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp-core"."^1.0.0-alpha13" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-spec."node-xmpp-core"."^1.0.0-alpha14" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-spec."node-xmpp-core"."^1.0.0-alpha6" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-spec."node-xmpp-core"."^1.0.0-alpha9" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-spec."node-xmpp-core"."git+https://github.com/node-xmpp/node-xmpp-core.git" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha14";
-  by-version."node-xmpp-core"."1.0.0-alpha14" = self.buildNodePackage {
-    name = "node-xmpp-core-1.0.0-alpha14";
-    version = "1.0.0-alpha14";
+  by-spec."node-xmpp-joap"."*" =
+    self.by-version."node-xmpp-joap"."0.0.19";
+  by-version."node-xmpp-joap"."0.0.19" = self.buildNodePackage {
+    name = "node-xmpp-joap-0.0.19";
+    version = "0.0.19";
     bin = false;
-    src = fetchgit {
-      url = "https://github.com/node-xmpp/node-xmpp-core.git";
-      rev = "e4bb484de051e76383608b41e45ea54af9c8f053";
-      sha256 = "51ff9b4accbd617357a394726dd8d7afbdd9d2dbeebe155ecfc0ae54c3bec662";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.19.tgz";
+      name = "node-xmpp-joap-0.0.19.tgz";
+      sha1 = "d026cef86639f9db67e0d7451f38bb2337ed1511";
     };
     deps = {
-      "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
-      "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1";
-      "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2";
-      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "ltx-0.9.1" = self.by-version."ltx"."0.9.1";
+      "node-expat-2.3.13" = self.by-version."node-expat"."2.3.13";
+      "node-stringprep-0.7.3" = self.by-version."node-stringprep"."0.7.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "node-xmpp-core-1.0.0" = self.by-version."node-xmpp-core"."1.0.0";
+      "toobusy-js-0.4.3" = self.by-version."toobusy-js"."0.4.3";
     };
     optionalDependencies = {
     };
@@ -28061,29 +32061,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp-core"."~1.0.0-alpha10" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-spec."node-xmpp-core"."~1.0.0-alpha14" =
-    self.by-version."node-xmpp-core"."1.0.0-alpha9";
-  by-spec."node-xmpp-joap"."*" =
-    self.by-version."node-xmpp-joap"."0.0.18";
-  by-version."node-xmpp-joap"."0.0.18" = self.buildNodePackage {
-    name = "node-xmpp-joap-0.0.18";
-    version = "0.0.18";
+  "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.19";
+  by-spec."node-xmpp-server"."*" =
+    self.by-version."node-xmpp-server"."2.1.2";
+  by-version."node-xmpp-server"."2.1.2" = self.buildNodePackage {
+    name = "node-xmpp-server-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-joap/-/node-xmpp-joap-0.0.18.tgz";
-      name = "node-xmpp-joap-0.0.18.tgz";
-      sha1 = "208c86f23789f1409e3888ad40bf7f61138a2db9";
+      url = "https://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-2.1.2.tgz";
+      name = "node-xmpp-server-2.1.2.tgz";
+      sha1 = "57ebff142811540070be50048db17d5179a243e5";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
-      "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "node-xmpp-1.0.0-alpha2" = self.by-version."node-xmpp"."1.0.0-alpha2";
-      "toobusy-js-0.4.1" = self.by-version."toobusy-js"."0.4.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "es6-collections-0.5.6" = self.by-version."es6-collections"."0.5.6";
+      "hat-0.0.3" = self.by-version."hat"."0.0.3";
+      "node-xmpp-core-4.2.0" = self.by-version."node-xmpp-core"."4.2.0";
+      "ws-0.8.1" = self.by-version."ws"."0.8.1";
     };
     optionalDependencies = {
     };
@@ -28091,22 +32086,24 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-joap" = self.by-version."node-xmpp-joap"."0.0.18";
-  by-spec."node-xmpp-server"."*" =
-    self.by-version."node-xmpp-server"."1.0.0-alpha9";
-  by-version."node-xmpp-server"."1.0.0-alpha9" = self.buildNodePackage {
-    name = "node-xmpp-server-1.0.0-alpha9";
-    version = "1.0.0-alpha9";
+  "node-xmpp-server" = self.by-version."node-xmpp-server"."2.1.2";
+  by-spec."node-xmpp-serviceadmin"."*" =
+    self.by-version."node-xmpp-serviceadmin"."0.2.0";
+  by-version."node-xmpp-serviceadmin"."0.2.0" = self.buildNodePackage {
+    name = "node-xmpp-serviceadmin-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-server/-/node-xmpp-server-1.0.0-alpha9.tgz";
-      name = "node-xmpp-server-1.0.0-alpha9.tgz";
-      sha1 = "1622aafddf9efde4dd9483c849d56b80e582a745";
+      url = "https://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.2.0.tgz";
+      name = "node-xmpp-serviceadmin-0.2.0.tgz";
+      sha1 = "35f8b07cf6d96c27fe292f1b0cb9ac73f69e6315";
     };
     deps = {
-      "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "node-xmpp-core-1.0.0" = self.by-version."node-xmpp-core"."1.0.0";
+      "node-stringprep-0.7.3" = self.by-version."node-stringprep"."0.7.3";
+      "ltx-0.9.1" = self.by-version."ltx"."0.9.1";
+      "node-expat-2.3.13" = self.by-version."node-expat"."2.3.13";
+      "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
     };
     optionalDependencies = {
     };
@@ -28114,23 +32111,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-server" = self.by-version."node-xmpp-server"."1.0.0-alpha9";
-  by-spec."node-xmpp-server"."git+https://github.com/node-xmpp/node-xmpp-server.git" =
-    self.by-version."node-xmpp-server"."1.0.0-alpha12";
-  by-version."node-xmpp-server"."1.0.0-alpha12" = self.buildNodePackage {
-    name = "node-xmpp-server-1.0.0-alpha12";
-    version = "1.0.0-alpha12";
+  "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.2.0";
+  by-spec."node-xmpp-stanza"."^1.1.0" =
+    self.by-version."node-xmpp-stanza"."1.1.0";
+  by-version."node-xmpp-stanza"."1.1.0" = self.buildNodePackage {
+    name = "node-xmpp-stanza-1.1.0";
+    version = "1.1.0";
     bin = false;
-    src = fetchgit {
-      url = "https://github.com/node-xmpp/node-xmpp-server.git";
-      rev = "db748d1e8c2510a6a834b9ebf179175c33c3dfba";
-      sha256 = "d0f3e91a045e3afda26ab3a276e95b15e29c099cb48f468a30185cfee3d96ce0";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/node-xmpp-stanza/-/node-xmpp-stanza-1.1.0.tgz";
+      name = "node-xmpp-stanza-1.1.0.tgz";
+      sha1 = "26bb749065fe00787004f8c3b7c0b28494d46554";
     };
     deps = {
-      "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "ws-0.7.1" = self.by-version."ws"."0.7.1";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "ltx-2.3.0" = self.by-version."ltx"."2.3.0";
     };
     optionalDependencies = {
     };
@@ -28138,23 +32133,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-xmpp-serviceadmin"."*" =
-    self.by-version."node-xmpp-serviceadmin"."0.2.0";
-  by-version."node-xmpp-serviceadmin"."0.2.0" = self.buildNodePackage {
-    name = "node-xmpp-serviceadmin-0.2.0";
-    version = "0.2.0";
+  by-spec."node-xmpp-tls-connect"."^1.0.1" =
+    self.by-version."node-xmpp-tls-connect"."1.0.1";
+  by-version."node-xmpp-tls-connect"."1.0.1" = self.buildNodePackage {
+    name = "node-xmpp-tls-connect-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-xmpp-serviceadmin/-/node-xmpp-serviceadmin-0.2.0.tgz";
-      name = "node-xmpp-serviceadmin-0.2.0.tgz";
-      sha1 = "35f8b07cf6d96c27fe292f1b0cb9ac73f69e6315";
+      url = "https://registry.npmjs.org/node-xmpp-tls-connect/-/node-xmpp-tls-connect-1.0.1.tgz";
+      name = "node-xmpp-tls-connect-1.0.1.tgz";
+      sha1 = "91ace43ac26b138861b2be478df9df19d61dc5c3";
     };
     deps = {
-      "node-xmpp-core-1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9";
-      "node-stringprep-0.7.0" = self.by-version."node-stringprep"."0.7.0";
-      "ltx-0.9.0" = self.by-version."ltx"."0.9.0";
-      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
-      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
     };
     optionalDependencies = {
     };
@@ -28162,7 +32152,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-xmpp-serviceadmin" = self.by-version."node-xmpp-serviceadmin"."0.2.0";
   by-spec."node.extend"."1.0.0" =
     self.by-version."node.extend"."1.0.0";
   by-version."node.extend"."1.0.0" = self.buildNodePackage {
@@ -28170,7 +32159,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
+      url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
       name = "node.extend-1.0.0.tgz";
       sha1 = "ab83960c477280d01ba5554a0d8fd3acfe39336e";
     };
@@ -28189,12 +32178,12 @@
     version = "0.3.35";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
+      url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.3.35.tgz";
       name = "nodemailer-0.3.35.tgz";
       sha1 = "4d38cdc0ad230bdf88cc27d1256ef49fcb422e19";
     };
     deps = {
-      "mailcomposer-0.2.12" = self.by-version."mailcomposer"."0.2.12";
+      "mailcomposer-3.7.0" = self.by-version."mailcomposer"."3.7.0";
       "simplesmtp-0.3.35" = self.by-version."simplesmtp"."0.3.35";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
     };
@@ -28211,7 +32200,7 @@
     version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemailer/-/nodemailer-0.7.1.tgz";
+      url = "https://registry.npmjs.org/nodemailer/-/nodemailer-0.7.1.tgz";
       name = "nodemailer-0.7.1.tgz";
       sha1 = "1ec819e243622300a00abe746cb5d3389c0f316c";
     };
@@ -28230,23 +32219,62 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer"."1.3.0" =
-    self.by-version."nodemailer"."1.3.0";
-  by-version."nodemailer"."1.3.0" = self.buildNodePackage {
-    name = "nodemailer-1.3.0";
+  by-spec."nodemailer"."1.3.4" =
+    self.by-version."nodemailer"."1.3.4";
+  by-version."nodemailer"."1.3.4" = self.buildNodePackage {
+    name = "nodemailer-1.3.4";
+    version = "1.3.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/nodemailer/-/nodemailer-1.3.4.tgz";
+      name = "nodemailer-1.3.4.tgz";
+      sha1 = "9e5ca29ddc9fd78584e5ed46ddc486385be43ae3";
+    };
+    deps = {
+      "buildmail-1.3.0" = self.by-version."buildmail"."1.3.0";
+      "hyperquest-1.3.0" = self.by-version."hyperquest"."1.3.0";
+      "libmime-1.2.0" = self.by-version."libmime"."1.2.0";
+      "nodemailer-direct-transport-1.1.0" = self.by-version."nodemailer-direct-transport"."1.1.0";
+      "nodemailer-smtp-transport-1.1.0" = self.by-version."nodemailer-smtp-transport"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nodemailer-direct-transport"."^1.0.2" =
+    self.by-version."nodemailer-direct-transport"."1.1.0";
+  by-version."nodemailer-direct-transport"."1.1.0" = self.buildNodePackage {
+    name = "nodemailer-direct-transport-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.1.0.tgz";
+      name = "nodemailer-direct-transport-1.1.0.tgz";
+      sha1 = "a2f78708ee6f16ea0573fc82949d138ff172f624";
+    };
+    deps = {
+      "smtp-connection-1.3.8" = self.by-version."smtp-connection"."1.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."nodemailer-fetch"."1.3.0" =
+    self.by-version."nodemailer-fetch"."1.3.0";
+  by-version."nodemailer-fetch"."1.3.0" = self.buildNodePackage {
+    name = "nodemailer-fetch-1.3.0";
     version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemailer/-/nodemailer-1.3.0.tgz";
-      name = "nodemailer-1.3.0.tgz";
-      sha1 = "a6e4c507b2f776a03d46e9be8d40b5be916f290a";
+      url = "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.3.0.tgz";
+      name = "nodemailer-fetch-1.3.0.tgz";
+      sha1 = "9f37f6a5b80c1cb5d697ca2bfbde41a6582a50b0";
     };
     deps = {
-      "buildmail-1.2.4" = self.by-version."buildmail"."1.2.4";
-      "hyperquest-0.3.0" = self.by-version."hyperquest"."0.3.0";
-      "libmime-0.1.7" = self.by-version."libmime"."0.1.7";
-      "nodemailer-direct-transport-1.0.2" = self.by-version."nodemailer-direct-transport"."1.0.2";
-      "nodemailer-smtp-transport-0.1.13" = self.by-version."nodemailer-smtp-transport"."0.1.13";
     };
     optionalDependencies = {
     };
@@ -28254,19 +32282,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer-direct-transport"."^1.0.0" =
-    self.by-version."nodemailer-direct-transport"."1.0.2";
-  by-version."nodemailer-direct-transport"."1.0.2" = self.buildNodePackage {
-    name = "nodemailer-direct-transport-1.0.2";
-    version = "1.0.2";
+  by-spec."nodemailer-shared"."1.0.4" =
+    self.by-version."nodemailer-shared"."1.0.4";
+  by-version."nodemailer-shared"."1.0.4" = self.buildNodePackage {
+    name = "nodemailer-shared-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-1.0.2.tgz";
-      name = "nodemailer-direct-transport-1.0.2.tgz";
-      sha1 = "cec0fb03bb7828c64faacc5344b28911807cdba1";
+      url = "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.0.4.tgz";
+      name = "nodemailer-shared-1.0.4.tgz";
+      sha1 = "8b5c5c35bfb29a47dda7d38303f3a4fb47ba38ae";
     };
     deps = {
-      "smtp-connection-1.2.0" = self.by-version."smtp-connection"."1.2.0";
+      "nodemailer-fetch-1.3.0" = self.by-version."nodemailer-fetch"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -28274,20 +32302,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer-smtp-transport"."^0.1.12" =
-    self.by-version."nodemailer-smtp-transport"."0.1.13";
-  by-version."nodemailer-smtp-transport"."0.1.13" = self.buildNodePackage {
-    name = "nodemailer-smtp-transport-0.1.13";
-    version = "0.1.13";
+  by-spec."nodemailer-smtp-transport"."^1.0.2" =
+    self.by-version."nodemailer-smtp-transport"."1.1.0";
+  by-version."nodemailer-smtp-transport"."1.1.0" = self.buildNodePackage {
+    name = "nodemailer-smtp-transport-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-0.1.13.tgz";
-      name = "nodemailer-smtp-transport-0.1.13.tgz";
-      sha1 = "f8d1babfd5221aaa1308fd36ab7945a2f7081476";
+      url = "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-1.1.0.tgz";
+      name = "nodemailer-smtp-transport-1.1.0.tgz";
+      sha1 = "e6c37f31885ab3080e7ded3cf528c4ad7e691398";
     };
     deps = {
-      "nodemailer-wellknown-0.1.5" = self.by-version."nodemailer-wellknown"."0.1.5";
-      "smtp-connection-1.2.0" = self.by-version."smtp-connection"."1.2.0";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "nodemailer-wellknown-0.1.8" = self.by-version."nodemailer-wellknown"."0.1.8";
+      "smtp-connection-1.3.8" = self.by-version."smtp-connection"."1.3.8";
     };
     optionalDependencies = {
     };
@@ -28295,16 +32324,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nodemailer-wellknown"."^0.1.1" =
-    self.by-version."nodemailer-wellknown"."0.1.5";
-  by-version."nodemailer-wellknown"."0.1.5" = self.buildNodePackage {
-    name = "nodemailer-wellknown-0.1.5";
-    version = "0.1.5";
+  by-spec."nodemailer-wellknown"."^0.1.7" =
+    self.by-version."nodemailer-wellknown"."0.1.8";
+  by-version."nodemailer-wellknown"."0.1.8" = self.buildNodePackage {
+    name = "nodemailer-wellknown-0.1.8";
+    version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.5.tgz";
-      name = "nodemailer-wellknown-0.1.5.tgz";
-      sha1 = "1e467a2f7132ec30273b45f1ae300dd1193dd035";
+      url = "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.8.tgz";
+      name = "nodemailer-wellknown-0.1.8.tgz";
+      sha1 = "d44f1ced0aedf1ac1d9a99e8444d0db6c01428dc";
     };
     deps = {
     };
@@ -28315,21 +32344,27 @@
     cpu = [ ];
   };
   by-spec."nodemon"."*" =
-    self.by-version."nodemon"."1.3.7";
-  by-version."nodemon"."1.3.7" = self.buildNodePackage {
-    name = "nodemon-1.3.7";
-    version = "1.3.7";
+    self.by-version."nodemon"."1.9.1";
+  by-version."nodemon"."1.9.1" = self.buildNodePackage {
+    name = "nodemon-1.9.1";
+    version = "1.9.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.7.tgz";
-      name = "nodemon-1.3.7.tgz";
-      sha1 = "447bc2e01bf499cbf5853f9937496e0a04835449";
+      url = "https://registry.npmjs.org/nodemon/-/nodemon-1.9.1.tgz";
+      name = "nodemon-1.9.1.tgz";
+      sha1 = "442071f88c39d801fb0bdfd209413da5dce6dad3";
     };
     deps = {
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
-      "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3";
-      "touch-0.0.3" = self.by-version."touch"."0.0.3";
-      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
+      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "es6-promise-3.1.2" = self.by-version."es6-promise"."3.1.2";
+      "ignore-by-default-1.0.1" = self.by-version."ignore-by-default"."1.0.1";
+      "lodash.defaults-3.1.2" = self.by-version."lodash.defaults"."3.1.2";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "ps-tree-1.0.1" = self.by-version."ps-tree"."1.0.1";
+      "touch-1.0.0" = self.by-version."touch"."1.0.0";
+      "undefsafe-0.0.3" = self.by-version."undefsafe"."0.0.3";
+      "update-notifier-0.5.0" = self.by-version."update-notifier"."0.5.0";
     };
     optionalDependencies = {
     };
@@ -28337,7 +32372,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "nodemon" = self.by-version."nodemon"."1.3.7";
+  "nodemon" = self.by-version."nodemon"."1.9.1";
   by-spec."nomnom"."1.6.x" =
     self.by-version."nomnom"."1.6.2";
   by-version."nomnom"."1.6.2" = self.buildNodePackage {
@@ -28345,7 +32380,7 @@
     version = "1.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
+      url = "https://registry.npmjs.org/nomnom/-/nomnom-1.6.2.tgz";
       name = "nomnom-1.6.2.tgz";
       sha1 = "84a66a260174408fc5b77a18f888eccc44fb6971";
     };
@@ -28366,12 +32401,12 @@
     version = "2.2.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
+      url = "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz";
       name = "nopt-2.2.1.tgz";
       sha1 = "2aa09b7d1768487b3b89a9c5aa52335bff0baea7";
     };
     deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
     };
     optionalDependencies = {
     };
@@ -28380,18 +32415,18 @@
     cpu = [ ];
   };
   by-spec."nopt"."2 || 3" =
-    self.by-version."nopt"."3.0.1";
-  by-version."nopt"."3.0.1" = self.buildNodePackage {
-    name = "nopt-3.0.1";
-    version = "3.0.1";
+    self.by-version."nopt"."3.0.6";
+  by-version."nopt"."3.0.6" = self.buildNodePackage {
+    name = "nopt-3.0.6";
+    version = "3.0.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
-      name = "nopt-3.0.1.tgz";
-      sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
+      url = "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz";
+      name = "nopt-3.0.6.tgz";
+      sha1 = "c6465dbf08abcd4db359317f79ac68a646b28ff9";
     };
     deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
     };
     optionalDependencies = {
     };
@@ -28406,12 +32441,12 @@
     version = "2.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
+      url = "https://registry.npmjs.org/nopt/-/nopt-2.0.0.tgz";
       name = "nopt-2.0.0.tgz";
       sha1 = "ca7416f20a5e3f9c3b86180f96295fa3d0b52e0d";
     };
     deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
     };
     optionalDependencies = {
     };
@@ -28426,12 +32461,12 @@
     version = "2.1.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
+      url = "https://registry.npmjs.org/nopt/-/nopt-2.1.1.tgz";
       name = "nopt-2.1.1.tgz";
       sha1 = "91eb7c4b017e7c00adcad1fd6d63944d0fdb75c1";
     };
     deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
     };
     optionalDependencies = {
     };
@@ -28441,23 +32476,17 @@
   };
   by-spec."nopt"."3.0.1" =
     self.by-version."nopt"."3.0.1";
-  by-spec."nopt"."3.x" =
-    self.by-version."nopt"."3.0.1";
-  by-spec."nopt"."^3.0.1" =
-    self.by-version."nopt"."3.0.1";
-  by-spec."nopt"."~1.0.10" =
-    self.by-version."nopt"."1.0.10";
-  by-version."nopt"."1.0.10" = self.buildNodePackage {
-    name = "nopt-1.0.10";
-    version = "1.0.10";
+  by-version."nopt"."3.0.1" = self.buildNodePackage {
+    name = "nopt-3.0.1";
+    version = "3.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
-      name = "nopt-1.0.10.tgz";
-      sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
+      url = "https://registry.npmjs.org/nopt/-/nopt-3.0.1.tgz";
+      name = "nopt-3.0.1.tgz";
+      sha1 = "bce5c42446a3291f47622a370abbf158fbbacbfd";
     };
     deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
     };
     optionalDependencies = {
     };
@@ -28465,21 +32494,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nopt"."~2" =
-    self.by-version."nopt"."2.2.1";
-  by-spec."nopt"."~2.1.1" =
-    self.by-version."nopt"."2.1.2";
-  by-version."nopt"."2.1.2" = self.buildNodePackage {
-    name = "nopt-2.1.2";
-    version = "2.1.2";
+  by-spec."nopt"."3.0.6" =
+    self.by-version."nopt"."3.0.6";
+  by-spec."nopt"."3.x" =
+    self.by-version."nopt"."3.0.6";
+  by-spec."nopt"."^3.0.6" =
+    self.by-version."nopt"."3.0.6";
+  by-spec."nopt"."~1.0.10" =
+    self.by-version."nopt"."1.0.10";
+  by-version."nopt"."1.0.10" = self.buildNodePackage {
+    name = "nopt-1.0.10";
+    version = "1.0.10";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz";
-      name = "nopt-2.1.2.tgz";
-      sha1 = "6cccd977b80132a07731d6e8ce58c2c8303cf9af";
+      url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz";
+      name = "nopt-1.0.10.tgz";
+      sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee";
     };
     deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
     };
     optionalDependencies = {
     };
@@ -28488,41 +32521,21 @@
     cpu = [ ];
   };
   by-spec."nopt"."~3.0.1" =
-    self.by-version."nopt"."3.0.1";
-  by-spec."normalize-git-url"."~1.0.0" =
-    self.by-version."normalize-git-url"."1.0.0";
-  by-version."normalize-git-url"."1.0.0" = self.buildNodePackage {
-    name = "normalize-git-url-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/normalize-git-url/-/normalize-git-url-1.0.0.tgz";
-      name = "normalize-git-url-1.0.0.tgz";
-      sha1 = "80e59471f0616b579893973e3f1b3684bedbad48";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."normalize-package-data"."^0.2.13" =
-    self.by-version."normalize-package-data"."0.2.13";
-  by-version."normalize-package-data"."0.2.13" = self.buildNodePackage {
-    name = "normalize-package-data-0.2.13";
-    version = "0.2.13";
+    self.by-version."nopt"."3.0.6";
+  by-spec."nopt"."~3.0.6" =
+    self.by-version."nopt"."3.0.6";
+  by-spec."normalize-git-url"."~3.0.1" =
+    self.by-version."normalize-git-url"."3.0.1";
+  by-version."normalize-git-url"."3.0.1" = self.buildNodePackage {
+    name = "normalize-git-url-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-0.2.13.tgz";
-      name = "normalize-package-data-0.2.13.tgz";
-      sha1 = "50f9fd9e77b1c8411cd231db2962e73963de774d";
+      url = "https://registry.npmjs.org/normalize-git-url/-/normalize-git-url-3.0.1.tgz";
+      name = "normalize-git-url-3.0.1.tgz";
+      sha1 = "d40d419d05a15870271e50534dbb7b8ccd9b0a5c";
     };
     deps = {
-      "github-url-from-git-1.1.1" = self.by-version."github-url-from-git"."1.1.1";
-      "github-url-from-username-repo-0.1.0" = self.by-version."github-url-from-username-repo"."0.1.0";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -28530,21 +32543,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."normalize-package-data"."^1.0.0" =
-    self.by-version."normalize-package-data"."1.0.3";
-  by-version."normalize-package-data"."1.0.3" = self.buildNodePackage {
-    name = "normalize-package-data-1.0.3";
-    version = "1.0.3";
+  by-spec."normalize-package-data"."^2.0.0" =
+    self.by-version."normalize-package-data"."2.3.5";
+  by-version."normalize-package-data"."2.3.5" = self.buildNodePackage {
+    name = "normalize-package-data-2.3.5";
+    version = "2.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-1.0.3.tgz";
-      name = "normalize-package-data-1.0.3.tgz";
-      sha1 = "8be955b8907af975f1a4584ea8bb9b41492312f5";
+      url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz";
+      name = "normalize-package-data-2.3.5.tgz";
+      sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
     };
     deps = {
-      "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
-      "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
+      "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -28552,20 +32566,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."normalize-package-data"."^2.0.0" =
-    self.by-version."normalize-package-data"."2.0.0";
-  by-version."normalize-package-data"."2.0.0" = self.buildNodePackage {
-    name = "normalize-package-data-2.0.0";
-    version = "2.0.0";
+  by-spec."normalize-package-data"."^2.3.2" =
+    self.by-version."normalize-package-data"."2.3.5";
+  by-spec."normalize-package-data"."^2.3.4" =
+    self.by-version."normalize-package-data"."2.3.5";
+  by-spec."normalize-package-data"."~1.0.1 || ^2.0.0" =
+    self.by-version."normalize-package-data"."2.3.5";
+  by-spec."normalize-package-data"."~2.3.5" =
+    self.by-version."normalize-package-data"."2.3.5";
+  by-spec."normalize-path"."^2.0.1" =
+    self.by-version."normalize-path"."2.0.1";
+  by-version."normalize-path"."2.0.1" = self.buildNodePackage {
+    name = "normalize-path-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.0.0.tgz";
-      name = "normalize-package-data-2.0.0.tgz";
-      sha1 = "8795d0d5c70c0e9ca36f419548aac0abf1f638bc";
+      url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz";
+      name = "normalize-path-2.0.1.tgz";
+      sha1 = "47886ac1662760d4261b7d979d241709d3ce3f7a";
     };
     deps = {
-      "hosted-git-info-2.1.2" = self.by-version."hosted-git-info"."2.1.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -28573,91 +32593,101 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."normalize-package-data"."~1.0.1" =
-    self.by-version."normalize-package-data"."1.0.3";
-  by-spec."normalize-package-data"."~1.0.1 || ^2.0.0" =
-    self.by-version."normalize-package-data"."2.0.0";
-  by-spec."normalize-package-data"."~2.0.0" =
-    self.by-version."normalize-package-data"."2.0.0";
   by-spec."npm"."*" =
-    self.by-version."npm"."2.8.4";
-  by-version."npm"."2.8.4" = self.buildNodePackage {
-    name = "npm-2.8.4";
-    version = "2.8.4";
+    self.by-version."npm"."3.8.6";
+  by-version."npm"."3.8.6" = self.buildNodePackage {
+    name = "npm-3.8.6";
+    version = "3.8.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm/-/npm-2.8.4.tgz";
-      name = "npm-2.8.4.tgz";
-      sha1 = "f5d84c990466b2b535b7be6ff7706fcf4bf38255";
+      url = "https://registry.npmjs.org/npm/-/npm-3.8.6.tgz";
+      name = "npm-3.8.6.tgz";
+      sha1 = "f9cb7b736e72c3b854895f6c054f830931ab14c6";
     };
     deps = {
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
-      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
       "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2";
       "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3";
+      "aproba-1.0.1" = self.by-version."aproba"."1.0.1";
       "archy-1.0.0" = self.by-version."archy"."1.0.0";
-      "async-some-1.0.1" = self.by-version."async-some"."1.0.1";
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1";
-      "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
-      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1";
-      "columnify-1.5.1" = self.by-version."columnify"."1.5.1";
-      "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
-      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
-      "editor-0.1.0" = self.by-version."editor"."0.1.0";
-      "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5";
-      "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2";
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
-      "fstream-npm-1.0.2" = self.by-version."fstream-npm"."1.0.2";
-      "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
-      "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
-      "glob-5.0.5" = self.by-version."glob"."5.0.5";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "hosted-git-info-2.1.2" = self.by-version."hosted-git-info"."2.1.2";
+      "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
+      "cmd-shim-2.0.2" = self.by-version."cmd-shim"."2.0.2";
+      "columnify-1.5.4" = self.by-version."columnify"."1.5.4";
+      "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
+      "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
+      "editor-1.0.0" = self.by-version."editor"."1.0.0";
+      "fs-vacuum-1.2.7" = self.by-version."fs-vacuum"."1.2.7";
+      "fs-write-stream-atomic-1.0.8" = self.by-version."fs-write-stream-atomic"."1.0.8";
+      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "fstream-npm-1.0.7" = self.by-version."fstream-npm"."1.0.7";
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "has-unicode-2.0.0" = self.by-version."has-unicode"."2.0.0";
+      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
+      "iferr-0.1.5" = self.by-version."iferr"."0.1.5";
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
-      "init-package-json-1.4.1" = self.by-version."init-package-json"."1.4.1";
-      "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0";
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "node-gyp-1.0.3" = self.by-version."node-gyp"."1.0.3";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "normalize-git-url-1.0.0" = self.by-version."normalize-git-url"."1.0.0";
-      "normalize-package-data-2.0.0" = self.by-version."normalize-package-data"."2.0.0";
-      "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1";
-      "npm-install-checks-1.0.5" = self.by-version."npm-install-checks"."1.0.5";
-      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
-      "npm-registry-client-6.3.2" = self.by-version."npm-registry-client"."6.3.2";
-      "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1";
-      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
+      "init-package-json-1.9.3" = self.by-version."init-package-json"."1.9.3";
+      "lockfile-1.0.1" = self.by-version."lockfile"."1.0.1";
+      "lodash._baseuniq-4.5.1" = self.by-version."lodash._baseuniq"."4.5.1";
+      "lodash.clonedeep-4.3.2" = self.by-version."lodash.clonedeep"."4.3.2";
+      "lodash.isarray-4.0.0" = self.by-version."lodash.isarray"."4.0.0";
+      "lodash.keys-4.0.6" = self.by-version."lodash.keys"."4.0.6";
+      "lodash.union-4.2.1" = self.by-version."lodash.union"."4.2.1";
+      "lodash.uniq-4.2.1" = self.by-version."lodash.uniq"."4.2.1";
+      "lodash.without-4.1.2" = self.by-version."lodash.without"."4.1.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "node-gyp-3.3.1" = self.by-version."node-gyp"."3.3.1";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "normalize-git-url-3.0.1" = self.by-version."normalize-git-url"."3.0.1";
+      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
+      "npm-cache-filename-1.0.2" = self.by-version."npm-cache-filename"."1.0.2";
+      "npm-install-checks-3.0.0" = self.by-version."npm-install-checks"."3.0.0";
+      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "npm-registry-client-7.1.0" = self.by-version."npm-registry-client"."7.1.0";
+      "npm-user-validate-0.1.2" = self.by-version."npm-user-validate"."0.1.2";
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "opener-1.4.1" = self.by-version."opener"."1.4.1";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
+      "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
       "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
-      "read-1.0.5" = self.by-version."read"."1.0.5";
-      "read-installed-4.0.0" = self.by-version."read-installed"."4.0.0";
-      "read-package-json-2.0.0" = self.by-version."read-package-json"."2.0.0";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "realize-package-specifier-3.0.0" = self.by-version."realize-package-specifier"."3.0.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "sha-1.3.0" = self.by-version."sha"."1.3.0";
+      "read-1.0.7" = self.by-version."read"."1.0.7";
+      "read-cmd-shim-1.0.1" = self.by-version."read-cmd-shim"."1.0.1";
+      "read-installed-4.0.3" = self.by-version."read-installed"."4.0.3";
+      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "read-package-tree-5.1.2" = self.by-version."read-package-tree"."5.1.2";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "realize-package-specifier-3.0.1" = self.by-version."realize-package-specifier"."3.0.1";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
+      "retry-0.9.0" = self.by-version."retry"."0.9.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "sha-2.0.1" = self.by-version."sha"."2.0.1";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
-      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
-      "tar-2.1.0" = self.by-version."tar"."2.1.0";
+      "sorted-object-2.0.0" = self.by-version."sorted-object"."2.0.0";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "tar-2.2.1" = self.by-version."tar"."2.2.1";
       "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
       "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6";
       "umask-1.1.0" = self.by-version."umask"."1.1.0";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
+      "unique-filename-1.1.0" = self.by-version."unique-filename"."1.1.0";
+      "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
+      "validate-npm-package-name-2.2.2" = self.by-version."validate-npm-package-name"."2.2.2";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
-      "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0";
+      "write-file-atomic-1.1.4" = self.by-version."write-file-atomic"."1.1.4";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+      "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
+      "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
+      "lodash._baseindexof-3.1.0" = self.by-version."lodash._baseindexof"."3.1.0";
+      "lodash._bindcallback-3.0.1" = self.by-version."lodash._bindcallback"."3.0.1";
+      "lodash._cacheindexof-3.0.2" = self.by-version."lodash._cacheindexof"."3.0.2";
+      "lodash._createcache-3.1.2" = self.by-version."lodash._createcache"."3.1.2";
+      "lodash._getnative-3.9.1" = self.by-version."lodash._getnative"."3.9.1";
+      "lodash.restparam-3.6.1" = self.by-version."lodash.restparam"."3.6.1";
+      "readdir-scoped-modules-1.0.2" = self.by-version."readdir-scoped-modules"."1.0.2";
+      "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -28665,60 +32695,90 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm" = self.by-version."npm"."2.8.4";
-  by-spec."npm"."1.3.4" =
-    self.by-version."npm"."1.3.4";
-  by-version."npm"."1.3.4" = self.buildNodePackage {
-    name = "npm-1.3.4";
-    version = "1.3.4";
+  "npm" = self.by-version."npm"."3.8.6";
+  by-spec."npm"."^2.1.12" =
+    self.by-version."npm"."2.15.3";
+  by-version."npm"."2.15.3" = self.buildNodePackage {
+    name = "npm-2.15.3";
+    version = "2.15.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm/-/npm-1.3.4.tgz";
-      name = "npm-1.3.4.tgz";
-      sha1 = "1dacc91458f2197c362d774d2cbf111680f86ec2";
+      url = "https://registry.npmjs.org/npm/-/npm-2.15.3.tgz";
+      name = "npm-2.15.3.tgz";
+      sha1 = "9ee96a12f7dad6e8dc3e90b5635b65aedffb6cd3";
     };
     deps = {
-      "semver-2.0.11" = self.by-version."semver"."2.0.11";
-      "ini-1.1.0" = self.by-version."ini"."1.1.0";
+      "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
+      "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
+      "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2";
+      "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3";
+      "archy-1.0.0" = self.by-version."archy"."1.0.0";
+      "async-some-1.0.2" = self.by-version."async-some"."1.0.2";
+      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
+      "char-spinner-1.0.1" = self.by-version."char-spinner"."1.0.1";
+      "chmodr-1.0.2" = self.by-version."chmodr"."1.0.2";
+      "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
+      "cmd-shim-2.0.2" = self.by-version."cmd-shim"."2.0.2";
+      "columnify-1.5.4" = self.by-version."columnify"."1.5.4";
+      "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
+      "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
+      "editor-1.0.0" = self.by-version."editor"."1.0.0";
+      "fs-vacuum-1.2.7" = self.by-version."fs-vacuum"."1.2.7";
+      "fs-write-stream-atomic-1.0.8" = self.by-version."fs-write-stream-atomic"."1.0.8";
+      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "fstream-npm-1.0.7" = self.by-version."fstream-npm"."1.0.7";
+      "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0";
+      "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2";
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
+      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
+      "init-package-json-1.9.3" = self.by-version."init-package-json"."1.9.3";
+      "lockfile-1.0.1" = self.by-version."lockfile"."1.0.1";
+      "lru-cache-3.2.0" = self.by-version."lru-cache"."3.2.0";
+      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "node-gyp-3.3.1" = self.by-version."node-gyp"."3.3.1";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "normalize-git-url-3.0.1" = self.by-version."normalize-git-url"."3.0.1";
+      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
+      "npm-cache-filename-1.0.2" = self.by-version."npm-cache-filename"."1.0.2";
+      "npm-install-checks-1.0.7" = self.by-version."npm-install-checks"."1.0.7";
+      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "npm-registry-client-7.1.0" = self.by-version."npm-registry-client"."7.1.0";
+      "npm-user-validate-0.1.2" = self.by-version."npm-user-validate"."0.1.2";
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "opener-1.4.1" = self.by-version."opener"."1.4.1";
+      "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
+      "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1";
+      "read-1.0.7" = self.by-version."read"."1.0.7";
+      "read-installed-4.0.3" = self.by-version."read-installed"."4.0.3";
+      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "realize-package-specifier-3.0.1" = self.by-version."realize-package-specifier"."3.0.1";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
+      "retry-0.9.0" = self.by-version."retry"."0.9.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "sha-2.0.1" = self.by-version."sha"."2.0.1";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5";
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
-      "nopt-2.1.2" = self.by-version."nopt"."2.1.2";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "request-2.21.0" = self.by-version."request"."2.21.0";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
-      "tar-0.1.20" = self.by-version."tar"."0.1.20";
-      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "read-1.0.5" = self.by-version."read"."1.0.5";
-      "lru-cache-2.3.1" = self.by-version."lru-cache"."2.3.1";
-      "node-gyp-0.10.10" = self.by-version."node-gyp"."0.10.10";
-      "fstream-npm-0.1.8" = self.by-version."fstream-npm"."0.1.8";
+      "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
+      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "tar-2.2.1" = self.by-version."tar"."2.2.1";
+      "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
       "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6";
-      "archy-0.0.2" = self.by-version."archy"."0.0.2";
-      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "npmlog-0.0.4" = self.by-version."npmlog"."0.0.4";
-      "ansi-0.1.2" = self.by-version."ansi"."0.1.2";
-      "npm-registry-client-0.2.31" = self.by-version."npm-registry-client"."0.2.31";
-      "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9";
-      "read-installed-0.2.5" = self.by-version."read-installed"."0.2.5";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "init-package-json-0.0.10" = self.by-version."init-package-json"."0.0.10";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "lockfile-0.4.3" = self.by-version."lockfile"."0.4.3";
-      "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "once-1.1.1" = self.by-version."once"."1.1.1";
-      "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16";
-      "opener-1.3.0" = self.by-version."opener"."1.3.0";
-      "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0";
-      "cmd-shim-1.1.2" = self.by-version."cmd-shim"."1.1.2";
-      "sha-1.0.1" = self.by-version."sha"."1.0.1";
-      "editor-0.0.4" = self.by-version."editor"."0.0.4";
-      "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1";
-      "npm-user-validate-0.0.3" = self.by-version."npm-user-validate"."0.0.3";
+      "umask-1.1.0" = self.by-version."umask"."1.1.0";
+      "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
+      "validate-npm-package-name-2.2.2" = self.by-version."validate-npm-package-name"."2.2.2";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
+      "write-file-atomic-1.1.4" = self.by-version."write-file-atomic"."1.1.4";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+      "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
     };
     optionalDependencies = {
     };
@@ -28726,18 +32786,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm"."^2.5.1" =
-    self.by-version."npm"."2.8.4";
-  by-spec."npm-cache-filename"."~1.0.1" =
-    self.by-version."npm-cache-filename"."1.0.1";
-  by-version."npm-cache-filename"."1.0.1" = self.buildNodePackage {
-    name = "npm-cache-filename-1.0.1";
-    version = "1.0.1";
+  by-spec."npm"."^2.10.x" =
+    self.by-version."npm"."2.15.3";
+  by-spec."npm"."^3.5.1" =
+    self.by-version."npm"."3.8.6";
+  by-spec."npm-cache-filename"."~1.0.2" =
+    self.by-version."npm-cache-filename"."1.0.2";
+  by-version."npm-cache-filename"."1.0.2" = self.buildNodePackage {
+    name = "npm-cache-filename-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.1.tgz";
-      name = "npm-cache-filename-1.0.1.tgz";
-      sha1 = "9b640f0c1a5ba1145659685372a9ff71f70c4323";
+      url = "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz";
+      name = "npm-cache-filename-1.0.2.tgz";
+      sha1 = "ded306c5b0bfc870a9e9faf823bc5f283e05ae11";
     };
     deps = {
     };
@@ -28748,25 +32810,35 @@
     cpu = [ ];
   };
   by-spec."npm-check-updates"."*" =
-    self.by-version."npm-check-updates"."2.0.0-alpha6";
-  by-version."npm-check-updates"."2.0.0-alpha6" = self.buildNodePackage {
-    name = "npm-check-updates-2.0.0-alpha6";
-    version = "2.0.0-alpha6";
+    self.by-version."npm-check-updates"."2.6.1";
+  by-version."npm-check-updates"."2.6.1" = self.buildNodePackage {
+    name = "npm-check-updates-2.6.1";
+    version = "2.6.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.0.0-alpha6.tgz";
-      name = "npm-check-updates-2.0.0-alpha6.tgz";
-      sha1 = "cc9a00208db31af606ed6bd018ed9354fac23f02";
+      url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-2.6.1.tgz";
+      name = "npm-check-updates-2.6.1.tgz";
+      sha1 = "50fe729bcb30178d806339851c02068b15c5d2c9";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
       "cint-8.2.1" = self.by-version."cint"."8.2.1";
-      "closest-package-1.0.0" = self.by-version."closest-package"."1.0.0";
-      "commander-2.8.0" = self.by-version."commander"."2.8.0";
-      "lodash-3.7.0" = self.by-version."lodash"."3.7.0";
-      "npm-2.8.4" = self.by-version."npm"."2.8.4";
-      "read-package-json-1.3.3" = self.by-version."read-package-json"."1.3.3";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "fast-diff-1.0.1" = self.by-version."fast-diff"."1.0.1";
+      "find-up-1.1.2" = self.by-version."find-up"."1.1.2";
+      "get-stdin-5.0.1" = self.by-version."get-stdin"."5.0.1";
+      "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "node-alias-1.0.4" = self.by-version."node-alias"."1.0.4";
+      "npm-3.8.6" = self.by-version."npm"."3.8.6";
+      "npmi-1.0.1" = self.by-version."npmi"."1.0.1";
+      "require-dir-0.3.0" = self.by-version."require-dir"."0.3.0";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "semver-utils-1.1.1" = self.by-version."semver-utils"."1.1.1";
+      "spawn-please-0.1.0" = self.by-version."spawn-please"."0.1.0";
+      "update-notifier-0.5.0" = self.by-version."update-notifier"."0.5.0";
     };
     optionalDependencies = {
     };
@@ -28774,21 +32846,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm-check-updates" = self.by-version."npm-check-updates"."2.0.0-alpha6";
-  by-spec."npm-install-checks"."~1.0.5" =
-    self.by-version."npm-install-checks"."1.0.5";
-  by-version."npm-install-checks"."1.0.5" = self.buildNodePackage {
-    name = "npm-install-checks-1.0.5";
-    version = "1.0.5";
+  "npm-check-updates" = self.by-version."npm-check-updates"."2.6.1";
+  by-spec."npm-install-checks"."~1.0.7" =
+    self.by-version."npm-install-checks"."1.0.7";
+  by-version."npm-install-checks"."1.0.7" = self.buildNodePackage {
+    name = "npm-install-checks-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.5.tgz";
-      name = "npm-install-checks-1.0.5.tgz";
-      sha1 = "a1b5beabfd60e0535b14f763157c410cb6bdae56";
+      url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-1.0.7.tgz";
+      name = "npm-install-checks-1.0.7.tgz";
+      sha1 = "6d91aeda0ac96801f1ed7aadee116a6c0a086a57";
     };
     deps = {
-      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
     };
@@ -28796,20 +32868,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-package-arg"."^3.0.0" =
-    self.by-version."npm-package-arg"."3.1.1";
-  by-version."npm-package-arg"."3.1.1" = self.buildNodePackage {
-    name = "npm-package-arg-3.1.1";
-    version = "3.1.1";
+  by-spec."npm-install-checks"."~3.0.0" =
+    self.by-version."npm-install-checks"."3.0.0";
+  by-version."npm-install-checks"."3.0.0" = self.buildNodePackage {
+    name = "npm-install-checks-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-3.1.1.tgz";
-      name = "npm-package-arg-3.1.1.tgz";
-      sha1 = "c9e5f7587f8484d1372a9b386fbf8b2443fc1bdb";
+      url = "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-3.0.0.tgz";
+      name = "npm-install-checks-3.0.0.tgz";
+      sha1 = "d4aecdfd51a53e3723b7b2f93b2ee28e307bc0d7";
     };
     deps = {
-      "hosted-git-info-1.6.0" = self.by-version."hosted-git-info"."1.6.0";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
     };
@@ -28818,19 +32889,19 @@
     cpu = [ ];
   };
   by-spec."npm-package-arg"."^3.0.0 || ^4.0.0" =
-    self.by-version."npm-package-arg"."4.0.0";
-  by-version."npm-package-arg"."4.0.0" = self.buildNodePackage {
-    name = "npm-package-arg-4.0.0";
-    version = "4.0.0";
+    self.by-version."npm-package-arg"."4.1.0";
+  by-version."npm-package-arg"."4.1.0" = self.buildNodePackage {
+    name = "npm-package-arg-4.1.0";
+    version = "4.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.0.0.tgz";
-      name = "npm-package-arg-4.0.0.tgz";
-      sha1 = "04766dc98dbc19f6d627a5817075f4ce13d64a5d";
+      url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-4.1.0.tgz";
+      name = "npm-package-arg-4.1.0.tgz";
+      sha1 = "2e015f8ac00737cb97f997c9cbf059f42a74527d";
     };
     deps = {
-      "hosted-git-info-2.1.2" = self.by-version."hosted-git-info"."2.1.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
     };
@@ -28839,9 +32910,9 @@
     cpu = [ ];
   };
   by-spec."npm-package-arg"."^4.0.0" =
-    self.by-version."npm-package-arg"."4.0.0";
-  by-spec."npm-package-arg"."~4.0.0" =
-    self.by-version."npm-package-arg"."4.0.0";
+    self.by-version."npm-package-arg"."4.1.0";
+  by-spec."npm-package-arg"."~4.1.0" =
+    self.by-version."npm-package-arg"."4.1.0";
   by-spec."npm-registry-client"."0.2.27" =
     self.by-version."npm-registry-client"."0.2.27";
   by-version."npm-registry-client"."0.2.27" = self.buildNodePackage {
@@ -28849,150 +32920,102 @@
     version = "0.2.27";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
+      url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.27.tgz";
       name = "npm-registry-client-0.2.27.tgz";
       sha1 = "8f338189d32769267886a07ad7b7fd2267446adf";
     };
     deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
       "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
       "semver-2.0.11" = self.by-version."semver"."2.0.11";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "retry-0.6.0" = self.by-version."retry"."0.6.0";
-      "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
-    };
-    optionalDependencies = {
-      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."npm-registry-client"."~0.2.27" =
-    self.by-version."npm-registry-client"."0.2.31";
-  by-version."npm-registry-client"."0.2.31" = self.buildNodePackage {
-    name = "npm-registry-client-0.2.31";
-    version = "0.2.31";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.2.31.tgz";
-      name = "npm-registry-client-0.2.31.tgz";
-      sha1 = "24a23e24e43246677cb485f8391829e9536563d4";
-    };
-    deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
-      "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
+      "chownr-0.0.2" = self.by-version."chownr"."0.0.2";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "retry-0.6.0" = self.by-version."retry"."0.6.0";
       "couch-login-0.1.20" = self.by-version."couch-login"."0.1.20";
     };
     optionalDependencies = {
-      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-registry-client"."~6.1.2" =
-    self.by-version."npm-registry-client"."6.1.2";
-  by-version."npm-registry-client"."6.1.2" = self.buildNodePackage {
-    name = "npm-registry-client-6.1.2";
-    version = "6.1.2";
+  by-spec."npm-registry-client"."~7.0.9" =
+    self.by-version."npm-registry-client"."7.0.9";
+  by-version."npm-registry-client"."7.0.9" = self.buildNodePackage {
+    name = "npm-registry-client-7.0.9";
+    version = "7.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.1.2.tgz";
-      name = "npm-registry-client-6.1.2.tgz";
-      sha1 = "b74ba7efa9bfbbce46a1bd15fa97dc7d784099cb";
+      url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.0.9.tgz";
+      name = "npm-registry-client-7.0.9.tgz";
+      sha1 = "1baf86ee5285c4e6d38d4556208ded56049231bb";
     };
     deps = {
-      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
-      "npm-package-arg-3.1.1" = self.by-version."npm-package-arg"."3.1.1";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
+      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "retry-0.8.0" = self.by-version."retry"."0.8.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
-      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-registry-client"."~6.3.2" =
-    self.by-version."npm-registry-client"."6.3.2";
-  by-version."npm-registry-client"."6.3.2" = self.buildNodePackage {
-    name = "npm-registry-client-6.3.2";
-    version = "6.3.2";
+  by-spec."npm-registry-client"."~7.1.0" =
+    self.by-version."npm-registry-client"."7.1.0";
+  by-version."npm-registry-client"."7.1.0" = self.buildNodePackage {
+    name = "npm-registry-client-7.1.0";
+    version = "7.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-6.3.2.tgz";
-      name = "npm-registry-client-6.3.2.tgz";
-      sha1 = "a662a36c6eda56c184099631cf429ba69b73d65b";
+      url = "https://registry.npmjs.org/npm-registry-client/-/npm-registry-client-7.1.0.tgz";
+      name = "npm-registry-client-7.1.0.tgz";
+      sha1 = "e3be14ab279fe5123e15ab5c8a650445415664a5";
     };
     deps = {
-      "chownr-0.0.1" = self.by-version."chownr"."0.0.1";
-      "concat-stream-1.4.8" = self.by-version."concat-stream"."1.4.8";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "normalize-package-data-2.0.0" = self.by-version."normalize-package-data"."2.0.0";
-      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "retry-0.6.1" = self.by-version."retry"."0.6.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "chownr-1.0.1" = self.by-version."chownr"."1.0.1";
+      "concat-stream-1.5.1" = self.by-version."concat-stream"."1.5.1";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
+      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "retry-0.8.0" = self.by-version."retry"."0.8.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
-      "npmlog-1.2.0" = self.by-version."npmlog"."1.2.0";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."npm-user-validate"."0.0.3" =
-    self.by-version."npm-user-validate"."0.0.3";
-  by-version."npm-user-validate"."0.0.3" = self.buildNodePackage {
-    name = "npm-user-validate-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.0.3.tgz";
-      name = "npm-user-validate-0.0.3.tgz";
-      sha1 = "818eca4312d13da648f9bc1d7f80bb4f151e0c2e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
+      "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npm-user-validate"."~0.1.1" =
-    self.by-version."npm-user-validate"."0.1.1";
-  by-version."npm-user-validate"."0.1.1" = self.buildNodePackage {
-    name = "npm-user-validate-0.1.1";
-    version = "0.1.1";
+  by-spec."npm-user-validate"."~0.1.2" =
+    self.by-version."npm-user-validate"."0.1.2";
+  by-version."npm-user-validate"."0.1.2" = self.buildNodePackage {
+    name = "npm-user-validate-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.1.tgz";
-      name = "npm-user-validate-0.1.1.tgz";
-      sha1 = "ea7774636c3c8fe6d01e174bd9f2ee0e22eeed57";
+      url = "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-0.1.2.tgz";
+      name = "npm-user-validate-0.1.2.tgz";
+      sha1 = "d585da0b47c9f41a9e6ca684b6fd84ba41ebe87d";
     };
     deps = {
     };
@@ -29014,7 +33037,7 @@
       sha256 = "fb79dccb5ca4bfa0c8cc4490be37313367eb98e216d8eb97cb00f9e492e8e7a7";
     };
     deps = {
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
       "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
       "npm-registry-client-0.2.27" = self.by-version."npm-registry-client"."0.2.27";
       "npmconf-0.1.1" = self.by-version."npmconf"."0.1.1";
@@ -29022,7 +33045,7 @@
       "temp-0.6.0" = self.by-version."temp"."0.6.0";
       "fs.extra-1.3.2" = self.by-version."fs.extra"."1.3.2";
       "findit-1.2.0" = self.by-version."findit"."1.2.0";
-      "coffee-script-1.9.2" = self.by-version."coffee-script"."1.9.2";
+      "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
     };
     optionalDependencies = {
     };
@@ -29031,6 +33054,33 @@
     cpu = [ ];
   };
   "npm2nix" = self.by-version."npm2nix"."5.12.0";
+  by-spec."npmconf"."0.0.24" =
+    self.by-version."npmconf"."0.0.24";
+  by-version."npmconf"."0.0.24" = self.buildNodePackage {
+    name = "npmconf-0.0.24";
+    version = "0.0.24";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/npmconf/-/npmconf-0.0.24.tgz";
+      name = "npmconf-0.0.24.tgz";
+      sha1 = "b78875b088ccc3c0afa3eceb3ce3244b1b52390c";
+    };
+    deps = {
+      "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
+      "inherits-1.0.2" = self.by-version."inherits"."1.0.2";
+      "once-1.1.1" = self.by-version."once"."1.1.1";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
+      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
+      "semver-1.1.4" = self.by-version."semver"."1.1.4";
+      "ini-1.1.0" = self.by-version."ini"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."npmconf"."0.1.1" =
     self.by-version."npmconf"."0.1.1";
   by-version."npmconf"."0.1.1" = self.buildNodePackage {
@@ -29038,13 +33088,13 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
+      url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.1.tgz";
       name = "npmconf-0.1.1.tgz";
       sha1 = "7a254182591ca22d77b2faecc0d17e0f9bdf25a1";
     };
     deps = {
-      "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
-      "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
+      "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
+      "inherits-1.0.2" = self.by-version."inherits"."1.0.2";
       "once-1.1.1" = self.by-version."once"."1.1.1";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
@@ -29058,21 +33108,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmconf"."0.1.16" =
+  by-spec."npmconf"."~0.1.2" =
     self.by-version."npmconf"."0.1.16";
   by-version."npmconf"."0.1.16" = self.buildNodePackage {
     name = "npmconf-0.1.16";
     version = "0.1.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
+      url = "https://registry.npmjs.org/npmconf/-/npmconf-0.1.16.tgz";
       name = "npmconf-0.1.16.tgz";
       sha1 = "0bdca78b8551419686b3a98004f06f0819edcd2a";
     };
     deps = {
-      "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
+      "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "osenv-0.0.3" = self.by-version."osenv"."0.0.3";
       "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
@@ -29085,26 +33135,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmconf"."2.1.1" =
-    self.by-version."npmconf"."2.1.1";
-  by-version."npmconf"."2.1.1" = self.buildNodePackage {
-    name = "npmconf-2.1.1";
-    version = "2.1.1";
+  by-spec."npmconf"."~2.1.2" =
+    self.by-version."npmconf"."2.1.2";
+  by-version."npmconf"."2.1.2" = self.buildNodePackage {
+    name = "npmconf-2.1.2";
+    version = "2.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmconf/-/npmconf-2.1.1.tgz";
-      name = "npmconf-2.1.1.tgz";
-      sha1 = "a266c7e5c56695eb7f55caf3a5a7328f24510dae";
+      url = "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz";
+      name = "npmconf-2.1.2.tgz";
+      sha1 = "66606a4a736f1e77a059aa071a79c94ab781853a";
     };
     deps = {
-      "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8";
+      "config-chain-1.1.10" = self.by-version."config-chain"."1.1.10";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "nopt-3.0.1" = self.by-version."nopt"."3.0.1";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "osenv-0.1.0" = self.by-version."osenv"."0.1.0";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "osenv-0.1.3" = self.by-version."osenv"."0.1.3";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
       "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5";
     };
     optionalDependencies = {
@@ -29113,27 +33163,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmconf"."~0.1.1" =
-    self.by-version."npmconf"."0.1.16";
-  by-spec."npmconf"."~0.1.2" =
-    self.by-version."npmconf"."0.1.16";
-  by-spec."npmconf"."~2.1.1" =
-    self.by-version."npmconf"."2.1.1";
+  by-spec."npmi"."^1.0.1" =
+    self.by-version."npmi"."1.0.1";
+  by-version."npmi"."1.0.1" = self.buildNodePackage {
+    name = "npmi-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/npmi/-/npmi-1.0.1.tgz";
+      name = "npmi-1.0.1.tgz";
+      sha1 = "15d769273547545e6809dcf0ce18aed48b0290e2";
+    };
+    deps = {
+      "npm-2.15.3" = self.by-version."npm"."2.15.3";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."npmlog"."*" =
-    self.by-version."npmlog"."1.2.0";
-  by-version."npmlog"."1.2.0" = self.buildNodePackage {
-    name = "npmlog-1.2.0";
-    version = "1.2.0";
+    self.by-version."npmlog"."2.0.3";
+  by-version."npmlog"."2.0.3" = self.buildNodePackage {
+    name = "npmlog-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmlog/-/npmlog-1.2.0.tgz";
-      name = "npmlog-1.2.0.tgz";
-      sha1 = "b512f18ae8696a0192ada78ba00c06dbbd91bafb";
+      url = "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz";
+      name = "npmlog-2.0.3.tgz";
+      sha1 = "020f99351f0c02e399c674ba256e7c4d3b3dd298";
     };
     deps = {
-      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
-      "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4";
-      "gauge-1.2.0" = self.by-version."gauge"."1.2.0";
+      "ansi-0.3.1" = self.by-version."ansi"."0.3.1";
+      "are-we-there-yet-1.1.2" = self.by-version."are-we-there-yet"."1.1.2";
+      "gauge-1.2.7" = self.by-version."gauge"."1.2.7";
     };
     optionalDependencies = {
     };
@@ -29141,19 +33206,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmlog"."0" =
-    self.by-version."npmlog"."0.1.1";
-  by-version."npmlog"."0.1.1" = self.buildNodePackage {
-    name = "npmlog-0.1.1";
-    version = "0.1.1";
+  by-spec."npmlog"."0 || 1 || 2" =
+    self.by-version."npmlog"."2.0.3";
+  by-spec."npmlog"."0.1 || 1 || 2" =
+    self.by-version."npmlog"."2.0.3";
+  by-spec."npmlog"."~2.0.0" =
+    self.by-version."npmlog"."2.0.3";
+  by-spec."npmlog"."~2.0.3" =
+    self.by-version."npmlog"."2.0.3";
+  by-spec."nssocket"."~0.5.1" =
+    self.by-version."nssocket"."0.5.3";
+  by-version."nssocket"."0.5.3" = self.buildNodePackage {
+    name = "nssocket-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmlog/-/npmlog-0.1.1.tgz";
-      name = "npmlog-0.1.1.tgz";
-      sha1 = "8b9b9e4405d7ec48c31c2346965aadc7abaecaa5";
+      url = "https://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz";
+      name = "nssocket-0.5.3.tgz";
+      sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
     };
     deps = {
-      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
+      "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+      "lazy-1.0.11" = self.by-version."lazy"."1.0.11";
     };
     optionalDependencies = {
     };
@@ -29161,21 +33235,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmlog"."0 || 1" =
-    self.by-version."npmlog"."1.2.0";
-  by-spec."npmlog"."0.0.4" =
-    self.by-version."npmlog"."0.0.4";
-  by-version."npmlog"."0.0.4" = self.buildNodePackage {
-    name = "npmlog-0.0.4";
-    version = "0.0.4";
+  by-spec."nth-check"."~1.0.0" =
+    self.by-version."nth-check"."1.0.1";
+  by-version."nth-check"."1.0.1" = self.buildNodePackage {
+    name = "nth-check-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.4.tgz";
-      name = "npmlog-0.0.4.tgz";
-      sha1 = "a12a7418606b7e0183a2851d97a8729b9a0f3837";
+      url = "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz";
+      name = "nth-check-1.0.1.tgz";
+      sha1 = "9929acdf628fc2c41098deab82ac580cf149aae4";
     };
     deps = {
-      "ansi-0.1.2" = self.by-version."ansi"."0.1.2";
+      "boolbase-1.0.0" = self.by-version."boolbase"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -29183,25 +33255,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmlog"."0.1 || 1" =
-    self.by-version."npmlog"."1.2.0";
-  by-spec."npmlog"."~0.1.1" =
-    self.by-version."npmlog"."0.1.1";
-  by-spec."npmlog"."~1.1.0" =
-    self.by-version."npmlog"."1.1.0";
-  by-version."npmlog"."1.1.0" = self.buildNodePackage {
-    name = "npmlog-1.1.0";
-    version = "1.1.0";
+  by-spec."ntwitter".">=0.5.0" =
+    self.by-version."ntwitter"."0.5.0";
+  by-version."ntwitter"."0.5.0" = self.buildNodePackage {
+    name = "ntwitter-0.5.0";
+    version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/npmlog/-/npmlog-1.1.0.tgz";
-      name = "npmlog-1.1.0.tgz";
-      sha1 = "8744168148df1ce3f3387c0bc38154883b4af5f4";
+      url = "https://registry.npmjs.org/ntwitter/-/ntwitter-0.5.0.tgz";
+      name = "ntwitter-0.5.0.tgz";
+      sha1 = "30c40105f82432fa8956a4f7655de932af631534";
     };
     deps = {
-      "ansi-0.3.0" = self.by-version."ansi"."0.3.0";
-      "are-we-there-yet-1.0.4" = self.by-version."are-we-there-yet"."1.0.4";
-      "gauge-1.1.0" = self.by-version."gauge"."1.1.0";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
+      "cookies-0.1.6" = self.by-version."cookies"."0.1.6";
+      "keygrip-0.2.4" = self.by-version."keygrip"."0.2.4";
     };
     optionalDependencies = {
     };
@@ -29209,22 +33277,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."npmlog"."~1.2.0" =
-    self.by-version."npmlog"."1.2.0";
-  by-spec."nssocket"."~0.5.1" =
-    self.by-version."nssocket"."0.5.3";
-  by-version."nssocket"."0.5.3" = self.buildNodePackage {
-    name = "nssocket-0.5.3";
-    version = "0.5.3";
+  by-spec."null-check"."^1.0.0" =
+    self.by-version."null-check"."1.0.0";
+  by-version."null-check"."1.0.0" = self.buildNodePackage {
+    name = "null-check-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz";
-      name = "nssocket-0.5.3.tgz";
-      sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d";
+      url = "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz";
+      name = "null-check-1.0.0.tgz";
+      sha1 = "977dffd7176012b9ec30d2a39db5cf72a0439edd";
     };
     deps = {
-      "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
-      "lazy-1.0.11" = self.by-version."lazy"."1.0.11";
     };
     optionalDependencies = {
     };
@@ -29232,21 +33296,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ntwitter".">=0.5.0" =
-    self.by-version."ntwitter"."0.5.0";
-  by-version."ntwitter"."0.5.0" = self.buildNodePackage {
-    name = "ntwitter-0.5.0";
-    version = "0.5.0";
+  by-spec."number-is-nan"."^1.0.0" =
+    self.by-version."number-is-nan"."1.0.0";
+  by-version."number-is-nan"."1.0.0" = self.buildNodePackage {
+    name = "number-is-nan-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ntwitter/-/ntwitter-0.5.0.tgz";
-      name = "ntwitter-0.5.0.tgz";
-      sha1 = "30c40105f82432fa8956a4f7655de932af631534";
+      url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
+      name = "number-is-nan-1.0.0.tgz";
+      sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
     };
     deps = {
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
-      "cookies-0.1.6" = self.by-version."cookies"."0.1.6";
-      "keygrip-0.2.4" = self.by-version."keygrip"."0.2.4";
     };
     optionalDependencies = {
     };
@@ -29261,7 +33322,7 @@
     version = "1.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
+      url = "https://registry.npmjs.org/numeral/-/numeral-1.5.3.tgz";
       name = "numeral-1.5.3.tgz";
       sha1 = "a4c3eba68239580509f818267c77243bce43ff62";
     };
@@ -29273,16 +33334,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."nwmatcher"."~1.3.1" =
-    self.by-version."nwmatcher"."1.3.4";
-  by-version."nwmatcher"."1.3.4" = self.buildNodePackage {
-    name = "nwmatcher-1.3.4";
-    version = "1.3.4";
+  by-spec."nwmatcher".">= 1.3.4 < 2.0.0" =
+    self.by-version."nwmatcher"."1.3.7";
+  by-version."nwmatcher"."1.3.7" = self.buildNodePackage {
+    name = "nwmatcher-1.3.7";
+    version = "1.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.4.tgz";
-      name = "nwmatcher-1.3.4.tgz";
-      sha1 = "965aa05fc3bc9de0a6438c8c07169866092fdaed";
+      url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.7.tgz";
+      name = "nwmatcher-1.3.7.tgz";
+      sha1 = "fec04ddfb1b07ff37b1e11a02b9c3c274cc131e0";
     };
     deps = {
     };
@@ -29292,19 +33353,20 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."nwmatcher"."~1.3.1" =
+    self.by-version."nwmatcher"."1.3.7";
   by-spec."nwmatcher"."~1.3.2" =
-    self.by-version."nwmatcher"."1.3.4";
+    self.by-version."nwmatcher"."1.3.7";
   by-spec."oauth"."*" =
-    self.by-version."oauth"."0.9.12";
-  by-version."oauth"."0.9.12" = self.buildNodePackage {
-    name = "oauth-0.9.12";
-    version = "0.9.12";
+    self.by-version."oauth"."0.9.14";
+  by-version."oauth"."0.9.14" = self.buildNodePackage {
+    name = "oauth-0.9.14";
+    version = "0.9.14";
     bin = false;
-    src = fetchFromGitHub {
-      owner = "ciaranj";
-      repo = "node-oauth";
-      rev = "0.9.12";
-      sha256 = "1c67nq1q5isfcvyp520q02w5c527s1wsfiyknzfvvp22sf2yn7k6";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/oauth/-/oauth-0.9.14.tgz";
+      name = "oauth-0.9.14.tgz";
+      sha1 = "c5748883a40b53de30ade9cabf2100414b8a0971";
     };
     deps = {
     };
@@ -29314,16 +33376,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."oauth"."0.9.12" =
-    self.by-version."oauth"."0.9.12";
+  by-spec."oauth"."0.9.14" =
+    self.by-version."oauth"."0.9.14";
   by-spec."oauth"."0.9.x" =
-    self.by-version."oauth"."0.9.12";
+    self.by-version."oauth"."0.9.14";
   by-spec."oauth".">=0.8.4" =
-    self.by-version."oauth"."0.9.12";
+    self.by-version."oauth"."0.9.14";
   by-spec."oauth".">=0.9.9" =
-    self.by-version."oauth"."0.9.12";
+    self.by-version."oauth"."0.9.14";
   by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" =
-    self.by-version."oauth"."0.9.12";
+    self.by-version."oauth"."0.9.14";
   by-spec."oauth-sign"."~0.2.0" =
     self.by-version."oauth-sign"."0.2.0";
   by-version."oauth-sign"."0.2.0" = self.buildNodePackage {
@@ -29331,7 +33393,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
+      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.2.0.tgz";
       name = "oauth-sign-0.2.0.tgz";
       sha1 = "a0e6a1715daed062f322b622b7fe5afd1035b6e2";
     };
@@ -29350,7 +33412,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
+      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.3.0.tgz";
       name = "oauth-sign-0.3.0.tgz";
       sha1 = "cb540f93bb2b22a7d5941691a288d60e8ea9386e";
     };
@@ -29369,7 +33431,7 @@
     version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
+      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz";
       name = "oauth-sign-0.4.0.tgz";
       sha1 = "f22956f31ea7151a821e5f2fb32c113cad8b9f69";
     };
@@ -29388,7 +33450,7 @@
     version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
+      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz";
       name = "oauth-sign-0.5.0.tgz";
       sha1 = "d767f5169325620eab2e087ef0c472e773db6461";
     };
@@ -29407,7 +33469,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
+      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
       name = "oauth-sign-0.6.0.tgz";
       sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
     };
@@ -29419,21 +33481,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."oauth2orize"."1.0.1" =
-    self.by-version."oauth2orize"."1.0.1";
-  by-version."oauth2orize"."1.0.1" = self.buildNodePackage {
-    name = "oauth2orize-1.0.1";
-    version = "1.0.1";
+  by-spec."oauth-sign"."~0.8.0" =
+    self.by-version."oauth-sign"."0.8.1";
+  by-version."oauth-sign"."0.8.1" = self.buildNodePackage {
+    name = "oauth-sign-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz";
+      name = "oauth-sign-0.8.1.tgz";
+      sha1 = "182439bdb91378bf7460e75c64ea43e6448def06";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."oauth-sign"."~0.8.1" =
+    self.by-version."oauth-sign"."0.8.1";
+  by-spec."oauth2orize"."1.2.2" =
+    self.by-version."oauth2orize"."1.2.2";
+  by-version."oauth2orize"."1.2.2" = self.buildNodePackage {
+    name = "oauth2orize-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth2orize/-/oauth2orize-1.0.1.tgz";
-      name = "oauth2orize-1.0.1.tgz";
-      sha1 = "eceb666b641caf717df43e63511518796c93642d";
+      url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.2.2.tgz";
+      name = "oauth2orize-1.2.2.tgz";
+      sha1 = "59611975c90b2105de61f7710abfd6f8a5a86be7";
     };
     deps = {
       "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -29448,7 +33531,7 @@
     version = "0.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
+      url = "https://registry.npmjs.org/object-additions/-/object-additions-0.5.1.tgz";
       name = "object-additions-0.5.1.tgz";
       sha1 = "ac624e0995e696c94cc69b41f316462b16a3bda4";
     };
@@ -29467,7 +33550,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
+      url = "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz";
       name = "object-assign-1.0.0.tgz";
       sha1 = "e65dc8766d3b47b4b8307465c8311da030b070a6";
     };
@@ -29480,15 +33563,53 @@
     cpu = [ ];
   };
   by-spec."object-assign"."^2.0.0" =
-    self.by-version."object-assign"."2.0.0";
-  by-version."object-assign"."2.0.0" = self.buildNodePackage {
-    name = "object-assign-2.0.0";
-    version = "2.0.0";
+    self.by-version."object-assign"."2.1.1";
+  by-version."object-assign"."2.1.1" = self.buildNodePackage {
+    name = "object-assign-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object-assign/-/object-assign-2.0.0.tgz";
-      name = "object-assign-2.0.0.tgz";
-      sha1 = "f8309b09083b01261ece3ef7373f2b57b8dd7042";
+      url = "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz";
+      name = "object-assign-2.1.1.tgz";
+      sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-assign"."^3.0.0" =
+    self.by-version."object-assign"."3.0.0";
+  by-version."object-assign"."3.0.0" = self.buildNodePackage {
+    name = "object-assign-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
+      name = "object-assign-3.0.0.tgz";
+      sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-assign"."^4.0.1" =
+    self.by-version."object-assign"."4.0.1";
+  by-version."object-assign"."4.0.1" = self.buildNodePackage {
+    name = "object-assign-4.0.1";
+    version = "4.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz";
+      name = "object-assign-4.0.1.tgz";
+      sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd";
     };
     deps = {
     };
@@ -29505,7 +33626,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+      url = "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
       name = "object-component-0.0.3.tgz";
       sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
     };
@@ -29517,16 +33638,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."object-inspect"."~0.4.0" =
-    self.by-version."object-inspect"."0.4.0";
-  by-version."object-inspect"."0.4.0" = self.buildNodePackage {
-    name = "object-inspect-0.4.0";
-    version = "0.4.0";
+  by-spec."object-keys"."^1.0.6" =
+    self.by-version."object-keys"."1.0.9";
+  by-version."object-keys"."1.0.9" = self.buildNodePackage {
+    name = "object-keys-1.0.9";
+    version = "1.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object-inspect/-/object-inspect-0.4.0.tgz";
-      name = "object-inspect-0.4.0.tgz";
-      sha1 = "f5157c116c1455b243b06ee97703392c5ad89fec";
+      url = "https://registry.npmjs.org/object-keys/-/object-keys-1.0.9.tgz";
+      name = "object-keys-1.0.9.tgz";
+      sha1 = "cabb1202d9a7af29b50edface8094bb46da5ea21";
     };
     deps = {
     };
@@ -29536,18 +33657,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."object-keys"."1.0.1" =
-    self.by-version."object-keys"."1.0.1";
-  by-version."object-keys"."1.0.1" = self.buildNodePackage {
-    name = "object-keys-1.0.1";
-    version = "1.0.1";
+  by-spec."object-keys"."~1.0.1" =
+    self.by-version."object-keys"."1.0.9";
+  by-spec."object.assign"."^1.1.1" =
+    self.by-version."object.assign"."1.1.1";
+  by-version."object.assign"."1.1.1" = self.buildNodePackage {
+    name = "object.assign-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object-keys/-/object-keys-1.0.1.tgz";
-      name = "object-keys-1.0.1.tgz";
-      sha1 = "55802e85842c26bbb5ebbc157abf3be302569ba8";
+      url = "https://registry.npmjs.org/object.assign/-/object.assign-1.1.1.tgz";
+      name = "object.assign-1.1.1.tgz";
+      sha1 = "f229674273f94fcb230d02c1958a8b94ec9ef95c";
     };
     deps = {
+      "object-keys-1.0.9" = self.by-version."object-keys"."1.0.9";
     };
     optionalDependencies = {
     };
@@ -29555,18 +33679,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."object-keys"."~0.4.0" =
-    self.by-version."object-keys"."0.4.0";
-  by-version."object-keys"."0.4.0" = self.buildNodePackage {
-    name = "object-keys-0.4.0";
-    version = "0.4.0";
+  by-spec."object.omit"."^2.0.0" =
+    self.by-version."object.omit"."2.0.0";
+  by-version."object.omit"."2.0.0" = self.buildNodePackage {
+    name = "object.omit-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz";
-      name = "object-keys-0.4.0.tgz";
-      sha1 = "28a6aae7428dd2c3a92f3d95f21335dd204e0336";
+      url = "https://registry.npmjs.org/object.omit/-/object.omit-2.0.0.tgz";
+      name = "object.omit-2.0.0.tgz";
+      sha1 = "868597333d54e60662940bb458605dd6ae12fe94";
     };
     deps = {
+      "for-own-0.1.4" = self.by-version."for-own"."0.1.4";
+      "is-extendable-0.1.1" = self.by-version."is-extendable"."0.1.1";
     };
     optionalDependencies = {
     };
@@ -29574,20 +33700,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."object.omit"."^0.2.1" =
-    self.by-version."object.omit"."0.2.1";
-  by-version."object.omit"."0.2.1" = self.buildNodePackage {
-    name = "object.omit-0.2.1";
-    version = "0.2.1";
+  by-spec."octicons"."~3.4.1" =
+    self.by-version."octicons"."3.4.1";
+  by-version."octicons"."3.4.1" = self.buildNodePackage {
+    name = "octicons-3.4.1";
+    version = "3.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/object.omit/-/object.omit-0.2.1.tgz";
-      name = "object.omit-0.2.1.tgz";
-      sha1 = "ca9af6631df6883fe61bae74df82a4fbc9df2e92";
+      url = "https://registry.npmjs.org/octicons/-/octicons-3.4.1.tgz";
+      name = "octicons-3.4.1.tgz";
+      sha1 = "042c3e433a0176212da3f2e61a4867e7b95557b1";
     };
     deps = {
-      "for-own-0.1.3" = self.by-version."for-own"."0.1.3";
-      "isobject-0.2.0" = self.by-version."isobject"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -29602,7 +33726,7 @@
     version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
+      url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz";
       name = "on-finished-2.1.0.tgz";
       sha1 = "0c539f09291e8ffadde0c8a25850fb2cedc7022d";
     };
@@ -29622,7 +33746,7 @@
     version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz";
+      url = "https://registry.npmjs.org/on-finished/-/on-finished-2.1.1.tgz";
       name = "on-finished-2.1.1.tgz";
       sha1 = "f82ca1c9e3a4f3286b1b9938610e5b8636bd3cb2";
     };
@@ -29635,21 +33759,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."on-finished"."~2.1.1" =
-    self.by-version."on-finished"."2.1.1";
-  by-spec."on-finished"."~2.2.0" =
-    self.by-version."on-finished"."2.2.0";
-  by-version."on-finished"."2.2.0" = self.buildNodePackage {
-    name = "on-finished-2.2.0";
-    version = "2.2.0";
+  by-spec."on-finished"."~2.3.0" =
+    self.by-version."on-finished"."2.3.0";
+  by-version."on-finished"."2.3.0" = self.buildNodePackage {
+    name = "on-finished-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/on-finished/-/on-finished-2.2.0.tgz";
-      name = "on-finished-2.2.0.tgz";
-      sha1 = "e6ba6a09a3482d6b7969bc3da92c86f0a967605e";
+      url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz";
+      name = "on-finished-2.3.0.tgz";
+      sha1 = "20f1336481b083cd75337992a16971aa2d906947";
     };
     deps = {
-      "ee-first-1.1.0" = self.by-version."ee-first"."1.1.0";
+      "ee-first-1.1.1" = self.by-version."ee-first"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -29657,16 +33779,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."on-headers"."1.0.0" =
-    self.by-version."on-headers"."1.0.0";
-  by-version."on-headers"."1.0.0" = self.buildNodePackage {
-    name = "on-headers-1.0.0";
-    version = "1.0.0";
+  by-spec."on-headers"."1.0.1" =
+    self.by-version."on-headers"."1.0.1";
+  by-version."on-headers"."1.0.1" = self.buildNodePackage {
+    name = "on-headers-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/on-headers/-/on-headers-1.0.0.tgz";
-      name = "on-headers-1.0.0.tgz";
-      sha1 = "2c75b5da4375513d0161c6052e7fcbe4953fca5d";
+      url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz";
+      name = "on-headers-1.0.1.tgz";
+      sha1 = "928f5d0f470d49342651ea6794b0857c100693f7";
     };
     deps = {
     };
@@ -29677,7 +33799,9 @@
     cpu = [ ];
   };
   by-spec."on-headers"."~1.0.0" =
-    self.by-version."on-headers"."1.0.0";
+    self.by-version."on-headers"."1.0.1";
+  by-spec."on-headers"."~1.0.1" =
+    self.by-version."on-headers"."1.0.1";
   by-spec."once"."1.3.0" =
     self.by-version."once"."1.3.0";
   by-version."once"."1.3.0" = self.buildNodePackage {
@@ -29685,7 +33809,7 @@
     version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.3.0.tgz";
+      url = "https://registry.npmjs.org/once/-/once-1.3.0.tgz";
       name = "once-1.3.0.tgz";
       sha1 = "151af86bfc1f08c4b9f07d06ab250ffcbeb56581";
     };
@@ -29698,15 +33822,15 @@
     cpu = [ ];
   };
   by-spec."once"."1.x" =
-    self.by-version."once"."1.3.1";
-  by-version."once"."1.3.1" = self.buildNodePackage {
-    name = "once-1.3.1";
-    version = "1.3.1";
+    self.by-version."once"."1.3.3";
+  by-version."once"."1.3.3" = self.buildNodePackage {
+    name = "once-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
-      name = "once-1.3.1.tgz";
-      sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f";
+      url = "https://registry.npmjs.org/once/-/once-1.3.3.tgz";
+      name = "once-1.3.3.tgz";
+      sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
     };
     deps = {
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
@@ -29718,11 +33842,11 @@
     cpu = [ ];
   };
   by-spec."once"."^1.1.1" =
-    self.by-version."once"."1.3.1";
+    self.by-version."once"."1.3.3";
   by-spec."once"."^1.3.0" =
-    self.by-version."once"."1.3.1";
+    self.by-version."once"."1.3.3";
   by-spec."once"."^1.3.1" =
-    self.by-version."once"."1.3.1";
+    self.by-version."once"."1.3.3";
   by-spec."once"."~1.1.1" =
     self.by-version."once"."1.1.1";
   by-version."once"."1.1.1" = self.buildNodePackage {
@@ -29730,7 +33854,7 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.1.1.tgz";
+      url = "https://registry.npmjs.org/once/-/once-1.1.1.tgz";
       name = "once-1.1.1.tgz";
       sha1 = "9db574933ccb08c3a7614d154032c09ea6f339e7";
     };
@@ -29749,7 +33873,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.2.0.tgz";
+      url = "https://registry.npmjs.org/once/-/once-1.2.0.tgz";
       name = "once-1.2.0.tgz";
       sha1 = "de1905c636af874a8fba862d9aabddd1f920461c";
     };
@@ -29762,19 +33886,19 @@
     cpu = [ ];
   };
   by-spec."once"."~1.3.0" =
-    self.by-version."once"."1.3.1";
-  by-spec."once"."~1.3.1" =
-    self.by-version."once"."1.3.1";
+    self.by-version."once"."1.3.3";
+  by-spec."once"."~1.3.3" =
+    self.by-version."once"."1.3.3";
   by-spec."onetime"."^1.0.0" =
-    self.by-version."onetime"."1.0.0";
-  by-version."onetime"."1.0.0" = self.buildNodePackage {
-    name = "onetime-1.0.0";
-    version = "1.0.0";
+    self.by-version."onetime"."1.1.0";
+  by-version."onetime"."1.1.0" = self.buildNodePackage {
+    name = "onetime-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz";
-      name = "onetime-1.0.0.tgz";
-      sha1 = "3a08a8e39d7816df52d34886374fb8ed8b651f62";
+      url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz";
+      name = "onetime-1.1.0.tgz";
+      sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789";
     };
     deps = {
     };
@@ -29791,7 +33915,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/open/-/open-0.0.2.tgz";
+      url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz";
       name = "open-0.0.2.tgz";
       sha1 = "0a620ba2574464742f51e69f8ba8eccfd97b5dfc";
     };
@@ -29810,7 +33934,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/open/-/open-0.0.5.tgz";
+      url = "https://registry.npmjs.org/open/-/open-0.0.5.tgz";
       name = "open-0.0.5.tgz";
       sha1 = "42c3e18ec95466b6bf0dc42f3a2945c3f0cad8fc";
     };
@@ -29835,7 +33959,7 @@
     version = "1.4.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/opener/-/opener-1.4.1.tgz";
+      url = "https://registry.npmjs.org/opener/-/opener-1.4.1.tgz";
       name = "opener-1.4.1.tgz";
       sha1 = "897590acd1aed3311b703b58bccb4d43f56f2895";
     };
@@ -29847,58 +33971,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."opener"."~1.3.0" =
-    self.by-version."opener"."1.3.0";
-  by-version."opener"."1.3.0" = self.buildNodePackage {
-    name = "opener-1.3.0";
-    version = "1.3.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/opener/-/opener-1.3.0.tgz";
-      name = "opener-1.3.0.tgz";
-      sha1 = "130ba662213fa842edb4cd0361d31a15301a43e2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."opener"."~1.4.1" =
     self.by-version."opener"."1.4.1";
   by-spec."openid".">=0.2.0" =
-    self.by-version."openid"."0.5.11";
-  by-version."openid"."0.5.11" = self.buildNodePackage {
-    name = "openid-0.5.11";
-    version = "0.5.11";
+    self.by-version."openid"."2.0.0";
+  by-version."openid"."2.0.0" = self.buildNodePackage {
+    name = "openid-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/openid/-/openid-0.5.11.tgz";
-      name = "openid-0.5.11.tgz";
-      sha1 = "01fda48f3c1d73d2f073f34240c933747eeac056";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."opn"."^1.0.1" =
-    self.by-version."opn"."1.0.1";
-  by-version."opn"."1.0.1" = self.buildNodePackage {
-    name = "opn-1.0.1";
-    version = "1.0.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/opn/-/opn-1.0.1.tgz";
-      name = "opn-1.0.1.tgz";
-      sha1 = "c2dce2a5c41ab9589a7486aaff4d8de002d041ca";
+      url = "https://registry.npmjs.org/openid/-/openid-2.0.0.tgz";
+      name = "openid-2.0.0.tgz";
+      sha1 = "cf738439d321d248790cc49f5cadded3e4b5910a";
     };
     deps = {
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -29913,12 +34000,12 @@
     version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
+      url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz";
       name = "optimist-0.6.1.tgz";
       sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
     };
     deps = {
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
     optionalDependencies = {
@@ -29935,12 +34022,12 @@
     version = "0.2.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
+      url = "https://registry.npmjs.org/optimist/-/optimist-0.2.8.tgz";
       name = "optimist-0.2.8.tgz";
       sha1 = "e981ab7e268b457948593b55674c099a815cac31";
     };
     deps = {
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -29955,12 +34042,12 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
+      url = "https://registry.npmjs.org/optimist/-/optimist-0.6.0.tgz";
       name = "optimist-0.6.0.tgz";
       sha1 = "69424826f3405f79f142e6fc3d9ae58d4dbb9200";
     };
     deps = {
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
     optionalDependencies = {
@@ -29969,7 +34056,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."optimist"."0.6.x" =
+  by-spec."optimist"."0.6.1" =
     self.by-version."optimist"."0.6.1";
   by-spec."optimist"."^0.6.1" =
     self.by-version."optimist"."0.6.1";
@@ -29980,12 +34067,12 @@
     version = "0.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
+      url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz";
       name = "optimist-0.3.7.tgz";
       sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9";
     };
     deps = {
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
     };
     optionalDependencies = {
     };
@@ -30008,17 +34095,42 @@
     version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz";
+      url = "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz";
       name = "optionator-0.5.0.tgz";
       sha1 = "b75a8995a2d417df25b6e4e3862f50aa88651368";
     };
     deps = {
-      "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
+      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
       "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
-      "type-check-0.3.1" = self.by-version."type-check"."0.3.1";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
+      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
       "levn-0.2.5" = self.by-version."levn"."0.2.5";
-      "fast-levenshtein-1.0.6" = self.by-version."fast-levenshtein"."1.0.6";
+      "fast-levenshtein-1.0.7" = self.by-version."fast-levenshtein"."1.0.7";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."optionator"."^0.8.1" =
+    self.by-version."optionator"."0.8.1";
+  by-version."optionator"."0.8.1" = self.buildNodePackage {
+    name = "optionator-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz";
+      name = "optionator-0.8.1.tgz";
+      sha1 = "e31b4932cdd5fb862a8b0d10bc63d3ee1ec7d78b";
+    };
+    deps = {
+      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
+      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
+      "wordwrap-1.0.0" = self.by-version."wordwrap"."1.0.0";
+      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
+      "levn-0.3.0" = self.by-version."levn"."0.3.0";
+      "fast-levenshtein-1.1.3" = self.by-version."fast-levenshtein"."1.1.3";
     };
     optionalDependencies = {
     };
@@ -30033,7 +34145,7 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
+      url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz";
       name = "options-0.0.6.tgz";
       sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
     };
@@ -30046,15 +34158,15 @@
     cpu = [ ];
   };
   by-spec."optjs"."*" =
-    self.by-version."optjs"."3.2.1-boom";
-  by-version."optjs"."3.2.1-boom" = self.buildNodePackage {
-    name = "optjs-3.2.1-boom";
-    version = "3.2.1-boom";
+    self.by-version."optjs"."3.2.2";
+  by-version."optjs"."3.2.2" = self.buildNodePackage {
+    name = "optjs-3.2.2";
+    version = "3.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optjs/-/optjs-3.2.1-boom.tgz";
-      name = "optjs-3.2.1-boom.tgz";
-      sha1 = "bc0af6c8647db5eec511c4ca2d264f9646add758";
+      url = "https://registry.npmjs.org/optjs/-/optjs-3.2.2.tgz";
+      name = "optjs-3.2.2.tgz";
+      sha1 = "69a6ce89c442a44403141ad2f9b370bd5bb6f4ee";
     };
     deps = {
     };
@@ -30071,7 +34183,7 @@
     version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
+      url = "https://registry.npmjs.org/optparse/-/optparse-1.0.5.tgz";
       name = "optparse-1.0.5.tgz";
       sha1 = "75e75a96506611eb1c65ba89018ff08a981e2c16";
     };
@@ -30093,7 +34205,7 @@
     version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/opts/-/opts-1.2.2.tgz";
+      url = "https://registry.npmjs.org/opts/-/opts-1.2.2.tgz";
       name = "opts-1.2.2.tgz";
       sha1 = "81782b93014a1cd88d56c226643fd4282473853d";
     };
@@ -30112,7 +34224,7 @@
     version = "0.3.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
+      url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.7.tgz";
       name = "orchestrator-0.3.7.tgz";
       sha1 = "c45064e22c5a2a7b99734f409a95ffedc7d3c3df";
     };
@@ -30134,7 +34246,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz";
+      url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz";
       name = "ordered-read-streams-0.1.0.tgz";
       sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126";
     };
@@ -30153,7 +34265,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
+      url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.1.2.tgz";
       name = "os-browserify-0.1.2.tgz";
       sha1 = "49ca0293e0b19590a5f5de10c7f265a617d8fe54";
     };
@@ -30167,20 +34279,18 @@
   };
   by-spec."os-browserify"."~0.1.2" =
     self.by-version."os-browserify"."0.1.2";
-  by-spec."os-name"."^1.0.0" =
-    self.by-version."os-name"."1.0.3";
-  by-version."os-name"."1.0.3" = self.buildNodePackage {
-    name = "os-name-1.0.3";
-    version = "1.0.3";
-    bin = true;
+  by-spec."os-browserify"."~0.2.0" =
+    self.by-version."os-browserify"."0.2.1";
+  by-version."os-browserify"."0.2.1" = self.buildNodePackage {
+    name = "os-browserify-0.2.1";
+    version = "0.2.1";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz";
-      name = "os-name-1.0.3.tgz";
-      sha1 = "1b379f64835af7c5a7f498b357cb95215c159edf";
+      url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz";
+      name = "os-browserify-0.2.1.tgz";
+      sha1 = "63fc4ccee5d2d7763d26bbf8601078e6c2e0044f";
     };
     deps = {
-      "osx-release-1.0.0" = self.by-version."osx-release"."1.0.0";
-      "win-release-1.0.0" = self.by-version."win-release"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -30188,16 +34298,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."osenv"."0" =
-    self.by-version."osenv"."0.1.0";
-  by-version."osenv"."0.1.0" = self.buildNodePackage {
-    name = "osenv-0.1.0";
-    version = "0.1.0";
+  by-spec."os-homedir"."^1.0.0" =
+    self.by-version."os-homedir"."1.0.1";
+  by-version."os-homedir"."1.0.1" = self.buildNodePackage {
+    name = "os-homedir-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz";
-      name = "osenv-0.1.0.tgz";
-      sha1 = "61668121eec584955030b9f470b1d2309504bfcb";
+      url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz";
+      name = "os-homedir-1.0.1.tgz";
+      sha1 = "0d62bdf44b916fd3bbdcf2cab191948fb094f007";
     };
     deps = {
     };
@@ -30207,18 +34317,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."osenv"."0.0.3" =
-    self.by-version."osenv"."0.0.3";
-  by-version."osenv"."0.0.3" = self.buildNodePackage {
-    name = "osenv-0.0.3";
-    version = "0.0.3";
+  by-spec."os-homedir"."~1.0.1" =
+    self.by-version."os-homedir"."1.0.1";
+  by-spec."os-locale"."^1.4.0" =
+    self.by-version."os-locale"."1.4.0";
+  by-version."os-locale"."1.4.0" = self.buildNodePackage {
+    name = "os-locale-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
-      name = "osenv-0.0.3.tgz";
-      sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
+      url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
+      name = "os-locale-1.4.0.tgz";
+      sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9";
     };
     deps = {
+      "lcid-1.0.0" = self.by-version."lcid"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -30226,25 +34339,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."osenv"."0.1.0" =
-    self.by-version."osenv"."0.1.0";
-  by-spec."osenv"."^0.1.0" =
-    self.by-version."osenv"."0.1.0";
-  by-spec."osenv"."~0.1.0" =
-    self.by-version."osenv"."0.1.0";
-  by-spec."osx-release"."^1.0.0" =
-    self.by-version."osx-release"."1.0.0";
-  by-version."osx-release"."1.0.0" = self.buildNodePackage {
-    name = "osx-release-1.0.0";
-    version = "1.0.0";
-    bin = true;
+  by-spec."os-tmpdir"."^1.0.0" =
+    self.by-version."os-tmpdir"."1.0.1";
+  by-version."os-tmpdir"."1.0.1" = self.buildNodePackage {
+    name = "os-tmpdir-1.0.1";
+    version = "1.0.1";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/osx-release/-/osx-release-1.0.0.tgz";
-      name = "osx-release-1.0.0.tgz";
-      sha1 = "02bee80f3b898aaa88922d2f86e178605974beac";
+      url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz";
+      name = "os-tmpdir-1.0.1.tgz";
+      sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e";
     };
     deps = {
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -30252,20 +34358,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."osx-trash"."^1.0.0" =
-    self.by-version."osx-trash"."1.0.0";
-  by-version."osx-trash"."1.0.0" = self.buildNodePackage {
-    name = "osx-trash-1.0.0";
-    version = "1.0.0";
-    bin = true;
+  by-spec."os-tmpdir"."~1.0.1" =
+    self.by-version."os-tmpdir"."1.0.1";
+  by-spec."osenv"."0" =
+    self.by-version."osenv"."0.1.3";
+  by-version."osenv"."0.1.3" = self.buildNodePackage {
+    name = "osenv-0.1.3";
+    version = "0.1.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/osx-trash/-/osx-trash-1.0.0.tgz";
-      name = "osx-trash-1.0.0.tgz";
-      sha1 = "be846a528b8d98e02a920f788857838d57d601d5";
+      url = "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
+      name = "osenv-0.1.3.tgz";
+      sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
     };
     deps = {
-      "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0";
-      "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1";
+      "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
+      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -30273,16 +34381,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."owl-deepcopy"."*" =
-    self.by-version."owl-deepcopy"."0.0.4";
-  by-version."owl-deepcopy"."0.0.4" = self.buildNodePackage {
-    name = "owl-deepcopy-0.0.4";
-    version = "0.0.4";
+  by-spec."osenv"."0.0.3" =
+    self.by-version."osenv"."0.0.3";
+  by-version."osenv"."0.0.3" = self.buildNodePackage {
+    name = "osenv-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz";
-      name = "owl-deepcopy-0.0.4.tgz";
-      sha1 = "665f3aeafab74302d98ecaeeb7b3e764ae21f369";
+      url = "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz";
+      name = "osenv-0.0.3.tgz";
+      sha1 = "cd6ad8ddb290915ad9e22765576025d411f29cb6";
     };
     deps = {
     };
@@ -30292,22 +34400,24 @@
     os = [ ];
     cpu = [ ];
   };
-  "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4";
-  by-spec."owl-deepcopy"."~0.0.1" =
+  by-spec."osenv"."^0.1.0" =
+    self.by-version."osenv"."0.1.3";
+  by-spec."osenv"."^0.1.3" =
+    self.by-version."osenv"."0.1.3";
+  by-spec."osenv"."~0.1.3" =
+    self.by-version."osenv"."0.1.3";
+  by-spec."owl-deepcopy"."*" =
     self.by-version."owl-deepcopy"."0.0.4";
-  by-spec."p-throttler"."0.1.1" =
-    self.by-version."p-throttler"."0.1.1";
-  by-version."p-throttler"."0.1.1" = self.buildNodePackage {
-    name = "p-throttler-0.1.1";
-    version = "0.1.1";
+  by-version."owl-deepcopy"."0.0.4" = self.buildNodePackage {
+    name = "owl-deepcopy-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/p-throttler/-/p-throttler-0.1.1.tgz";
-      name = "p-throttler-0.1.1.tgz";
-      sha1 = "15246409d225d3eefca85c50de710a83a78cca6a";
+      url = "https://registry.npmjs.org/owl-deepcopy/-/owl-deepcopy-0.0.4.tgz";
+      name = "owl-deepcopy-0.0.4.tgz";
+      sha1 = "665f3aeafab74302d98ecaeeb7b3e764ae21f369";
     };
     deps = {
-      "q-0.9.7" = self.by-version."q"."0.9.7";
     };
     optionalDependencies = {
     };
@@ -30315,6 +34425,9 @@
     os = [ ];
     cpu = [ ];
   };
+  "owl-deepcopy" = self.by-version."owl-deepcopy"."0.0.4";
+  by-spec."owl-deepcopy"."~0.0.1" =
+    self.by-version."owl-deepcopy"."0.0.4";
   by-spec."pac-proxy-agent"."0" =
     self.by-version."pac-proxy-agent"."0.2.0";
   by-version."pac-proxy-agent"."0.2.0" = self.buildNodePackage {
@@ -30322,18 +34435,18 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-0.2.0.tgz";
+      url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-0.2.0.tgz";
       name = "pac-proxy-agent-0.2.0.tgz";
       sha1 = "ad902909d92f4fe7cc2e5f59f5bf5061bcfa71b2";
     };
     deps = {
-      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
+      "agent-base-1.0.2" = self.by-version."agent-base"."1.0.2";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
       "pac-resolver-1.2.6" = self.by-version."pac-resolver"."1.2.6";
-      "proxy-agent-1.1.0" = self.by-version."proxy-agent"."1.1.0";
-      "get-uri-0.1.3" = self.by-version."get-uri"."0.1.3";
+      "proxy-agent-1.1.1" = self.by-version."proxy-agent"."1.1.1";
+      "get-uri-0.1.4" = self.by-version."get-uri"."0.1.4";
       "stream-to-array-1.0.0" = self.by-version."stream-to-array"."1.0.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
     };
@@ -30348,15 +34461,15 @@
     version = "1.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.6.tgz";
+      url = "https://registry.npmjs.org/pac-resolver/-/pac-resolver-1.2.6.tgz";
       name = "pac-resolver-1.2.6.tgz";
       sha1 = "ed03af0c5b5933505bdd3f07f75175466d5e7cfb";
     };
     deps = {
       "co-3.0.6" = self.by-version."co"."3.0.6";
       "netmask-1.0.5" = self.by-version."netmask"."1.0.5";
-      "degenerator-1.0.1" = self.by-version."degenerator"."1.0.1";
-      "regenerator-0.8.22" = self.by-version."regenerator"."0.8.22";
+      "degenerator-1.0.2" = self.by-version."degenerator"."1.0.2";
+      "regenerator-0.8.42" = self.by-version."regenerator"."0.8.42";
       "thunkify-2.1.2" = self.by-version."thunkify"."2.1.2";
     };
     optionalDependencies = {
@@ -30366,19 +34479,19 @@
     cpu = [ ];
   };
   by-spec."package-json"."^1.0.0" =
-    self.by-version."package-json"."1.1.0";
-  by-version."package-json"."1.1.0" = self.buildNodePackage {
-    name = "package-json-1.1.0";
-    version = "1.1.0";
+    self.by-version."package-json"."1.2.0";
+  by-version."package-json"."1.2.0" = self.buildNodePackage {
+    name = "package-json-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/package-json/-/package-json-1.1.0.tgz";
-      name = "package-json-1.1.0.tgz";
-      sha1 = "32b427c626385ccce180dc73a66d94f35f545e4b";
+      url = "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz";
+      name = "package-json-1.2.0.tgz";
+      sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
     };
     deps = {
-      "got-2.7.2" = self.by-version."got"."2.7.2";
-      "registry-url-3.0.3" = self.by-version."registry-url"."3.0.3";
+      "got-3.3.1" = self.by-version."got"."3.3.1";
+      "registry-url-3.1.0" = self.by-version."registry-url"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -30393,7 +34506,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pad/-/pad-0.0.5.tgz";
+      url = "https://registry.npmjs.org/pad/-/pad-0.0.5.tgz";
       name = "pad-0.0.5.tgz";
       sha1 = "2219ab4db2ac74549a676164bc475d68cb87de05";
     };
@@ -30406,34 +34519,15 @@
     cpu = [ ];
   };
   by-spec."pako"."~0.2.0" =
-    self.by-version."pako"."0.2.6";
-  by-version."pako"."0.2.6" = self.buildNodePackage {
-    name = "pako-0.2.6";
-    version = "0.2.6";
+    self.by-version."pako"."0.2.8";
+  by-version."pako"."0.2.8" = self.buildNodePackage {
+    name = "pako-0.2.8";
+    version = "0.2.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pako/-/pako-0.2.6.tgz";
-      name = "pako-0.2.6.tgz";
-      sha1 = "3e0c548353b859ab9c8005fac706bdd6c7af505f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parents"."0.0.2" =
-    self.by-version."parents"."0.0.2";
-  by-version."parents"."0.0.2" = self.buildNodePackage {
-    name = "parents-0.0.2";
-    version = "0.0.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parents/-/parents-0.0.2.tgz";
-      name = "parents-0.0.2.tgz";
-      sha1 = "67147826e497d40759aaf5ba4c99659b6034d302";
+      url = "https://registry.npmjs.org/pako/-/pako-0.2.8.tgz";
+      name = "pako-0.2.8.tgz";
+      sha1 = "15ad772915362913f20de4a8a164b4aacc6165d6";
     };
     deps = {
     };
@@ -30450,7 +34544,7 @@
     version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parents/-/parents-1.0.1.tgz";
+      url = "https://registry.npmjs.org/parents/-/parents-1.0.1.tgz";
       name = "parents-1.0.1.tgz";
       sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751";
     };
@@ -30465,19 +34559,23 @@
   };
   by-spec."parents"."^1.0.1" =
     self.by-version."parents"."1.0.1";
-  by-spec."parents"."~0.0.1" =
-    self.by-version."parents"."0.0.3";
-  by-version."parents"."0.0.3" = self.buildNodePackage {
-    name = "parents-0.0.3";
-    version = "0.0.3";
-    bin = true;
+  by-spec."parse-asn1"."^5.0.0" =
+    self.by-version."parse-asn1"."5.0.0";
+  by-version."parse-asn1"."5.0.0" = self.buildNodePackage {
+    name = "parse-asn1-5.0.0";
+    version = "5.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parents/-/parents-0.0.3.tgz";
-      name = "parents-0.0.3.tgz";
-      sha1 = "fa212f024d9fa6318dbb6b4ce676c8be493b9c43";
+      url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.0.0.tgz";
+      name = "parse-asn1-5.0.0.tgz";
+      sha1 = "35060f6d5015d37628c770f4e091a0b5a278bc23";
     };
     deps = {
-      "path-platform-0.0.1" = self.by-version."path-platform"."0.0.1";
+      "asn1.js-4.5.2" = self.by-version."asn1.js"."4.5.2";
+      "browserify-aes-1.0.6" = self.by-version."browserify-aes"."1.0.6";
+      "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
+      "evp_bytestokey-1.0.0" = self.by-version."evp_bytestokey"."1.0.0";
+      "pbkdf2-3.0.4" = self.by-version."pbkdf2"."3.0.4";
     };
     optionalDependencies = {
     };
@@ -30485,22 +34583,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."parse-asn1"."^3.0.0" =
-    self.by-version."parse-asn1"."3.0.0";
-  by-version."parse-asn1"."3.0.0" = self.buildNodePackage {
-    name = "parse-asn1-3.0.0";
-    version = "3.0.0";
+  by-spec."parse-glob"."^3.0.4" =
+    self.by-version."parse-glob"."3.0.4";
+  by-version."parse-glob"."3.0.4" = self.buildNodePackage {
+    name = "parse-glob-3.0.4";
+    version = "3.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-3.0.0.tgz";
-      name = "parse-asn1-3.0.0.tgz";
-      sha1 = "36ea30eb2ad99084e738e92801647910cdbf1ee4";
+      url = "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz";
+      name = "parse-glob-3.0.4.tgz";
+      sha1 = "b2c376cfb11f35513badd173ef0bb6e3a388391c";
     };
     deps = {
-      "asn1.js-1.0.4" = self.by-version."asn1.js"."1.0.4";
-      "browserify-aes-1.0.0" = self.by-version."browserify-aes"."1.0.0";
-      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
-      "pbkdf2-compat-3.0.2" = self.by-version."pbkdf2-compat"."3.0.2";
+      "glob-base-0.3.0" = self.by-version."glob-base"."0.3.0";
+      "is-dotfile-1.0.2" = self.by-version."is-dotfile"."1.0.2";
+      "is-extglob-1.0.0" = self.by-version."is-extglob"."1.0.0";
+      "is-glob-2.0.1" = self.by-version."is-glob"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -30508,22 +34606,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."parse-glob"."^3.0.0" =
-    self.by-version."parse-glob"."3.0.1";
-  by-version."parse-glob"."3.0.1" = self.buildNodePackage {
-    name = "parse-glob-3.0.1";
-    version = "3.0.1";
+  by-spec."parse-json"."^2.2.0" =
+    self.by-version."parse-json"."2.2.0";
+  by-version."parse-json"."2.2.0" = self.buildNodePackage {
+    name = "parse-json-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parse-glob/-/parse-glob-3.0.1.tgz";
-      name = "parse-glob-3.0.1.tgz";
-      sha1 = "6dc718c0265f41096e106bb9adb40d327b7ab588";
+      url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
+      name = "parse-json-2.2.0.tgz";
+      sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
     };
     deps = {
-      "glob-base-0.2.0" = self.by-version."glob-base"."0.2.0";
-      "is-dotfile-1.0.0" = self.by-version."is-dotfile"."1.0.0";
-      "is-extglob-1.0.0" = self.by-version."is-extglob"."1.0.0";
-      "is-glob-1.1.3" = self.by-version."is-glob"."1.1.3";
+      "error-ex-1.3.0" = self.by-version."error-ex"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -30531,19 +34626,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."parse-torrent"."^1.4.0" =
-    self.by-version."parse-torrent"."1.7.0";
-  by-version."parse-torrent"."1.7.0" = self.buildNodePackage {
-    name = "parse-torrent-1.7.0";
-    version = "1.7.0";
+  by-spec."parse-torrent"."^4.0.0" =
+    self.by-version."parse-torrent"."4.1.0";
+  by-version."parse-torrent"."4.1.0" = self.buildNodePackage {
+    name = "parse-torrent-4.1.0";
+    version = "4.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.7.0.tgz";
-      name = "parse-torrent-1.7.0.tgz";
-      sha1 = "f64d09d2efa05f7a9e89378d041a63d9ca1e47d2";
+      url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-4.1.0.tgz";
+      name = "parse-torrent-4.1.0.tgz";
+      sha1 = "a814bd8505e8b58e88eb8ff3e2daff5d19a711b7";
     };
     deps = {
-      "bencode-0.6.0" = self.by-version."bencode"."0.6.0";
+      "magnet-uri-4.2.3" = self.by-version."magnet-uri"."4.2.3";
+      "parse-torrent-file-2.1.4" = self.by-version."parse-torrent-file"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -30551,20 +34647,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."parse-torrent"."^4.0.0" =
-    self.by-version."parse-torrent"."4.0.0";
-  by-version."parse-torrent"."4.0.0" = self.buildNodePackage {
-    name = "parse-torrent-4.0.0";
-    version = "4.0.0";
+  by-spec."parse-torrent"."^5.4.0" =
+    self.by-version."parse-torrent"."5.7.3";
+  by-version."parse-torrent"."5.7.3" = self.buildNodePackage {
+    name = "parse-torrent-5.7.3";
+    version = "5.7.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-4.0.0.tgz";
-      name = "parse-torrent-4.0.0.tgz";
-      sha1 = "bdf118b5e59eadfbf5ad4795dbf1765b2ec46a25";
+      url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-5.7.3.tgz";
+      name = "parse-torrent-5.7.3.tgz";
+      sha1 = "8e7159acc2a3206cafba63ca6b418f1e4e64df34";
     };
     deps = {
-      "magnet-uri-4.2.2" = self.by-version."magnet-uri"."4.2.2";
-      "parse-torrent-file-2.1.3" = self.by-version."parse-torrent-file"."2.1.3";
+      "blob-to-buffer-1.2.6" = self.by-version."blob-to-buffer"."1.2.6";
+      "get-stdin-5.0.1" = self.by-version."get-stdin"."5.0.1";
+      "magnet-uri-5.1.3" = self.by-version."magnet-uri"."5.1.3";
+      "parse-torrent-file-3.3.7" = self.by-version."parse-torrent-file"."3.3.7";
+      "simple-get-2.0.0" = self.by-version."simple-get"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -30572,20 +34671,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."parse-torrent"."~1.0.0" =
-    self.by-version."parse-torrent"."1.0.0";
-  by-version."parse-torrent"."1.0.0" = self.buildNodePackage {
-    name = "parse-torrent-1.0.0";
-    version = "1.0.0";
+  by-spec."parse-torrent-file"."^2.0.0" =
+    self.by-version."parse-torrent-file"."2.1.4";
+  by-version."parse-torrent-file"."2.1.4" = self.buildNodePackage {
+    name = "parse-torrent-file-2.1.4";
+    version = "2.1.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parse-torrent/-/parse-torrent-1.0.0.tgz";
-      name = "parse-torrent-1.0.0.tgz";
-      sha1 = "5a47a038c5db161b7b67b0534636194e1c8907a2";
+      url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-2.1.4.tgz";
+      name = "parse-torrent-file-2.1.4.tgz";
+      sha1 = "32d4b6afde631420e5f415919a222b774b575707";
     };
     deps = {
-      "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
-      "rusha-browserify-0.7.3" = self.by-version."rusha-browserify"."0.7.3";
+      "bencode-0.7.0" = self.by-version."bencode"."0.7.0";
+      "simple-sha1-2.0.8" = self.by-version."simple-sha1"."2.0.8";
     };
     optionalDependencies = {
     };
@@ -30593,20 +34692,40 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."parse-torrent-file"."^2.0.0" =
-    self.by-version."parse-torrent-file"."2.1.3";
-  by-version."parse-torrent-file"."2.1.3" = self.buildNodePackage {
-    name = "parse-torrent-file-2.1.3";
-    version = "2.1.3";
+  by-spec."parse-torrent-file"."^3.0.0" =
+    self.by-version."parse-torrent-file"."3.3.7";
+  by-version."parse-torrent-file"."3.3.7" = self.buildNodePackage {
+    name = "parse-torrent-file-3.3.7";
+    version = "3.3.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-2.1.3.tgz";
-      name = "parse-torrent-file-2.1.3.tgz";
-      sha1 = "b537e0b277a76d5652fd1c1d045f7ee7189d88a4";
+      url = "https://registry.npmjs.org/parse-torrent-file/-/parse-torrent-file-3.3.7.tgz";
+      name = "parse-torrent-file-3.3.7.tgz";
+      sha1 = "4b39e456b5ce16761ccf26ef3275b4ac848e9394";
+    };
+    deps = {
+      "bencode-0.9.0" = self.by-version."bencode"."0.9.0";
+      "simple-sha1-2.0.8" = self.by-version."simple-sha1"."2.0.8";
+      "uniq-1.0.1" = self.by-version."uniq"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parse5".">= 1.3.1 < 2.0.0" =
+    self.by-version."parse5"."1.5.1";
+  by-version."parse5"."1.5.1" = self.buildNodePackage {
+    name = "parse5-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz";
+      name = "parse5-1.5.1.tgz";
+      sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94";
     };
     deps = {
-      "bencode-0.7.0" = self.by-version."bencode"."0.7.0";
-      "simple-sha1-2.0.7" = self.by-version."simple-sha1"."2.0.7";
     };
     optionalDependencies = {
     };
@@ -30621,7 +34740,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
+      url = "https://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
       name = "parsejson-0.0.1.tgz";
       sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
     };
@@ -30641,7 +34760,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
+      url = "https://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
       name = "parseqs-0.0.2.tgz";
       sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
     };
@@ -30661,7 +34780,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz";
+      url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.2.tgz";
       name = "parseuri-0.0.2.tgz";
       sha1 = "db41878f2d6964718be870b3140973d8093be156";
     };
@@ -30681,7 +34800,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
+      url = "https://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
       name = "parseuri-0.0.4.tgz";
       sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
     };
@@ -30701,7 +34820,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
+      url = "https://registry.npmjs.org/parseurl/-/parseurl-1.0.1.tgz";
       name = "parseurl-1.0.1.tgz";
       sha1 = "2e57dce6efdd37c3518701030944c22bf388b7b4";
     };
@@ -30720,7 +34839,7 @@
     version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.1.3.tgz";
+      url = "https://registry.npmjs.org/parseurl/-/parseurl-1.1.3.tgz";
       name = "parseurl-1.1.3.tgz";
       sha1 = "1f005738ac71b417bc2d0845cbdfa2a8b63ea639";
     };
@@ -30733,15 +34852,15 @@
     cpu = [ ];
   };
   by-spec."parseurl"."~1.3.0" =
-    self.by-version."parseurl"."1.3.0";
-  by-version."parseurl"."1.3.0" = self.buildNodePackage {
-    name = "parseurl-1.3.0";
-    version = "1.3.0";
+    self.by-version."parseurl"."1.3.1";
+  by-version."parseurl"."1.3.1" = self.buildNodePackage {
+    name = "parseurl-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parseurl/-/parseurl-1.3.0.tgz";
-      name = "parseurl-1.3.0.tgz";
-      sha1 = "b58046db4223e145afa76009e61bac87cc2281b3";
+      url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz";
+      name = "parseurl-1.3.1.tgz";
+      sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56";
     };
     deps = {
     };
@@ -30751,34 +34870,40 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."parseurl"."~1.3.1" =
+    self.by-version."parseurl"."1.3.1";
   by-spec."parsoid"."*" =
-    self.by-version."parsoid"."0.2.0";
-  by-version."parsoid"."0.2.0" = self.buildNodePackage {
-    name = "parsoid-0.2.0";
-    version = "0.2.0";
+    self.by-version."parsoid"."0.4.0";
+  by-version."parsoid"."0.4.0" = self.buildNodePackage {
+    name = "parsoid-0.4.0";
+    version = "0.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/parsoid/-/parsoid-0.2.0.tgz";
-      name = "parsoid-0.2.0.tgz";
-      sha1 = "6b32e8246d1e477d00fcf3b25b79fbd9b1223069";
+      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.4.0.tgz";
+      name = "parsoid-0.4.0.tgz";
+      sha1 = "3bfc61b6d217a6f7903650140f880fa2550865a7";
     };
     deps = {
       "alea-0.0.9" = self.by-version."alea"."0.0.9";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
       "bunyan-1.0.1" = self.by-version."bunyan"."1.0.1";
+      "compression-1.6.1" = self.by-version."compression"."1.6.1";
+      "connect-busboy-0.0.2" = self.by-version."connect-busboy"."0.0.2";
+      "core-js-0.8.4" = self.by-version."core-js"."0.8.4";
       "diff-1.0.8" = self.by-version."diff"."1.0.8";
-      "domino-1.0.18" = self.by-version."domino"."1.0.18";
+      "domino-1.0.23" = self.by-version."domino"."1.0.23";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
-      "es6-shim-0.16.0" = self.by-version."es6-shim"."0.16.0";
-      "express-2.5.11" = self.by-version."express"."2.5.11";
+      "express-4.13.4" = self.by-version."express"."4.13.4";
+      "express-handlebars-2.0.1" = self.by-version."express-handlebars"."2.0.1";
       "gelf-stream-0.2.4" = self.by-version."gelf-stream"."0.2.4";
-      "handlebars-1.3.0" = self.by-version."handlebars"."1.3.0";
       "html5-1.0.5" = self.by-version."html5"."1.0.5";
-      "html5-entities-1.0.0" = self.by-version."html5-entities"."1.0.0";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-txstatsd-0.1.6" = self.by-version."node-txstatsd"."0.1.6";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "pegjs-0.8.0" = self.by-version."pegjs"."0.8.0";
-      "prfun-1.0.2" = self.by-version."prfun"."1.0.2";
+      "prfun-2.0.0" = self.by-version."prfun"."2.0.0";
       "request-2.40.0" = self.by-version."request"."2.40.0";
+      "serve-favicon-2.3.0" = self.by-version."serve-favicon"."2.3.0";
       "simplediff-0.1.1" = self.by-version."simplediff"."0.1.1";
       "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
     };
@@ -30788,17 +34913,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "parsoid" = self.by-version."parsoid"."0.2.0";
+  "parsoid" = self.by-version."parsoid"."0.4.0";
   by-spec."passport"."*" =
-    self.by-version."passport"."0.2.1";
-  by-version."passport"."0.2.1" = self.buildNodePackage {
-    name = "passport-0.2.1";
-    version = "0.2.1";
+    self.by-version."passport"."0.3.2";
+  by-version."passport"."0.3.2" = self.buildNodePackage {
+    name = "passport-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport/-/passport-0.2.1.tgz";
-      name = "passport-0.2.1.tgz";
-      sha1 = "a7d34c07b30fb605be885edbc8c93e5142e38574";
+      url = "https://registry.npmjs.org/passport/-/passport-0.3.2.tgz";
+      name = "passport-0.3.2.tgz";
+      sha1 = "9dd009f915e8fe095b0124a01b8f82da07510102";
     };
     deps = {
       "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
@@ -30810,11 +34935,11 @@
     os = [ ];
     cpu = [ ];
   };
-  "passport" = self.by-version."passport"."0.2.1";
-  by-spec."passport"."0.2.1" =
-    self.by-version."passport"."0.2.1";
+  "passport" = self.by-version."passport"."0.3.2";
+  by-spec."passport"."0.3.2" =
+    self.by-version."passport"."0.3.2";
   by-spec."passport".">=0.1.15" =
-    self.by-version."passport"."0.2.1";
+    self.by-version."passport"."0.3.2";
   by-spec."passport"."~0.1.1" =
     self.by-version."passport"."0.1.18";
   by-version."passport"."0.1.18" = self.buildNodePackage {
@@ -30822,7 +34947,7 @@
     version = "0.1.18";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
+      url = "https://registry.npmjs.org/passport/-/passport-0.1.18.tgz";
       name = "passport-0.1.18.tgz";
       sha1 = "c8264479dcb6414cadbb66752d12b37e0b6525a1";
     };
@@ -30836,45 +34961,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."passport"."~0.1.3" =
-    self.by-version."passport"."0.1.18";
-  by-spec."passport"."~0.2.1" =
-    self.by-version."passport"."0.2.1";
-  by-spec."passport-bitly"."git://github.com/simov/passport-bitly.git" =
-    self.by-version."passport-bitly"."0.1.0";
-  by-version."passport-bitly"."0.1.0" = self.buildNodePackage {
-    name = "passport-bitly-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchgit {
-      url = "git://github.com/simov/passport-bitly.git";
-      rev = "838ce018873eb4b8bb23331216c78e2822c6493f";
-      sha256 = "7cb69e2ca9ef5cf47fecf0d669f15c0366174183ec0c7623ad5a619365c36e8a";
-    };
-    deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."passport"."~0.3.2" =
+    self.by-version."passport"."0.3.2";
   by-spec."passport-dropbox".">=0.1.2" =
-    self.by-version."passport-dropbox"."0.1.2";
-  by-version."passport-dropbox"."0.1.2" = self.buildNodePackage {
-    name = "passport-dropbox-0.1.2";
-    version = "0.1.2";
+    self.by-version."passport-dropbox"."2.0.0";
+  by-version."passport-dropbox"."2.0.0" = self.buildNodePackage {
+    name = "passport-dropbox-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-dropbox/-/passport-dropbox-0.1.2.tgz";
-      name = "passport-dropbox-0.1.2.tgz";
-      sha1 = "19149539d88895ce4627e166ddc8009239f58010";
+      url = "https://registry.npmjs.org/passport-dropbox/-/passport-dropbox-2.0.0.tgz";
+      name = "passport-dropbox-2.0.0.tgz";
+      sha1 = "7efe6ced152a4f4db4e4db385743c2764eba963b";
     };
     deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "passport-oauth1-1.1.0" = self.by-version."passport-oauth1"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -30889,7 +34990,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-evernote/-/passport-evernote-0.1.1.tgz";
+      url = "https://registry.npmjs.org/passport-evernote/-/passport-evernote-0.1.1.tgz";
       name = "passport-evernote-0.1.1.tgz";
       sha1 = "10e097affa7e7520358d9ea26f34f1cce176adc2";
     };
@@ -30904,18 +35005,18 @@
     cpu = [ ];
   };
   by-spec."passport-facebook".">=0.1.5" =
-    self.by-version."passport-facebook"."2.0.0";
-  by-version."passport-facebook"."2.0.0" = self.buildNodePackage {
-    name = "passport-facebook-2.0.0";
-    version = "2.0.0";
+    self.by-version."passport-facebook"."2.1.0";
+  by-version."passport-facebook"."2.1.0" = self.buildNodePackage {
+    name = "passport-facebook-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-facebook/-/passport-facebook-2.0.0.tgz";
-      name = "passport-facebook-2.0.0.tgz";
-      sha1 = "35a0cd0b5a791d25810a78014f0cc0a9e72e1957";
+      url = "https://registry.npmjs.org/passport-facebook/-/passport-facebook-2.1.0.tgz";
+      name = "passport-facebook-2.1.0.tgz";
+      sha1 = "41f591557fc209b621be79a3b37be395ca5de4d0";
     };
     deps = {
-      "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2";
+      "passport-oauth2-1.3.0" = self.by-version."passport-oauth2"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -30930,7 +35031,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-flickr/-/passport-flickr-0.2.0.tgz";
+      url = "https://registry.npmjs.org/passport-flickr/-/passport-flickr-0.2.0.tgz";
       name = "passport-flickr-0.2.0.tgz";
       sha1 = "9f3a77eac4b48a9e2109df12e544114b42960c5c";
     };
@@ -30944,19 +35045,18 @@
     cpu = [ ];
   };
   by-spec."passport-github".">=0.1.5" =
-    self.by-version."passport-github"."0.1.5";
-  by-version."passport-github"."0.1.5" = self.buildNodePackage {
-    name = "passport-github-0.1.5";
-    version = "0.1.5";
+    self.by-version."passport-github"."1.1.0";
+  by-version."passport-github"."1.1.0" = self.buildNodePackage {
+    name = "passport-github-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-github/-/passport-github-0.1.5.tgz";
-      name = "passport-github-0.1.5.tgz";
-      sha1 = "258ebb75af40cdc4e3af11be3a138b75c1f865c1";
+      url = "https://registry.npmjs.org/passport-github/-/passport-github-1.1.0.tgz";
+      name = "passport-github-1.1.0.tgz";
+      sha1 = "8ce1e3fcd61ad7578eb1df595839e4aea12355d4";
     };
     deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "passport-oauth2-1.3.0" = self.by-version."passport-oauth2"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -30964,20 +35064,60 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."passport-google-oauth"."*" =
-    self.by-version."passport-google-oauth"."0.2.0";
-  by-version."passport-google-oauth"."0.2.0" = self.buildNodePackage {
-    name = "passport-google-oauth-0.2.0";
-    version = "0.2.0";
+  by-spec."passport-google-oauth".">=0.1.5" =
+    self.by-version."passport-google-oauth"."1.0.0";
+  by-version."passport-google-oauth"."1.0.0" = self.buildNodePackage {
+    name = "passport-google-oauth-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-0.2.0.tgz";
-      name = "passport-google-oauth-0.2.0.tgz";
-      sha1 = "e9a87e9cd3bc71b08819fa44825cc5bf464a894a";
+      url = "https://registry.npmjs.org/passport-google-oauth/-/passport-google-oauth-1.0.0.tgz";
+      name = "passport-google-oauth-1.0.0.tgz";
+      sha1 = "65f50633192ad0627a18b08960077109d84eb76d";
     };
     deps = {
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
-      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
+      "passport-google-oauth1-1.0.0" = self.by-version."passport-google-oauth1"."1.0.0";
+      "passport-google-oauth20-1.0.0" = self.by-version."passport-google-oauth20"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."passport-google-oauth1"."1.x.x" =
+    self.by-version."passport-google-oauth1"."1.0.0";
+  by-version."passport-google-oauth1"."1.0.0" = self.buildNodePackage {
+    name = "passport-google-oauth1-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-google-oauth1/-/passport-google-oauth1-1.0.0.tgz";
+      name = "passport-google-oauth1-1.0.0.tgz";
+      sha1 = "af74a803df51ec646f66a44d82282be6f108e0cc";
+    };
+    deps = {
+      "passport-oauth1-1.1.0" = self.by-version."passport-oauth1"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."passport-google-oauth20"."1.x.x" =
+    self.by-version."passport-google-oauth20"."1.0.0";
+  by-version."passport-google-oauth20"."1.0.0" = self.buildNodePackage {
+    name = "passport-google-oauth20-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/passport-google-oauth20/-/passport-google-oauth20-1.0.0.tgz";
+      name = "passport-google-oauth20-1.0.0.tgz";
+      sha1 = "3b960e8a1d70d1dbe794615c827c68c40392a5d0";
+    };
+    deps = {
+      "passport-oauth2-1.3.0" = self.by-version."passport-oauth2"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -30985,22 +35125,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."passport-google-oauth".">=0.1.5" =
-    self.by-version."passport-google-oauth"."0.2.0";
   by-spec."passport-http"."*" =
-    self.by-version."passport-http"."0.2.2";
-  by-version."passport-http"."0.2.2" = self.buildNodePackage {
-    name = "passport-http-0.2.2";
-    version = "0.2.2";
+    self.by-version."passport-http"."0.3.0";
+  by-version."passport-http"."0.3.0" = self.buildNodePackage {
+    name = "passport-http-0.3.0";
+    version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-http/-/passport-http-0.2.2.tgz";
-      name = "passport-http-0.2.2.tgz";
-      sha1 = "2501314c0ff4a831e8a51ccfdb1b68f5c7cbc9f6";
+      url = "https://registry.npmjs.org/passport-http/-/passport-http-0.3.0.tgz";
+      name = "passport-http-0.3.0.tgz";
+      sha1 = "8ee53d4380be9c60df2151925029826f77115603";
     };
     deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-0.1.18" = self.by-version."passport"."0.1.18";
+      "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -31008,7 +35145,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "passport-http" = self.by-version."passport-http"."0.2.2";
+  "passport-http" = self.by-version."passport-http"."0.3.0";
   by-spec."passport-http-bearer"."1.0.1" =
     self.by-version."passport-http-bearer"."1.0.1";
   by-version."passport-http-bearer"."1.0.1" = self.buildNodePackage {
@@ -31016,7 +35153,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz";
+      url = "https://registry.npmjs.org/passport-http-bearer/-/passport-http-bearer-1.0.1.tgz";
       name = "passport-http-bearer-1.0.1.tgz";
       sha1 = "147469ea3669e2a84c6167ef99dbb77e1f0098a8";
     };
@@ -31030,15 +35167,15 @@
     cpu = [ ];
   };
   by-spec."passport-imgur".">=0.0.1" =
-    self.by-version."passport-imgur"."0.0.2";
-  by-version."passport-imgur"."0.0.2" = self.buildNodePackage {
-    name = "passport-imgur-0.0.2";
-    version = "0.0.2";
+    self.by-version."passport-imgur"."0.0.3";
+  by-version."passport-imgur"."0.0.3" = self.buildNodePackage {
+    name = "passport-imgur-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-imgur/-/passport-imgur-0.0.2.tgz";
-      name = "passport-imgur-0.0.2.tgz";
-      sha1 = "81d1d7049f3f83b71d04f4eb08627659b07e58b0";
+      url = "https://registry.npmjs.org/passport-imgur/-/passport-imgur-0.0.3.tgz";
+      name = "passport-imgur-0.0.3.tgz";
+      sha1 = "c27fca66db4745b4061b59b80c81262fd3bbe17f";
     };
     deps = {
       "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
@@ -31050,19 +35187,18 @@
     cpu = [ ];
   };
   by-spec."passport-instagram".">=0.1.2" =
-    self.by-version."passport-instagram"."0.1.2";
-  by-version."passport-instagram"."0.1.2" = self.buildNodePackage {
-    name = "passport-instagram-0.1.2";
-    version = "0.1.2";
+    self.by-version."passport-instagram"."1.0.0";
+  by-version."passport-instagram"."1.0.0" = self.buildNodePackage {
+    name = "passport-instagram-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-instagram/-/passport-instagram-0.1.2.tgz";
-      name = "passport-instagram-0.1.2.tgz";
-      sha1 = "a1c84525330eed8a05d3ecfec3bf56caa895cfd6";
+      url = "https://registry.npmjs.org/passport-instagram/-/passport-instagram-1.0.0.tgz";
+      name = "passport-instagram-1.0.0.tgz";
+      sha1 = "eaa2b42d11473bcfda5190f26234cf485f645656";
     };
     deps = {
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
+      "passport-oauth2-1.3.0" = self.by-version."passport-oauth2"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -31077,7 +35213,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
+      url = "https://registry.npmjs.org/passport-local/-/passport-local-1.0.0.tgz";
       name = "passport-local-1.0.0.tgz";
       sha1 = "1fe63268c92e75606626437e3b906662c15ba6ee";
     };
@@ -31094,19 +35230,19 @@
   by-spec."passport-local"."~1.0.0" =
     self.by-version."passport-local"."1.0.0";
   by-spec."passport-mailchimp".">=0.0.1" =
-    self.by-version."passport-mailchimp"."0.0.1";
-  by-version."passport-mailchimp"."0.0.1" = self.buildNodePackage {
-    name = "passport-mailchimp-0.0.1";
-    version = "0.0.1";
+    self.by-version."passport-mailchimp"."1.0.0";
+  by-version."passport-mailchimp"."1.0.0" = self.buildNodePackage {
+    name = "passport-mailchimp-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-mailchimp/-/passport-mailchimp-0.0.1.tgz";
-      name = "passport-mailchimp-0.0.1.tgz";
-      sha1 = "24f78c6926d2fa684ee7aa51cfb1b2b11f3fe4ac";
+      url = "https://registry.npmjs.org/passport-mailchimp/-/passport-mailchimp-1.0.0.tgz";
+      name = "passport-mailchimp-1.0.0.tgz";
+      sha1 = "34c5ec1186fd7ef265153d1258406b96d8d64e74";
     };
     deps = {
-      "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "passport-oauth2-1.3.0" = self.by-version."passport-oauth2"."1.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
     };
     optionalDependencies = {
     };
@@ -31121,7 +35257,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-mixcloud/-/passport-mixcloud-0.0.2.tgz";
+      url = "https://registry.npmjs.org/passport-mixcloud/-/passport-mixcloud-0.0.2.tgz";
       name = "passport-mixcloud-0.0.2.tgz";
       sha1 = "b216bcb0cbc605ec5dac87e65387d456768346c1";
     };
@@ -31129,7 +35265,7 @@
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-oauth-0.1.15" = self.by-version."passport-oauth"."0.1.15";
       "passport-mixcloud-0.0.2" = self.by-version."passport-mixcloud"."0.0.2";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -31144,14 +35280,14 @@
     version = "0.1.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-0.1.15.tgz";
+      url = "https://registry.npmjs.org/passport-oauth/-/passport-oauth-0.1.15.tgz";
       name = "passport-oauth-0.1.15.tgz";
       sha1 = "fb74e0afe84614bfa256c5fc716cc56bbfc8cec0";
     };
     deps = {
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
       "passport-0.1.18" = self.by-version."passport"."0.1.18";
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
     };
     optionalDependencies = {
     };
@@ -31166,13 +35302,13 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-oauth/-/passport-oauth-1.0.0.tgz";
+      url = "https://registry.npmjs.org/passport-oauth/-/passport-oauth-1.0.0.tgz";
       name = "passport-oauth-1.0.0.tgz";
       sha1 = "90aff63387540f02089af28cdad39ea7f80d77df";
     };
     deps = {
-      "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1";
-      "passport-oauth2-1.1.2" = self.by-version."passport-oauth2"."1.1.2";
+      "passport-oauth1-1.1.0" = self.by-version."passport-oauth1"."1.1.0";
+      "passport-oauth2-1.3.0" = self.by-version."passport-oauth2"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -31180,26 +35316,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."passport-oauth"."^1.0.0" =
-    self.by-version."passport-oauth"."1.0.0";
   by-spec."passport-oauth"."~0.1.1" =
     self.by-version."passport-oauth"."0.1.15";
-  by-spec."passport-oauth"."~0.1.15" =
-    self.by-version."passport-oauth"."0.1.15";
   by-spec."passport-oauth1"."1.x.x" =
-    self.by-version."passport-oauth1"."1.0.1";
-  by-version."passport-oauth1"."1.0.1" = self.buildNodePackage {
-    name = "passport-oauth1-1.0.1";
-    version = "1.0.1";
+    self.by-version."passport-oauth1"."1.1.0";
+  by-version."passport-oauth1"."1.1.0" = self.buildNodePackage {
+    name = "passport-oauth1-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.0.1.tgz";
-      name = "passport-oauth1-1.0.1.tgz";
-      sha1 = "41ade140b881392b144cbdd426095c035a91ad9c";
+      url = "https://registry.npmjs.org/passport-oauth1/-/passport-oauth1-1.1.0.tgz";
+      name = "passport-oauth1-1.1.0.tgz";
+      sha1 = "a7de988a211f9cf4687377130ea74df32730c918";
     };
     deps = {
       "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
       "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
     };
     optionalDependencies = {
@@ -31208,20 +35340,22 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."passport-oauth1"."^1.0.1" =
+    self.by-version."passport-oauth1"."1.1.0";
   by-spec."passport-oauth2"."1.x.x" =
-    self.by-version."passport-oauth2"."1.1.2";
-  by-version."passport-oauth2"."1.1.2" = self.buildNodePackage {
-    name = "passport-oauth2-1.1.2";
-    version = "1.1.2";
+    self.by-version."passport-oauth2"."1.3.0";
+  by-version."passport-oauth2"."1.3.0" = self.buildNodePackage {
+    name = "passport-oauth2-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.1.2.tgz";
-      name = "passport-oauth2-1.1.2.tgz";
-      sha1 = "bd7163b1b6090371868dc4ef6f9f2e1e4cc4b948";
+      url = "https://registry.npmjs.org/passport-oauth2/-/passport-oauth2-1.3.0.tgz";
+      name = "passport-oauth2-1.3.0.tgz";
+      sha1 = "d72b4bd62eeb807a4089ff3071a22c26c382dc0c";
     };
     deps = {
       "passport-strategy-1.0.0" = self.by-version."passport-strategy"."1.0.0";
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
       "uid2-0.0.3" = self.by-version."uid2"."0.0.3";
     };
     optionalDependencies = {
@@ -31230,6 +35364,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."passport-oauth2"."^1.1.2" =
+    self.by-version."passport-oauth2"."1.3.0";
   by-spec."passport-oauth2-client-password"."0.1.2" =
     self.by-version."passport-oauth2-client-password"."0.1.2";
   by-version."passport-oauth2-client-password"."0.1.2" = self.buildNodePackage {
@@ -31237,7 +35373,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz";
+      url = "https://registry.npmjs.org/passport-oauth2-client-password/-/passport-oauth2-client-password-0.1.2.tgz";
       name = "passport-oauth2-client-password-0.1.2.tgz";
       sha1 = "4f378b678b92d16dbbd233a6c706520093e561ba";
     };
@@ -31257,7 +35393,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-soundcloud/-/passport-soundcloud-0.1.2.tgz";
+      url = "https://registry.npmjs.org/passport-soundcloud/-/passport-soundcloud-0.1.2.tgz";
       name = "passport-soundcloud-0.1.2.tgz";
       sha1 = "4ecf4b42b3e7d9641b78b9181aae6b75127beb21";
     };
@@ -31278,7 +35414,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
+      url = "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz";
       name = "passport-strategy-1.0.0.tgz";
       sha1 = "b5539aa8fc225a3d1ad179476ddf236b440f52e4";
     };
@@ -31291,18 +35427,18 @@
     cpu = [ ];
   };
   by-spec."passport-trello"."~0.1.4" =
-    self.by-version."passport-trello"."0.1.4";
-  by-version."passport-trello"."0.1.4" = self.buildNodePackage {
-    name = "passport-trello-0.1.4";
-    version = "0.1.4";
+    self.by-version."passport-trello"."0.1.5";
+  by-version."passport-trello"."0.1.5" = self.buildNodePackage {
+    name = "passport-trello-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-trello/-/passport-trello-0.1.4.tgz";
-      name = "passport-trello-0.1.4.tgz";
-      sha1 = "c0aeeaa4dd598f99e129cb83b97950f672519442";
+      url = "https://registry.npmjs.org/passport-trello/-/passport-trello-0.1.5.tgz";
+      name = "passport-trello-0.1.5.tgz";
+      sha1 = "cc98ce493a4827a6335490acd2c0d995580fd039";
     };
     deps = {
-      "passport-oauth-1.0.0" = self.by-version."passport-oauth"."1.0.0";
+      "passport-oauth1-1.1.0" = self.by-version."passport-oauth1"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -31311,18 +35447,18 @@
     cpu = [ ];
   };
   by-spec."passport-twitter".">=0.1.4" =
-    self.by-version."passport-twitter"."1.0.3";
-  by-version."passport-twitter"."1.0.3" = self.buildNodePackage {
-    name = "passport-twitter-1.0.3";
-    version = "1.0.3";
+    self.by-version."passport-twitter"."1.0.4";
+  by-version."passport-twitter"."1.0.4" = self.buildNodePackage {
+    name = "passport-twitter-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.3.tgz";
-      name = "passport-twitter-1.0.3.tgz";
-      sha1 = "887076f265a598cdffde59be2169a040e5908353";
+      url = "https://registry.npmjs.org/passport-twitter/-/passport-twitter-1.0.4.tgz";
+      name = "passport-twitter-1.0.4.tgz";
+      sha1 = "01a799e1f760bf2de49f2ba5fba32282f18932d7";
     };
     deps = {
-      "passport-oauth1-1.0.1" = self.by-version."passport-oauth1"."1.0.1";
+      "passport-oauth1-1.1.0" = self.by-version."passport-oauth1"."1.1.0";
       "xtraverse-0.1.0" = self.by-version."xtraverse"."0.1.0";
     };
     optionalDependencies = {
@@ -31338,7 +35474,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/passport-wordpress/-/passport-wordpress-0.0.3.tgz";
+      url = "https://registry.npmjs.org/passport-wordpress/-/passport-wordpress-0.0.3.tgz";
       name = "passport-wordpress-0.0.3.tgz";
       sha1 = "fa3b144c7c5a4c967a5f5f383139d515a95a7988";
     };
@@ -31352,6 +35488,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."path-array"."^1.0.0" =
+    self.by-version."path-array"."1.0.1";
+  by-version."path-array"."1.0.1" = self.buildNodePackage {
+    name = "path-array-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/path-array/-/path-array-1.0.1.tgz";
+      name = "path-array-1.0.1.tgz";
+      sha1 = "7e2f0f35f07a2015122b868b7eac0eb2c4fec271";
+    };
+    deps = {
+      "array-index-1.0.0" = self.by-version."array-index"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."path-browserify"."0.0.0" =
     self.by-version."path-browserify"."0.0.0";
   by-version."path-browserify"."0.0.0" = self.buildNodePackage {
@@ -31359,7 +35515,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
+      url = "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz";
       name = "path-browserify-0.0.0.tgz";
       sha1 = "a0b870729aae214005b7d5032ec2cbbb0fb4451a";
     };
@@ -31373,14 +35529,36 @@
   };
   by-spec."path-browserify"."~0.0.0" =
     self.by-version."path-browserify"."0.0.0";
-  by-spec."path-is-absolute"."^1.0.0" =
+  by-spec."path-exists"."^2.0.0" =
+    self.by-version."path-exists"."2.1.0";
+  by-version."path-exists"."2.1.0" = self.buildNodePackage {
+    name = "path-exists-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
+      name = "path-exists-2.1.0.tgz";
+      sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
+    };
+    deps = {
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."path-exists"."^2.1.0" =
+    self.by-version."path-exists"."2.1.0";
+  by-spec."path-is-absolute"."1.0.0" =
     self.by-version."path-is-absolute"."1.0.0";
   by-version."path-is-absolute"."1.0.0" = self.buildNodePackage {
     name = "path-is-absolute-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
+      url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.0.tgz";
       name = "path-is-absolute-1.0.0.tgz";
       sha1 = "263dada66ab3f2fb10bf7f9d24dd8f3e570ef912";
     };
@@ -31392,6 +35570,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."path-is-absolute"."^1.0.0" =
+    self.by-version."path-is-absolute"."1.0.0";
+  by-spec."path-is-absolute"."~1.0.0" =
+    self.by-version."path-is-absolute"."1.0.0";
   by-spec."path-is-inside"."^1.0.1" =
     self.by-version."path-is-inside"."1.0.1";
   by-version."path-is-inside"."1.0.1" = self.buildNodePackage {
@@ -31399,7 +35581,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz";
+      url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.1.tgz";
       name = "path-is-inside-1.0.1.tgz";
       sha1 = "98d8f1d030bf04bd7aeee4a1ba5485d40318fd89";
     };
@@ -31413,16 +35595,18 @@
   };
   by-spec."path-is-inside"."~1.0.0" =
     self.by-version."path-is-inside"."1.0.1";
-  by-spec."path-platform"."^0.0.1" =
-    self.by-version."path-platform"."0.0.1";
-  by-version."path-platform"."0.0.1" = self.buildNodePackage {
-    name = "path-platform-0.0.1";
-    version = "0.0.1";
+  by-spec."path-is-inside"."~1.0.1" =
+    self.by-version."path-is-inside"."1.0.1";
+  by-spec."path-parse"."^1.0.5" =
+    self.by-version."path-parse"."1.0.5";
+  by-version."path-parse"."1.0.5" = self.buildNodePackage {
+    name = "path-parse-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-platform/-/path-platform-0.0.1.tgz";
-      name = "path-platform-0.0.1.tgz";
-      sha1 = "b5585d7c3c463d89aa0060d86611cf1afd617e2a";
+      url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz";
+      name = "path-parse-1.0.5.tgz";
+      sha1 = "3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1";
     };
     deps = {
     };
@@ -31439,7 +35623,7 @@
     version = "0.11.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz";
+      url = "https://registry.npmjs.org/path-platform/-/path-platform-0.11.15.tgz";
       name = "path-platform-0.11.15.tgz";
       sha1 = "e864217f74c36850f0852b78dc7bf7d4a5721bf2";
     };
@@ -31458,7 +35642,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz";
+      url = "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz";
       name = "path-proxy-1.0.0.tgz";
       sha1 = "18e8a36859fc9d2f1a53b48dee138543c020de5e";
     };
@@ -31478,7 +35662,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
+      url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.3.tgz";
       name = "path-to-regexp-0.1.3.tgz";
       sha1 = "21b9ab82274279de25b156ea08fd12ca51b8aecb";
     };
@@ -31490,6 +35674,66 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."path-to-regexp"."0.1.6" =
+    self.by-version."path-to-regexp"."0.1.6";
+  by-version."path-to-regexp"."0.1.6" = self.buildNodePackage {
+    name = "path-to-regexp-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.6.tgz";
+      name = "path-to-regexp-0.1.6.tgz";
+      sha1 = "f01fd5734047b6bfbc5f208c6135a33d7af09c36";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."path-to-regexp"."0.1.7" =
+    self.by-version."path-to-regexp"."0.1.7";
+  by-version."path-to-regexp"."0.1.7" = self.buildNodePackage {
+    name = "path-to-regexp-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz";
+      name = "path-to-regexp-0.1.7.tgz";
+      sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."path-type"."^1.0.0" =
+    self.by-version."path-type"."1.1.0";
+  by-version."path-type"."1.1.0" = self.buildNodePackage {
+    name = "path-type-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
+      name = "path-type-1.1.0.tgz";
+      sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
+    };
+    deps = {
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "pify-2.3.0" = self.by-version."pify"."2.3.0";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pause"."0.0.1" =
     self.by-version."pause"."0.0.1";
   by-version."pause"."0.0.1" = self.buildNodePackage {
@@ -31497,7 +35741,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
+      url = "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz";
       name = "pause-0.0.1.tgz";
       sha1 = "1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d";
     };
@@ -31509,6 +35753,45 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."pause"."0.1.0" =
+    self.by-version."pause"."0.1.0";
+  by-version."pause"."0.1.0" = self.buildNodePackage {
+    name = "pause-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz";
+      name = "pause-0.1.0.tgz";
+      sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pause-stream"."0.0.11" =
+    self.by-version."pause-stream"."0.0.11";
+  by-version."pause-stream"."0.0.11" = self.buildNodePackage {
+    name = "pause-stream-0.0.11";
+    version = "0.0.11";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
+      name = "pause-stream-0.0.11.tgz";
+      sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pbkdf2"."^3.0.3" =
     self.by-version."pbkdf2"."3.0.4";
   by-version."pbkdf2"."3.0.4" = self.buildNodePackage {
@@ -31516,12 +35799,12 @@
     version = "3.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz";
+      url = "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.4.tgz";
       name = "pbkdf2-3.0.4.tgz";
       sha1 = "12c8bfaf920543786a85150b03f68d5f1aa982fc";
     };
     deps = {
-      "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
+      "create-hmac-1.1.4" = self.by-version."create-hmac"."1.1.4";
     };
     optionalDependencies = {
     };
@@ -31536,7 +35819,7 @@
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
+      url = "https://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-2.0.1.tgz";
       name = "pbkdf2-compat-2.0.1.tgz";
       sha1 = "b6e0c8fa99494d94e0511575802a59a5c142f288";
     };
@@ -31548,19 +35831,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pbkdf2-compat"."^3.0.0" =
-    self.by-version."pbkdf2-compat"."3.0.2";
-  by-version."pbkdf2-compat"."3.0.2" = self.buildNodePackage {
-    name = "pbkdf2-compat-3.0.2";
-    version = "3.0.2";
+  by-spec."peer-wire-protocol"."^0.7.0" =
+    self.by-version."peer-wire-protocol"."0.7.0";
+  by-version."peer-wire-protocol"."0.7.0" = self.buildNodePackage {
+    name = "peer-wire-protocol-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pbkdf2-compat/-/pbkdf2-compat-3.0.2.tgz";
-      name = "pbkdf2-compat-3.0.2.tgz";
-      sha1 = "0b207887e7d45467e9dd1027bbf1414e1f165291";
+      url = "https://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz";
+      name = "peer-wire-protocol-0.7.0.tgz";
+      sha1 = "6c015abf24b4877ed9eca3822b22d996078011da";
     };
     deps = {
-      "create-hmac-1.1.3" = self.by-version."create-hmac"."1.1.3";
+      "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "bncode-0.2.3" = self.by-version."bncode"."0.2.3";
+      "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
     };
     optionalDependencies = {
     };
@@ -31568,22 +35854,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."peer-wire-protocol"."^0.7.0" =
-    self.by-version."peer-wire-protocol"."0.7.0";
-  by-version."peer-wire-protocol"."0.7.0" = self.buildNodePackage {
-    name = "peer-wire-protocol-0.7.0";
-    version = "0.7.0";
+  by-spec."peer-wire-swarm"."^0.12.0" =
+    self.by-version."peer-wire-swarm"."0.12.1";
+  by-version."peer-wire-swarm"."0.12.1" = self.buildNodePackage {
+    name = "peer-wire-swarm-0.12.1";
+    version = "0.12.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/peer-wire-protocol/-/peer-wire-protocol-0.7.0.tgz";
-      name = "peer-wire-protocol-0.7.0.tgz";
-      sha1 = "6c015abf24b4877ed9eca3822b22d996078011da";
+      url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.12.1.tgz";
+      name = "peer-wire-swarm-0.12.1.tgz";
+      sha1 = "51b75da99c335c64c9ba9ef99fe27a4a5951ff42";
     };
     deps = {
-      "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "bncode-0.2.3" = self.by-version."bncode"."0.2.3";
+      "fifo-0.1.4" = self.by-version."fifo"."0.1.4";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "peer-wire-protocol-0.7.0" = self.by-version."peer-wire-protocol"."0.7.0";
       "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
+      "utp-0.0.7" = self.by-version."utp"."0.0.7";
     };
     optionalDependencies = {
     };
@@ -31591,21 +35878,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."peer-wire-swarm"."^0.9.0" =
+  by-spec."peer-wire-swarm"."^0.9.2" =
     self.by-version."peer-wire-swarm"."0.9.2";
   by-version."peer-wire-swarm"."0.9.2" = self.buildNodePackage {
     name = "peer-wire-swarm-0.9.2";
     version = "0.9.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz";
+      url = "https://registry.npmjs.org/peer-wire-swarm/-/peer-wire-swarm-0.9.2.tgz";
       name = "peer-wire-swarm-0.9.2.tgz";
       sha1 = "092848005607d8ca94e69f9bc9ebe52956ec3048";
     };
     deps = {
       "peer-wire-protocol-0.7.0" = self.by-version."peer-wire-protocol"."0.7.0";
       "fifo-0.1.4" = self.by-version."fifo"."0.1.4";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "speedometer-0.1.4" = self.by-version."speedometer"."0.1.4";
     };
     optionalDependencies = {
@@ -31614,22 +35901,56 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."peer-wire-swarm"."^0.9.2" =
-    self.by-version."peer-wire-swarm"."0.9.2";
   by-spec."peerflix"."*" =
+    self.by-version."peerflix"."0.32.4";
+  by-version."peerflix"."0.32.4" = self.buildNodePackage {
+    name = "peerflix-0.32.4";
+    version = "0.32.4";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.32.4.tgz";
+      name = "peerflix-0.32.4.tgz";
+      sha1 = "f971df69db962ecaee1b7a7ba67fff7c57fd12dc";
+    };
+    deps = {
+      "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
+      "inquirer-0.8.5" = self.by-version."inquirer"."0.8.5";
+      "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "network-address-0.0.5" = self.by-version."network-address"."0.0.5";
+      "numeral-1.5.3" = self.by-version."numeral"."1.5.3";
+      "open-0.0.5" = self.by-version."open"."0.0.5";
+      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
+      "parse-torrent-5.7.3" = self.by-version."parse-torrent"."5.7.3";
+      "pump-0.3.5" = self.by-version."pump"."0.3.5";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "rc-0.4.0" = self.by-version."rc"."0.4.0";
+      "torrent-stream-1.0.2" = self.by-version."torrent-stream"."1.0.2";
+      "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+      "airplay-js-0.2.16" = self.by-version."airplay-js"."0.2.16";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "peerflix" = self.by-version."peerflix"."0.32.4";
+  by-spec."peerflix"."^0.29.1" =
     self.by-version."peerflix"."0.29.2";
   by-version."peerflix"."0.29.2" = self.buildNodePackage {
     name = "peerflix-0.29.2";
     version = "0.29.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/peerflix/-/peerflix-0.29.2.tgz";
+      url = "https://registry.npmjs.org/peerflix/-/peerflix-0.29.2.tgz";
       name = "peerflix-0.29.2.tgz";
       sha1 = "6a32587260546d42d4d2c0ccc37063d977af105c";
     };
     deps = {
       "clivas-0.1.4" = self.by-version."clivas"."0.1.4";
-      "inquirer-0.8.2" = self.by-version."inquirer"."0.8.2";
+      "inquirer-0.8.5" = self.by-version."inquirer"."0.8.5";
       "keypress-0.2.1" = self.by-version."keypress"."0.2.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
       "network-address-0.0.5" = self.by-version."network-address"."0.0.5";
@@ -31637,53 +35958,50 @@
       "open-0.0.5" = self.by-version."open"."0.0.5";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "pump-0.3.5" = self.by-version."pump"."0.3.5";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
       "rc-0.4.0" = self.by-version."rc"."0.4.0";
       "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
       "torrent-stream-0.18.1" = self.by-version."torrent-stream"."0.18.1";
       "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
-      "airplay-js-0.2.13" = self.by-version."airplay-js"."0.2.13";
+      "airplay-js-0.2.16" = self.by-version."airplay-js"."0.2.16";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "peerflix" = self.by-version."peerflix"."0.29.2";
-  by-spec."peerflix"."^0.29.1" =
-    self.by-version."peerflix"."0.29.2";
   by-spec."peerflix-server"."*" =
-    self.by-version."peerflix-server"."0.0.22";
-  by-version."peerflix-server"."0.0.22" = self.buildNodePackage {
-    name = "peerflix-server-0.0.22";
-    version = "0.0.22";
+    self.by-version."peerflix-server"."0.0.29";
+  by-version."peerflix-server"."0.0.29" = self.buildNodePackage {
+    name = "peerflix-server-0.0.29";
+    version = "0.0.29";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.22.tgz";
-      name = "peerflix-server-0.0.22.tgz";
-      sha1 = "008b0463eb3139729b8787db95131735803ae94d";
+      url = "https://registry.npmjs.org/peerflix-server/-/peerflix-server-0.0.29.tgz";
+      name = "peerflix-server-0.0.29.tgz";
+      sha1 = "db21c35c6c1bde4a54dd1f215dc466ab55962751";
     };
     deps = {
       "connect-multiparty-1.2.5" = self.by-version."connect-multiparty"."1.2.5";
       "express-3.5.3" = self.by-version."express"."3.5.3";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "pump-0.3.5" = self.by-version."pump"."0.3.5";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-      "read-torrent-1.0.0" = self.by-version."read-torrent"."1.0.0";
+      "lodash-2.4.2" = self.by-version."lodash"."2.4.2";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "pump-1.0.1" = self.by-version."pump"."1.0.1";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "read-torrent-1.3.0" = self.by-version."read-torrent"."1.3.0";
       "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
-      "torrent-stream-0.13.5" = self.by-version."torrent-stream"."0.13.5";
+      "torrent-stream-0.18.1" = self.by-version."torrent-stream"."0.18.1";
     };
     optionalDependencies = {
-      "fluent-ffmpeg-2.0.0-rc3" = self.by-version."fluent-ffmpeg"."2.0.0-rc3";
+      "fluent-ffmpeg-2.0.1" = self.by-version."fluent-ffmpeg"."2.0.1";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "peerflix-server" = self.by-version."peerflix-server"."0.0.22";
+  "peerflix-server" = self.by-version."peerflix-server"."0.0.29";
   by-spec."pegjs"."0.6.2" =
     self.by-version."pegjs"."0.6.2";
   by-version."pegjs"."0.6.2" = self.buildNodePackage {
@@ -31691,7 +36009,7 @@
     version = "0.6.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz";
+      url = "https://registry.npmjs.org/pegjs/-/pegjs-0.6.2.tgz";
       name = "pegjs-0.6.2.tgz";
       sha1 = "74651f8a800e444db688e4eeae8edb65637a17a5";
     };
@@ -31703,16 +36021,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pegjs"."git+https://github.com/arlolra/pegjs#startOffset" =
+  by-spec."pegjs"."git+https://github.com/tstarling/pegjs#fork" =
     self.by-version."pegjs"."0.8.0";
   by-version."pegjs"."0.8.0" = self.buildNodePackage {
     name = "pegjs-0.8.0";
     version = "0.8.0";
     bin = true;
     src = fetchgit {
-      url = "https://github.com/arlolra/pegjs";
-      rev = "7ff7464d082dd96def08e8c14aadc6bc5e5a84ba";
-      sha256 = "36706b776a50ca1320cd5f7d4db2668d1567cccd43ee6a746e4d2c70552570e9";
+      url = "https://github.com/tstarling/pegjs";
+      rev = "9162b1e114e41992dd0fdafa24d2574a0b8a836a";
+      sha256 = "11f0b6b159709bc7c9223c0c8013b3e307b87ea6bbfcf615b804b2d67fe3813a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pend"."~1.2.0" =
+    self.by-version."pend"."1.2.0";
+  by-version."pend"."1.2.0" = self.buildNodePackage {
+    name = "pend-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz";
+      name = "pend-1.2.0.tgz";
+      sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50";
     };
     deps = {
     };
@@ -31723,24 +36060,54 @@
     cpu = [ ];
   };
   by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."1.9.16";
-  by-version."phantomjs"."1.9.16" = self.buildNodePackage {
-    name = "phantomjs-1.9.16";
-    version = "1.9.16";
+    self.by-version."phantomjs"."2.1.3";
+  by-version."phantomjs"."2.1.3" = self.buildNodePackage {
+    name = "phantomjs-2.1.3";
+    version = "2.1.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/phantomjs/-/phantomjs-1.9.16.tgz";
-      name = "phantomjs-1.9.16.tgz";
-      sha1 = "989256190c00f987fc96b7067bdb5cd2e420bac9";
+      url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.3.tgz";
+      name = "phantomjs-2.1.3.tgz";
+      sha1 = "330c254837c474ec022b70fa1e9b6202309e7556";
     };
     deps = {
-      "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
-      "fs-extra-0.16.5" = self.by-version."fs-extra"."0.16.5";
-      "kew-0.4.0" = self.by-version."kew"."0.4.0";
-      "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
+      "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
+      "fs-extra-0.26.7" = self.by-version."fs-extra"."0.26.7";
+      "kew-0.7.0" = self.by-version."kew"."0.7.0";
+      "md5-2.0.0" = self.by-version."md5"."2.0.0";
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
-      "request-2.42.0" = self.by-version."request"."2.42.0";
+      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "request-progress-2.0.1" = self.by-version."request-progress"."2.0.1";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "phantomjs" = self.by-version."phantomjs"."2.1.3";
+  by-spec."phantomjs"."1.9.7-15" =
+    self.by-version."phantomjs"."1.9.7-15";
+  by-version."phantomjs"."1.9.7-15" = self.buildNodePackage {
+    name = "phantomjs-1.9.7-15";
+    version = "1.9.7-15";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.7-15.tgz";
+      name = "phantomjs-1.9.7-15.tgz";
+      sha1 = "0b3a7ce630486a83be91ff4e832eee20e971115b";
+    };
+    deps = {
+      "adm-zip-0.2.1" = self.by-version."adm-zip"."0.2.1";
+      "kew-0.1.7" = self.by-version."kew"."0.1.7";
+      "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
+      "npmconf-0.0.24" = self.by-version."npmconf"."0.0.24";
+      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
+      "progress-1.1.8" = self.by-version."progress"."1.1.8";
+      "request-2.36.0" = self.by-version."request"."2.36.0";
       "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1";
+      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
       "which-1.0.9" = self.by-version."which"."1.0.9";
     };
     optionalDependencies = {
@@ -31749,30 +36116,111 @@
     os = [ ];
     cpu = [ ];
   };
-  "phantomjs" = self.by-version."phantomjs"."1.9.16";
-  by-spec."phantomjs"."~1.9.1" =
-    self.by-version."phantomjs"."1.9.16";
   by-spec."phantomjs"."~1.9.10" =
-    self.by-version."phantomjs"."1.9.16";
+    self.by-version."phantomjs"."1.9.20";
+  by-version."phantomjs"."1.9.20" = self.buildNodePackage {
+    name = "phantomjs-1.9.20";
+    version = "1.9.20";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/phantomjs/-/phantomjs-1.9.20.tgz";
+      name = "phantomjs-1.9.20.tgz";
+      sha1 = "4424aca20e14d255c0b0889af6f6b8973da10e0d";
+    };
+    deps = {
+      "extract-zip-1.5.0" = self.by-version."extract-zip"."1.5.0";
+      "fs-extra-0.26.7" = self.by-version."fs-extra"."0.26.7";
+      "hasha-2.2.0" = self.by-version."hasha"."2.2.0";
+      "kew-0.7.0" = self.by-version."kew"."0.7.0";
+      "progress-1.1.8" = self.by-version."progress"."1.1.8";
+      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "request-progress-2.0.1" = self.by-version."request-progress"."2.0.1";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pify"."^2.0.0" =
+    self.by-version."pify"."2.3.0";
+  by-version."pify"."2.3.0" = self.buildNodePackage {
+    name = "pify-2.3.0";
+    version = "2.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
+      name = "pify-2.3.0.tgz";
+      sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pinkie"."^2.0.0" =
+    self.by-version."pinkie"."2.0.4";
+  by-version."pinkie"."2.0.4" = self.buildNodePackage {
+    name = "pinkie-2.0.4";
+    version = "2.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+      name = "pinkie-2.0.4.tgz";
+      sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pinkie-promise"."^2.0.0" =
+    self.by-version."pinkie-promise"."2.0.0";
+  by-version."pinkie-promise"."2.0.0" = self.buildNodePackage {
+    name = "pinkie-promise-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz";
+      name = "pinkie-promise-2.0.0.tgz";
+      sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
+    };
+    deps = {
+      "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."pkgcloud".">=1.1.0" =
-    self.by-version."pkgcloud"."1.1.0";
-  by-version."pkgcloud"."1.1.0" = self.buildNodePackage {
-    name = "pkgcloud-1.1.0";
-    version = "1.1.0";
+    self.by-version."pkgcloud"."1.3.0";
+  by-version."pkgcloud"."1.3.0" = self.buildNodePackage {
+    name = "pkgcloud-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pkgcloud/-/pkgcloud-1.1.0.tgz";
-      name = "pkgcloud-1.1.0.tgz";
-      sha1 = "b67d48d9c39c40c2578eeb255165bbb05d4803d4";
+      url = "https://registry.npmjs.org/pkgcloud/-/pkgcloud-1.3.0.tgz";
+      name = "pkgcloud-1.3.0.tgz";
+      sha1 = "d7e44892e5ddd24dcc6c10bee2bcefb7526a5ed6";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "aws-sdk-2.0.31" = self.by-version."aws-sdk"."2.0.31";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "aws-sdk-2.3.0" = self.by-version."aws-sdk"."2.3.0";
       "errs-0.3.2" = self.by-version."errs"."0.3.2";
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
+      "fast-json-patch-0.5.6" = self.by-version."fast-json-patch"."0.5.6";
       "filed-0.1.0" = self.by-version."filed"."0.1.0";
       "gcloud-0.10.0" = self.by-version."gcloud"."0.10.0";
-      "ip-0.3.2" = self.by-version."ip"."0.3.2";
+      "ip-0.3.3" = self.by-version."ip"."0.3.3";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
       "request-2.40.0" = self.by-version."request"."2.40.0";
@@ -31795,7 +36243,7 @@
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
+      url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
       name = "pkginfo-0.2.3.tgz";
       sha1 = "7239c42a5ef6c30b8f328439d9b9ff71042490f8";
     };
@@ -31807,16 +36255,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pkginfo"."0.3.0" =
-    self.by-version."pkginfo"."0.3.0";
-  by-version."pkginfo"."0.3.0" = self.buildNodePackage {
-    name = "pkginfo-0.3.0";
-    version = "0.3.0";
+  by-spec."pkginfo"."0.3.x" =
+    self.by-version."pkginfo"."0.3.1";
+  by-version."pkginfo"."0.3.1" = self.buildNodePackage {
+    name = "pkginfo-0.3.1";
+    version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
-      name = "pkginfo-0.3.0.tgz";
-      sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+      url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
+      name = "pkginfo-0.3.1.tgz";
+      sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
     };
     deps = {
     };
@@ -31826,12 +36274,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pkginfo"."0.3.x" =
-    self.by-version."pkginfo"."0.3.0";
   by-spec."pkginfo"."0.x.x" =
-    self.by-version."pkginfo"."0.3.0";
-  by-spec."pkginfo"."~0.3.0" =
-    self.by-version."pkginfo"."0.3.0";
+    self.by-version."pkginfo"."0.4.0";
+  by-version."pkginfo"."0.4.0" = self.buildNodePackage {
+    name = "pkginfo-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.0.tgz";
+      name = "pkginfo-0.4.0.tgz";
+      sha1 = "349dbb7ffd38081fcadc0853df687f0c7744cd65";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pkginfo"."^0.3.0" =
+    self.by-version."pkginfo"."0.3.1";
   by-spec."playerui"."^1.2.0" =
     self.by-version."playerui"."1.2.0";
   by-version."playerui"."1.2.0" = self.buildNodePackage {
@@ -31839,7 +36302,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz";
+      url = "https://registry.npmjs.org/playerui/-/playerui-1.2.0.tgz";
       name = "playerui-1.2.0.tgz";
       sha1 = "2d59c8cb736e189cb2398cd809469ca47077f812";
     };
@@ -31847,7 +36310,7 @@
       "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
       "pad-0.0.5" = self.by-version."pad"."0.0.5";
       "single-line-log-0.4.1" = self.by-version."single-line-log"."0.4.1";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -31855,22 +36318,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."plist"."1.1.0" =
-    self.by-version."plist"."1.1.0";
-  by-version."plist"."1.1.0" = self.buildNodePackage {
-    name = "plist-1.1.0";
-    version = "1.1.0";
+  by-spec."plist"."*" =
+    self.by-version."plist"."1.2.0";
+  by-version."plist"."1.2.0" = self.buildNodePackage {
+    name = "plist-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/plist/-/plist-1.1.0.tgz";
-      name = "plist-1.1.0.tgz";
-      sha1 = "ff6708590c97cc438e7bc45de5251bd725f3f89d";
+      url = "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz";
+      name = "plist-1.2.0.tgz";
+      sha1 = "084b5093ddc92506e259f874b8d9b1afb8c79593";
     };
     deps = {
-      "base64-js-0.0.6" = self.by-version."base64-js"."0.0.6";
-      "xmlbuilder-2.2.1" = self.by-version."xmlbuilder"."2.2.1";
-      "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
-      "util-deprecate-1.0.0" = self.by-version."util-deprecate"."1.0.0";
+      "base64-js-0.0.8" = self.by-version."base64-js"."0.0.8";
+      "xmlbuilder-4.0.0" = self.by-version."xmlbuilder"."4.0.0";
+      "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22";
+      "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -31879,20 +36342,22 @@
     cpu = [ ];
   };
   by-spec."plist"."^1.0.1" =
-    self.by-version."plist"."1.1.0";
+    self.by-version."plist"."1.2.0";
+  by-spec."plist"."^1.2.0" =
+    self.by-version."plist"."1.2.0";
   by-spec."plist-native"."*" =
-    self.by-version."plist-native"."0.4.0";
-  by-version."plist-native"."0.4.0" = self.buildNodePackage {
-    name = "plist-native-0.4.0";
-    version = "0.4.0";
+    self.by-version."plist-native"."0.4.2";
+  by-version."plist-native"."0.4.2" = self.buildNodePackage {
+    name = "plist-native-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/plist-native/-/plist-native-0.4.0.tgz";
-      name = "plist-native-0.4.0.tgz";
-      sha1 = "9b257c5e99b704dff177f23af082c59f7d58855f";
+      url = "https://registry.npmjs.org/plist-native/-/plist-native-0.4.2.tgz";
+      name = "plist-native-0.4.2.tgz";
+      sha1 = "5fa25c9c4ce9b01144de02564e8aa984ebbc8901";
     };
     deps = {
-      "libxmljs-0.13.0" = self.by-version."libxmljs"."0.13.0";
+      "libxmljs-0.17.1" = self.by-version."libxmljs"."0.17.1";
     };
     optionalDependencies = {
     };
@@ -31900,21 +36365,19 @@
     os = [ ];
     cpu = [ ];
   };
-  "plist-native" = self.by-version."plist-native"."0.4.0";
-  by-spec."plist-with-patches"."0.5.1" =
-    self.by-version."plist-with-patches"."0.5.1";
-  by-version."plist-with-patches"."0.5.1" = self.buildNodePackage {
-    name = "plist-with-patches-0.5.1";
-    version = "0.5.1";
+  "plist-native" = self.by-version."plist-native"."0.4.2";
+  by-spec."pluralize"."^1.2.1" =
+    self.by-version."pluralize"."1.2.1";
+  by-version."pluralize"."1.2.1" = self.buildNodePackage {
+    name = "pluralize-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/plist-with-patches/-/plist-with-patches-0.5.1.tgz";
-      name = "plist-with-patches-0.5.1.tgz";
-      sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d";
+      url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
+      name = "pluralize-1.2.1.tgz";
+      sha1 = "d1a21483fd22bb41e58a12fa3421823140897c45";
     };
     deps = {
-      "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
-      "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
     };
     optionalDependencies = {
     };
@@ -31929,7 +36392,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
+      url = "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz";
       name = "policyfile-0.0.4.tgz";
       sha1 = "d6b82ead98ae79ebe228e2daf5903311ec982e4d";
     };
@@ -31948,7 +36411,7 @@
     version = "0.4.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pooling/-/pooling-0.4.6.tgz";
+      url = "https://registry.npmjs.org/pooling/-/pooling-0.4.6.tgz";
       name = "pooling-0.4.6.tgz";
       sha1 = "76a317371ea8a363b4858fa4799e60245f30e664";
     };
@@ -31972,7 +36435,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz";
+      url = "https://registry.npmjs.org/pop-iterate/-/pop-iterate-1.0.1.tgz";
       name = "pop-iterate-1.0.1.tgz";
       sha1 = "ceacfdab4abf353d7a0f2aaa2c1fc7b3f9413ba3";
     };
@@ -31984,26 +36447,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."portfinder"."^0.2.1" =
-    self.by-version."portfinder"."0.2.1";
-  by-version."portfinder"."0.2.1" = self.buildNodePackage {
-    name = "portfinder-0.2.1";
-    version = "0.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/portfinder/-/portfinder-0.2.1.tgz";
-      name = "portfinder-0.2.1.tgz";
-      sha1 = "b2b9b0164f9e17fa3a9c7db2304d0a75140c71ad";
-    };
-    deps = {
-      "mkdirp-0.0.7" = self.by-version."mkdirp"."0.0.7";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."portfinder"."^0.3.0" =
     self.by-version."portfinder"."0.3.0";
   by-version."portfinder"."0.3.0" = self.buildNodePackage {
@@ -32011,7 +36454,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz";
+      url = "https://registry.npmjs.org/portfinder/-/portfinder-0.3.0.tgz";
       name = "portfinder-0.3.0.tgz";
       sha1 = "f9f2c96894440c5b5113b84e0ad1013042b7c2a0";
     };
@@ -32025,18 +36468,18 @@
     cpu = [ ];
   };
   by-spec."posix"."*" =
-    self.by-version."posix"."2.0.0";
-  by-version."posix"."2.0.0" = self.buildNodePackage {
-    name = "posix-2.0.0";
-    version = "2.0.0";
+    self.by-version."posix"."4.0.1";
+  by-version."posix"."4.0.1" = self.buildNodePackage {
+    name = "posix-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/posix/-/posix-2.0.0.tgz";
-      name = "posix-2.0.0.tgz";
-      sha1 = "90fd0ec73968d805c890b61ae6cc95ae5803a87d";
+      url = "https://registry.npmjs.org/posix/-/posix-4.0.1.tgz";
+      name = "posix-4.0.1.tgz";
+      sha1 = "22d195ef7915705b69430eb997780dc74e159be4";
     };
     deps = {
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-2.0.9" = self.by-version."nan"."2.0.9";
     };
     optionalDependencies = {
     };
@@ -32044,7 +36487,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "posix" = self.by-version."posix"."2.0.0";
+  "posix" = self.by-version."posix"."4.0.1";
   by-spec."posix-getopt"."1.1.0" =
     self.by-version."posix-getopt"."1.1.0";
   by-version."posix-getopt"."1.1.0" = self.buildNodePackage {
@@ -32052,7 +36495,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/posix-getopt/-/posix-getopt-1.1.0.tgz";
+      url = "https://registry.npmjs.org/posix-getopt/-/posix-getopt-1.1.0.tgz";
       name = "posix-getopt-1.1.0.tgz";
       sha1 = "8e258aca8f34d6906c159a32b0388360197e5698";
     };
@@ -32071,7 +36514,7 @@
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/precond/-/precond-0.2.3.tgz";
+      url = "https://registry.npmjs.org/precond/-/precond-0.2.3.tgz";
       name = "precond-0.2.3.tgz";
       sha1 = "aa9591bcaa24923f1e0f4849d240f47efc1075ac";
     };
@@ -32084,15 +36527,15 @@
     cpu = [ ];
   };
   by-spec."prelude-ls"."~1.1.0" =
-    self.by-version."prelude-ls"."1.1.1";
-  by-version."prelude-ls"."1.1.1" = self.buildNodePackage {
-    name = "prelude-ls-1.1.1";
-    version = "1.1.1";
+    self.by-version."prelude-ls"."1.1.2";
+  by-version."prelude-ls"."1.1.2" = self.buildNodePackage {
+    name = "prelude-ls-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz";
-      name = "prelude-ls-1.1.1.tgz";
-      sha1 = "c0b86c1ffd151ad3cc75e7e3fe38d7a1bf33728a";
+      url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
+      name = "prelude-ls-1.1.2.tgz";
+      sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54";
     };
     deps = {
     };
@@ -32103,17 +36546,19 @@
     cpu = [ ];
   };
   by-spec."prelude-ls"."~1.1.1" =
-    self.by-version."prelude-ls"."1.1.1";
+    self.by-version."prelude-ls"."1.1.2";
+  by-spec."prelude-ls"."~1.1.2" =
+    self.by-version."prelude-ls"."1.1.2";
   by-spec."prepend-http"."^1.0.0" =
-    self.by-version."prepend-http"."1.0.1";
-  by-version."prepend-http"."1.0.1" = self.buildNodePackage {
-    name = "prepend-http-1.0.1";
-    version = "1.0.1";
+    self.by-version."prepend-http"."1.0.3";
+  by-version."prepend-http"."1.0.3" = self.buildNodePackage {
+    name = "prepend-http-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/prepend-http/-/prepend-http-1.0.1.tgz";
-      name = "prepend-http-1.0.1.tgz";
-      sha1 = "5f13dad9a434fa4f346aa51cf03f3cea15fe4eb3";
+      url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz";
+      name = "prepend-http-1.0.3.tgz";
+      sha1 = "4d0d2b6f9efcf1190c23931325b4f3a9dba84869";
     };
     deps = {
     };
@@ -32130,7 +36575,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz";
+      url = "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz";
       name = "preserve-0.2.0.tgz";
       sha1 = "815ed1f6ebc65926f865b310c0713bcb3315ce4b";
     };
@@ -32149,32 +36594,13 @@
     version = "1.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz";
+      url = "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.4.tgz";
       name = "pretty-bytes-1.0.4.tgz";
       sha1 = "0a22e8210609ad35542f8c8d5d2159aff0751c84";
     };
     deps = {
       "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-      "meow-3.1.0" = self.by-version."meow"."3.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pretty-hrtime"."^0.2.0" =
-    self.by-version."pretty-hrtime"."0.2.2";
-  by-version."pretty-hrtime"."0.2.2" = self.buildNodePackage {
-    name = "pretty-hrtime-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-0.2.2.tgz";
-      name = "pretty-hrtime-0.2.2.tgz";
-      sha1 = "d4fd88351e3a4741f8173af7d6a4b846f9895c00";
-    };
-    deps = {
+      "meow-3.7.0" = self.by-version."meow"."3.7.0";
     };
     optionalDependencies = {
     };
@@ -32182,19 +36608,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."prfun"."~1.0.2" =
-    self.by-version."prfun"."1.0.2";
-  by-version."prfun"."1.0.2" = self.buildNodePackage {
-    name = "prfun-1.0.2";
+  by-spec."pretty-hrtime"."^1.0.0" =
+    self.by-version."pretty-hrtime"."1.0.2";
+  by-version."pretty-hrtime"."1.0.2" = self.buildNodePackage {
+    name = "pretty-hrtime-1.0.2";
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/prfun/-/prfun-1.0.2.tgz";
-      name = "prfun-1.0.2.tgz";
-      sha1 = "ac8799843d8194ea478ee4442e455fd5e054db3e";
+      url = "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.2.tgz";
+      name = "pretty-hrtime-1.0.2.tgz";
+      sha1 = "70ca96f4d0628a443b918758f79416a9a7bc9fa8";
     };
     deps = {
-      "es6-shim-0.28.1" = self.by-version."es6-shim"."0.28.1";
     };
     optionalDependencies = {
     };
@@ -32202,18 +36627,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."private"."~0.1.2" =
-    self.by-version."private"."0.1.6";
-  by-version."private"."0.1.6" = self.buildNodePackage {
-    name = "private-0.1.6";
-    version = "0.1.6";
-    bin = false;
+  by-spec."prettyjson"."^1.1.2" =
+    self.by-version."prettyjson"."1.1.3";
+  by-version."prettyjson"."1.1.3" = self.buildNodePackage {
+    name = "prettyjson-1.1.3";
+    version = "1.1.3";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/private/-/private-0.1.6.tgz";
-      name = "private-0.1.6.tgz";
-      sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
+      url = "https://registry.npmjs.org/prettyjson/-/prettyjson-1.1.3.tgz";
+      name = "prettyjson-1.1.3.tgz";
+      sha1 = "d0787f732c9c3a566f4165fa4f1176fd67e6b263";
     };
     deps = {
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -32221,39 +36648,36 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."private"."~0.1.5" =
-    self.by-version."private"."0.1.6";
-  by-spec."private"."~0.1.6" =
-    self.by-version."private"."0.1.6";
-  by-spec."process"."^0.10.0" =
-    self.by-version."process"."0.10.1";
-  by-version."process"."0.10.1" = self.buildNodePackage {
-    name = "process-0.10.1";
-    version = "0.10.1";
+  by-spec."prfun"."~2.0.0" =
+    self.by-version."prfun"."2.0.0";
+  by-version."prfun"."2.0.0" = self.buildNodePackage {
+    name = "prfun-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/process/-/process-0.10.1.tgz";
-      name = "process-0.10.1.tgz";
-      sha1 = "842457cc51cfed72dc775afeeafb8c6034372725";
+      url = "https://registry.npmjs.org/prfun/-/prfun-2.0.0.tgz";
+      name = "prfun-2.0.0.tgz";
+      sha1 = "f8d8217fac9f0853299a103e9e1fd9cb15238c9a";
     };
     deps = {
     };
     optionalDependencies = {
+      "es6-shim-0.35.0" = self.by-version."es6-shim"."0.35.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."process"."^0.8.0" =
-    self.by-version."process"."0.8.0";
-  by-version."process"."0.8.0" = self.buildNodePackage {
-    name = "process-0.8.0";
-    version = "0.8.0";
+  by-spec."private"."^0.1.6" =
+    self.by-version."private"."0.1.6";
+  by-version."private"."0.1.6" = self.buildNodePackage {
+    name = "private-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/process/-/process-0.8.0.tgz";
-      name = "process-0.8.0.tgz";
-      sha1 = "7bbaf7187fe6ded3fd5be0cb6103fba9cacb9798";
+      url = "https://registry.npmjs.org/private/-/private-0.1.6.tgz";
+      name = "private-0.1.6.tgz";
+      sha1 = "55c6a976d0f9bafb9924851350fe47b9b5fbb7c1";
     };
     deps = {
     };
@@ -32263,18 +36687,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."process"."~0.10.0" =
-    self.by-version."process"."0.10.1";
-  by-spec."process"."~0.5.1" =
-    self.by-version."process"."0.5.2";
-  by-version."process"."0.5.2" = self.buildNodePackage {
-    name = "process-0.5.2";
-    version = "0.5.2";
+  by-spec."private"."~0.1.2" =
+    self.by-version."private"."0.1.6";
+  by-spec."private"."~0.1.5" =
+    self.by-version."private"."0.1.6";
+  by-spec."process"."^0.11.0" =
+    self.by-version."process"."0.11.2";
+  by-version."process"."0.11.2" = self.buildNodePackage {
+    name = "process-0.11.2";
+    version = "0.11.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/process/-/process-0.5.2.tgz";
-      name = "process-0.5.2.tgz";
-      sha1 = "1638d8a8e34c2f440a91db95ab9aeb677fc185cf";
+      url = "https://registry.npmjs.org/process/-/process-0.11.2.tgz";
+      name = "process-0.11.2.tgz";
+      sha1 = "8a58d1d12c573f3f890da9848a4fe8e16ca977b2";
     };
     deps = {
     };
@@ -32284,16 +36710,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."process"."~0.6.0" =
-    self.by-version."process"."0.6.0";
-  by-version."process"."0.6.0" = self.buildNodePackage {
-    name = "process-0.6.0";
-    version = "0.6.0";
+  by-spec."process"."~0.11.0" =
+    self.by-version."process"."0.11.2";
+  by-spec."process-nextick-args"."~1.0.6" =
+    self.by-version."process-nextick-args"."1.0.6";
+  by-version."process-nextick-args"."1.0.6" = self.buildNodePackage {
+    name = "process-nextick-args-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/process/-/process-0.6.0.tgz";
-      name = "process-0.6.0.tgz";
-      sha1 = "7dd9be80ffaaedd4cb628f1827f1cbab6dc0918f";
+      url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz";
+      name = "process-nextick-args-1.0.6.tgz";
+      sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05";
     };
     deps = {
     };
@@ -32310,7 +36738,7 @@
     version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/progress/-/progress-1.1.4.tgz";
+      url = "https://registry.npmjs.org/progress/-/progress-1.1.4.tgz";
       name = "progress-1.1.4.tgz";
       sha1 = "789f57691b88b826a439bc52dc9620245d60255b";
     };
@@ -32322,14 +36750,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."progress"."1.1.8" =
+  by-spec."progress"."^1.1.5" =
     self.by-version."progress"."1.1.8";
   by-version."progress"."1.1.8" = self.buildNodePackage {
     name = "progress-1.1.8";
     version = "1.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
+      url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
       name = "progress-1.1.8.tgz";
       sha1 = "e260c78f6161cdd9b0e56cc3e0a85de17c7a57be";
     };
@@ -32341,6 +36769,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."progress"."^1.1.8" =
+    self.by-version."progress"."1.1.8";
+  by-spec."progress"."~1.1.8" =
+    self.by-version."progress"."1.1.8";
   by-spec."promiscuous"."^0.6.0" =
     self.by-version."promiscuous"."0.6.0";
   by-version."promiscuous"."0.6.0" = self.buildNodePackage {
@@ -32348,7 +36780,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz";
+      url = "https://registry.npmjs.org/promiscuous/-/promiscuous-0.6.0.tgz";
       name = "promiscuous-0.6.0.tgz";
       sha1 = "54014cd3d62cafe831e3354990c05ff5b78c8892";
     };
@@ -32360,14 +36792,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."promise"."^6.0.1" =
+  by-spec."promise"."^6.0.0" =
     self.by-version."promise"."6.1.0";
   by-version."promise"."6.1.0" = self.buildNodePackage {
     name = "promise-6.1.0";
     version = "6.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
+      url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz";
       name = "promise-6.1.0.tgz";
       sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6";
     };
@@ -32380,6 +36812,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."promise"."^6.0.1" =
+    self.by-version."promise"."6.1.0";
+  by-spec."promise"."^7.1.1" =
+    self.by-version."promise"."7.1.1";
+  by-version."promise"."7.1.1" = self.buildNodePackage {
+    name = "promise-7.1.1";
+    version = "7.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/promise/-/promise-7.1.1.tgz";
+      name = "promise-7.1.1.tgz";
+      sha1 = "489654c692616b8aa55b0724fa809bb7db49c5bf";
+    };
+    deps = {
+      "asap-2.0.3" = self.by-version."asap"."2.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."promise"."~2.0" =
     self.by-version."promise"."2.0.0";
   by-version."promise"."2.0.0" = self.buildNodePackage {
@@ -32387,7 +36841,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
+      url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz";
       name = "promise-2.0.0.tgz";
       sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e";
     };
@@ -32400,23 +36854,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."prompt"."0.2.14" =
-    self.by-version."prompt"."0.2.14";
-  by-version."prompt"."0.2.14" = self.buildNodePackage {
-    name = "prompt-0.2.14";
-    version = "0.2.14";
+  by-spec."promised-temp"."^0.1.0" =
+    self.by-version."promised-temp"."0.1.0";
+  by-version."promised-temp"."0.1.0" = self.buildNodePackage {
+    name = "promised-temp-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
-      name = "prompt-0.2.14.tgz";
-      sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
+      url = "https://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz";
+      name = "promised-temp-0.1.0.tgz";
+      sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb";
     };
     deps = {
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
-      "read-1.0.5" = self.by-version."read"."1.0.5";
-      "revalidator-0.1.8" = self.by-version."revalidator"."0.1.8";
-      "utile-0.2.1" = self.by-version."utile"."0.2.1";
-      "winston-0.8.3" = self.by-version."winston"."0.8.3";
+      "temp-0.8.3" = self.by-version."temp"."0.8.3";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
     };
     optionalDependencies = {
     };
@@ -32424,21 +36877,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."prompt"."0.2.x" =
+  by-spec."prompt"."0.2.14" =
     self.by-version."prompt"."0.2.14";
-  by-spec."promptly"."0.2.0" =
-    self.by-version."promptly"."0.2.0";
-  by-version."promptly"."0.2.0" = self.buildNodePackage {
-    name = "promptly-0.2.0";
-    version = "0.2.0";
+  by-version."prompt"."0.2.14" = self.buildNodePackage {
+    name = "prompt-0.2.14";
+    version = "0.2.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz";
-      name = "promptly-0.2.0.tgz";
-      sha1 = "73ef200fa8329d5d3a8df41798950b8646ca46d9";
+      url = "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz";
+      name = "prompt-0.2.14.tgz";
+      sha1 = "57754f64f543fd7b0845707c818ece618f05ffdc";
     };
     deps = {
-      "read-1.0.5" = self.by-version."read"."1.0.5";
+      "pkginfo-0.4.0" = self.by-version."pkginfo"."0.4.0";
+      "read-1.0.7" = self.by-version."read"."1.0.7";
+      "revalidator-0.1.8" = self.by-version."revalidator"."0.1.8";
+      "utile-0.2.1" = self.by-version."utile"."0.2.1";
+      "winston-0.8.3" = self.by-version."winston"."0.8.3";
     };
     optionalDependencies = {
     };
@@ -32446,6 +36901,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."prompt"."0.2.x" =
+    self.by-version."prompt"."0.2.14";
   by-spec."promzard"."^0.3.0" =
     self.by-version."promzard"."0.3.0";
   by-version."promzard"."0.3.0" = self.buildNodePackage {
@@ -32453,32 +36910,12 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz";
+      url = "https://registry.npmjs.org/promzard/-/promzard-0.3.0.tgz";
       name = "promzard-0.3.0.tgz";
       sha1 = "26a5d6ee8c7dee4cb12208305acfb93ba382a9ee";
     };
     deps = {
-      "read-1.0.5" = self.by-version."read"."1.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."promzard"."~0.2.0" =
-    self.by-version."promzard"."0.2.2";
-  by-version."promzard"."0.2.2" = self.buildNodePackage {
-    name = "promzard-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/promzard/-/promzard-0.2.2.tgz";
-      name = "promzard-0.2.2.tgz";
-      sha1 = "918b9f2b29458cb001781a8856502e4a79b016e0";
-    };
-    deps = {
-      "read-1.0.5" = self.by-version."read"."1.0.5";
+      "read-1.0.7" = self.by-version."read"."1.0.7";
     };
     optionalDependencies = {
     };
@@ -32493,7 +36930,7 @@
     version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz";
+      url = "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz";
       name = "properties-parser-0.2.3.tgz";
       sha1 = "f7591255f707abbff227c7b56b637dbb0373a10f";
     };
@@ -32512,7 +36949,7 @@
     version = "0.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/protein/-/protein-0.5.0.tgz";
+      url = "https://registry.npmjs.org/protein/-/protein-0.5.0.tgz";
       name = "protein-0.5.0.tgz";
       sha1 = "80ab4e919749351263ef14500d684e57c4202840";
     };
@@ -32525,15 +36962,15 @@
     cpu = [ ];
   };
   by-spec."proto-list"."~1.2.1" =
-    self.by-version."proto-list"."1.2.3";
-  by-version."proto-list"."1.2.3" = self.buildNodePackage {
-    name = "proto-list-1.2.3";
-    version = "1.2.3";
+    self.by-version."proto-list"."1.2.4";
+  by-version."proto-list"."1.2.4" = self.buildNodePackage {
+    name = "proto-list-1.2.4";
+    version = "1.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/proto-list/-/proto-list-1.2.3.tgz";
-      name = "proto-list-1.2.3.tgz";
-      sha1 = "6235554a1bca1f0d15e3ca12ca7329d5def42bd9";
+      url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz";
+      name = "proto-list-1.2.4.tgz";
+      sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849";
     };
     deps = {
     };
@@ -32550,12 +36987,12 @@
     version = "3.8.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz";
+      url = "https://registry.npmjs.org/protobufjs/-/protobufjs-3.8.2.tgz";
       name = "protobufjs-3.8.2.tgz";
       sha1 = "bc826e34c3af4697e8d0af7a669e4d612aedcd17";
     };
     deps = {
-      "bytebuffer-3.5.4" = self.by-version."bytebuffer"."3.5.4";
+      "bytebuffer-3.5.5" = self.by-version."bytebuffer"."3.5.5";
       "ascli-0.3.0" = self.by-version."ascli"."0.3.0";
     };
     optionalDependencies = {
@@ -32573,7 +37010,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
+      url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz";
       name = "proxy-addr-1.0.1.tgz";
       sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8";
     };
@@ -32586,20 +37023,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."proxy-addr"."~1.0.3" =
-    self.by-version."proxy-addr"."1.0.7";
-  by-version."proxy-addr"."1.0.7" = self.buildNodePackage {
-    name = "proxy-addr-1.0.7";
-    version = "1.0.7";
+  by-spec."proxy-addr"."~1.0.10" =
+    self.by-version."proxy-addr"."1.0.10";
+  by-version."proxy-addr"."1.0.10" = self.buildNodePackage {
+    name = "proxy-addr-1.0.10";
+    version = "1.0.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.7.tgz";
-      name = "proxy-addr-1.0.7.tgz";
-      sha1 = "6e2655aa9c56b014f09734a7e6d558cc77751939";
+      url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz";
+      name = "proxy-addr-1.0.10.tgz";
+      sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5";
     };
     deps = {
       "forwarded-0.1.0" = self.by-version."forwarded"."0.1.0";
-      "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
+      "ipaddr.js-1.0.5" = self.by-version."ipaddr.js"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -32607,25 +37044,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."proxy-addr"."~1.0.7" =
-    self.by-version."proxy-addr"."1.0.7";
+  by-spec."proxy-addr"."~1.0.8" =
+    self.by-version."proxy-addr"."1.0.10";
   by-spec."proxy-agent"."1" =
-    self.by-version."proxy-agent"."1.1.0";
-  by-version."proxy-agent"."1.1.0" = self.buildNodePackage {
-    name = "proxy-agent-1.1.0";
-    version = "1.1.0";
+    self.by-version."proxy-agent"."1.1.1";
+  by-version."proxy-agent"."1.1.1" = self.buildNodePackage {
+    name = "proxy-agent-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/proxy-agent/-/proxy-agent-1.1.0.tgz";
-      name = "proxy-agent-1.1.0.tgz";
-      sha1 = "e23fd209bcbaa3e6743206f4e5fef0b765c380a6";
+      url = "https://registry.npmjs.org/proxy-agent/-/proxy-agent-1.1.1.tgz";
+      name = "proxy-agent-1.1.1.tgz";
+      sha1 = "fcb1eef5e58965c995f938f029d729fc81858b95";
     };
     deps = {
-      "http-proxy-agent-0.2.6" = self.by-version."http-proxy-agent"."0.2.6";
-      "https-proxy-agent-0.3.5" = self.by-version."https-proxy-agent"."0.3.5";
-      "pac-proxy-agent-0.2.0" = self.by-version."pac-proxy-agent"."0.2.0";
-      "socks-proxy-agent-0.1.2" = self.by-version."socks-proxy-agent"."0.1.2";
       "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2";
+      "pac-proxy-agent-0.2.0" = self.by-version."pac-proxy-agent"."0.2.0";
+      "http-proxy-agent-0.2.7" = self.by-version."http-proxy-agent"."0.2.7";
+      "https-proxy-agent-0.3.6" = self.by-version."https-proxy-agent"."0.3.6";
+      "socks-proxy-agent-1.0.2" = self.by-version."socks-proxy-agent"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -32634,7 +37071,7 @@
     cpu = [ ];
   };
   by-spec."proxy-agent"."~1.1.0" =
-    self.by-version."proxy-agent"."1.1.0";
+    self.by-version."proxy-agent"."1.1.1";
   by-spec."prr"."~0.0.0" =
     self.by-version."prr"."0.0.0";
   by-version."prr"."0.0.0" = self.buildNodePackage {
@@ -32642,7 +37079,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
+      url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz";
       name = "prr-0.0.0.tgz";
       sha1 = "1a84b85908325501411853d0081ee3fa86e2926a";
     };
@@ -32661,7 +37098,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
+      url = "https://registry.npmjs.org/ps-tree/-/ps-tree-0.0.3.tgz";
       name = "ps-tree-0.0.3.tgz";
       sha1 = "dbf8d752a7fe22fa7d58635689499610e9276ddc";
     };
@@ -32674,8 +37111,45 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ps-tree"."~0.0.3" =
-    self.by-version."ps-tree"."0.0.3";
+  by-spec."ps-tree"."^1.0.1" =
+    self.by-version."ps-tree"."1.0.1";
+  by-version."ps-tree"."1.0.1" = self.buildNodePackage {
+    name = "ps-tree-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ps-tree/-/ps-tree-1.0.1.tgz";
+      name = "ps-tree-1.0.1.tgz";
+      sha1 = "c64063b4ce8d72f7f874975f3ecc5f3597ac8e4b";
+    };
+    deps = {
+      "event-stream-3.3.2" = self.by-version."event-stream"."3.3.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pseudomap"."^1.0.1" =
+    self.by-version."pseudomap"."1.0.2";
+  by-version."pseudomap"."1.0.2" = self.buildNodePackage {
+    name = "pseudomap-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
+      name = "pseudomap-1.0.2.tgz";
+      sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."public-address"."~0.1.1" =
     self.by-version."public-address"."0.1.1";
   by-version."public-address"."0.1.1" = self.buildNodePackage {
@@ -32683,7 +37157,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/public-address/-/public-address-0.1.1.tgz";
+      url = "https://registry.npmjs.org/public-address/-/public-address-0.1.1.tgz";
       name = "public-address-0.1.1.tgz";
       sha1 = "58bdea323c88287b6914159312454b804ca9eeaf";
     };
@@ -32695,23 +37169,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."public-encrypt"."^2.0.0" =
-    self.by-version."public-encrypt"."2.0.0";
-  by-version."public-encrypt"."2.0.0" = self.buildNodePackage {
-    name = "public-encrypt-2.0.0";
-    version = "2.0.0";
+  by-spec."public-encrypt"."^4.0.0" =
+    self.by-version."public-encrypt"."4.0.0";
+  by-version."public-encrypt"."4.0.0" = self.buildNodePackage {
+    name = "public-encrypt-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-2.0.0.tgz";
-      name = "public-encrypt-2.0.0.tgz";
-      sha1 = "9e49010bf021d33f6597c77abd939612a82767fc";
+      url = "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz";
+      name = "public-encrypt-4.0.0.tgz";
+      sha1 = "39f699f3a46560dd5ebacbca693caf7c65c18cc6";
     };
     deps = {
-      "bn.js-1.3.0" = self.by-version."bn.js"."1.3.0";
-      "browserify-rsa-2.0.0" = self.by-version."browserify-rsa"."2.0.0";
-      "create-hash-1.1.1" = self.by-version."create-hash"."1.1.1";
-      "parse-asn1-3.0.0" = self.by-version."parse-asn1"."3.0.0";
-      "randombytes-2.0.1" = self.by-version."randombytes"."2.0.1";
+      "bn.js-4.11.1" = self.by-version."bn.js"."4.11.1";
+      "browserify-rsa-4.0.1" = self.by-version."browserify-rsa"."4.0.1";
+      "create-hash-1.1.2" = self.by-version."create-hash"."1.1.2";
+      "parse-asn1-5.0.0" = self.by-version."parse-asn1"."5.0.0";
+      "randombytes-2.0.3" = self.by-version."randombytes"."2.0.3";
     };
     optionalDependencies = {
     };
@@ -32726,7 +37200,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pull-core/-/pull-core-1.0.0.tgz";
+      url = "https://registry.npmjs.org/pull-core/-/pull-core-1.0.0.tgz";
       name = "pull-core-1.0.0.tgz";
       sha1 = "e0eb93918dfa70963ed09e36f63daa15b76b38a4";
     };
@@ -32745,7 +37219,7 @@
     version = "2.21.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pull-stream/-/pull-stream-2.21.0.tgz";
+      url = "https://registry.npmjs.org/pull-stream/-/pull-stream-2.21.0.tgz";
       name = "pull-stream-2.21.0.tgz";
       sha1 = "5b04e0bb35ffe64744fa9bb68465a84f9e1fe5d1";
     };
@@ -32765,7 +37239,7 @@
     version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pump/-/pump-0.3.5.tgz";
+      url = "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz";
       name = "pump-0.3.5.tgz";
       sha1 = "ae5ff8c1f93ed87adc6530a97565b126f585454b";
     };
@@ -32780,19 +37254,19 @@
     cpu = [ ];
   };
   by-spec."pump"."^1.0.0" =
-    self.by-version."pump"."1.0.0";
-  by-version."pump"."1.0.0" = self.buildNodePackage {
-    name = "pump-1.0.0";
-    version = "1.0.0";
+    self.by-version."pump"."1.0.1";
+  by-version."pump"."1.0.1" = self.buildNodePackage {
+    name = "pump-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pump/-/pump-1.0.0.tgz";
-      name = "pump-1.0.0.tgz";
-      sha1 = "f0250fe282742492e4dea170e5ed3f7bc8a5e32c";
+      url = "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz";
+      name = "pump-1.0.1.tgz";
+      sha1 = "f1f1409fb9bd1085bbdb576b43b84ec4b5eadc1a";
     };
     deps = {
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -32800,22 +37274,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."pump"."~0.3.2" =
-    self.by-version."pump"."0.3.5";
   by-spec."pumpify"."^1.3.3" =
-    self.by-version."pumpify"."1.3.3";
-  by-version."pumpify"."1.3.3" = self.buildNodePackage {
-    name = "pumpify-1.3.3";
-    version = "1.3.3";
+    self.by-version."pumpify"."1.3.4";
+  by-version."pumpify"."1.3.4" = self.buildNodePackage {
+    name = "pumpify-1.3.4";
+    version = "1.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pumpify/-/pumpify-1.3.3.tgz";
-      name = "pumpify-1.3.3.tgz";
-      sha1 = "f6d27bb71d32871ff6d0868859dbacfeb2ebdbfe";
+      url = "https://registry.npmjs.org/pumpify/-/pumpify-1.3.4.tgz";
+      name = "pumpify-1.3.4.tgz";
+      sha1 = "33418bdaf200b8fd55276c39eefb1bb842e4a606";
     };
     deps = {
-      "duplexify-3.3.0" = self.by-version."duplexify"."3.3.0";
-      "pump-1.0.0" = self.by-version."pump"."1.0.0";
+      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "pump-1.0.1" = self.by-version."pump"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -32830,7 +37303,7 @@
     version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
+      url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
       name = "punycode-1.3.2.tgz";
       sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
     };
@@ -32842,18 +37315,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.3.2";
-  by-spec."punycode".">=1.0.0 <1.1.0" =
-    self.by-version."punycode"."1.0.0";
-  by-version."punycode"."1.0.0" = self.buildNodePackage {
-    name = "punycode-1.0.0";
-    version = "1.0.0";
+  by-spec."punycode"."^1.2.4" =
+    self.by-version."punycode"."1.4.1";
+  by-version."punycode"."1.4.1" = self.buildNodePackage {
+    name = "punycode-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/punycode/-/punycode-1.0.0.tgz";
-      name = "punycode-1.0.0.tgz";
-      sha1 = "ce9e6c6e9c1db5827174fceb12ff4938700a1bd3";
+      url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz";
+      name = "punycode-1.4.1.tgz";
+      sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e";
     };
     deps = {
     };
@@ -32863,16 +37334,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."punycode"."^1.2.4" =
-    self.by-version."punycode"."1.3.2";
-  by-spec."punycode"."~1.2.3" =
+  by-spec."punycode"."^1.3.2" =
+    self.by-version."punycode"."1.4.1";
+  by-spec."punycode"."~1.2.4" =
     self.by-version."punycode"."1.2.4";
   by-version."punycode"."1.2.4" = self.buildNodePackage {
     name = "punycode-1.2.4";
     version = "1.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
+      url = "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz";
       name = "punycode-1.2.4.tgz";
       sha1 = "54008ac972aec74175def9cba6df7fa9d3918740";
     };
@@ -32884,18 +37355,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."punycode"."~1.2.4" =
-    self.by-version."punycode"."1.2.4";
-  by-spec."pure-css"."git://github.com/yui/pure.git#v0.5.0-rc-1" =
-    self.by-version."pure-css"."0.5.0-rc-1";
-  by-version."pure"."0.5.0-rc-1" = self.buildNodePackage {
-    name = "pure-0.5.0-rc-1";
-    version = "0.5.0-rc-1";
+  by-spec."pure"."*" =
+    self.by-version."pure"."2.67.0";
+  by-version."pure"."2.67.0" = self.buildNodePackage {
+    name = "pure-2.67.0";
+    version = "2.67.0";
     bin = false;
-    src = fetchgit {
-      url = "git://github.com/yui/pure.git";
-      rev = "f5ce3ae4b48ce252adac7b6ddac50c9518729a2d";
-      sha256 = "049ac2ef812771852978d11cd5aecac2dd561e97bb16ad89c79eb1e10aa57672";
+    src = fetchurl {
+      url = "https://registry.npmjs.org/pure/-/pure-2.67.0.tgz";
+      name = "pure-2.67.0.tgz";
+      sha1 = "23c1503cf6e9eb8a08ba29c81fe9c8c372970710";
     };
     deps = {
     };
@@ -32905,22 +37374,23 @@
     os = [ ];
     cpu = [ ];
   };
-  "pure-css" = self.by-version."pure"."0.5.0-rc-1";
+  "pure" = self.by-version."pure"."2.67.0";
   by-spec."pusher"."^1.0.0" =
-    self.by-version."pusher"."1.0.4";
-  by-version."pusher"."1.0.4" = self.buildNodePackage {
-    name = "pusher-1.0.4";
-    version = "1.0.4";
+    self.by-version."pusher"."1.2.1";
+  by-version."pusher"."1.2.1" = self.buildNodePackage {
+    name = "pusher-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pusher/-/pusher-1.0.4.tgz";
-      name = "pusher-1.0.4.tgz";
-      sha1 = "bdf7a51a82c86fbdebe96602f1559b6ffea7450b";
+      url = "https://registry.npmjs.org/pusher/-/pusher-1.2.1.tgz";
+      name = "pusher-1.2.1.tgz";
+      sha1 = "58b8c406e34373b7f46579854c445d09e2eacd6b";
     };
     deps = {
-      "request-2.45.0" = self.by-version."request"."2.45.0";
+      "request-2.67.0" = self.by-version."request"."2.67.0";
     };
     optionalDependencies = {
+      "webpack-1.12.14" = self.by-version."webpack"."1.12.14";
     };
     peerDependencies = [];
     os = [ ];
@@ -32933,7 +37403,7 @@
     version = "0.9.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-0.9.7.tgz";
+      url = "https://registry.npmjs.org/q/-/q-0.9.7.tgz";
       name = "q-0.9.7.tgz";
       sha1 = "4de2e6cb3b29088c9e4cbc03bf9d42fb96ce2f75";
     };
@@ -32952,7 +37422,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-1.0.1.tgz";
+      url = "https://registry.npmjs.org/q/-/q-1.0.1.tgz";
       name = "q-1.0.1.tgz";
       sha1 = "11872aeedee89268110b10a718448ffb10112a14";
     };
@@ -32971,12 +37441,12 @@
     version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-2.0.3.tgz";
+      url = "https://registry.npmjs.org/q/-/q-2.0.3.tgz";
       name = "q-2.0.3.tgz";
       sha1 = "75b8db0255a1a5af82f58c3f3aaa1efec7d0d134";
     };
     deps = {
-      "asap-2.0.2" = self.by-version."asap"."2.0.2";
+      "asap-2.0.3" = self.by-version."asap"."2.0.3";
       "pop-iterate-1.0.1" = self.by-version."pop-iterate"."1.0.1";
       "weak-map-1.0.5" = self.by-version."weak-map"."1.0.5";
     };
@@ -32987,15 +37457,15 @@
     cpu = [ ];
   };
   by-spec."q"."^1.0.1" =
-    self.by-version."q"."1.2.0";
-  by-version."q"."1.2.0" = self.buildNodePackage {
-    name = "q-1.2.0";
-    version = "1.2.0";
+    self.by-version."q"."1.4.1";
+  by-version."q"."1.4.1" = self.buildNodePackage {
+    name = "q-1.4.1";
+    version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-1.2.0.tgz";
-      name = "q-1.2.0.tgz";
-      sha1 = "811705ce4a9802adff811ab0fcdbd01946e1fe22";
+      url = "https://registry.npmjs.org/q/-/q-1.4.1.tgz";
+      name = "q-1.4.1.tgz";
+      sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
     };
     deps = {
     };
@@ -33006,13 +37476,9 @@
     cpu = [ ];
   };
   by-spec."q"."^1.1.2" =
-    self.by-version."q"."1.2.0";
-  by-spec."q"."~0.9.2" =
-    self.by-version."q"."0.9.7";
-  by-spec."q"."~0.9.6" =
-    self.by-version."q"."0.9.7";
-  by-spec."q"."~0.9.7" =
-    self.by-version."q"."0.9.7";
+    self.by-version."q"."1.4.1";
+  by-spec."q"."^1.4.1" =
+    self.by-version."q"."1.4.1";
   by-spec."q"."~1.0.1" =
     self.by-version."q"."1.0.1";
   by-spec."q"."~1.1.2" =
@@ -33022,7 +37488,7 @@
     version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-1.1.2.tgz";
+      url = "https://registry.npmjs.org/q/-/q-1.1.2.tgz";
       name = "q-1.1.2.tgz";
       sha1 = "6357e291206701d99f197ab84e57e8ad196f2a89";
     };
@@ -33034,6 +37500,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."q"."~1.4.1" =
+    self.by-version."q"."1.4.1";
   by-spec."qap"."^3.1.2" =
     self.by-version."qap"."3.1.3";
   by-version."qap"."3.1.3" = self.buildNodePackage {
@@ -33041,7 +37509,7 @@
     version = "3.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qap/-/qap-3.1.3.tgz";
+      url = "https://registry.npmjs.org/qap/-/qap-3.1.3.tgz";
       name = "qap-3.1.3.tgz";
       sha1 = "394288bf07c8fe16cf36bb2e40a3bb947ed24963";
     };
@@ -33060,7 +37528,7 @@
     version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
       name = "qs-0.4.2.tgz";
       sha1 = "3cac4c861e371a8c9c4770ac23cda8de639b8e5f";
     };
@@ -33081,7 +37549,7 @@
     version = "0.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-0.5.1.tgz";
       name = "qs-0.5.1.tgz";
       sha1 = "9f6bf5d9ac6c76384e95d36d15b48980e5e4add0";
     };
@@ -33093,25 +37561,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."0.5.x" =
-    self.by-version."qs"."0.5.6";
-  by-version."qs"."0.5.6" = self.buildNodePackage {
-    name = "qs-0.5.6";
-    version = "0.5.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
-      name = "qs-0.5.6.tgz";
-      sha1 = "31b1ad058567651c526921506b9a8793911a0384";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."qs"."0.6.5" =
     self.by-version."qs"."0.6.5";
   by-version."qs"."0.6.5" = self.buildNodePackage {
@@ -33119,7 +37568,7 @@
     version = "0.6.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-0.6.5.tgz";
       name = "qs-0.6.5.tgz";
       sha1 = "294b268e4b0d4250f6dde19b3b8b34935dff14ef";
     };
@@ -33138,7 +37587,7 @@
     version = "0.6.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-0.6.6.tgz";
       name = "qs-0.6.6.tgz";
       sha1 = "6e015098ff51968b8a3c819001d5f2c89bc4b107";
     };
@@ -33157,7 +37606,7 @@
     version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-1.2.0.tgz";
       name = "qs-1.2.0.tgz";
       sha1 = "ed079be28682147e6fd9a34cc2b0c1e0ec6453ee";
     };
@@ -33176,7 +37625,7 @@
     version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz";
       name = "qs-1.2.2.tgz";
       sha1 = "19b57ff24dc2a99ce1f8bdf6afcda59f8ef61f88";
     };
@@ -33188,16 +37637,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."2.2.3" =
-    self.by-version."qs"."2.2.3";
-  by-version."qs"."2.2.3" = self.buildNodePackage {
-    name = "qs-2.2.3";
-    version = "2.2.3";
+  by-spec."qs"."1.x.x" =
+    self.by-version."qs"."1.2.2";
+  by-spec."qs"."4.0.0" =
+    self.by-version."qs"."4.0.0";
+  by-version."qs"."4.0.0" = self.buildNodePackage {
+    name = "qs-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz";
-      name = "qs-2.2.3.tgz";
-      sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb";
+      url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz";
+      name = "qs-4.0.0.tgz";
+      sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607";
     };
     deps = {
     };
@@ -33207,16 +37658,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."2.2.4" =
-    self.by-version."qs"."2.2.4";
-  by-version."qs"."2.2.4" = self.buildNodePackage {
-    name = "qs-2.2.4";
-    version = "2.2.4";
+  by-spec."qs"."5.2.0" =
+    self.by-version."qs"."5.2.0";
+  by-version."qs"."5.2.0" = self.buildNodePackage {
+    name = "qs-5.2.0";
+    version = "5.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz";
-      name = "qs-2.2.4.tgz";
-      sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8";
+      url = "https://registry.npmjs.org/qs/-/qs-5.2.0.tgz";
+      name = "qs-5.2.0.tgz";
+      sha1 = "a9f31142af468cb72b25b30136ba2456834916be";
     };
     deps = {
     };
@@ -33226,16 +37677,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."2.3.2" =
-    self.by-version."qs"."2.3.2";
-  by-version."qs"."2.3.2" = self.buildNodePackage {
-    name = "qs-2.3.2";
-    version = "2.3.2";
+  by-spec."qs"."6.1.0" =
+    self.by-version."qs"."6.1.0";
+  by-version."qs"."6.1.0" = self.buildNodePackage {
+    name = "qs-6.1.0";
+    version = "6.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.3.2.tgz";
-      name = "qs-2.3.2.tgz";
-      sha1 = "d45ec249e4b9b029af008829a101d5ff7e972790";
+      url = "https://registry.npmjs.org/qs/-/qs-6.1.0.tgz";
+      name = "qs-6.1.0.tgz";
+      sha1 = "ec1d1626b24278d99f0fdf4549e524e24eceeb26";
     };
     deps = {
     };
@@ -33245,16 +37696,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."2.4.1" =
-    self.by-version."qs"."2.4.1";
-  by-version."qs"."2.4.1" = self.buildNodePackage {
-    name = "qs-2.4.1";
-    version = "2.4.1";
+  by-spec."qs".">= 0.4.0" =
+    self.by-version."qs"."6.1.0";
+  by-spec."qs"."^3.1.0" =
+    self.by-version."qs"."3.1.0";
+  by-version."qs"."3.1.0" = self.buildNodePackage {
+    name = "qs-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz";
-      name = "qs-2.4.1.tgz";
-      sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245";
+      url = "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz";
+      name = "qs-3.1.0.tgz";
+      sha1 = "d0e9ae745233a12dc43fb4f3055bba446261153c";
     };
     deps = {
     };
@@ -33264,12 +37717,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs".">= 0.4.0" =
-    self.by-version."qs"."2.4.1";
-  by-spec."qs"."^1.0.0" =
-    self.by-version."qs"."1.2.2";
   by-spec."qs"."~0.5.4" =
     self.by-version."qs"."0.5.6";
+  by-version."qs"."0.5.6" = self.buildNodePackage {
+    name = "qs-0.5.6";
+    version = "0.5.6";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/qs/-/qs-0.5.6.tgz";
+      name = "qs-0.5.6.tgz";
+      sha1 = "31b1ad058567651c526921506b9a8793911a0384";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."qs"."~0.6.0" =
     self.by-version."qs"."0.6.6";
   by-spec."qs"."~1.0.0" =
@@ -33279,7 +37745,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-1.0.2.tgz";
       name = "qs-1.0.2.tgz";
       sha1 = "50a93e2b5af6691c31bcea5dae78ee6ea1903768";
     };
@@ -33291,8 +37757,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."~1.2.0" =
-    self.by-version."qs"."1.2.2";
   by-spec."qs"."~1.2.2" =
     self.by-version."qs"."1.2.2";
   by-spec."qs"."~2.2.4" =
@@ -33302,7 +37766,7 @@
     version = "2.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.2.5.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-2.2.5.tgz";
       name = "qs-2.2.5.tgz";
       sha1 = "1088abaf9dcc0ae5ae45b709e6c6b5888b23923c";
     };
@@ -33321,7 +37785,7 @@
     version = "2.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
+      url = "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz";
       name = "qs-2.3.3.tgz";
       sha1 = "e9e85adbe75da0bbe4c8e0476a086290f863b404";
     };
@@ -33334,17 +37798,15 @@
     cpu = [ ];
   };
   by-spec."qs"."~2.4.0" =
-    self.by-version."qs"."2.4.1";
-  by-spec."query-string"."^1.0.0" =
-    self.by-version."query-string"."1.0.0";
-  by-version."query-string"."1.0.0" = self.buildNodePackage {
-    name = "query-string-1.0.0";
-    version = "1.0.0";
+    self.by-version."qs"."2.4.2";
+  by-version."qs"."2.4.2" = self.buildNodePackage {
+    name = "qs-2.4.2";
+    version = "2.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/query-string/-/query-string-1.0.0.tgz";
-      name = "query-string-1.0.0.tgz";
-      sha1 = "c1bc6af99fa698a5395922ae5b3de3efe978c59b";
+      url = "https://registry.npmjs.org/qs/-/qs-2.4.2.tgz";
+      name = "qs-2.4.2.tgz";
+      sha1 = "f7ce788e5777df0b5010da7f7c4e73ba32470f5a";
     };
     deps = {
     };
@@ -33354,16 +37816,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."querystring"."0.2.0" =
-    self.by-version."querystring"."0.2.0";
-  by-version."querystring"."0.2.0" = self.buildNodePackage {
-    name = "querystring-0.2.0";
-    version = "0.2.0";
+  by-spec."qs"."~4.0.0" =
+    self.by-version."qs"."4.0.0";
+  by-spec."qs"."~5.1.0" =
+    self.by-version."qs"."5.1.0";
+  by-version."qs"."5.1.0" = self.buildNodePackage {
+    name = "qs-5.1.0";
+    version = "5.1.0";
     bin = false;
     src = fetchurl {
-      url = "https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz";
-      name = "querystring-0.2.0.tgz";
-      sha256 = "9476079402605957bae231ea3ec5ae83b454b2de68ddaa3450096821996be8f5";
+      url = "https://registry.npmjs.org/qs/-/qs-5.1.0.tgz";
+      name = "qs-5.1.0.tgz";
+      sha1 = "4d932e5c7ea411cca76a312d39a606200fd50cd9";
     };
     deps = {
     };
@@ -33373,16 +37837,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."querystring".">=0.1.0 <0.2.0" =
-    self.by-version."querystring"."0.1.0";
-  by-version."querystring"."0.1.0" = self.buildNodePackage {
-    name = "querystring-0.1.0";
-    version = "0.1.0";
+  by-spec."qs"."~5.2.0" =
+    self.by-version."qs"."5.2.0";
+  by-spec."qs"."~6.0.2" =
+    self.by-version."qs"."6.0.2";
+  by-version."qs"."6.0.2" = self.buildNodePackage {
+    name = "qs-6.0.2";
+    version = "6.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/querystring/-/querystring-0.1.0.tgz";
-      name = "querystring-0.1.0.tgz";
-      sha1 = "cb76a26cda0a10a94163fcdb3e132827f04b7b10";
+      url = "https://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+      name = "qs-6.0.2.tgz";
+      sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
     };
     deps = {
     };
@@ -33392,8 +37858,46 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."querystring"."https://github.com/substack/querystring/archive/0.2.0-ie8.tar.gz" =
+  by-spec."qs"."~6.1.0" =
+    self.by-version."qs"."6.1.0";
+  by-spec."query-string"."^1.0.0" =
+    self.by-version."query-string"."1.0.1";
+  by-version."query-string"."1.0.1" = self.buildNodePackage {
+    name = "query-string-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/query-string/-/query-string-1.0.1.tgz";
+      name = "query-string-1.0.1.tgz";
+      sha1 = "63ac953352499ad670a9681a75680f6bf3dd1faf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."querystring"."0.2.0" =
     self.by-version."querystring"."0.2.0";
+  by-version."querystring"."0.2.0" = self.buildNodePackage {
+    name = "querystring-0.2.0";
+    version = "0.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz";
+      name = "querystring-0.2.0.tgz";
+      sha1 = "b209849203bb25df820da756e747005878521620";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."querystring-es3"."~0.2.0" =
     self.by-version."querystring-es3"."0.2.1";
   by-version."querystring-es3"."0.2.1" = self.buildNodePackage {
@@ -33401,7 +37905,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
+      url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz";
       name = "querystring-es3-0.2.1.tgz";
       sha1 = "9ec61f79049875707d69414596fd907a4d711e73";
     };
@@ -33420,7 +37924,7 @@
     version = "0.1.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rai/-/rai-0.1.12.tgz";
+      url = "https://registry.npmjs.org/rai/-/rai-0.1.12.tgz";
       name = "rai-0.1.12.tgz";
       sha1 = "8ccfd014d0f9608630dd73c19b8e4b057754a6a6";
     };
@@ -33432,19 +37936,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rainbowsocks"."~0.1.2" =
-    self.by-version."rainbowsocks"."0.1.2";
-  by-version."rainbowsocks"."0.1.2" = self.buildNodePackage {
-    name = "rainbowsocks-0.1.2";
-    version = "0.1.2";
+  by-spec."random-access-file"."^0.3.1" =
+    self.by-version."random-access-file"."0.3.2";
+  by-version."random-access-file"."0.3.2" = self.buildNodePackage {
+    name = "random-access-file-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rainbowsocks/-/rainbowsocks-0.1.2.tgz";
-      name = "rainbowsocks-0.1.2.tgz";
-      sha1 = "eebddb330eac4f178d79eadb12ff851c84ab97e1";
+      url = "https://registry.npmjs.org/random-access-file/-/random-access-file-0.3.2.tgz";
+      name = "random-access-file-0.3.2.tgz";
+      sha1 = "cbca246e131db7b68a1c6bb6328dd4d0997100a0";
     };
     deps = {
-      "debug-1.0.4" = self.by-version."debug"."1.0.4";
+      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -33452,19 +37956,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."random-access-file"."^0.3.1" =
-    self.by-version."random-access-file"."0.3.1";
-  by-version."random-access-file"."0.3.1" = self.buildNodePackage {
-    name = "random-access-file-0.3.1";
-    version = "0.3.1";
+  by-spec."random-bytes"."~1.0.0" =
+    self.by-version."random-bytes"."1.0.0";
+  by-version."random-bytes"."1.0.0" = self.buildNodePackage {
+    name = "random-bytes-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/random-access-file/-/random-access-file-0.3.1.tgz";
-      name = "random-access-file-0.3.1.tgz";
-      sha1 = "8afffaac665de38feba00f371429648f057d5c16";
+      url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz";
+      name = "random-bytes-1.0.0.tgz";
+      sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b";
     };
     deps = {
-      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -33472,20 +37975,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."randomatic"."^1.1.0" =
-    self.by-version."randomatic"."1.1.0";
-  by-version."randomatic"."1.1.0" = self.buildNodePackage {
-    name = "randomatic-1.1.0";
-    version = "1.1.0";
+  by-spec."random-iterate"."^1.0.1" =
+    self.by-version."random-iterate"."1.0.1";
+  by-version."random-iterate"."1.0.1" = self.buildNodePackage {
+    name = "random-iterate-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/randomatic/-/randomatic-1.1.0.tgz";
-      name = "randomatic-1.1.0.tgz";
-      sha1 = "2ca36b9f93747aac985eb242749af88b45d5d42d";
+      url = "https://registry.npmjs.org/random-iterate/-/random-iterate-1.0.1.tgz";
+      name = "random-iterate-1.0.1.tgz";
+      sha1 = "f7d97d92dee6665ec5f6da08c7f963cad4b2ac99";
     };
     deps = {
-      "is-number-1.1.2" = self.by-version."is-number"."1.1.2";
-      "kind-of-1.1.0" = self.by-version."kind-of"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."randomatic"."^1.1.3" =
+    self.by-version."randomatic"."1.1.5";
+  by-version."randomatic"."1.1.5" = self.buildNodePackage {
+    name = "randomatic-1.1.5";
+    version = "1.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz";
+      name = "randomatic-1.1.5.tgz";
+      sha1 = "5e9ef5f2d573c67bd2b8124ae90b5156e457840b";
+    };
+    deps = {
+      "is-number-2.1.0" = self.by-version."is-number"."2.1.0";
+      "kind-of-3.0.2" = self.by-version."kind-of"."3.0.2";
     };
     optionalDependencies = {
     };
@@ -33494,15 +38016,15 @@
     cpu = [ ];
   };
   by-spec."randombytes"."^2.0.0" =
-    self.by-version."randombytes"."2.0.1";
-  by-version."randombytes"."2.0.1" = self.buildNodePackage {
-    name = "randombytes-2.0.1";
-    version = "2.0.1";
+    self.by-version."randombytes"."2.0.3";
+  by-version."randombytes"."2.0.3" = self.buildNodePackage {
+    name = "randombytes-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/randombytes/-/randombytes-2.0.1.tgz";
-      name = "randombytes-2.0.1.tgz";
-      sha1 = "18f4a9ba0dd07bdb1580bc9156091fcf90eabc6f";
+      url = "https://registry.npmjs.org/randombytes/-/randombytes-2.0.3.tgz";
+      name = "randombytes-2.0.3.tgz";
+      sha1 = "674c99760901c3c4112771a31e521dc349cc09ec";
     };
     deps = {
     };
@@ -33513,7 +38035,7 @@
     cpu = [ ];
   };
   by-spec."randombytes"."^2.0.1" =
-    self.by-version."randombytes"."2.0.1";
+    self.by-version."randombytes"."2.0.3";
   by-spec."range-parser"."0.0.4" =
     self.by-version."range-parser"."0.0.4";
   by-version."range-parser"."0.0.4" = self.buildNodePackage {
@@ -33521,7 +38043,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
+      url = "https://registry.npmjs.org/range-parser/-/range-parser-0.0.4.tgz";
       name = "range-parser-0.0.4.tgz";
       sha1 = "c0427ffef51c10acba0782a46c9602e744ff620b";
     };
@@ -33540,7 +38062,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
+      url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.0.tgz";
       name = "range-parser-1.0.0.tgz";
       sha1 = "a4b264cfe0be5ce36abe3765ac9c2a248746dbc0";
     };
@@ -33553,15 +38075,15 @@
     cpu = [ ];
   };
   by-spec."range-parser"."^1.0.0" =
-    self.by-version."range-parser"."1.0.2";
-  by-version."range-parser"."1.0.2" = self.buildNodePackage {
-    name = "range-parser-1.0.2";
-    version = "1.0.2";
+    self.by-version."range-parser"."1.0.3";
+  by-version."range-parser"."1.0.3" = self.buildNodePackage {
+    name = "range-parser-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/range-parser/-/range-parser-1.0.2.tgz";
-      name = "range-parser-1.0.2.tgz";
-      sha1 = "06a12a42e5131ba8e457cd892044867f2344e549";
+      url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz";
+      name = "range-parser-1.0.3.tgz";
+      sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175";
     };
     deps = {
     };
@@ -33572,26 +38094,28 @@
     cpu = [ ];
   };
   by-spec."range-parser"."^1.0.2" =
-    self.by-version."range-parser"."1.0.2";
+    self.by-version."range-parser"."1.0.3";
   by-spec."range-parser"."~1.0.0" =
-    self.by-version."range-parser"."1.0.2";
+    self.by-version."range-parser"."1.0.3";
   by-spec."range-parser"."~1.0.2" =
-    self.by-version."range-parser"."1.0.2";
-  by-spec."raven"."~0.7.3" =
-    self.by-version."raven"."0.7.3";
-  by-version."raven"."0.7.3" = self.buildNodePackage {
-    name = "raven-0.7.3";
-    version = "0.7.3";
+    self.by-version."range-parser"."1.0.3";
+  by-spec."range-parser"."~1.0.3" =
+    self.by-version."range-parser"."1.0.3";
+  by-spec."raven"."~0.10.0" =
+    self.by-version."raven"."0.10.0";
+  by-version."raven"."0.10.0" = self.buildNodePackage {
+    name = "raven-0.10.0";
+    version = "0.10.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raven/-/raven-0.7.3.tgz";
-      name = "raven-0.7.3.tgz";
-      sha1 = "73fbf418a4363767ac50fdaf6e7d541f3b35f507";
+      url = "https://registry.npmjs.org/raven/-/raven-0.10.0.tgz";
+      name = "raven-0.10.0.tgz";
+      sha1 = "2144346322955bd9e1519ac66081c63b178b452f";
     };
     deps = {
       "cookie-0.1.0" = self.by-version."cookie"."0.1.0";
       "lsmod-0.0.3" = self.by-version."lsmod"."0.0.3";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7";
     };
     optionalDependencies = {
@@ -33607,7 +38131,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
+      url = "https://registry.npmjs.org/raw-body/-/raw-body-0.0.3.tgz";
       name = "raw-body-0.0.3.tgz";
       sha1 = "0cb3eb22ced1ca607d32dd8fd94a6eb383f3eb8a";
     };
@@ -33626,7 +38150,7 @@
     version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
+      url = "https://registry.npmjs.org/raw-body/-/raw-body-1.1.4.tgz";
       name = "raw-body-1.1.4.tgz";
       sha1 = "f0b5624388d031f63da07f870c86cb9ccadcb67d";
     };
@@ -33646,7 +38170,7 @@
     version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
+      url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz";
       name = "raw-body-1.3.0.tgz";
       sha1 = "978230a156a5548f42eef14de22d0f4f610083d1";
     };
@@ -33660,35 +38184,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."raw-body"."1.3.2" =
-    self.by-version."raw-body"."1.3.2";
-  by-version."raw-body"."1.3.2" = self.buildNodePackage {
-    name = "raw-body-1.3.2";
-    version = "1.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.2.tgz";
-      name = "raw-body-1.3.2.tgz";
-      sha1 = "0e186f27c5fbfe326d8b3062774804564a0ecf93";
-    };
-    deps = {
-      "bytes-1.0.0" = self.by-version."bytes"."1.0.0";
-      "iconv-lite-0.4.6" = self.by-version."iconv-lite"."0.4.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."raw-body"."1.3.4" =
+  by-spec."raw-body"."1.x" =
     self.by-version."raw-body"."1.3.4";
   by-version."raw-body"."1.3.4" = self.buildNodePackage {
     name = "raw-body-1.3.4";
     version = "1.3.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz";
+      url = "https://registry.npmjs.org/raw-body/-/raw-body-1.3.4.tgz";
       name = "raw-body-1.3.4.tgz";
       sha1 = "ccc7ddfc46b72861cdd5bb433c840b70b6f27f54";
     };
@@ -33702,20 +38205,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."raw-body"."1.x" =
-    self.by-version."raw-body"."1.3.4";
-  by-spec."raw-socket"."*" =
-    self.by-version."raw-socket"."1.2.2";
-  by-version."raw-socket"."1.2.2" = self.buildNodePackage {
-    name = "raw-socket-1.2.2";
-    version = "1.2.2";
+  by-spec."raw-body"."2.1.6" =
+    self.by-version."raw-body"."2.1.6";
+  by-version."raw-body"."2.1.6" = self.buildNodePackage {
+    name = "raw-body-2.1.6";
+    version = "2.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/raw-socket/-/raw-socket-1.2.2.tgz";
-      name = "raw-socket-1.2.2.tgz";
-      sha1 = "c9be873878a1ef70497a27e40b6e55b563d8f886";
+      url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.6.tgz";
+      name = "raw-body-2.1.6.tgz";
+      sha1 = "9c050737fe07ced6d94a4fd09c61b6ad874d310f";
     };
     deps = {
+      "bytes-2.3.0" = self.by-version."bytes"."2.3.0";
+      "iconv-lite-0.4.13" = self.by-version."iconv-lite"."0.4.13";
+      "unpipe-1.0.0" = self.by-version."unpipe"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -33723,22 +38227,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rc"."0.5.2" =
-    self.by-version."rc"."0.5.2";
-  by-version."rc"."0.5.2" = self.buildNodePackage {
-    name = "rc-0.5.2";
-    version = "0.5.2";
-    bin = true;
+  by-spec."raw-body"."~2.1.2" =
+    self.by-version."raw-body"."2.1.6";
+  by-spec."raw-body"."~2.1.5" =
+    self.by-version."raw-body"."2.1.6";
+  by-spec."raw-socket"."*" =
+    self.by-version."raw-socket"."1.4.0";
+  by-version."raw-socket"."1.4.0" = self.buildNodePackage {
+    name = "raw-socket-1.4.0";
+    version = "1.4.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-0.5.2.tgz";
-      name = "rc-0.5.2.tgz";
-      sha1 = "6b8e05894a158e3d4a15e7daddb970f4d15a024f";
+      url = "https://registry.npmjs.org/raw-socket/-/raw-socket-1.4.0.tgz";
+      name = "raw-socket-1.4.0.tgz";
+      sha1 = "739c09259e5524d68024f0e13ea9e5e2702d2e8b";
     };
     deps = {
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
-      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
-      "ini-1.1.0" = self.by-version."ini"."1.1.0";
+      "nan-2.0.9" = self.by-version."nan"."2.0.9";
     };
     optionalDependencies = {
     };
@@ -33753,7 +38258,7 @@
     version = "0.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
+      url = "https://registry.npmjs.org/rc/-/rc-0.4.0.tgz";
       name = "rc-0.4.0.tgz";
       sha1 = "ce24a2029ad94c3a40d09604a87227027d7210d3";
     };
@@ -33770,21 +38275,21 @@
     cpu = [ ];
   };
   by-spec."rc"."^1.0.1" =
-    self.by-version."rc"."1.0.1";
-  by-version."rc"."1.0.1" = self.buildNodePackage {
-    name = "rc-1.0.1";
-    version = "1.0.1";
+    self.by-version."rc"."1.1.6";
+  by-version."rc"."1.1.6" = self.buildNodePackage {
+    name = "rc-1.1.6";
+    version = "1.1.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-1.0.1.tgz";
-      name = "rc-1.0.1.tgz";
-      sha1 = "f919c25e804cb0aa60f6fd92d929fc86b45013e8";
+      url = "https://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
+      name = "rc-1.1.6.tgz";
+      sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
     };
     deps = {
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
-      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+      "deep-extend-0.4.1" = self.by-version."deep-extend"."0.4.1";
+      "ini-1.3.4" = self.by-version."ini"."1.3.4";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
+      "strip-json-comments-1.0.4" = self.by-version."strip-json-comments"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -33792,22 +38297,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rc"."~0.5.0" =
-    self.by-version."rc"."0.5.5";
-  by-version."rc"."0.5.5" = self.buildNodePackage {
-    name = "rc-0.5.5";
-    version = "0.5.5";
-    bin = true;
+  by-spec."rc"."~1.1.0" =
+    self.by-version."rc"."1.1.6";
+  by-spec."rc"."~1.1.6" =
+    self.by-version."rc"."1.1.6";
+  by-spec."re-emitter"."^1.0.0" =
+    self.by-version."re-emitter"."1.1.3";
+  by-version."re-emitter"."1.1.3" = self.buildNodePackage {
+    name = "re-emitter-1.1.3";
+    version = "1.1.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-0.5.5.tgz";
-      name = "rc-0.5.5.tgz";
-      sha1 = "541cc3300f464b6dfe6432d756f0f2dd3e9eb199";
+      url = "https://registry.npmjs.org/re-emitter/-/re-emitter-1.1.3.tgz";
+      name = "re-emitter-1.1.3.tgz";
+      sha1 = "fa9e319ffdeeeb35b27296ef0f3d374dac2f52a7";
     };
     deps = {
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
-      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -33815,24 +38320,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rc"."~0.5.1" =
-    self.by-version."rc"."0.5.5";
-  by-spec."rc"."~0.6.0" =
-    self.by-version."rc"."0.6.0";
-  by-version."rc"."0.6.0" = self.buildNodePackage {
-    name = "rc-0.6.0";
-    version = "0.6.0";
+  by-spec."react"."*" =
+    self.by-version."react"."15.0.0-rc.2";
+  by-version."react"."15.0.0-rc.2" = self.buildNodePackage {
+    name = "react-15.0.0-rc.2";
+    version = "15.0.0-rc.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/react/-/react-15.0.0-rc.2.tgz";
+      name = "react-15.0.0-rc.2.tgz";
+      sha1 = "acfb768af86deb06b5bbb676778d5ec90661faa3";
+    };
+    deps = {
+      "envify-3.4.0" = self.by-version."envify"."3.4.0";
+      "fbjs-0.8.0" = self.by-version."fbjs"."0.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "react" = self.by-version."react"."15.0.0-rc.2";
+  by-spec."react-tools"."*" =
+    self.by-version."react-tools"."0.14.0-alpha3";
+  by-version."react-tools"."0.14.0-alpha3" = self.buildNodePackage {
+    name = "react-tools-0.14.0-alpha3";
+    version = "0.14.0-alpha3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-0.6.0.tgz";
-      name = "rc-0.6.0.tgz";
-      sha1 = "e1c930059af831c85413fe275ae2f40f4e3c5371";
+      url = "https://registry.npmjs.org/react-tools/-/react-tools-0.14.0-alpha3.tgz";
+      name = "react-tools-0.14.0-alpha3.tgz";
+      sha1 = "e22664c10faee3200b1fa2b5c2b3bb7bfd72c8fd";
     };
     deps = {
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
-      "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11";
-      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
-      "ini-1.3.3" = self.by-version."ini"."1.3.3";
+      "commoner-0.10.4" = self.by-version."commoner"."0.10.4";
+      "jstransform-11.0.3" = self.by-version."jstransform"."11.0.3";
     };
     optionalDependencies = {
     };
@@ -33840,21 +38363,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rc"."~1.0.1" =
-    self.by-version."rc"."1.0.1";
-  by-spec."react"."*" =
-    self.by-version."react"."0.13.2";
-  by-version."react"."0.13.2" = self.buildNodePackage {
-    name = "react-0.13.2";
-    version = "0.13.2";
+  "react-tools" = self.by-version."react-tools"."0.14.0-alpha3";
+  by-spec."read"."1" =
+    self.by-version."read"."1.0.7";
+  by-version."read"."1.0.7" = self.buildNodePackage {
+    name = "read-1.0.7";
+    version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/react/-/react-0.13.2.tgz";
-      name = "react-0.13.2.tgz";
-      sha1 = "a1c7cec5e7be080c4e249b20740d4d4cd18880ca";
+      url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz";
+      name = "read-1.0.7.tgz";
+      sha1 = "b3da19bd052431a97671d44a42634adf710b40c4";
     };
     deps = {
-      "envify-3.4.0" = self.by-version."envify"."3.4.0";
+      "mute-stream-0.0.6" = self.by-version."mute-stream"."0.0.6";
     };
     optionalDependencies = {
     };
@@ -33862,21 +38384,25 @@
     os = [ ];
     cpu = [ ];
   };
-  "react" = self.by-version."react"."0.13.2";
-  by-spec."react-tools"."*" =
-    self.by-version."react-tools"."0.13.2";
-  by-version."react-tools"."0.13.2" = self.buildNodePackage {
-    name = "react-tools-0.13.2";
-    version = "0.13.2";
-    bin = true;
+  by-spec."read"."1.0.x" =
+    self.by-version."read"."1.0.7";
+  by-spec."read"."~1.0.1" =
+    self.by-version."read"."1.0.7";
+  by-spec."read"."~1.0.7" =
+    self.by-version."read"."1.0.7";
+  by-spec."read-all-stream"."^2.0.0" =
+    self.by-version."read-all-stream"."2.2.0";
+  by-version."read-all-stream"."2.2.0" = self.buildNodePackage {
+    name = "read-all-stream-2.2.0";
+    version = "2.2.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/react-tools/-/react-tools-0.13.2.tgz";
-      name = "react-tools-0.13.2.tgz";
-      sha1 = "f96613c59576a7b04597b307bb8cd5b647c9ebbf";
+      url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-2.2.0.tgz";
+      name = "read-all-stream-2.2.0.tgz";
+      sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
     };
     deps = {
-      "commoner-0.10.1" = self.by-version."commoner"."0.10.1";
-      "jstransform-10.1.0" = self.by-version."jstransform"."10.1.0";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -33884,20 +38410,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "react-tools" = self.by-version."react-tools"."0.13.2";
-  by-spec."read"."1" =
-    self.by-version."read"."1.0.5";
-  by-version."read"."1.0.5" = self.buildNodePackage {
-    name = "read-1.0.5";
-    version = "1.0.5";
+  by-spec."read-all-stream"."^3.0.0" =
+    self.by-version."read-all-stream"."3.1.0";
+  by-version."read-all-stream"."3.1.0" = self.buildNodePackage {
+    name = "read-all-stream-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read/-/read-1.0.5.tgz";
-      name = "read-1.0.5.tgz";
-      sha1 = "007a3d169478aa710a491727e453effb92e76203";
+      url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
+      name = "read-all-stream-3.1.0.tgz";
+      sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
     };
     deps = {
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -33905,25 +38431,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read"."1.0.x" =
-    self.by-version."read"."1.0.5";
-  by-spec."read"."~1.0.1" =
-    self.by-version."read"."1.0.5";
-  by-spec."read"."~1.0.4" =
-    self.by-version."read"."1.0.5";
-  by-spec."read-all-stream"."^2.0.0" =
-    self.by-version."read-all-stream"."2.1.2";
-  by-version."read-all-stream"."2.1.2" = self.buildNodePackage {
-    name = "read-all-stream-2.1.2";
-    version = "2.1.2";
+  by-spec."read-cmd-shim"."~1.0.1" =
+    self.by-version."read-cmd-shim"."1.0.1";
+  by-version."read-cmd-shim"."1.0.1" = self.buildNodePackage {
+    name = "read-cmd-shim-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-2.1.2.tgz";
-      name = "read-all-stream-2.1.2.tgz";
-      sha1 = "0e80070eadd99712383e9f3c26762310900bda0a";
+      url = "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.1.tgz";
+      name = "read-cmd-shim-1.0.1.tgz";
+      sha1 = "2d5d157786a37c055d22077c32c53f8329e91c7b";
     };
     deps = {
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
     };
     optionalDependencies = {
     };
@@ -33931,50 +38451,47 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-installed"."~0.2.2" =
-    self.by-version."read-installed"."0.2.5";
-  by-version."read-installed"."0.2.5" = self.buildNodePackage {
-    name = "read-installed-0.2.5";
-    version = "0.2.5";
+  by-spec."read-installed"."~4.0.3" =
+    self.by-version."read-installed"."4.0.3";
+  by-version."read-installed"."4.0.3" = self.buildNodePackage {
+    name = "read-installed-4.0.3";
+    version = "4.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-installed/-/read-installed-0.2.5.tgz";
-      name = "read-installed-0.2.5.tgz";
-      sha1 = "134df8b326d8b54b11e18f7dd8c81bf5e976ef86";
+      url = "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz";
+      name = "read-installed-4.0.3.tgz";
+      sha1 = "ff9b8b67f187d1e4c29b9feb31f6b223acd19067";
     };
     deps = {
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
+      "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
+      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "readdir-scoped-modules-1.0.2" = self.by-version."readdir-scoped-modules"."1.0.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "read-package-json-1.3.3" = self.by-version."read-package-json"."1.3.3";
+      "util-extend-1.0.3" = self.by-version."util-extend"."1.0.3";
     };
     optionalDependencies = {
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-installed"."~4.0.0" =
-    self.by-version."read-installed"."4.0.0";
-  by-version."read-installed"."4.0.0" = self.buildNodePackage {
-    name = "read-installed-4.0.0";
-    version = "4.0.0";
+  by-spec."read-json-sync"."^1.1.0" =
+    self.by-version."read-json-sync"."1.1.1";
+  by-version."read-json-sync"."1.1.1" = self.buildNodePackage {
+    name = "read-json-sync-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-installed/-/read-installed-4.0.0.tgz";
-      name = "read-installed-4.0.0.tgz";
-      sha1 = "dbca08d6bd83e2a3b93c962053ba4d839e0769ba";
+      url = "https://registry.npmjs.org/read-json-sync/-/read-json-sync-1.1.1.tgz";
+      name = "read-json-sync-1.1.1.tgz";
+      sha1 = "43c669ae864aae308dfbbb2721a67e295ec8fff6";
     };
     deps = {
-      "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
-      "read-package-json-2.0.0" = self.by-version."read-package-json"."2.0.0";
-      "readdir-scoped-modules-1.0.1" = self.by-version."readdir-scoped-modules"."1.0.1";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
     };
     peerDependencies = [];
     os = [ ];
@@ -33987,7 +38504,7 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz";
+      url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-1.1.1.tgz";
       name = "read-only-stream-1.1.1.tgz";
       sha1 = "5da77c799ed1388d3ef88a18471bb5924f8a0ba1";
     };
@@ -34001,97 +38518,92 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-package-json"."1" =
-    self.by-version."read-package-json"."1.3.3";
-  by-version."read-package-json"."1.3.3" = self.buildNodePackage {
-    name = "read-package-json-1.3.3";
-    version = "1.3.3";
+  by-spec."read-only-stream"."^2.0.0" =
+    self.by-version."read-only-stream"."2.0.0";
+  by-version."read-only-stream"."2.0.0" = self.buildNodePackage {
+    name = "read-only-stream-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.3.3.tgz";
-      name = "read-package-json-1.3.3.tgz";
-      sha1 = "ef79dfda46e165376ee8a57efbfedd4d1b029ba4";
+      url = "https://registry.npmjs.org/read-only-stream/-/read-only-stream-2.0.0.tgz";
+      name = "read-only-stream-2.0.0.tgz";
+      sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0";
     };
     deps = {
-      "glob-5.0.5" = self.by-version."glob"."5.0.5";
-      "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
-      "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."read-package-json"."1 || 2" =
-    self.by-version."read-package-json"."2.0.0";
-  by-version."read-package-json"."2.0.0" = self.buildNodePackage {
-    name = "read-package-json-2.0.0";
-    version = "2.0.0";
+    self.by-version."read-package-json"."2.0.3";
+  by-version."read-package-json"."2.0.3" = self.buildNodePackage {
+    name = "read-package-json-2.0.3";
+    version = "2.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-2.0.0.tgz";
-      name = "read-package-json-2.0.0.tgz";
-      sha1 = "ca7543298275028d27064b9118e6e501c9b3ae41";
+      url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.0.3.tgz";
+      name = "read-package-json-2.0.3.tgz";
+      sha1 = "f8cec1627053b54f384b353224545e607554c5d2";
     };
     deps = {
-      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
       "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
-      "normalize-package-data-2.0.0" = self.by-version."normalize-package-data"."2.0.0";
+      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-package-json"."^1.3.1" =
-    self.by-version."read-package-json"."1.3.3";
   by-spec."read-package-json"."^2.0.0" =
-    self.by-version."read-package-json"."2.0.0";
-  by-spec."read-package-json"."~1.1.0" =
-    self.by-version."read-package-json"."1.1.9";
-  by-version."read-package-json"."1.1.9" = self.buildNodePackage {
-    name = "read-package-json-1.1.9";
-    version = "1.1.9";
+    self.by-version."read-package-json"."2.0.3";
+  by-spec."read-package-json"."~2.0.3" =
+    self.by-version."read-package-json"."2.0.3";
+  by-spec."read-package-tree"."~5.1.2" =
+    self.by-version."read-package-tree"."5.1.2";
+  by-version."read-package-tree"."5.1.2" = self.buildNodePackage {
+    name = "read-package-tree-5.1.2";
+    version = "5.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-package-json/-/read-package-json-1.1.9.tgz";
-      name = "read-package-json-1.1.9.tgz";
-      sha1 = "9c319185e5f8461661c01f8d4e5e80b468aa18ee";
+      url = "https://registry.npmjs.org/read-package-tree/-/read-package-tree-5.1.2.tgz";
+      name = "read-package-tree-5.1.2.tgz";
+      sha1 = "e3a488792f40cf470819f01a610e719d64f09094";
     };
     deps = {
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "normalize-package-data-0.2.13" = self.by-version."normalize-package-data"."0.2.13";
+      "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
+      "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "read-package-json-2.0.3" = self.by-version."read-package-json"."2.0.3";
+      "readdir-scoped-modules-1.0.2" = self.by-version."readdir-scoped-modules"."1.0.2";
     };
     optionalDependencies = {
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-package-json"."~2.0.0" =
-    self.by-version."read-package-json"."2.0.0";
-  by-spec."read-torrent"."^1.0.0" =
-    self.by-version."read-torrent"."1.3.0";
-  by-version."read-torrent"."1.3.0" = self.buildNodePackage {
-    name = "read-torrent-1.3.0";
-    version = "1.3.0";
-    bin = true;
+  by-spec."read-pkg"."^1.0.0" =
+    self.by-version."read-pkg"."1.1.0";
+  by-version."read-pkg"."1.1.0" = self.buildNodePackage {
+    name = "read-pkg-1.1.0";
+    version = "1.1.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz";
-      name = "read-torrent-1.3.0.tgz";
-      sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4";
+      url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
+      name = "read-pkg-1.1.0.tgz";
+      sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
     };
     deps = {
-      "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
-      "parse-torrent-4.0.0" = self.by-version."parse-torrent"."4.0.0";
-      "request-2.16.6" = self.by-version."request"."2.16.6";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0";
+      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
+      "path-type-1.1.0" = self.by-version."path-type"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -34099,23 +38611,43 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."read-torrent"."^1.1.0" =
+  by-spec."read-pkg-up"."^1.0.1" =
+    self.by-version."read-pkg-up"."1.0.1";
+  by-version."read-pkg-up"."1.0.1" = self.buildNodePackage {
+    name = "read-pkg-up-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
+      name = "read-pkg-up-1.0.1.tgz";
+      sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
+    };
+    deps = {
+      "find-up-1.1.2" = self.by-version."find-up"."1.1.2";
+      "read-pkg-1.1.0" = self.by-version."read-pkg"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."read-torrent"."^1.0.0" =
     self.by-version."read-torrent"."1.3.0";
-  by-spec."read-torrent"."~1.0.0" =
-    self.by-version."read-torrent"."1.0.0";
-  by-version."read-torrent"."1.0.0" = self.buildNodePackage {
-    name = "read-torrent-1.0.0";
-    version = "1.0.0";
+  by-version."read-torrent"."1.3.0" = self.buildNodePackage {
+    name = "read-torrent-1.3.0";
+    version = "1.3.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.0.0.tgz";
-      name = "read-torrent-1.0.0.tgz";
-      sha1 = "d45427a10dbbf21479fdf7e1ce8ce4ad39770966";
+      url = "https://registry.npmjs.org/read-torrent/-/read-torrent-1.3.0.tgz";
+      name = "read-torrent-1.3.0.tgz";
+      sha1 = "4e0ef5bea6cb24d31843eb6fa8543ad0232ab9f4";
     };
     deps = {
-      "request-2.16.6" = self.by-version."request"."2.16.6";
-      "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0";
       "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
+      "parse-torrent-4.1.0" = self.by-version."parse-torrent"."4.1.0";
+      "request-2.16.6" = self.by-version."request"."2.16.6";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -34123,22 +38655,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readable-stream"."*" =
-    self.by-version."readable-stream"."1.1.13";
-  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
-    name = "readable-stream-1.1.13";
-    version = "1.1.13";
+  by-spec."read-torrent"."^1.1.0" =
+    self.by-version."read-torrent"."1.3.0";
+  by-spec."read-torrent"."^1.3.0" =
+    self.by-version."read-torrent"."1.3.0";
+  by-spec."readable-stream"."1 || 2" =
+    self.by-version."readable-stream"."2.0.6";
+  by-version."readable-stream"."2.0.6" = self.buildNodePackage {
+    name = "readable-stream-2.0.6";
+    version = "2.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
-      name = "readable-stream-1.1.13.tgz";
-      sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
+      name = "readable-stream-2.0.6.tgz";
+      sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
+      "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2";
     };
     optionalDependencies = {
     };
@@ -34153,12 +38691,12 @@
     version = "1.0.27-1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.27-1.tgz";
       name = "readable-stream-1.0.27-1.tgz";
       sha1 = "6b67983c20357cefd07f0165001a16d710d91078";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -34176,12 +38714,12 @@
     version = "1.0.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.31.tgz";
       name = "readable-stream-1.0.31.tgz";
       sha1 = "8f2502e0bc9e3b0da1b94520aabb4e2603ecafae";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -34194,8 +38732,31 @@
   };
   by-spec."readable-stream"."1.1" =
     self.by-version."readable-stream"."1.1.13";
+  by-version."readable-stream"."1.1.13" = self.buildNodePackage {
+    name = "readable-stream-1.1.13";
+    version = "1.1.13";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz";
+      name = "readable-stream-1.1.13.tgz";
+      sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
+    };
+    deps = {
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."readable-stream"."1.1.x" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."2" =
+    self.by-version."readable-stream"."2.0.6";
   by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" =
     self.by-version."readable-stream"."1.0.33";
   by-version."readable-stream"."1.0.33" = self.buildNodePackage {
@@ -34203,12 +38764,12 @@
     version = "1.0.33";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
+      url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
       name = "readable-stream-1.0.33.tgz";
       sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -34221,20 +38782,30 @@
   };
   by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream".">=2.0.0 <3.0.0" =
+    self.by-version."readable-stream"."2.0.6";
   by-spec."readable-stream"."^1.0.2" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.0.27-1" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.0.31" =
     self.by-version."readable-stream"."1.1.13";
-  by-spec."readable-stream"."^1.0.33-1" =
+  by-spec."readable-stream"."^1.0.33" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.1.13" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."^1.1.13-1" =
     self.by-version."readable-stream"."1.1.13";
-  by-spec."readable-stream"."^1.1.8" =
-    self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."^2.0.0" =
+    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."^2.0.0 || ^1.1.13" =
+    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."^2.0.1" =
+    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."^2.0.2" =
+    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."^2.0.5" =
+    self.by-version."readable-stream"."2.0.6";
   by-spec."readable-stream"."~1.0.17" =
     self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.0.2" =
@@ -34245,11 +38816,9 @@
     self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.0.26-2" =
     self.by-version."readable-stream"."1.0.33";
-  by-spec."readable-stream"."~1.0.26-4" =
-    self.by-version."readable-stream"."1.0.33";
   by-spec."readable-stream"."~1.0.33" =
     self.by-version."readable-stream"."1.0.33";
-  by-spec."readable-stream"."~1.1" =
+  by-spec."readable-stream"."~1.1.0" =
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."~1.1.10" =
     self.by-version."readable-stream"."1.1.13";
@@ -34259,6 +38828,14 @@
     self.by-version."readable-stream"."1.1.13";
   by-spec."readable-stream"."~1.1.9" =
     self.by-version."readable-stream"."1.1.13";
+  by-spec."readable-stream"."~2.0.0" =
+    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."~2.0.4" =
+    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."~2.0.5" =
+    self.by-version."readable-stream"."2.0.6";
+  by-spec."readable-stream"."~2.0.6" =
+    self.by-version."readable-stream"."2.0.6";
   by-spec."readable-wrap"."^1.0.0" =
     self.by-version."readable-wrap"."1.0.0";
   by-version."readable-wrap"."1.0.0" = self.buildNodePackage {
@@ -34266,7 +38843,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
+      url = "https://registry.npmjs.org/readable-wrap/-/readable-wrap-1.0.0.tgz";
       name = "readable-wrap-1.0.0.tgz";
       sha1 = "3b5a211c631e12303a54991c806c17e7ae206bff";
     };
@@ -34279,22 +38856,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readdir-scoped-modules"."^1.0.0" =
-    self.by-version."readdir-scoped-modules"."1.0.1";
-  by-version."readdir-scoped-modules"."1.0.1" = self.buildNodePackage {
-    name = "readdir-scoped-modules-1.0.1";
-    version = "1.0.1";
+  by-spec."readdir-scoped-modules"."*" =
+    self.by-version."readdir-scoped-modules"."1.0.2";
+  by-version."readdir-scoped-modules"."1.0.2" = self.buildNodePackage {
+    name = "readdir-scoped-modules-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.1.tgz";
-      name = "readdir-scoped-modules-1.0.1.tgz";
-      sha1 = "5c2a77f3e08250a8fddf53fa58cdc17900b808b9";
+      url = "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz";
+      name = "readdir-scoped-modules-1.0.2.tgz";
+      sha1 = "9fafa37d286be5d92cbaebdee030dc9b5f406747";
     };
     deps = {
       "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1";
-      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -34302,21 +38879,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readdirp"."^1.2.0" =
-    self.by-version."readdirp"."1.3.0";
-  by-version."readdirp"."1.3.0" = self.buildNodePackage {
-    name = "readdirp-1.3.0";
-    version = "1.3.0";
+  by-spec."readdir-scoped-modules"."^1.0.0" =
+    self.by-version."readdir-scoped-modules"."1.0.2";
+  by-spec."readdirp"."^2.0.0" =
+    self.by-version."readdirp"."2.0.0";
+  by-version."readdirp"."2.0.0" = self.buildNodePackage {
+    name = "readdirp-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz";
-      name = "readdirp-1.3.0.tgz";
-      sha1 = "eaf1a9b463be9a8190fc9ae163aa1ac934aa340b";
+      url = "https://registry.npmjs.org/readdirp/-/readdirp-2.0.0.tgz";
+      name = "readdirp-2.0.0.tgz";
+      sha1 = "cc09ba5d12d8feb864bc75f6e2ebc137060cbd82";
     };
     deps = {
-      "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3";
-      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "minimatch-2.0.10" = self.by-version."minimatch"."2.0.10";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -34324,21 +38903,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readdirp"."^1.3.0" =
-    self.by-version."readdirp"."1.3.0";
-  by-spec."readdirp"."~0.2.3" =
-    self.by-version."readdirp"."0.2.5";
-  by-version."readdirp"."0.2.5" = self.buildNodePackage {
-    name = "readdirp-0.2.5";
-    version = "0.2.5";
+  by-spec."readline2"."^0.1.1" =
+    self.by-version."readline2"."0.1.1";
+  by-version."readline2"."0.1.1" = self.buildNodePackage {
+    name = "readline2-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readdirp/-/readdirp-0.2.5.tgz";
-      name = "readdirp-0.2.5.tgz";
-      sha1 = "c4c276e52977ae25db5191fe51d008550f15d9bb";
+      url = "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz";
+      name = "readline2-0.1.1.tgz";
+      sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568";
     };
     deps = {
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
+      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
     };
     optionalDependencies = {
     };
@@ -34346,20 +38924,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readline2"."^0.1.1" =
-    self.by-version."readline2"."0.1.1";
-  by-version."readline2"."0.1.1" = self.buildNodePackage {
-    name = "readline2-0.1.1";
-    version = "0.1.1";
+  by-spec."readline2"."^1.0.1" =
+    self.by-version."readline2"."1.0.1";
+  by-version."readline2"."1.0.1" = self.buildNodePackage {
+    name = "readline2-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz";
-      name = "readline2-0.1.1.tgz";
-      sha1 = "99443ba6e83b830ef3051bfd7dc241a82728d568";
+      url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz";
+      name = "readline2-1.0.1.tgz";
+      sha1 = "41059608ffc154757b715d9989d199ffbf372e35";
     };
     deps = {
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
-      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "code-point-at-1.0.0" = self.by-version."code-point-at"."1.0.0";
+      "is-fullwidth-code-point-1.0.0" = self.by-version."is-fullwidth-code-point"."1.0.0";
+      "mute-stream-0.0.5" = self.by-version."mute-stream"."0.0.5";
     };
     optionalDependencies = {
     };
@@ -34367,22 +38946,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readline2"."~0.1.0" =
-    self.by-version."readline2"."0.1.1";
-  by-spec."realize-package-specifier"."~3.0.0" =
-    self.by-version."realize-package-specifier"."3.0.0";
-  by-version."realize-package-specifier"."3.0.0" = self.buildNodePackage {
-    name = "realize-package-specifier-3.0.0";
-    version = "3.0.0";
+  by-spec."realize-package-specifier"."~3.0.1" =
+    self.by-version."realize-package-specifier"."3.0.1";
+  by-version."realize-package-specifier"."3.0.1" = self.buildNodePackage {
+    name = "realize-package-specifier-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.0.tgz";
-      name = "realize-package-specifier-3.0.0.tgz";
-      sha1 = "38224d63f546d4972f0a68cb6e91f6cf73ac67fa";
+      url = "https://registry.npmjs.org/realize-package-specifier/-/realize-package-specifier-3.0.1.tgz";
+      name = "realize-package-specifier-3.0.1.tgz";
+      sha1 = "fde32e926448e38f99334d95b7b08d51e3a98d9f";
     };
     deps = {
-      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
-      "npm-package-arg-4.0.0" = self.by-version."npm-package-arg"."4.0.0";
+      "dezalgo-1.0.3" = self.by-version."dezalgo"."1.0.3";
+      "npm-package-arg-4.1.0" = self.by-version."npm-package-arg"."4.1.0";
     };
     optionalDependencies = {
     };
@@ -34390,22 +38967,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."recast"."~0.10.3" =
-    self.by-version."recast"."0.10.12";
-  by-version."recast"."0.10.12" = self.buildNodePackage {
-    name = "recast-0.10.12";
-    version = "0.10.12";
+  by-spec."recast"."0.10.33" =
+    self.by-version."recast"."0.10.33";
+  by-version."recast"."0.10.33" = self.buildNodePackage {
+    name = "recast-0.10.33";
+    version = "0.10.33";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/recast/-/recast-0.10.12.tgz";
-      name = "recast-0.10.12.tgz";
-      sha1 = "c616c1b7c4a82f0b9eb68734fc8f46ad2f5d2ac5";
+      url = "https://registry.npmjs.org/recast/-/recast-0.10.33.tgz";
+      name = "recast-0.10.33.tgz";
+      sha1 = "942808f7aa016f1fa7142c461d7e5704aaa8d697";
     };
     deps = {
-      "esprima-fb-14001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."14001.1.0-dev-harmony-fb";
-      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
+      "esprima-fb-15001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "ast-types-0.7.6" = self.by-version."ast-types"."0.7.6";
+      "ast-types-0.8.12" = self.by-version."ast-types"."0.8.12";
     };
     optionalDependencies = {
     };
@@ -34413,22 +38990,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."recast"."~0.9.5" =
-    self.by-version."recast"."0.9.18";
-  by-version."recast"."0.9.18" = self.buildNodePackage {
-    name = "recast-0.9.18";
-    version = "0.9.18";
+  by-spec."recast"."^0.10.0" =
+    self.by-version."recast"."0.10.43";
+  by-version."recast"."0.10.43" = self.buildNodePackage {
+    name = "recast-0.10.43";
+    version = "0.10.43";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/recast/-/recast-0.9.18.tgz";
-      name = "recast-0.9.18.tgz";
-      sha1 = "f70921bb9f737d8e1fb06a440315bd7ec14587c9";
+      url = "https://registry.npmjs.org/recast/-/recast-0.10.43.tgz";
+      name = "recast-0.10.43.tgz";
+      sha1 = "b95d50f6d60761a5f6252e15d80678168491ce7f";
     };
     deps = {
-      "esprima-fb-10001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."10001.1.0-dev-harmony-fb";
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
+      "esprima-fb-15001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "ast-types-0.6.16" = self.by-version."ast-types"."0.6.16";
+      "ast-types-0.8.15" = self.by-version."ast-types"."0.8.15";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rechoir"."^0.6.0" =
+    self.by-version."rechoir"."0.6.2";
+  by-version."rechoir"."0.6.2" = self.buildNodePackage {
+    name = "rechoir-0.6.2";
+    version = "0.6.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz";
+      name = "rechoir-0.6.2.tgz";
+      sha1 = "85204b54dba82d5742e28c96756ef43af50e3384";
+    };
+    deps = {
+      "resolve-1.1.7" = self.by-version."resolve"."1.1.7";
     };
     optionalDependencies = {
     };
@@ -34456,19 +39053,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."redeyed"."~0.4.0" =
-    self.by-version."redeyed"."0.4.4";
-  by-version."redeyed"."0.4.4" = self.buildNodePackage {
-    name = "redeyed-0.4.4";
-    version = "0.4.4";
+  by-spec."redent"."^1.0.0" =
+    self.by-version."redent"."1.0.0";
+  by-version."redent"."1.0.0" = self.buildNodePackage {
+    name = "redent-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz";
-      name = "redeyed-0.4.4.tgz";
-      sha1 = "37e990a6f2b21b2a11c2e6a48fd4135698cba97f";
+      url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz";
+      name = "redent-1.0.0.tgz";
+      sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
     };
     deps = {
-      "esprima-1.0.4" = self.by-version."esprima"."1.0.4";
+      "indent-string-2.1.0" = self.by-version."indent-string"."2.1.0";
+      "strip-indent-1.0.1" = self.by-version."strip-indent"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -34477,17 +39075,20 @@
     cpu = [ ];
   };
   by-spec."redis"."*" =
-    self.by-version."redis"."0.12.1";
-  by-version."redis"."0.12.1" = self.buildNodePackage {
-    name = "redis-0.12.1";
-    version = "0.12.1";
+    self.by-version."redis"."2.6.0-1";
+  by-version."redis"."2.6.0-1" = self.buildNodePackage {
+    name = "redis-2.6.0-1";
+    version = "2.6.0-1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
-      name = "redis-0.12.1.tgz";
-      sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
+      url = "https://registry.npmjs.org/redis/-/redis-2.6.0-1.tgz";
+      name = "redis-2.6.0-1.tgz";
+      sha1 = "d6feb32cf08a734ba7f7f776699363ef69e3b9b4";
     };
     deps = {
+      "double-ended-queue-2.1.0-0" = self.by-version."double-ended-queue"."2.1.0-0";
+      "redis-commands-1.1.0" = self.by-version."redis-commands"."1.1.0";
+      "redis-parser-1.3.0" = self.by-version."redis-parser"."1.3.0";
     };
     optionalDependencies = {
     };
@@ -34495,7 +39096,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "redis" = self.by-version."redis"."0.12.1";
+  "redis" = self.by-version."redis"."2.6.0-1";
   by-spec."redis"."0.10.x" =
     self.by-version."redis"."0.10.3";
   by-version."redis"."0.10.3" = self.buildNodePackage {
@@ -34503,7 +39104,7 @@
     version = "0.10.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
+      url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz";
       name = "redis-0.10.3.tgz";
       sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6";
     };
@@ -34522,7 +39123,7 @@
     version = "0.7.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
+      url = "https://registry.npmjs.org/redis/-/redis-0.7.3.tgz";
       name = "redis-0.7.3.tgz";
       sha1 = "ee57b7a44d25ec1594e44365d8165fa7d1d4811a";
     };
@@ -34536,16 +39137,95 @@
   };
   by-spec."redis"."^0.12.1" =
     self.by-version."redis"."0.12.1";
-  by-spec."redis"."~0.12.0" =
-    self.by-version."redis"."0.12.1";
-  by-spec."reds"."~0.2.4" =
+  by-version."redis"."0.12.1" = self.buildNodePackage {
+    name = "redis-0.12.1";
+    version = "0.12.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz";
+      name = "redis-0.12.1.tgz";
+      sha1 = "64df76ad0fc8acebaebd2a0645e8a48fac49185e";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."redis"."^2.4.2" =
+    self.by-version."redis"."2.5.3";
+  by-version."redis"."2.5.3" = self.buildNodePackage {
+    name = "redis-2.5.3";
+    version = "2.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/redis/-/redis-2.5.3.tgz";
+      name = "redis-2.5.3.tgz";
+      sha1 = "f61b036e118d21150a1085adef08bd97c8e13925";
+    };
+    deps = {
+      "double-ended-queue-2.1.0-0" = self.by-version."double-ended-queue"."2.1.0-0";
+      "redis-commands-1.1.0" = self.by-version."redis-commands"."1.1.0";
+      "redis-parser-1.3.0" = self.by-version."redis-parser"."1.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."redis-commands"."^1.0.1" =
+    self.by-version."redis-commands"."1.1.0";
+  by-version."redis-commands"."1.1.0" = self.buildNodePackage {
+    name = "redis-commands-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/redis-commands/-/redis-commands-1.1.0.tgz";
+      name = "redis-commands-1.1.0.tgz";
+      sha1 = "aa5609a52213596816b6050384332ef631011272";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."redis-commands"."^1.1.0" =
+    self.by-version."redis-commands"."1.1.0";
+  by-spec."redis-parser"."^1.1.0" =
+    self.by-version."redis-parser"."1.3.0";
+  by-version."redis-parser"."1.3.0" = self.buildNodePackage {
+    name = "redis-parser-1.3.0";
+    version = "1.3.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/redis-parser/-/redis-parser-1.3.0.tgz";
+      name = "redis-parser-1.3.0.tgz";
+      sha1 = "806ebe7bbfb7d34e4d7c1e9ef282efcfad04126a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."redis-parser"."^1.2.0" =
+    self.by-version."redis-parser"."1.3.0";
+  by-spec."reds"."~0.2.5" =
     self.by-version."reds"."0.2.5";
   by-version."reds"."0.2.5" = self.buildNodePackage {
     name = "reds-0.2.5";
     version = "0.2.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/reds/-/reds-0.2.5.tgz";
+      url = "https://registry.npmjs.org/reds/-/reds-0.2.5.tgz";
       name = "reds-0.2.5.tgz";
       sha1 = "38a767f7663cd749036848697d82c74fd29bc01f";
     };
@@ -34566,7 +39246,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
+      url = "https://registry.npmjs.org/reduce-component/-/reduce-component-1.0.1.tgz";
       name = "reduce-component-1.0.1.tgz";
       sha1 = "e0c93542c574521bea13df0f9488ed82ab77c5da";
     };
@@ -34578,24 +39258,45 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."reduplexer"."^1.1.0" =
+    self.by-version."reduplexer"."1.1.0";
+  by-version."reduplexer"."1.1.0" = self.buildNodePackage {
+    name = "reduplexer-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/reduplexer/-/reduplexer-1.1.0.tgz";
+      name = "reduplexer-1.1.0.tgz";
+      sha1 = "7dfed18a679e749c1d7ad36de01acb515f08e140";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."regenerator"."~0.8.13" =
-    self.by-version."regenerator"."0.8.22";
-  by-version."regenerator"."0.8.22" = self.buildNodePackage {
-    name = "regenerator-0.8.22";
-    version = "0.8.22";
+    self.by-version."regenerator"."0.8.42";
+  by-version."regenerator"."0.8.42" = self.buildNodePackage {
+    name = "regenerator-0.8.42";
+    version = "0.8.42";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/regenerator/-/regenerator-0.8.22.tgz";
-      name = "regenerator-0.8.22.tgz";
-      sha1 = "6706f6f3abb9268c161f9f25a0520d0cdec250fc";
+      url = "https://registry.npmjs.org/regenerator/-/regenerator-0.8.42.tgz";
+      name = "regenerator-0.8.42.tgz";
+      sha1 = "17957424df24db002208f1498f62b9a40231cfc9";
     };
     deps = {
-      "commoner-0.10.1" = self.by-version."commoner"."0.10.1";
-      "esprima-fb-13001.1.0-dev-harmony-fb" = self.by-version."esprima-fb"."13001.1.0-dev-harmony-fb";
-      "recast-0.10.12" = self.by-version."recast"."0.10.12";
+      "commoner-0.10.4" = self.by-version."commoner"."0.10.4";
+      "defs-1.1.1" = self.by-version."defs"."1.1.1";
+      "esprima-fb-15001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."15001.1001.0-dev-harmony-fb";
       "private-0.1.6" = self.by-version."private"."0.1.6";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "defs-1.1.0" = self.by-version."defs"."1.1.0";
+      "recast-0.10.33" = self.by-version."recast"."0.10.33";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
     };
     optionalDependencies = {
     };
@@ -34603,19 +39304,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."regex-cache"."^0.4.0" =
-    self.by-version."regex-cache"."0.4.2";
-  by-version."regex-cache"."0.4.2" = self.buildNodePackage {
-    name = "regex-cache-0.4.2";
-    version = "0.4.2";
+  by-spec."regex-cache"."^0.4.2" =
+    self.by-version."regex-cache"."0.4.3";
+  by-version."regex-cache"."0.4.3" = self.buildNodePackage {
+    name = "regex-cache-0.4.3";
+    version = "0.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/regex-cache/-/regex-cache-0.4.2.tgz";
-      name = "regex-cache-0.4.2.tgz";
-      sha1 = "6e4f89c266bc03c33fd129c062184687f4663487";
+      url = "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz";
+      name = "regex-cache-0.4.3.tgz";
+      sha1 = "9b1a6c35d4d0dfcef5711ae651e8e9d3d7114145";
     };
     deps = {
-      "is-equal-shallow-0.1.2" = self.by-version."is-equal-shallow"."0.1.2";
+      "is-equal-shallow-0.1.3" = self.by-version."is-equal-shallow"."0.1.3";
       "is-primitive-2.0.0" = self.by-version."is-primitive"."2.0.0";
     };
     optionalDependencies = {
@@ -34631,7 +39332,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
+      url = "https://registry.npmjs.org/regexp-clone/-/regexp-clone-0.0.1.tgz";
       name = "regexp-clone-0.0.1.tgz";
       sha1 = "a7c2e09891fdbf38fbb10d376fb73003e68ac589";
     };
@@ -34650,7 +39351,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz";
+      url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz";
       name = "regexp-quote-0.0.0.tgz";
       sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2";
     };
@@ -34663,18 +39364,37 @@
     cpu = [ ];
   };
   by-spec."registry-url"."^3.0.0" =
-    self.by-version."registry-url"."3.0.3";
-  by-version."registry-url"."3.0.3" = self.buildNodePackage {
-    name = "registry-url-3.0.3";
-    version = "3.0.3";
+    self.by-version."registry-url"."3.1.0";
+  by-version."registry-url"."3.1.0" = self.buildNodePackage {
+    name = "registry-url-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/registry-url/-/registry-url-3.0.3.tgz";
-      name = "registry-url-3.0.3.tgz";
-      sha1 = "c9f5102e0fd9c9f250522a7f19f68672c84ccc96";
+      url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
+      name = "registry-url-3.1.0.tgz";
+      sha1 = "3d4ef870f73dde1d77f0cf9a381432444e174942";
+    };
+    deps = {
+      "rc-1.1.6" = self.by-version."rc"."1.1.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."reinterval"."^1.0.1" =
+    self.by-version."reinterval"."1.0.2";
+  by-version."reinterval"."1.0.2" = self.buildNodePackage {
+    name = "reinterval-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/reinterval/-/reinterval-1.0.2.tgz";
+      name = "reinterval-1.0.2.tgz";
+      sha1 = "029056fb7637844bec872f36f2c07b0d7c112e6d";
     };
     deps = {
-      "rc-1.0.1" = self.by-version."rc"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -34683,15 +39403,15 @@
     cpu = [ ];
   };
   by-spec."relative-date"."^1.1.1" =
-    self.by-version."relative-date"."1.1.2";
-  by-version."relative-date"."1.1.2" = self.buildNodePackage {
-    name = "relative-date-1.1.2";
-    version = "1.1.2";
+    self.by-version."relative-date"."1.1.3";
+  by-version."relative-date"."1.1.3" = self.buildNodePackage {
+    name = "relative-date-1.1.3";
+    version = "1.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/relative-date/-/relative-date-1.1.2.tgz";
-      name = "relative-date-1.1.2.tgz";
-      sha1 = "89b990c49bc543052929f34bc76d263605edb964";
+      url = "https://registry.npmjs.org/relative-date/-/relative-date-1.1.3.tgz";
+      name = "relative-date-1.1.3.tgz";
+      sha1 = "120903040588ec7a4a399c6547fd01d0e3d2dc63";
     };
     deps = {
     };
@@ -34702,21 +39422,21 @@
     cpu = [ ];
   };
   by-spec."render-readme".">=0.2.1" =
-    self.by-version."render-readme"."1.3.0";
-  by-version."render-readme"."1.3.0" = self.buildNodePackage {
-    name = "render-readme-1.3.0";
-    version = "1.3.0";
+    self.by-version."render-readme"."1.3.1";
+  by-version."render-readme"."1.3.1" = self.buildNodePackage {
+    name = "render-readme-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/render-readme/-/render-readme-1.3.0.tgz";
-      name = "render-readme-1.3.0.tgz";
-      sha1 = "b3c766ba8688cb46005e0fd7233aa5a236a09501";
+      url = "https://registry.npmjs.org/render-readme/-/render-readme-1.3.1.tgz";
+      name = "render-readme-1.3.1.tgz";
+      sha1 = "d2a98f9a87dd64fa73c6877ac5c45b0f6341a797";
     };
     deps = {
-      "markdown-it-4.1.2" = self.by-version."markdown-it"."4.1.2";
-      "sanitize-html-1.6.1" = self.by-version."sanitize-html"."1.6.1";
-      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
-      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
+      "markdown-it-4.4.0" = self.by-version."markdown-it"."4.4.0";
+      "sanitize-html-1.11.4" = self.by-version."sanitize-html"."1.11.4";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "highlight.js-8.9.1" = self.by-version."highlight.js"."8.9.1";
     };
     optionalDependencies = {
     };
@@ -34724,16 +39444,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."repeat-element"."^1.1.0" =
-    self.by-version."repeat-element"."1.1.0";
-  by-version."repeat-element"."1.1.0" = self.buildNodePackage {
-    name = "repeat-element-1.1.0";
-    version = "1.1.0";
+  by-spec."repeat-element"."^1.1.2" =
+    self.by-version."repeat-element"."1.1.2";
+  by-version."repeat-element"."1.1.2" = self.buildNodePackage {
+    name = "repeat-element-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/repeat-element/-/repeat-element-1.1.0.tgz";
-      name = "repeat-element-1.1.0.tgz";
-      sha1 = "3307c041c52bb36a36e380de2d252ef61a907cca";
+      url = "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz";
+      name = "repeat-element-1.1.2.tgz";
+      sha1 = "ef089a178d1483baae4d93eb98b4f9e4e11d990a";
     };
     deps = {
     };
@@ -34750,7 +39470,7 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz";
+      url = "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz";
       name = "repeat-string-0.2.2.tgz";
       sha1 = "c7a8d3236068362059a7e4651fc6884e8b1fb4ae";
     };
@@ -34763,15 +39483,15 @@
     cpu = [ ];
   };
   by-spec."repeat-string"."^1.5.2" =
-    self.by-version."repeat-string"."1.5.2";
-  by-version."repeat-string"."1.5.2" = self.buildNodePackage {
-    name = "repeat-string-1.5.2";
-    version = "1.5.2";
+    self.by-version."repeat-string"."1.5.4";
+  by-version."repeat-string"."1.5.4" = self.buildNodePackage {
+    name = "repeat-string-1.5.4";
+    version = "1.5.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/repeat-string/-/repeat-string-1.5.2.tgz";
-      name = "repeat-string-1.5.2.tgz";
-      sha1 = "21065f70727ad053a0dd5e957ac9e00c7560d90a";
+      url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.5.4.tgz";
+      name = "repeat-string-1.5.4.tgz";
+      sha1 = "64ec0c91e0f4b475f90d5b643651e3e6e5b6c2d5";
     };
     deps = {
     };
@@ -34782,19 +39502,40 @@
     cpu = [ ];
   };
   by-spec."repeating"."^1.1.0" =
-    self.by-version."repeating"."1.1.2";
-  by-version."repeating"."1.1.2" = self.buildNodePackage {
-    name = "repeating-1.1.2";
-    version = "1.1.2";
+    self.by-version."repeating"."1.1.3";
+  by-version."repeating"."1.1.3" = self.buildNodePackage {
+    name = "repeating-1.1.3";
+    version = "1.1.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/repeating/-/repeating-1.1.2.tgz";
-      name = "repeating-1.1.2.tgz";
-      sha1 = "dcced290c4d22df9818746eb5257679d27fe0283";
+      url = "https://registry.npmjs.org/repeating/-/repeating-1.1.3.tgz";
+      name = "repeating-1.1.3.tgz";
+      sha1 = "3d4114218877537494f97f77f9785fab810fa4ac";
+    };
+    deps = {
+      "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."repeating"."^1.1.2" =
+    self.by-version."repeating"."1.1.3";
+  by-spec."repeating"."^2.0.0" =
+    self.by-version."repeating"."2.0.0";
+  by-version."repeating"."2.0.0" = self.buildNodePackage {
+    name = "repeating-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz";
+      name = "repeating-2.0.0.tgz";
+      sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e";
     };
     deps = {
-      "is-finite-1.0.0" = self.by-version."is-finite"."1.0.0";
-      "meow-3.1.0" = self.by-version."meow"."3.1.0";
+      "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -34809,7 +39550,7 @@
     version = "0.2.10";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/replace/-/replace-0.2.10.tgz";
+      url = "https://registry.npmjs.org/replace/-/replace-0.2.10.tgz";
       name = "replace-0.2.10.tgz";
       sha1 = "1123397e995b3bfef9985fc63cddcf79a014fd64";
     };
@@ -34831,7 +39572,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
+      url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
       name = "replace-ext-0.0.1.tgz";
       sha1 = "29bbd92078a739f0bcce2b4ee41e837953522924";
     };
@@ -34844,35 +39585,38 @@
     cpu = [ ];
   };
   by-spec."request"."2" =
-    self.by-version."request"."2.55.0";
-  by-version."request"."2.55.0" = self.buildNodePackage {
-    name = "request-2.55.0";
-    version = "2.55.0";
+    self.by-version."request"."2.70.0";
+  by-version."request"."2.70.0" = self.buildNodePackage {
+    name = "request-2.70.0";
+    version = "2.70.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.55.0.tgz";
-      name = "request-2.55.0.tgz";
-      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
+      url = "https://registry.npmjs.org/request/-/request-2.70.0.tgz";
+      name = "request-2.70.0.tgz";
+      sha1 = "7ecf8437d6fb553e92e2981a411b9ee2aadd7cce";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "aws4-1.3.2" = self.by-version."aws4"."1.3.2";
+      "bl-1.1.2" = self.by-version."bl"."1.1.2";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
-      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
-      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
+      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
+      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "har-validator-1.6.1" = self.by-version."har-validator"."1.6.1";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "qs-6.1.0" = self.by-version."qs"."6.1.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
     };
     optionalDependencies = {
     };
@@ -34881,9 +39625,9 @@
     cpu = [ ];
   };
   by-spec."request"."2 >=2.20.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request"."2 >=2.25.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request"."2.16.x" =
     self.by-version."request"."2.16.6";
   by-version."request"."2.16.6" = self.buildNodePackage {
@@ -34891,7 +39635,7 @@
     version = "2.16.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.16.6.tgz";
+      url = "https://registry.npmjs.org/request/-/request-2.16.6.tgz";
       name = "request-2.16.6.tgz";
       sha1 = "872fe445ae72de266b37879d6ad7dc948fa01cad";
     };
@@ -34899,7 +39643,7 @@
       "form-data-0.0.10" = self.by-version."form-data"."0.0.10";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "hawk-0.10.2" = self.by-version."hawk"."0.10.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0";
       "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0";
       "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0";
@@ -34921,44 +39665,13 @@
     version = "2.26.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.26.0.tgz";
+      url = "https://registry.npmjs.org/request/-/request-2.26.0.tgz";
       name = "request-2.26.0.tgz";
       sha1 = "79b03075cbac2e22ebe41aa7fca884e869c1c212";
     };
     deps = {
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
-      "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
-      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
-      "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."2.27.x" =
-    self.by-version."request"."2.27.0";
-  by-version."request"."2.27.0" = self.buildNodePackage {
-    name = "request-2.27.0";
-    version = "2.27.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.27.0.tgz";
-      name = "request-2.27.0.tgz";
-      sha1 = "dfb1a224dd3a5a9bade4337012503d710e538668";
-    };
-    deps = {
-      "qs-0.6.6" = self.by-version."qs"."0.6.6";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
@@ -34966,7 +39679,7 @@
       "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
       "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
@@ -34976,37 +39689,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."2.29.0" =
-    self.by-version."request"."2.29.0";
-  by-version."request"."2.29.0" = self.buildNodePackage {
-    name = "request-2.29.0";
-    version = "2.29.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.29.0.tgz";
-      name = "request-2.29.0.tgz";
-      sha1 = "0d4b8de70d26a9911a8344af9a0e8edab81ff1c3";
-    };
-    deps = {
-      "qs-0.6.6" = self.by-version."qs"."0.6.6";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-    };
-    optionalDependencies = {
-      "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
-      "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."request"."2.36.0" =
     self.by-version."request"."2.36.0";
   by-version."request"."2.36.0" = self.buildNodePackage {
@@ -35014,21 +39696,21 @@
     version = "2.36.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.36.0.tgz";
+      url = "https://registry.npmjs.org/request/-/request-2.36.0.tgz";
       name = "request-2.36.0.tgz";
       sha1 = "28c6c04262c7b9ffdd21b9255374517ee6d943f5";
     };
     deps = {
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
     };
     optionalDependencies = {
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "hawk-1.0.0" = self.by-version."hawk"."1.0.0";
@@ -35038,69 +39720,33 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."2.40.0" =
+  by-spec."request"."2.40.x" =
     self.by-version."request"."2.40.0";
   by-version."request"."2.40.0" = self.buildNodePackage {
     name = "request-2.40.0";
     version = "2.40.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.40.0.tgz";
+      url = "https://registry.npmjs.org/request/-/request-2.40.0.tgz";
       name = "request-2.40.0.tgz";
       sha1 = "4dd670f696f1e6e842e66b4b5e839301ab9beb67";
     };
     deps = {
       "qs-1.0.2" = self.by-version."qs"."1.0.2";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
     };
     optionalDependencies = {
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
       "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."2.40.x" =
-    self.by-version."request"."2.40.0";
-  by-spec."request"."2.42.0" =
-    self.by-version."request"."2.42.0";
-  by-version."request"."2.42.0" = self.buildNodePackage {
-    name = "request-2.42.0";
-    version = "2.42.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.42.0.tgz";
-      name = "request-2.42.0.tgz";
-      sha1 = "572bd0148938564040ac7ab148b96423a063304a";
-    };
-    deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "qs-1.2.2" = self.by-version."qs"."1.2.2";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-    };
-    optionalDependencies = {
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
-      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
     };
     peerDependencies = [];
     os = [ ];
@@ -35113,26 +39759,26 @@
     version = "2.47.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.47.0.tgz";
+      url = "https://registry.npmjs.org/request/-/request-2.47.0.tgz";
       name = "request-2.47.0.tgz";
       sha1 = "09e9fd1a4fed6593a805ef8202b20f0c5ecb485f";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
       "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
     optionalDependencies = {
@@ -35141,35 +39787,36 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."2.53.0" =
-    self.by-version."request"."2.53.0";
-  by-version."request"."2.53.0" = self.buildNodePackage {
-    name = "request-2.53.0";
-    version = "2.53.0";
+  by-spec."request"."2.55.x" =
+    self.by-version."request"."2.55.0";
+  by-version."request"."2.55.0" = self.buildNodePackage {
+    name = "request-2.55.0";
+    version = "2.55.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.53.0.tgz";
-      name = "request-2.53.0.tgz";
-      sha1 = "180a3ae92b7b639802e4f9545dd8fcdeb71d760c";
+      url = "https://registry.npmjs.org/request/-/request-2.55.0.tgz";
+      name = "request-2.55.0.tgz";
+      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-2.4.2" = self.by-version."qs"."2.4.2";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
       "oauth-sign-0.6.0" = self.by-version."oauth-sign"."0.6.0";
       "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
       "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0";
     };
     optionalDependencies = {
     };
@@ -35177,18 +39824,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."2.9.x" =
-    self.by-version."request"."2.9.203";
-  by-version."request"."2.9.203" = self.buildNodePackage {
-    name = "request-2.9.203";
-    version = "2.9.203";
+  by-spec."request"."2.61.0" =
+    self.by-version."request"."2.61.0";
+  by-version."request"."2.61.0" = self.buildNodePackage {
+    name = "request-2.61.0";
+    version = "2.61.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.9.203.tgz";
-      name = "request-2.9.203.tgz";
-      sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
+      url = "https://registry.npmjs.org/request/-/request-2.61.0.tgz";
+      name = "request-2.61.0.tgz";
+      sha1 = "6973cb2ac94885f02693f554eec64481d6013f9f";
     };
     deps = {
+      "bl-1.0.3" = self.by-version."bl"."1.0.3";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0";
     };
     optionalDependencies = {
     };
@@ -35196,107 +39862,186 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."2.x" =
-    self.by-version."request"."2.55.0";
-  by-spec."request"."2.x.x" =
-    self.by-version."request"."2.55.0";
-  by-spec."request"."=2.45.0" =
-    self.by-version."request"."2.45.0";
-  by-version."request"."2.45.0" = self.buildNodePackage {
-    name = "request-2.45.0";
-    version = "2.45.0";
+  by-spec."request"."2.62.0" =
+    self.by-version."request"."2.62.0";
+  by-version."request"."2.62.0" = self.buildNodePackage {
+    name = "request-2.62.0";
+    version = "2.62.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.45.0.tgz";
-      name = "request-2.45.0.tgz";
-      sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c";
+      url = "https://registry.npmjs.org/request/-/request-2.62.0.tgz";
+      name = "request-2.62.0.tgz";
+      sha1 = "55c165f702a146f1e21e0725c0b75e1136487b0f";
+    };
+    deps = {
+      "bl-1.0.3" = self.by-version."bl"."1.0.3";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-5.1.0" = self.by-version."qs"."5.1.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."2.65.0" =
+    self.by-version."request"."2.65.0";
+  by-version."request"."2.65.0" = self.buildNodePackage {
+    name = "request-2.65.0";
+    version = "2.65.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/request/-/request-2.65.0.tgz";
+      name = "request-2.65.0.tgz";
+      sha1 = "cc1a3bc72b96254734fc34296da322f9486ddeba";
+    };
+    deps = {
+      "bl-1.0.3" = self.by-version."bl"."1.0.3";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-5.2.0" = self.by-version."qs"."5.2.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."2.67.0" =
+    self.by-version."request"."2.67.0";
+  by-version."request"."2.67.0" = self.buildNodePackage {
+    name = "request-2.67.0";
+    version = "2.67.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/request/-/request-2.67.0.tgz";
+      name = "request-2.67.0.tgz";
+      sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
+    };
+    deps = {
+      "bl-1.0.3" = self.by-version."bl"."1.0.3";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-5.2.0" = self.by-version."qs"."5.2.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
+      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."request"."2.9.x" =
+    self.by-version."request"."2.9.203";
+  by-version."request"."2.9.203" = self.buildNodePackage {
+    name = "request-2.9.203";
+    version = "2.9.203";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
+      name = "request-2.9.203.tgz";
+      sha1 = "6c1711a5407fb94a114219563e44145bcbf4723a";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "qs-1.2.2" = self.by-version."qs"."1.2.2";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
     };
     optionalDependencies = {
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
-      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
+  by-spec."request"."2.x" =
+    self.by-version."request"."2.70.0";
+  by-spec."request"."2.x.x" =
+    self.by-version."request"."2.70.0";
+  by-spec."request"."=2.67.0" =
+    self.by-version."request"."2.67.0";
   by-spec."request".">= 2.2.9" =
-    self.by-version."request"."2.55.0";
-  by-spec."request".">= 2.9.153" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
+  by-spec."request".">= 2.44.0 < 3.0.0" =
+    self.by-version."request"."2.70.0";
   by-spec."request".">=2.2.9" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request".">=2.27.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request".">=2.29.1" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request".">=2.30.1" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request".">=2.31.0 <3.0.0-0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
+  by-spec."request".">=2.55" =
+    self.by-version."request"."2.70.0";
   by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request"."^2.39.0" =
-    self.by-version."request"."2.55.0";
-  by-spec."request"."^2.40.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request"."^2.47.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request"."^2.51.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request"."^2.54.0" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
+  by-spec."request"."^2.55.0" =
+    self.by-version."request"."2.70.0";
+  by-spec."request"."^2.61.0" =
+    self.by-version."request"."2.70.0";
+  by-spec."request"."^2.62.0" =
+    self.by-version."request"."2.70.0";
+  by-spec."request"."^2.65.0" =
+    self.by-version."request"."2.70.0";
+  by-spec."request"."^2.67.0" =
+    self.by-version."request"."2.70.0";
   by-spec."request"."~2" =
-    self.by-version."request"."2.55.0";
+    self.by-version."request"."2.70.0";
   by-spec."request"."~2.16.2" =
     self.by-version."request"."2.16.6";
-  by-spec."request"."~2.21.0" =
-    self.by-version."request"."2.21.0";
-  by-version."request"."2.21.0" = self.buildNodePackage {
-    name = "request-2.21.0";
-    version = "2.21.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.21.0.tgz";
-      name = "request-2.21.0.tgz";
-      sha1 = "5728ab9c45e5a87c99daccd530298b6673a868d7";
-    };
-    deps = {
-      "qs-0.6.6" = self.by-version."qs"."0.6.6";
-      "json-stringify-safe-4.0.0" = self.by-version."json-stringify-safe"."4.0.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
-      "http-signature-0.9.11" = self.by-version."http-signature"."0.9.11";
-      "hawk-0.13.1" = self.by-version."hawk"."0.13.1";
-      "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0";
-      "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0";
-      "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "form-data-0.0.8" = self.by-version."form-data"."0.0.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."~2.27.0" =
-    self.by-version."request"."2.27.0";
   by-spec."request"."~2.34.0" =
     self.by-version."request"."2.34.0";
   by-version."request"."2.34.0" = self.buildNodePackage {
@@ -35304,19 +40049,19 @@
     version = "2.34.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.34.0.tgz";
+      url = "https://registry.npmjs.org/request/-/request-2.34.0.tgz";
       name = "request-2.34.0.tgz";
       sha1 = "b5d8b9526add4a2d4629f4d417124573996445ae";
     };
     deps = {
       "qs-0.6.6" = self.by-version."qs"."0.6.6";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
     };
     optionalDependencies = {
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
       "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
@@ -35330,33 +40075,34 @@
   };
   by-spec."request"."~2.40.0" =
     self.by-version."request"."2.40.0";
-  by-spec."request"."~2.46.0" =
-    self.by-version."request"."2.46.0";
-  by-version."request"."2.46.0" = self.buildNodePackage {
-    name = "request-2.46.0";
-    version = "2.46.0";
+  by-spec."request"."~2.51.0" =
+    self.by-version."request"."2.51.0";
+  by-version."request"."2.51.0" = self.buildNodePackage {
+    name = "request-2.51.0";
+    version = "2.51.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.46.0.tgz";
-      name = "request-2.46.0.tgz";
-      sha1 = "359195d52eaf720bc69742579d04ad6d265a8274";
+      url = "https://registry.npmjs.org/request/-/request-2.51.0.tgz";
+      name = "request-2.51.0.tgz";
+      sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
+      "caseless-0.8.0" = self.by-version."caseless"."0.8.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
+      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
       "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-1.2.2" = self.by-version."qs"."1.2.2";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-2.3.3" = self.by-version."qs"."2.3.3";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
       "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.4.0" = self.by-version."oauth-sign"."0.4.0";
+      "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
       "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
     };
     optionalDependencies = {
     };
@@ -35364,34 +40110,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."~2.48.0" =
-    self.by-version."request"."2.48.0";
-  by-version."request"."2.48.0" = self.buildNodePackage {
-    name = "request-2.48.0";
-    version = "2.48.0";
+  by-spec."request"."~2.55.0" =
+    self.by-version."request"."2.55.0";
+  by-spec."request"."~2.60.0" =
+    self.by-version."request"."2.60.0";
+  by-version."request"."2.60.0" = self.buildNodePackage {
+    name = "request-2.60.0";
+    version = "2.60.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.48.0.tgz";
-      name = "request-2.48.0.tgz";
-      sha1 = "3ae2e091c9698282d58a0e6989ece2638f0f1f28";
+      url = "https://registry.npmjs.org/request/-/request-2.60.0.tgz";
+      name = "request-2.60.0.tgz";
+      sha1 = "498820957fcdded1d37749069610c85f61a29f2d";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.7.0" = self.by-version."caseless"."0.7.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "form-data-0.1.4" = self.by-version."form-data"."0.1.4";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
-      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
+      "bl-1.0.3" = self.by-version."bl"."1.0.3";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "qs-4.0.0" = self.by-version."qs"."4.0.0";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "har-validator-1.8.0" = self.by-version."har-validator"."1.8.0";
     };
     optionalDependencies = {
     };
@@ -35399,34 +40150,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."~2.51.0" =
-    self.by-version."request"."2.51.0";
-  by-version."request"."2.51.0" = self.buildNodePackage {
-    name = "request-2.51.0";
-    version = "2.51.0";
+  by-spec."request"."~2.67.0" =
+    self.by-version."request"."2.67.0";
+  by-spec."request"."~2.69.0" =
+    self.by-version."request"."2.69.0";
+  by-version."request"."2.69.0" = self.buildNodePackage {
+    name = "request-2.69.0";
+    version = "2.69.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz";
-      name = "request-2.51.0.tgz";
-      sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e";
+      url = "https://registry.npmjs.org/request/-/request-2.69.0.tgz";
+      name = "request-2.69.0.tgz";
+      sha1 = "cf91d2e000752b1217155c005241911991a2346a";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.8.0" = self.by-version."caseless"."0.8.0";
-      "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
-      "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.3.3" = self.by-version."qs"."2.3.3";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "oauth-sign-0.5.0" = self.by-version."oauth-sign"."0.5.0";
-      "hawk-1.1.1" = self.by-version."hawk"."1.1.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "aws4-1.3.2" = self.by-version."aws4"."1.3.2";
+      "bl-1.0.3" = self.by-version."bl"."1.0.3";
+      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
+      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
+      "extend-3.0.0" = self.by-version."extend"."3.0.0";
+      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
+      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
+      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
+      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
+      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
+      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
+      "qs-6.0.2" = self.by-version."qs"."6.0.2";
+      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
+      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
     };
     optionalDependencies = {
     };
@@ -35434,16 +40192,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."~2.55.0" =
-    self.by-version."request"."2.55.0";
-  by-spec."request-progress"."0.3.1" =
+  by-spec."request-progress"."^0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = self.buildNodePackage {
     name = "request-progress-0.3.1";
     version = "0.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
+      url = "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz";
       name = "request-progress-0.3.1.tgz";
       sha1 = "0721c105d8a96ac6b2ce8b2c89ae2d5ecfcf6b3a";
     };
@@ -35456,19 +40212,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request-replay"."~0.2.0" =
-    self.by-version."request-replay"."0.2.0";
-  by-version."request-replay"."0.2.0" = self.buildNodePackage {
-    name = "request-replay-0.2.0";
-    version = "0.2.0";
+  by-spec."request-progress"."~2.0.1" =
+    self.by-version."request-progress"."2.0.1";
+  by-version."request-progress"."2.0.1" = self.buildNodePackage {
+    name = "request-progress-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz";
-      name = "request-replay-0.2.0.tgz";
-      sha1 = "9b693a5d118b39f5c596ead5ed91a26444057f60";
+      url = "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz";
+      name = "request-progress-2.0.1.tgz";
+      sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08";
     };
     deps = {
-      "retry-0.6.1" = self.by-version."retry"."0.6.1";
+      "throttleit-1.0.0" = self.by-version."throttleit"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -35476,16 +40232,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."requirejs"."~2.1" =
-    self.by-version."requirejs"."2.1.17";
-  by-version."requirejs"."2.1.17" = self.buildNodePackage {
-    name = "requirejs-2.1.17";
-    version = "2.1.17";
-    bin = true;
+  by-spec."require-dir"."^0.3.0" =
+    self.by-version."require-dir"."0.3.0";
+  by-version."require-dir"."0.3.0" = self.buildNodePackage {
+    name = "require-dir-0.3.0";
+    version = "0.3.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/requirejs/-/requirejs-2.1.17.tgz";
-      name = "requirejs-2.1.17.tgz";
-      sha1 = "d812203a34f7fd571f52e459d7748fc0f8717f27";
+      url = "https://registry.npmjs.org/require-dir/-/require-dir-0.3.0.tgz";
+      name = "require-dir-0.3.0.tgz";
+      sha1 = "89f074a85638b07c20a4fb94c93b5db635a64781";
     };
     deps = {
     };
@@ -35495,21 +40251,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."requirejs"."~2.1.0" =
-    self.by-version."requirejs"."2.1.17";
-  by-spec."resanitize"."~0.3.0" =
-    self.by-version."resanitize"."0.3.0";
-  by-version."resanitize"."0.3.0" = self.buildNodePackage {
-    name = "resanitize-0.3.0";
-    version = "0.3.0";
+  by-spec."require-uncached"."^1.0.2" =
+    self.by-version."require-uncached"."1.0.2";
+  by-version."require-uncached"."1.0.2" = self.buildNodePackage {
+    name = "require-uncached-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resanitize/-/resanitize-0.3.0.tgz";
-      name = "resanitize-0.3.0.tgz";
-      sha1 = "dfcb2bf2ae1df2838439ed6cd04c78845c532353";
+      url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz";
+      name = "require-uncached-1.0.2.tgz";
+      sha1 = "67dad3b733089e77030124678a459589faf6a7ec";
     };
     deps = {
-      "validator-1.5.1" = self.by-version."validator"."1.5.1";
+      "caller-path-0.1.0" = self.by-version."caller-path"."0.1.0";
+      "resolve-from-1.0.1" = self.by-version."resolve-from"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -35517,18 +40272,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."resolve"."0.6.3" =
-    self.by-version."resolve"."0.6.3";
-  by-version."resolve"."0.6.3" = self.buildNodePackage {
-    name = "resolve-0.6.3";
-    version = "0.6.3";
+  by-spec."require_optional"."~1.0.0" =
+    self.by-version."require_optional"."1.0.0";
+  by-version."require_optional"."1.0.0" = self.buildNodePackage {
+    name = "require_optional-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-0.6.3.tgz";
-      name = "resolve-0.6.3.tgz";
-      sha1 = "dd957982e7e736debdf53b58a4dd91754575dd46";
+      url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz";
+      name = "require_optional-1.0.0.tgz";
+      sha1 = "52a86137a849728eb60a55533617f8f914f59abf";
     };
     deps = {
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "resolve-from-2.0.0" = self.by-version."resolve-from"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -35536,16 +40293,54 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."resolve"."1.1.6" =
-    self.by-version."resolve"."1.1.6";
-  by-version."resolve"."1.1.6" = self.buildNodePackage {
-    name = "resolve-1.1.6";
-    version = "1.1.6";
+  by-spec."requirejs"."^2.1.0" =
+    self.by-version."requirejs"."2.2.0";
+  by-version."requirejs"."2.2.0" = self.buildNodePackage {
+    name = "requirejs-2.2.0";
+    version = "2.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/requirejs/-/requirejs-2.2.0.tgz";
+      name = "requirejs-2.2.0.tgz";
+      sha1 = "0f2b1538af2b8d0a4fffffde5d367aa9cd4cfe84";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."requires-port"."1.x.x" =
+    self.by-version."requires-port"."1.0.0";
+  by-version."requires-port"."1.0.0" = self.buildNodePackage {
+    name = "requires-port-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz";
+      name = "requires-port-1.0.0.tgz";
+      sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."resolve"."1.1.7" =
+    self.by-version."resolve"."1.1.7";
+  by-version."resolve"."1.1.7" = self.buildNodePackage {
+    name = "resolve-1.1.7";
+    version = "1.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-1.1.6.tgz";
-      name = "resolve-1.1.6.tgz";
-      sha1 = "d3492ad054ca800f5befa612e61beac1eec98f8f";
+      url = "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz";
+      name = "resolve-1.1.7.tgz";
+      sha1 = "203114d82ad2c5ed9e8e0411b3932875e889e97b";
     };
     deps = {
     };
@@ -35556,21 +40351,25 @@
     cpu = [ ];
   };
   by-spec."resolve"."1.1.x" =
-    self.by-version."resolve"."1.1.6";
+    self.by-version."resolve"."1.1.7";
   by-spec."resolve"."^1.1.3" =
-    self.by-version."resolve"."1.1.6";
+    self.by-version."resolve"."1.1.7";
   by-spec."resolve"."^1.1.4" =
-    self.by-version."resolve"."1.1.6";
-  by-spec."resolve"."~0.3.0" =
-    self.by-version."resolve"."0.3.1";
-  by-version."resolve"."0.3.1" = self.buildNodePackage {
-    name = "resolve-0.3.1";
-    version = "0.3.1";
+    self.by-version."resolve"."1.1.7";
+  by-spec."resolve"."^1.1.6" =
+    self.by-version."resolve"."1.1.7";
+  by-spec."resolve"."~1.1.0" =
+    self.by-version."resolve"."1.1.7";
+  by-spec."resolve-from"."^1.0.0" =
+    self.by-version."resolve-from"."1.0.1";
+  by-version."resolve-from"."1.0.1" = self.buildNodePackage {
+    name = "resolve-from-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-0.3.1.tgz";
-      name = "resolve-0.3.1.tgz";
-      sha1 = "34c63447c664c70598d1c9b126fc43b2a24310a4";
+      url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz";
+      name = "resolve-from-1.0.1.tgz";
+      sha1 = "26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226";
     };
     deps = {
     };
@@ -35580,20 +40379,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."resolve"."~0.3.1" =
-    self.by-version."resolve"."0.3.1";
-  by-spec."resolve"."~0.6.0" =
-    self.by-version."resolve"."0.6.3";
-  by-spec."resolve"."~0.7.1" =
-    self.by-version."resolve"."0.7.4";
-  by-version."resolve"."0.7.4" = self.buildNodePackage {
-    name = "resolve-0.7.4";
-    version = "0.7.4";
+  by-spec."resolve-from"."^2.0.0" =
+    self.by-version."resolve-from"."2.0.0";
+  by-version."resolve-from"."2.0.0" = self.buildNodePackage {
+    name = "resolve-from-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resolve/-/resolve-0.7.4.tgz";
-      name = "resolve-0.7.4.tgz";
-      sha1 = "395a9ef9e873fbfe12bd14408bd91bb936003d69";
+      url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
+      name = "resolve-from-2.0.0.tgz";
+      sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57";
     };
     deps = {
     };
@@ -35603,8 +40398,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."resolve"."~1.1.0" =
-    self.by-version."resolve"."1.1.6";
   by-spec."response-time"."1.0.0" =
     self.by-version."response-time"."1.0.0";
   by-version."response-time"."1.0.0" = self.buildNodePackage {
@@ -35612,7 +40405,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
+      url = "https://registry.npmjs.org/response-time/-/response-time-1.0.0.tgz";
       name = "response-time-1.0.0.tgz";
       sha1 = "c2bc8d08f3c359f97eae1d6da86eead175fabdc9";
     };
@@ -35624,19 +40417,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."response-time"."~2.0.1" =
-    self.by-version."response-time"."2.0.1";
-  by-version."response-time"."2.0.1" = self.buildNodePackage {
-    name = "response-time-2.0.1";
-    version = "2.0.1";
+  by-spec."response-time"."~2.3.1" =
+    self.by-version."response-time"."2.3.1";
+  by-version."response-time"."2.3.1" = self.buildNodePackage {
+    name = "response-time-2.3.1";
+    version = "2.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/response-time/-/response-time-2.0.1.tgz";
-      name = "response-time-2.0.1.tgz";
-      sha1 = "c6d2cbadeac4cb251b21016fe182640c02aff343";
+      url = "https://registry.npmjs.org/response-time/-/response-time-2.3.1.tgz";
+      name = "response-time-2.3.1.tgz";
+      sha1 = "2bde19181de6c81ab95e3207a28d61d965b31797";
     };
     deps = {
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+      "depd-1.0.1" = self.by-version."depd"."1.0.1";
+      "on-headers-1.0.1" = self.by-version."on-headers"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -35644,61 +40438,61 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."response-time"."~2.3.0" =
-    self.by-version."response-time"."2.3.0";
-  by-version."response-time"."2.3.0" = self.buildNodePackage {
-    name = "response-time-2.3.0";
-    version = "2.3.0";
-    bin = false;
+  by-spec."restify"."4.0.3" =
+    self.by-version."restify"."4.0.3";
+  by-version."restify"."4.0.3" = self.buildNodePackage {
+    name = "restify-4.0.3";
+    version = "4.0.3";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/response-time/-/response-time-2.3.0.tgz";
-      name = "response-time-2.3.0.tgz";
-      sha1 = "27cf2194fa373ef02c04781287416a3138060b68";
+      url = "https://registry.npmjs.org/restify/-/restify-4.0.3.tgz";
+      name = "restify-4.0.3.tgz";
+      sha1 = "e1e5b7ad9d4f6aeacd20e28f44a045f26c146dbc";
     };
     deps = {
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0";
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "backoff-2.5.0" = self.by-version."backoff"."2.5.0";
+      "bunyan-1.8.0" = self.by-version."bunyan"."1.8.0";
+      "csv-0.4.6" = self.by-version."csv"."0.4.6";
+      "escape-regexp-component-1.0.2" = self.by-version."escape-regexp-component"."1.0.2";
+      "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
+      "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
+      "keep-alive-agent-0.0.1" = self.by-version."keep-alive-agent"."0.0.1";
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "negotiator-0.5.3" = self.by-version."negotiator"."0.5.3";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "qs-3.1.0" = self.by-version."qs"."3.1.0";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
+      "spdy-1.32.5" = self.by-version."spdy"."1.32.5";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
+      "vasync-1.6.3" = self.by-version."vasync"."1.6.3";
+      "verror-1.6.1" = self.by-version."verror"."1.6.1";
     };
     optionalDependencies = {
+      "dtrace-provider-0.6.0" = self.by-version."dtrace-provider"."0.6.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."restify"."2.8.5" =
-    self.by-version."restify"."2.8.5";
-  by-version."restify"."2.8.5" = self.buildNodePackage {
-    name = "restify-2.8.5";
-    version = "2.8.5";
-    bin = true;
+  by-spec."restore-cursor"."^1.0.1" =
+    self.by-version."restore-cursor"."1.0.1";
+  by-version."restore-cursor"."1.0.1" = self.buildNodePackage {
+    name = "restore-cursor-1.0.1";
+    version = "1.0.1";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/restify/-/restify-2.8.5.tgz";
-      name = "restify-2.8.5.tgz";
-      sha1 = "a28ac9d690e88db60937309942efc735010b1329";
+      url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz";
+      name = "restore-cursor-1.0.1.tgz";
+      sha1 = "34661f46886327fed2991479152252df92daa541";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
-      "backoff-2.4.1" = self.by-version."backoff"."2.4.1";
-      "bunyan-1.3.5" = self.by-version."bunyan"."1.3.5";
-      "csv-0.4.1" = self.by-version."csv"."0.4.1";
-      "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
-      "escape-regexp-component-1.0.2" = self.by-version."escape-regexp-component"."1.0.2";
-      "formidable-1.0.17" = self.by-version."formidable"."1.0.17";
-      "http-signature-0.10.1" = self.by-version."http-signature"."0.10.1";
-      "keep-alive-agent-0.0.1" = self.by-version."keep-alive-agent"."0.0.1";
-      "lru-cache-2.6.1" = self.by-version."lru-cache"."2.6.1";
-      "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-      "qs-1.2.2" = self.by-version."qs"."1.2.2";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
-      "spdy-1.32.0" = self.by-version."spdy"."1.32.0";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "verror-1.6.0" = self.by-version."verror"."1.6.0";
+      "exit-hook-1.1.1" = self.by-version."exit-hook"."1.1.1";
+      "onetime-1.1.0" = self.by-version."onetime"."1.1.0";
     };
     optionalDependencies = {
-      "dtrace-provider-0.3.2" = self.by-version."dtrace-provider"."0.3.2";
     };
     peerDependencies = [];
     os = [ ];
@@ -35711,12 +40505,12 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
+      url = "https://registry.npmjs.org/resumer/-/resumer-0.0.0.tgz";
       name = "resumer-0.0.0.tgz";
       sha1 = "f1e8f461e4064ba39e82af3cdc2a8c893d076759";
     };
     deps = {
-      "through-2.3.7" = self.by-version."through"."2.3.7";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
     };
     optionalDependencies = {
     };
@@ -35725,15 +40519,15 @@
     cpu = [ ];
   };
   by-spec."ret"."~0.1.6" =
-    self.by-version."ret"."0.1.10";
-  by-version."ret"."0.1.10" = self.buildNodePackage {
-    name = "ret-0.1.10";
-    version = "0.1.10";
+    self.by-version."ret"."0.1.11";
+  by-version."ret"."0.1.11" = self.buildNodePackage {
+    name = "ret-0.1.11";
+    version = "0.1.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ret/-/ret-0.1.10.tgz";
-      name = "ret-0.1.10.tgz";
-      sha1 = "7bda7048cb6b0566617d3b15a3345f712060a1a4";
+      url = "https://registry.npmjs.org/ret/-/ret-0.1.11.tgz";
+      name = "ret-0.1.11.tgz";
+      sha1 = "281bbd5bd0e2a935181a503ec5ca60e3faa9c4a9";
     };
     deps = {
     };
@@ -35744,18 +40538,18 @@
     cpu = [ ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."2.0.0";
-  by-version."rethinkdb"."2.0.0" = self.buildNodePackage {
-    name = "rethinkdb-2.0.0";
-    version = "2.0.0";
+    self.by-version."rethinkdb"."2.2.3";
+  by-version."rethinkdb"."2.2.3" = self.buildNodePackage {
+    name = "rethinkdb-2.2.3";
+    version = "2.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rethinkdb/-/rethinkdb-2.0.0.tgz";
-      name = "rethinkdb-2.0.0.tgz";
-      sha1 = "5d46f58a843d4dfc028193b497b56130784eea95";
+      url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.2.3.tgz";
+      name = "rethinkdb-2.2.3.tgz";
+      sha1 = "26036a6b1055a8dcac803828ee869e1fa84233ba";
     };
     deps = {
-      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
+      "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
     };
     optionalDependencies = {
     };
@@ -35763,7 +40557,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."2.0.0";
+  "rethinkdb" = self.by-version."rethinkdb"."2.2.3";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = self.buildNodePackage {
@@ -35771,7 +40565,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
+      url = "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz";
       name = "retry-0.6.0.tgz";
       sha1 = "1c010713279a6fd1e8def28af0c3ff1871caa537";
     };
@@ -35783,16 +40577,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."retry"."0.6.1" =
-    self.by-version."retry"."0.6.1";
-  by-version."retry"."0.6.1" = self.buildNodePackage {
-    name = "retry-0.6.1";
-    version = "0.6.1";
+  by-spec."retry"."^0.8.0" =
+    self.by-version."retry"."0.8.0";
+  by-version."retry"."0.8.0" = self.buildNodePackage {
+    name = "retry-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
-      name = "retry-0.6.1.tgz";
-      sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+      url = "https://registry.npmjs.org/retry/-/retry-0.8.0.tgz";
+      name = "retry-0.8.0.tgz";
+      sha1 = "2367628dc0edb247b1eab649dc53ac8628ac2d5f";
     };
     deps = {
     };
@@ -35802,12 +40596,44 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."retry"."^0.6.1" =
-    self.by-version."retry"."0.6.1";
   by-spec."retry"."~0.6.0" =
     self.by-version."retry"."0.6.1";
-  by-spec."retry"."~0.6.1" =
-    self.by-version."retry"."0.6.1";
+  by-version."retry"."0.6.1" = self.buildNodePackage {
+    name = "retry-0.6.1";
+    version = "0.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/retry/-/retry-0.6.1.tgz";
+      name = "retry-0.6.1.tgz";
+      sha1 = "fdc90eed943fde11b893554b8cc63d0e899ba918";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."retry"."~0.9.0" =
+    self.by-version."retry"."0.9.0";
+  by-version."retry"."0.9.0" = self.buildNodePackage {
+    name = "retry-0.9.0";
+    version = "0.9.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/retry/-/retry-0.9.0.tgz";
+      name = "retry-0.9.0.tgz";
+      sha1 = "6f697e50a0e4ddc8c8f7fb547a9b60dead43678d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."revalidator"."0.1.x" =
     self.by-version."revalidator"."0.1.8";
   by-version."revalidator"."0.1.8" = self.buildNodePackage {
@@ -35815,7 +40641,7 @@
     version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
+      url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz";
       name = "revalidator-0.1.8.tgz";
       sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b";
     };
@@ -35827,20 +40653,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rfile"."~1.0" =
-    self.by-version."rfile"."1.0.0";
-  by-version."rfile"."1.0.0" = self.buildNodePackage {
-    name = "rfile-1.0.0";
-    version = "1.0.0";
+  by-spec."right-align"."^0.1.1" =
+    self.by-version."right-align"."0.1.3";
+  by-version."right-align"."0.1.3" = self.buildNodePackage {
+    name = "right-align-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rfile/-/rfile-1.0.0.tgz";
-      name = "rfile-1.0.0.tgz";
-      sha1 = "59708cf90ca1e74c54c3cfc5c36fdb9810435261";
+      url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz";
+      name = "right-align-0.1.3.tgz";
+      sha1 = "61339b722fe6a3515689210d24e14c96148613ef";
+    };
+    deps = {
+      "align-text-0.1.4" = self.by-version."align-text"."0.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rimraf"."1.x.x" =
+    self.by-version."rimraf"."1.0.9";
+  by-version."rimraf"."1.0.9" = self.buildNodePackage {
+    name = "rimraf-1.0.9";
+    version = "1.0.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/rimraf/-/rimraf-1.0.9.tgz";
+      name = "rimraf-1.0.9.tgz";
+      sha1 = "be4801ff76c2ba6f1c50c78e9700eb1d21f239f1";
     };
     deps = {
-      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
-      "resolve-0.3.1" = self.by-version."resolve"."0.3.1";
     };
     optionalDependencies = {
     };
@@ -35848,21 +40692,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rfile"."~1.0.0" =
-    self.by-version."rfile"."1.0.0";
   by-spec."rimraf"."2" =
-    self.by-version."rimraf"."2.3.2";
-  by-version."rimraf"."2.3.2" = self.buildNodePackage {
-    name = "rimraf-2.3.2";
-    version = "2.3.2";
+    self.by-version."rimraf"."2.5.2";
+  by-version."rimraf"."2.5.2" = self.buildNodePackage {
+    name = "rimraf-2.5.2";
+    version = "2.5.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz";
-      name = "rimraf-2.3.2.tgz";
-      sha1 = "7304bd9275c401b89103b106b3531c1ef0c02fe9";
+      url = "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz";
+      name = "rimraf-2.5.2.tgz";
+      sha1 = "62ba947fa4c0b4363839aefecd4f0fbad6059726";
     };
     deps = {
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+      "glob-7.0.3" = self.by-version."glob"."7.0.3";
     };
     optionalDependencies = {
     };
@@ -35870,18 +40712,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rimraf"."2.2.6" =
-    self.by-version."rimraf"."2.2.6";
-  by-version."rimraf"."2.2.6" = self.buildNodePackage {
-    name = "rimraf-2.2.6";
-    version = "2.2.6";
+  by-spec."rimraf"."2.4.3" =
+    self.by-version."rimraf"."2.4.3";
+  by-version."rimraf"."2.4.3" = self.buildNodePackage {
+    name = "rimraf-2.4.3";
+    version = "2.4.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.6.tgz";
-      name = "rimraf-2.2.6.tgz";
-      sha1 = "c59597569b14d956ad29cacc42bdddf5f0ea4f4c";
+      url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.3.tgz";
+      name = "rimraf-2.4.3.tgz";
+      sha1 = "e5b51c9437a4c582adb955e9f28cf8d945e272af";
     };
     deps = {
+      "glob-5.0.15" = self.by-version."glob"."5.0.15";
     };
     optionalDependencies = {
     };
@@ -35890,15 +40733,21 @@
     cpu = [ ];
   };
   by-spec."rimraf"."2.x.x" =
-    self.by-version."rimraf"."2.3.2";
+    self.by-version."rimraf"."2.5.2";
   by-spec."rimraf".">=2.2.6" =
-    self.by-version."rimraf"."2.3.2";
+    self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."^2.2.5" =
-    self.by-version."rimraf"."2.3.2";
+    self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."^2.2.8" =
-    self.by-version."rimraf"."2.3.2";
+    self.by-version."rimraf"."2.5.2";
+  by-spec."rimraf"."^2.3.3" =
+    self.by-version."rimraf"."2.5.2";
+  by-spec."rimraf"."^2.4.2" =
+    self.by-version."rimraf"."2.5.2";
+  by-spec."rimraf"."^2.4.3" =
+    self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."~2" =
-    self.by-version."rimraf"."2.3.2";
+    self.by-version."rimraf"."2.5.2";
   by-spec."rimraf"."~2.1.4" =
     self.by-version."rimraf"."2.1.4";
   by-version."rimraf"."2.1.4" = self.buildNodePackage {
@@ -35906,7 +40755,7 @@
     version = "2.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
+      url = "https://registry.npmjs.org/rimraf/-/rimraf-2.1.4.tgz";
       name = "rimraf-2.1.4.tgz";
       sha1 = "5a6eb62eeda068f51ede50f29b3e5cd22f3d9bb2";
     };
@@ -35926,7 +40775,7 @@
     version = "2.2.8";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
+      url = "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz";
       name = "rimraf-2.2.8.tgz";
       sha1 = "e439be2aaee327321952730f99a8929e4fc50582";
     };
@@ -35938,14 +40787,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rimraf"."~2.2.5" =
+  by-spec."rimraf"."~2.2.2" =
     self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.6" =
     self.by-version."rimraf"."2.2.8";
   by-spec."rimraf"."~2.2.8" =
     self.by-version."rimraf"."2.2.8";
-  by-spec."rimraf"."~2.3.2" =
-    self.by-version."rimraf"."2.3.2";
+  by-spec."rimraf"."~2.4.0" =
+    self.by-version."rimraf"."2.4.5";
+  by-version."rimraf"."2.4.5" = self.buildNodePackage {
+    name = "rimraf-2.4.5";
+    version = "2.4.5";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz";
+      name = "rimraf-2.4.5.tgz";
+      sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da";
+    };
+    deps = {
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."rimraf"."~2.5.0" =
+    self.by-version."rimraf"."2.5.2";
+  by-spec."rimraf"."~2.5.1" =
+    self.by-version."rimraf"."2.5.2";
+  by-spec."rimraf"."~2.5.2" =
+    self.by-version."rimraf"."2.5.2";
   by-spec."ripemd160"."0.2.0" =
     self.by-version."ripemd160"."0.2.0";
   by-version."ripemd160"."0.2.0" = self.buildNodePackage {
@@ -35953,7 +40826,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
+      url = "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz";
       name = "ripemd160-0.2.0.tgz";
       sha1 = "2bf198bde167cacfa51c0a928e84b68bbe171fce";
     };
@@ -35966,15 +40839,15 @@
     cpu = [ ];
   };
   by-spec."ripemd160"."^1.0.0" =
-    self.by-version."ripemd160"."1.0.0";
-  by-version."ripemd160"."1.0.0" = self.buildNodePackage {
-    name = "ripemd160-1.0.0";
-    version = "1.0.0";
+    self.by-version."ripemd160"."1.0.1";
+  by-version."ripemd160"."1.0.1" = self.buildNodePackage {
+    name = "ripemd160-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ripemd160/-/ripemd160-1.0.0.tgz";
-      name = "ripemd160-1.0.0.tgz";
-      sha1 = "15fd251d56e58848840f3d5864a5cfbb259114c7";
+      url = "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz";
+      name = "ripemd160-1.0.1.tgz";
+      sha1 = "93a4bbd4942bc574b69a8fa57c71de10ecca7d6e";
     };
     deps = {
     };
@@ -35984,16 +40857,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rndm"."~1.1.0" =
-    self.by-version."rndm"."1.1.0";
-  by-version."rndm"."1.1.0" = self.buildNodePackage {
-    name = "rndm-1.1.0";
-    version = "1.1.0";
+  by-spec."rndm"."1.2.0" =
+    self.by-version."rndm"."1.2.0";
+  by-version."rndm"."1.2.0" = self.buildNodePackage {
+    name = "rndm-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rndm/-/rndm-1.1.0.tgz";
-      name = "rndm-1.1.0.tgz";
-      sha1 = "01d1a8f1fb9b471181925b627b9049bf33074574";
+      url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz";
+      name = "rndm-1.2.0.tgz";
+      sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c";
     };
     deps = {
     };
@@ -36010,7 +40883,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/root/-/root-2.0.0.tgz";
+      url = "https://registry.npmjs.org/root/-/root-2.0.0.tgz";
       name = "root-2.0.0.tgz";
       sha1 = "5cde3bc4ee9eb314c9dc64f97d9b9787df22e2f7";
     };
@@ -36032,7 +40905,7 @@
     version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/router/-/router-0.6.2.tgz";
+      url = "https://registry.npmjs.org/router/-/router-0.6.2.tgz";
       name = "router-0.6.2.tgz";
       sha1 = "6f04063a2d04eba3303a1bbc6765eef63037cf3d";
     };
@@ -36044,6 +40917,32 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."router"."~1.1.2" =
+    self.by-version."router"."1.1.4";
+  by-version."router"."1.1.4" = self.buildNodePackage {
+    name = "router-1.1.4";
+    version = "1.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/router/-/router-1.1.4.tgz";
+      name = "router-1.1.4.tgz";
+      sha1 = "5d449dde9d6e0ad5c3f53369064baf7798834a97";
+    };
+    deps = {
+      "array-flatten-2.0.0" = self.by-version."array-flatten"."2.0.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "methods-1.1.2" = self.by-version."methods"."1.1.2";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "path-to-regexp-0.1.7" = self.by-version."path-to-regexp"."0.1.7";
+      "setprototypeof-1.0.0" = self.by-version."setprototypeof"."1.0.0";
+      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."rrecur".">=2.0.0" =
     self.by-version."rrecur"."2.0.0";
   by-version."rrecur"."2.0.0" = self.buildNodePackage {
@@ -36051,7 +40950,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rrecur/-/rrecur-2.0.0.tgz";
+      url = "https://registry.npmjs.org/rrecur/-/rrecur-2.0.0.tgz";
       name = "rrecur-2.0.0.tgz";
       sha1 = "d4bcce601cb0e15be6ee8489a54474a6af97811c";
     };
@@ -36072,7 +40971,7 @@
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rrule/-/rrule-2.0.1.tgz";
+      url = "https://registry.npmjs.org/rrule/-/rrule-2.0.1.tgz";
       name = "rrule-2.0.1.tgz";
       sha1 = "360fc68e4391896c4c329f85073d2f5e1f41310b";
     };
@@ -36086,40 +40985,19 @@
     cpu = [ ];
   };
   by-spec."rss".">=0.2.1" =
-    self.by-version."rss"."1.1.1";
-  by-version."rss"."1.1.1" = self.buildNodePackage {
-    name = "rss-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/rss/-/rss-1.1.1.tgz";
-      name = "rss-1.1.1.tgz";
-      sha1 = "eb240f55e48bda42b9f546be5fc659221a95c72c";
-    };
-    deps = {
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "xml-1.0.0" = self.by-version."xml"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ruglify"."~1.0.0" =
-    self.by-version."ruglify"."1.0.0";
-  by-version."ruglify"."1.0.0" = self.buildNodePackage {
-    name = "ruglify-1.0.0";
-    version = "1.0.0";
+    self.by-version."rss"."1.2.1";
+  by-version."rss"."1.2.1" = self.buildNodePackage {
+    name = "rss-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ruglify/-/ruglify-1.0.0.tgz";
-      name = "ruglify-1.0.0.tgz";
-      sha1 = "dc8930e2a9544a274301cc9972574c0d0986b675";
+      url = "https://registry.npmjs.org/rss/-/rss-1.2.1.tgz";
+      name = "rss-1.2.1.tgz";
+      sha1 = "a52671ea35a73ef969b66026b8a2f0653261bc46";
     };
     deps = {
-      "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
-      "uglify-js-2.2.5" = self.by-version."uglify-js"."2.2.5";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "xml-1.0.1" = self.by-version."xml"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -36127,18 +41005,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."run-applescript"."^1.0.0" =
-    self.by-version."run-applescript"."1.0.1";
-  by-version."run-applescript"."1.0.1" = self.buildNodePackage {
-    name = "run-applescript-1.0.1";
-    version = "1.0.1";
+  by-spec."run-async"."^0.1.0" =
+    self.by-version."run-async"."0.1.0";
+  by-version."run-async"."0.1.0" = self.buildNodePackage {
+    name = "run-async-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz";
-      name = "run-applescript-1.0.1.tgz";
-      sha1 = "9f0be74a910dcea702caba65f747563706e86fe2";
+      url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz";
+      name = "run-async-0.1.0.tgz";
+      sha1 = "c8ad4a5e110661e402a7d21b530e009f25f8e389";
     };
     deps = {
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -36146,21 +41025,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."run-applescript"."^1.0.1" =
-    self.by-version."run-applescript"."1.0.1";
   by-spec."run-parallel"."^1.0.0" =
-    self.by-version."run-parallel"."1.1.0";
-  by-version."run-parallel"."1.1.0" = self.buildNodePackage {
-    name = "run-parallel-1.1.0";
-    version = "1.1.0";
+    self.by-version."run-parallel"."1.1.6";
+  by-version."run-parallel"."1.1.6" = self.buildNodePackage {
+    name = "run-parallel-1.1.6";
+    version = "1.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/run-parallel/-/run-parallel-1.1.0.tgz";
-      name = "run-parallel-1.1.0.tgz";
-      sha1 = "6c51c3b7e06400a39f38e34aa1e76463a015e67f";
+      url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.6.tgz";
+      name = "run-parallel-1.1.6.tgz";
+      sha1 = "29003c9a2163e01e2d2dfc90575f2c6c1d61a039";
     };
     deps = {
-      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -36168,39 +41044,20 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."run-parallel"."^1.1.2" =
+    self.by-version."run-parallel"."1.1.6";
   by-spec."run-series"."^1.0.2" =
-    self.by-version."run-series"."1.1.0";
-  by-version."run-series"."1.1.0" = self.buildNodePackage {
-    name = "run-series-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/run-series/-/run-series-1.1.0.tgz";
-      name = "run-series-1.1.0.tgz";
-      sha1 = "f2c3a60ad91078220d1c06bccb5124cc1f02748b";
-    };
-    deps = {
-      "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."runforcover"."~0.0.2" =
-    self.by-version."runforcover"."0.0.2";
-  by-version."runforcover"."0.0.2" = self.buildNodePackage {
-    name = "runforcover-0.0.2";
-    version = "0.0.2";
+    self.by-version."run-series"."1.1.4";
+  by-version."run-series"."1.1.4" = self.buildNodePackage {
+    name = "run-series-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/runforcover/-/runforcover-0.0.2.tgz";
-      name = "runforcover-0.0.2.tgz";
-      sha1 = "344f057d8d45d33aebc6cc82204678f69c4857cc";
+      url = "https://registry.npmjs.org/run-series/-/run-series-1.1.4.tgz";
+      name = "run-series-1.1.4.tgz";
+      sha1 = "89a73ddc5e75c9ef8ab6320c0a1600d6a41179b9";
     };
     deps = {
-      "bunker-0.1.2" = self.by-version."bunker"."0.1.2";
     };
     optionalDependencies = {
     };
@@ -36209,15 +41066,15 @@
     cpu = [ ];
   };
   by-spec."rusha"."^0.8.1" =
-    self.by-version."rusha"."0.8.2";
-  by-version."rusha"."0.8.2" = self.buildNodePackage {
-    name = "rusha-0.8.2";
-    version = "0.8.2";
+    self.by-version."rusha"."0.8.3";
+  by-version."rusha"."0.8.3" = self.buildNodePackage {
+    name = "rusha-0.8.3";
+    version = "0.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rusha/-/rusha-0.8.2.tgz";
-      name = "rusha-0.8.2.tgz";
-      sha1 = "05f3196df37b166bc080db1bbd69c84d64fa1c1f";
+      url = "https://registry.npmjs.org/rusha/-/rusha-0.8.3.tgz";
+      name = "rusha-0.8.3.tgz";
+      sha1 = "63cafec9e626ae09565ab0c4ab2cbc1f2f69b71f";
     };
     deps = {
     };
@@ -36227,16 +41084,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rusha-browserify"."^0.7.3" =
-    self.by-version."rusha-browserify"."0.7.3";
-  by-version."rusha-browserify"."0.7.3" = self.buildNodePackage {
-    name = "rusha-browserify-0.7.3";
-    version = "0.7.3";
+  by-spec."rx"."^2.4.3" =
+    self.by-version."rx"."2.5.3";
+  by-version."rx"."2.5.3" = self.buildNodePackage {
+    name = "rx-2.5.3";
+    version = "2.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rusha-browserify/-/rusha-browserify-0.7.3.tgz";
-      name = "rusha-browserify-0.7.3.tgz";
-      sha1 = "03b313892e287021cc2fc391e2c154fd7d79aef2";
+      url = "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz";
+      name = "rx-2.5.3.tgz";
+      sha1 = "21adc7d80f02002af50dae97fd9dbf248755f566";
     };
     deps = {
     };
@@ -36246,16 +41103,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rx"."^2.2.27" =
-    self.by-version."rx"."2.5.2";
-  by-version."rx"."2.5.2" = self.buildNodePackage {
-    name = "rx-2.5.2";
-    version = "2.5.2";
+  by-spec."rx-lite"."^3.1.2" =
+    self.by-version."rx-lite"."3.1.2";
+  by-version."rx-lite"."3.1.2" = self.buildNodePackage {
+    name = "rx-lite-3.1.2";
+    version = "3.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rx/-/rx-2.5.2.tgz";
-      name = "rx-2.5.2.tgz";
-      sha1 = "52f236b5a6d24e538aa1fba88152909322a02886";
+      url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz";
+      name = "rx-lite-3.1.2.tgz";
+      sha1 = "19ce502ca572665f3b647b10939f97fd1615f102";
     };
     deps = {
     };
@@ -36265,16 +41122,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."rx"."^2.4.3" =
-    self.by-version."rx"."2.5.2";
-  by-spec."s3-upload-stream"."~1.0.0" =
+  by-spec."s3-upload-stream"."~1.0.7" =
     self.by-version."s3-upload-stream"."1.0.7";
   by-version."s3-upload-stream"."1.0.7" = self.buildNodePackage {
     name = "s3-upload-stream-1.0.7";
     version = "1.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/s3-upload-stream/-/s3-upload-stream-1.0.7.tgz";
+      url = "https://registry.npmjs.org/s3-upload-stream/-/s3-upload-stream-1.0.7.tgz";
       name = "s3-upload-stream-1.0.7.tgz";
       sha1 = "e3f80253141c569f105a62aa50ca9b45760e481d";
     };
@@ -36283,7 +41138,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."aws-sdk"."2.1.24"];
+      self.by-version."aws-sdk"."2.3.0"];
     os = [ ];
     cpu = [ ];
   };
@@ -36294,7 +41149,7 @@
     version = "0.0.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
+      url = "https://registry.npmjs.org/s3http/-/s3http-0.0.5.tgz";
       name = "s3http-0.0.5.tgz";
       sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198";
     };
@@ -36322,7 +41177,7 @@
     version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
+      url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.3.tgz";
       name = "safe-json-stringify-1.0.3.tgz";
       sha1 = "3cb6717660a086d07cb5bd9b7a6875bcf67bd05e";
     };
@@ -36341,12 +41196,12 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/safe-regex/-/safe-regex-0.0.1.tgz";
+      url = "https://registry.npmjs.org/safe-regex/-/safe-regex-0.0.1.tgz";
       name = "safe-regex-0.0.1.tgz";
       sha1 = "350ae32b49b7dc75d1cac3a18cb8b375a94ef15c";
     };
     deps = {
-      "ret-0.1.10" = self.by-version."ret"."0.1.10";
+      "ret-0.1.11" = self.by-version."ret"."0.1.11";
     };
     optionalDependencies = {
     };
@@ -36354,14 +41209,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."samsam"."~1.1" =
+  by-spec."samsam"."1.1.2" =
     self.by-version."samsam"."1.1.2";
   by-version."samsam"."1.1.2" = self.buildNodePackage {
     name = "samsam-1.1.2";
     version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
+      url = "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz";
       name = "samsam-1.1.2.tgz";
       sha1 = "bec11fdc83a9fda063401210e40176c3024d1567";
     };
@@ -36373,21 +41228,40 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."samsam"."~1.1" =
+    self.by-version."samsam"."1.1.3";
+  by-version."samsam"."1.1.3" = self.buildNodePackage {
+    name = "samsam-1.1.3";
+    version = "1.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/samsam/-/samsam-1.1.3.tgz";
+      name = "samsam-1.1.3.tgz";
+      sha1 = "9f5087419b4d091f232571e7fa52e90b0f552621";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sanitize-html"."1.x >=1.4" =
-    self.by-version."sanitize-html"."1.6.1";
-  by-version."sanitize-html"."1.6.1" = self.buildNodePackage {
-    name = "sanitize-html-1.6.1";
-    version = "1.6.1";
+    self.by-version."sanitize-html"."1.11.4";
+  by-version."sanitize-html"."1.11.4" = self.buildNodePackage {
+    name = "sanitize-html-1.11.4";
+    version = "1.11.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sanitize-html/-/sanitize-html-1.6.1.tgz";
-      name = "sanitize-html-1.6.1.tgz";
-      sha1 = "05c53fa54e919b4f4b77feb6dc2000fc5bdb4141";
+      url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.11.4.tgz";
+      name = "sanitize-html-1.11.4.tgz";
+      sha1 = "286698b6debeb3f9c5206ecd14135d32a9f9c5b9";
     };
     deps = {
-      "htmlparser2-3.8.2" = self.by-version."htmlparser2"."3.8.2";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
+      "htmlparser2-3.9.0" = self.by-version."htmlparser2"."3.9.0";
       "regexp-quote-0.0.0" = self.by-version."regexp-quote"."0.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -36395,22 +41269,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sauce-connect-launcher"."~0.6.0" =
-    self.by-version."sauce-connect-launcher"."0.6.1";
-  by-version."sauce-connect-launcher"."0.6.1" = self.buildNodePackage {
-    name = "sauce-connect-launcher-0.6.1";
-    version = "0.6.1";
+  by-spec."sauce-connect-launcher"."^0.13.0" =
+    self.by-version."sauce-connect-launcher"."0.13.0";
+  by-version."sauce-connect-launcher"."0.13.0" = self.buildNodePackage {
+    name = "sauce-connect-launcher-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.6.1.tgz";
-      name = "sauce-connect-launcher-0.6.1.tgz";
-      sha1 = "a770184d8d9860cbb1e76c344af28cdf5d0e247a";
+      url = "https://registry.npmjs.org/sauce-connect-launcher/-/sauce-connect-launcher-0.13.0.tgz";
+      name = "sauce-connect-launcher-0.13.0.tgz";
+      sha1 = "25d7df9da16a5ed1caa13df424cb57cb0b6d5a22";
     };
     deps = {
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+      "async-1.4.0" = self.by-version."async"."1.4.0";
       "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
+      "rimraf-2.4.3" = self.by-version."rimraf"."2.4.3";
     };
     optionalDependencies = {
     };
@@ -36418,18 +41292,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."saucelabs"."~0.1.0" =
-    self.by-version."saucelabs"."0.1.1";
-  by-version."saucelabs"."0.1.1" = self.buildNodePackage {
-    name = "saucelabs-0.1.1";
-    version = "0.1.1";
+  by-spec."saucelabs"."^1.0.1" =
+    self.by-version."saucelabs"."1.2.0";
+  by-version."saucelabs"."1.2.0" = self.buildNodePackage {
+    name = "saucelabs-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/saucelabs/-/saucelabs-0.1.1.tgz";
-      name = "saucelabs-0.1.1.tgz";
-      sha1 = "5e0ea1cf3d735d6ea15fde94b5bda6bc15d2c06d";
+      url = "https://registry.npmjs.org/saucelabs/-/saucelabs-1.2.0.tgz";
+      name = "saucelabs-1.2.0.tgz";
+      sha1 = "5e80476b36da1b42d10f39707e9af2a53b03d88a";
     };
     deps = {
+      "https-proxy-agent-1.0.0" = self.by-version."https-proxy-agent"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -36444,7 +41319,7 @@
     version = "0.3.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
+      url = "https://registry.npmjs.org/sax/-/sax-0.3.5.tgz";
       name = "sax-0.3.5.tgz";
       sha1 = "88fcfc1f73c0c8bbd5b7c776b6d3f3501eed073d";
     };
@@ -36463,7 +41338,7 @@
     version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
+      url = "https://registry.npmjs.org/sax/-/sax-0.4.2.tgz";
       name = "sax-0.4.2.tgz";
       sha1 = "39f3b601733d6bec97105b242a2a40fd6978ac3c";
     };
@@ -36475,25 +41350,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sax"."0.5.3" =
-    self.by-version."sax"."0.5.3";
-  by-version."sax"."0.5.3" = self.buildNodePackage {
-    name = "sax-0.5.3";
-    version = "0.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-0.5.3.tgz";
-      name = "sax-0.5.3.tgz";
-      sha1 = "3773714a0d9157caaa7302971efa5c6dcda552d6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."sax"."0.5.x" =
     self.by-version."sax"."0.5.8";
   by-version."sax"."0.5.8" = self.buildNodePackage {
@@ -36501,7 +41357,7 @@
     version = "0.5.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
+      url = "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz";
       name = "sax-0.5.8.tgz";
       sha1 = "d472db228eb331c2506b0e8c15524adb939d12c1";
     };
@@ -36520,7 +41376,7 @@
     version = "0.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
+      url = "https://registry.npmjs.org/sax/-/sax-0.6.1.tgz";
       name = "sax-0.6.1.tgz";
       sha1 = "563b19c7c1de892e09bfc4f2fc30e3c27f0952b9";
     };
@@ -36532,10 +41388,48 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sax"."1.1.5" =
+    self.by-version."sax"."1.1.5";
+  by-version."sax"."1.1.5" = self.buildNodePackage {
+    name = "sax-1.1.5";
+    version = "1.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sax/-/sax-1.1.5.tgz";
+      name = "sax-1.1.5.tgz";
+      sha1 = "1da50a8d00cdecd59405659f5ff85349fe773743";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sax".">=0.1.1" =
-    self.by-version."sax"."0.6.1";
+    self.by-version."sax"."1.2.1";
+  by-version."sax"."1.2.1" = self.buildNodePackage {
+    name = "sax-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz";
+      name = "sax-1.2.1.tgz";
+      sha1 = "7b8e656190b228e81a66aea748480d828cd2d37a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sax".">=0.4.2" =
-    self.by-version."sax"."0.6.1";
+    self.by-version."sax"."1.2.1";
+  by-spec."sax".">=0.6.0" =
+    self.by-version."sax"."1.2.1";
   by-spec."sax"."~0.6.0" =
     self.by-version."sax"."0.6.1";
   by-spec."scmp"."0.0.3" =
@@ -36545,7 +41439,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
+      url = "https://registry.npmjs.org/scmp/-/scmp-0.0.3.tgz";
       name = "scmp-0.0.3.tgz";
       sha1 = "3648df2d7294641e7f78673ffc29681d9bad9073";
     };
@@ -36564,7 +41458,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz";
+      url = "https://registry.npmjs.org/scmp/-/scmp-1.0.0.tgz";
       name = "scmp-1.0.0.tgz";
       sha1 = "a0b272c3fc7292f77115646f00618b0262514e04";
     };
@@ -36580,22 +41474,41 @@
     self.by-version."scmp"."0.0.3";
   by-spec."scmp"."~1.0.0" =
     self.by-version."scmp"."1.0.0";
+  by-spec."secure-keys"."^1.0.0" =
+    self.by-version."secure-keys"."1.0.0";
+  by-version."secure-keys"."1.0.0" = self.buildNodePackage {
+    name = "secure-keys-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/secure-keys/-/secure-keys-1.0.0.tgz";
+      name = "secure-keys-1.0.0.tgz";
+      sha1 = "f0c82d98a3b139a8776a8808050b824431087fca";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."selenium-webdriver"."*" =
-    self.by-version."selenium-webdriver"."2.45.1";
-  by-version."selenium-webdriver"."2.45.1" = self.buildNodePackage {
-    name = "selenium-webdriver-2.45.1";
-    version = "2.45.1";
+    self.by-version."selenium-webdriver"."2.53.1";
+  by-version."selenium-webdriver"."2.53.1" = self.buildNodePackage {
+    name = "selenium-webdriver-2.53.1";
+    version = "2.53.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.45.1.tgz";
-      name = "selenium-webdriver-2.45.1.tgz";
-      sha1 = "6fc6a8ce385085a7b670edd36a379b2eddadf2c9";
+      url = "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-2.53.1.tgz";
+      name = "selenium-webdriver-2.53.1.tgz";
+      sha1 = "b50673955dc03b9164c07773a86b25ea7161dbd9";
     };
     deps = {
       "adm-zip-0.4.4" = self.by-version."adm-zip"."0.4.4";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "tmp-0.0.24" = self.by-version."tmp"."0.0.24";
-      "ws-0.7.1" = self.by-version."ws"."0.7.1";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
       "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4";
     };
     optionalDependencies = {
@@ -36604,17 +41517,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.45.1";
+  "selenium-webdriver" = self.by-version."selenium-webdriver"."2.53.1";
   by-spec."semver"."*" =
-    self.by-version."semver"."4.3.3";
-  by-version."semver"."4.3.3" = self.buildNodePackage {
-    name = "semver-4.3.3";
-    version = "4.3.3";
+    self.by-version."semver"."5.1.0";
+  by-version."semver"."5.1.0" = self.buildNodePackage {
+    name = "semver-5.1.0";
+    version = "5.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.3.tgz";
-      name = "semver-4.3.3.tgz";
-      sha1 = "15466b61220bc371cd8f0e666a9f785329ea8228";
+      url = "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+      name = "semver-5.1.0.tgz";
+      sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
     };
     deps = {
     };
@@ -36624,7 +41537,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "semver" = self.by-version."semver"."4.3.3";
+  "semver" = self.by-version."semver"."5.1.0";
   by-spec."semver"."1.1.0" =
     self.by-version."semver"."1.1.0";
   by-version."semver"."1.1.0" = self.buildNodePackage {
@@ -36632,7 +41545,7 @@
     version = "1.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
+      url = "https://registry.npmjs.org/semver/-/semver-1.1.0.tgz";
       name = "semver-1.1.0.tgz";
       sha1 = "da9b9c837e31550a7c928622bc2381de7dd7a53e";
     };
@@ -36651,7 +41564,7 @@
     version = "2.3.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
+      url = "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz";
       name = "semver-2.3.2.tgz";
       sha1 = "b9848f25d6cf36333073ec9ef8856d42f1233e52";
     };
@@ -36663,20 +41576,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."2 >=2.2.1 || 3.x || 4" =
-    self.by-version."semver"."4.3.3";
+  by-spec."semver"."2 >=2.2.1 || 3.x || 4 || 5" =
+    self.by-version."semver"."5.1.0";
   by-spec."semver"."2 || 3 || 4" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."2.1.0" =
-    self.by-version."semver"."2.1.0";
-  by-version."semver"."2.1.0" = self.buildNodePackage {
-    name = "semver-2.1.0";
-    version = "2.1.0";
+    self.by-version."semver"."4.3.6";
+  by-version."semver"."4.3.6" = self.buildNodePackage {
+    name = "semver-4.3.6";
+    version = "4.3.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-2.1.0.tgz";
-      name = "semver-2.1.0.tgz";
-      sha1 = "356294a90690b698774d62cf35d7c91f983e728a";
+      url = "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+      name = "semver-4.3.6.tgz";
+      sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
     };
     deps = {
     };
@@ -36686,32 +41597,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."2.x" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver"."2.x || 3.x || 4" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."4" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver".">=2.2.1 <3" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver".">=2.2.1 <5.0.0-0" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."^2.2.1" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver"."^2.3.0" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver"."^2.3.0 || 3.x || 4" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."^3.0.1" =
-    self.by-version."semver"."3.0.1";
-  by-version."semver"."3.0.1" = self.buildNodePackage {
-    name = "semver-3.0.1";
-    version = "3.0.1";
+  by-spec."semver"."2 || 3 || 4 || 5" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."2.x || 3.x || 4 || 5" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."4 || 5" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."5.0.1" =
+    self.by-version."semver"."5.0.1";
+  by-version."semver"."5.0.1" = self.buildNodePackage {
+    name = "semver-5.0.1";
+    version = "5.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz";
-      name = "semver-3.0.1.tgz";
-      sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078";
+      url = "https://registry.npmjs.org/semver/-/semver-5.0.1.tgz";
+      name = "semver-5.0.1.tgz";
+      sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9";
     };
     deps = {
     };
@@ -36721,24 +41622,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."^4.0.0" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."^4.1.0" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."^4.3.0" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."^4.3.1" =
-    self.by-version."semver"."4.3.3";
-  by-spec."semver"."~2.0.5" =
-    self.by-version."semver"."2.0.11";
-  by-version."semver"."2.0.11" = self.buildNodePackage {
-    name = "semver-2.0.11";
-    version = "2.0.11";
+  by-spec."semver"."5.0.3" =
+    self.by-version."semver"."5.0.3";
+  by-version."semver"."5.0.3" = self.buildNodePackage {
+    name = "semver-5.0.3";
+    version = "5.0.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
-      name = "semver-2.0.11.tgz";
-      sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
+      url = "https://registry.npmjs.org/semver/-/semver-5.0.3.tgz";
+      name = "semver-5.0.3.tgz";
+      sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
     };
     deps = {
     };
@@ -36748,20 +41641,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."~2.0.8" =
-    self.by-version."semver"."2.0.11";
-  by-spec."semver"."~2.1" =
-    self.by-version."semver"."2.1.0";
-  by-spec."semver"."~2.2.1" =
-    self.by-version."semver"."2.2.1";
-  by-version."semver"."2.2.1" = self.buildNodePackage {
-    name = "semver-2.2.1";
-    version = "2.2.1";
+  by-spec."semver"."5.1.0" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver".">=2.2.1 <5.0.0-0" =
+    self.by-version."semver"."4.3.6";
+  by-spec."semver".">=5.1.0 <6" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."^2.3.0 || 3.x || 4 || 5" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."^4.1.0" =
+    self.by-version."semver"."4.3.6";
+  by-spec."semver"."^4.3.3" =
+    self.by-version."semver"."4.3.6";
+  by-spec."semver"."^4.3.4" =
+    self.by-version."semver"."4.3.6";
+  by-spec."semver"."^4.3.x" =
+    self.by-version."semver"."4.3.6";
+  by-spec."semver"."^5.0.1" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."^5.0.3" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."^5.1.0" =
+    self.by-version."semver"."5.1.0";
+  by-spec."semver"."~1.1.0" =
+    self.by-version."semver"."1.1.4";
+  by-version."semver"."1.1.4" = self.buildNodePackage {
+    name = "semver-1.1.4";
+    version = "1.1.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz";
-      name = "semver-2.2.1.tgz";
-      sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213";
+      url = "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz";
+      name = "semver-1.1.4.tgz";
+      sha1 = "2e5a4e72bab03472cc97f72753b4508912ef5540";
     };
     deps = {
     };
@@ -36771,20 +41682,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."semver"."~2.3.1" =
-    self.by-version."semver"."2.3.2";
-  by-spec."semver"."~3.0.1" =
-    self.by-version."semver"."3.0.1";
-  by-spec."semver"."~4.1.0" =
-    self.by-version."semver"."4.1.1";
-  by-version."semver"."4.1.1" = self.buildNodePackage {
-    name = "semver-4.1.1";
-    version = "4.1.1";
+  by-spec."semver"."~2.0.5" =
+    self.by-version."semver"."2.0.11";
+  by-version."semver"."2.0.11" = self.buildNodePackage {
+    name = "semver-2.0.11";
+    version = "2.0.11";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz";
-      name = "semver-4.1.1.tgz";
-      sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3";
+      url = "https://registry.npmjs.org/semver/-/semver-2.0.11.tgz";
+      name = "semver-2.0.11.tgz";
+      sha1 = "f51f07d03fa5af79beb537fc067a7e141786cced";
     };
     deps = {
     };
@@ -36794,23 +41701,48 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."semver"."~2.3.1" =
+    self.by-version."semver"."2.3.2";
   by-spec."semver"."~4.3.0" =
-    self.by-version."semver"."4.3.3";
+    self.by-version."semver"."4.3.6";
   by-spec."semver"."~4.3.3" =
-    self.by-version."semver"."4.3.3";
+    self.by-version."semver"."4.3.6";
+  by-spec."semver"."~5.0.1" =
+    self.by-version."semver"."5.0.3";
+  by-spec."semver"."~5.1.0" =
+    self.by-version."semver"."5.1.0";
   by-spec."semver-diff"."^2.0.0" =
-    self.by-version."semver-diff"."2.0.0";
-  by-version."semver-diff"."2.0.0" = self.buildNodePackage {
-    name = "semver-diff-2.0.0";
-    version = "2.0.0";
+    self.by-version."semver-diff"."2.1.0";
+  by-version."semver-diff"."2.1.0" = self.buildNodePackage {
+    name = "semver-diff-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
+      name = "semver-diff-2.1.0.tgz";
+      sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
+    };
+    deps = {
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."semver-utils"."^1.1.1" =
+    self.by-version."semver-utils"."1.1.1";
+  by-version."semver-utils"."1.1.1" = self.buildNodePackage {
+    name = "semver-utils-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz";
-      name = "semver-diff-2.0.0.tgz";
-      sha1 = "d43024f91aa7843937dc1379002766809f7480d2";
+      url = "https://registry.npmjs.org/semver-utils/-/semver-utils-1.1.1.tgz";
+      name = "semver-utils-1.1.1.tgz";
+      sha1 = "27d92fec34d27cfa42707d3b40d025ae9855f2df";
     };
     deps = {
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
     };
     optionalDependencies = {
     };
@@ -36819,27 +41751,29 @@
     cpu = [ ];
   };
   by-spec."send"."*" =
-    self.by-version."send"."0.12.2";
-  by-version."send"."0.12.2" = self.buildNodePackage {
-    name = "send-0.12.2";
-    version = "0.12.2";
+    self.by-version."send"."0.13.2";
+  by-version."send"."0.13.2" = self.buildNodePackage {
+    name = "send-0.13.2";
+    version = "0.13.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.12.2.tgz";
-      name = "send-0.12.2.tgz";
-      sha1 = "ba6785e47ab41aa0358b9da401ab22ff0f58eab6";
+      url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz";
+      name = "send-0.13.2.tgz";
+      sha1 = "765e7607c8055452bba6f0b052595350986036de";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "depd-1.0.1" = self.by-version."depd"."1.0.1";
-      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "destroy-1.0.4" = self.by-version."destroy"."1.0.4";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
       "mime-1.3.4" = self.by-version."mime"."1.3.4";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "on-finished-2.2.0" = self.by-version."on-finished"."2.2.0";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -36854,12 +41788,12 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.0.3.tgz";
+      url = "https://registry.npmjs.org/send/-/send-0.0.3.tgz";
       name = "send-0.0.3.tgz";
       sha1 = "4d5f843edf9d65dac31c8a5d2672c179ecb67184";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "mime-1.2.6" = self.by-version."mime"."1.2.6";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
@@ -36877,12 +41811,12 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.1.0.tgz";
+      url = "https://registry.npmjs.org/send/-/send-0.1.0.tgz";
       name = "send-0.1.0.tgz";
       sha1 = "cfb08ebd3cec9b7fc1a37d9ff9e875a971cf4640";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "mime-1.2.6" = self.by-version."mime"."1.2.6";
       "fresh-0.1.0" = self.by-version."fresh"."0.1.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
@@ -36900,12 +41834,12 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.1.4.tgz";
+      url = "https://registry.npmjs.org/send/-/send-0.1.4.tgz";
       name = "send-0.1.4.tgz";
       sha1 = "be70d8d1be01de61821af13780b50345a4f71abd";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "fresh-0.2.0" = self.by-version."fresh"."0.2.0";
       "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4";
@@ -36916,28 +41850,61 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."send"."0.10.1" =
-    self.by-version."send"."0.10.1";
-  by-version."send"."0.10.1" = self.buildNodePackage {
-    name = "send-0.10.1";
-    version = "0.10.1";
+  by-spec."send"."0.13.0" =
+    self.by-version."send"."0.13.0";
+  by-version."send"."0.13.0" = self.buildNodePackage {
+    name = "send-0.13.0";
+    version = "0.13.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.10.1.tgz";
-      name = "send-0.10.1.tgz";
-      sha1 = "7745c50ec72f115115980e8fb179aec01900e08a";
+      url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz";
+      name = "send-0.13.0.tgz";
+      sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de";
     };
     deps = {
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "depd-1.0.1" = self.by-version."depd"."1.0.1";
       "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
-      "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "escape-html-1.0.2" = self.by-version."escape-html"."1.0.2";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."send"."0.13.1" =
+    self.by-version."send"."0.13.1";
+  by-version."send"."0.13.1" = self.buildNodePackage {
+    name = "send-0.13.1";
+    version = "0.13.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/send/-/send-0.13.1.tgz";
+      name = "send-0.13.1.tgz";
+      sha1 = "a30d5f4c82c8a9bae9ad00a1d9b1bdbe6f199ed7";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "depd-1.1.0" = self.by-version."depd"."1.1.0";
+      "destroy-1.0.4" = self.by-version."destroy"."1.0.4";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "mime-1.3.4" = self.by-version."mime"."1.3.4";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "on-finished-2.3.0" = self.by-version."on-finished"."2.3.0";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
+      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -36945,8 +41912,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."send"."0.12.2" =
-    self.by-version."send"."0.12.2";
   by-spec."send"."0.3.0" =
     self.by-version."send"."0.3.0";
   by-version."send"."0.3.0" = self.buildNodePackage {
@@ -36954,7 +41919,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.3.0.tgz";
+      url = "https://registry.npmjs.org/send/-/send-0.3.0.tgz";
       name = "send-0.3.0.tgz";
       sha1 = "9718324634806fc75bc4f8f5e51f57d9d66606e7";
     };
@@ -36963,7 +41928,7 @@
       "debug-0.8.0" = self.by-version."debug"."0.8.0";
       "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -36978,7 +41943,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.6.0.tgz";
+      url = "https://registry.npmjs.org/send/-/send-0.6.0.tgz";
       name = "send-0.6.0.tgz";
       sha1 = "a59da9265db7c35141e1079cf1f368ee0d59b3ab";
     };
@@ -36990,7 +41955,7 @@
       "fresh-0.2.2" = self.by-version."fresh"."0.2.2";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -36998,43 +41963,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."send"."0.9.2" =
-    self.by-version."send"."0.9.2";
-  by-version."send"."0.9.2" = self.buildNodePackage {
-    name = "send-0.9.2";
-    version = "0.9.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.9.2.tgz";
-      name = "send-0.9.2.tgz";
-      sha1 = "77d22a0f462604451917075c6f52e69c2b3b6e25";
-    };
-    deps = {
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "depd-0.4.5" = self.by-version."depd"."0.4.5";
-      "destroy-1.0.3" = self.by-version."destroy"."1.0.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "etag-1.3.1" = self.by-version."etag"."1.3.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
-      "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."send"."0.9.3" =
+  by-spec."send"."^0.9.2" =
     self.by-version."send"."0.9.3";
   by-version."send"."0.9.3" = self.buildNodePackage {
     name = "send-0.9.3";
     version = "0.9.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz";
+      url = "https://registry.npmjs.org/send/-/send-0.9.3.tgz";
       name = "send-0.9.3.tgz";
       sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0";
     };
@@ -37048,7 +41984,7 @@
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "ms-0.6.2" = self.by-version."ms"."0.6.2";
       "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0";
-      "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2";
+      "range-parser-1.0.3" = self.by-version."range-parser"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -37056,41 +41992,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."send"."^0.9.2" =
-    self.by-version."send"."0.9.3";
-  by-spec."sentiment"."0.2.3" =
-    self.by-version."sentiment"."0.2.3";
-  by-version."sentiment"."0.2.3" = self.buildNodePackage {
-    name = "sentiment-0.2.3";
-    version = "0.2.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sentiment/-/sentiment-0.2.3.tgz";
-      name = "sentiment-0.2.3.tgz";
-      sha1 = "aa3e8581268b5c384746aa3ac7218f302cff3b2a";
-    };
-    deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "lodash-1.3.1" = self.by-version."lodash"."1.3.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sequence"."2.2.1" =
-    self.by-version."sequence"."2.2.1";
-  by-version."sequence"."2.2.1" = self.buildNodePackage {
-    name = "sequence-2.2.1";
-    version = "2.2.1";
+  by-spec."sentiment"."1.0.6" =
+    self.by-version."sentiment"."1.0.6";
+  by-version."sentiment"."1.0.6" = self.buildNodePackage {
+    name = "sentiment-1.0.6";
+    version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sequence/-/sequence-2.2.1.tgz";
-      name = "sequence-2.2.1.tgz";
-      sha1 = "7f5617895d44351c0a047e764467690490a16b03";
+      url = "https://registry.npmjs.org/sentiment/-/sentiment-1.0.6.tgz";
+      name = "sentiment-1.0.6.tgz";
+      sha1 = "f6096c6271f020f490d58b54a8afd598db8acbb1";
     };
     deps = {
+      "lodash.assign-4.0.1" = self.by-version."lodash.assign"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -37105,7 +42019,7 @@
     version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz";
+      url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz";
       name = "sequencify-0.0.7.tgz";
       sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c";
     };
@@ -37117,24 +42031,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serialport"."1.4.10" =
-    self.by-version."serialport"."1.4.10";
-  by-version."serialport"."1.4.10" = self.buildNodePackage {
-    name = "serialport-1.4.10";
-    version = "1.4.10";
+  by-spec."serialport"."2.0.*" =
+    self.by-version."serialport"."2.0.6";
+  by-version."serialport"."2.0.6" = self.buildNodePackage {
+    name = "serialport-2.0.6";
+    version = "2.0.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serialport/-/serialport-1.4.10.tgz";
-      name = "serialport-1.4.10.tgz";
-      sha1 = "dcefd2cea7a351685716b8ccb43b93822480fb93";
+      url = "https://registry.npmjs.org/serialport/-/serialport-2.0.6.tgz";
+      name = "serialport-2.0.6.tgz";
+      sha1 = "c344e9449dcd3da0f2d0256c337d0ff384af1ea8";
     };
     deps = {
-      "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31";
-      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "sf-0.1.7" = self.by-version."sf"."0.1.7";
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "nan-2.0.9" = self.by-version."nan"."2.0.9";
+      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-github-1.1.2" = self.by-version."node-pre-gyp-github"."1.1.2";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "nan-1.3.0" = self.by-version."nan"."1.3.0";
+      "sf-0.1.7" = self.by-version."sf"."0.1.7";
     };
     optionalDependencies = {
     };
@@ -37143,45 +42059,21 @@
     cpu = [ ];
   };
   by-spec."serve-favicon"."^2.1.1" =
-    self.by-version."serve-favicon"."2.2.0";
-  by-version."serve-favicon"."2.2.0" = self.buildNodePackage {
-    name = "serve-favicon-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz";
-      name = "serve-favicon-2.2.0.tgz";
-      sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858";
-    };
-    deps = {
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "ms-0.7.0" = self.by-version."ms"."0.7.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."serve-favicon"."^2.2.0" =
-    self.by-version."serve-favicon"."2.2.0";
-  by-spec."serve-favicon"."~2.1.4" =
-    self.by-version."serve-favicon"."2.1.7";
-  by-version."serve-favicon"."2.1.7" = self.buildNodePackage {
-    name = "serve-favicon-2.1.7";
-    version = "2.1.7";
+    self.by-version."serve-favicon"."2.3.0";
+  by-version."serve-favicon"."2.3.0" = self.buildNodePackage {
+    name = "serve-favicon-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.1.7.tgz";
-      name = "serve-favicon-2.1.7.tgz";
-      sha1 = "7b911c0ea4c0f9a2ad686daa5222766f7bc7db79";
+      url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.0.tgz";
+      name = "serve-favicon-2.3.0.tgz";
+      sha1 = "aed36cc6834069a6f189cc7222c6a1a811dc5b39";
     };
     deps = {
-      "etag-1.5.1" = self.by-version."etag"."1.5.1";
-      "fresh-0.2.4" = self.by-version."fresh"."0.2.4";
-      "ms-0.6.2" = self.by-version."ms"."0.6.2";
+      "etag-1.7.0" = self.by-version."etag"."1.7.0";
+      "fresh-0.3.0" = self.by-version."fresh"."0.3.0";
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
     };
     optionalDependencies = {
     };
@@ -37189,10 +42081,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-favicon"."~2.1.5" =
-    self.by-version."serve-favicon"."2.1.7";
-  by-spec."serve-favicon"."~2.2.0" =
-    self.by-version."serve-favicon"."2.2.0";
+  by-spec."serve-favicon"."^2.2.1" =
+    self.by-version."serve-favicon"."2.3.0";
+  by-spec."serve-favicon"."~2.3.0" =
+    self.by-version."serve-favicon"."2.3.0";
   by-spec."serve-index"."1.0.1" =
     self.by-version."serve-index"."1.0.1";
   by-version."serve-index"."1.0.1" = self.buildNodePackage {
@@ -37200,7 +42092,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
+      url = "https://registry.npmjs.org/serve-index/-/serve-index-1.0.1.tgz";
       name = "serve-index-1.0.1.tgz";
       sha1 = "2782ee8ede6cccaae54957962c4715e8ce1921a6";
     };
@@ -37214,48 +42106,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-index"."~1.2.1" =
-    self.by-version."serve-index"."1.2.1";
-  by-version."serve-index"."1.2.1" = self.buildNodePackage {
-    name = "serve-index-1.2.1";
-    version = "1.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.2.1.tgz";
-      name = "serve-index-1.2.1.tgz";
-      sha1 = "854daef00ac9ff2f5bfda1c019b78fb0ed6d2e6f";
-    };
-    deps = {
-      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
-      "batch-0.5.1" = self.by-version."batch"."0.5.1";
-      "debug-2.0.0" = self.by-version."debug"."2.0.0";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."serve-index"."~1.6.3" =
-    self.by-version."serve-index"."1.6.3";
-  by-version."serve-index"."1.6.3" = self.buildNodePackage {
-    name = "serve-index-1.6.3";
-    version = "1.6.3";
+  by-spec."serve-index"."~1.7.2" =
+    self.by-version."serve-index"."1.7.3";
+  by-version."serve-index"."1.7.3" = self.buildNodePackage {
+    name = "serve-index-1.7.3";
+    version = "1.7.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-index/-/serve-index-1.6.3.tgz";
-      name = "serve-index-1.6.3.tgz";
-      sha1 = "639056494ea59470a2c9518c28e7f225a342fd79";
+      url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz";
+      name = "serve-index-1.7.3.tgz";
+      sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2";
     };
     deps = {
-      "accepts-1.2.5" = self.by-version."accepts"."1.2.5";
-      "batch-0.5.2" = self.by-version."batch"."0.5.2";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
+      "accepts-1.2.13" = self.by-version."accepts"."1.2.13";
+      "batch-0.5.3" = self.by-version."batch"."0.5.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
       "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
     };
     optionalDependencies = {
     };
@@ -37270,7 +42139,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz";
+      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.1.0.tgz";
       name = "serve-static-1.1.0.tgz";
       sha1 = "454dfa05bb3ddd4e701a8915b83a278aa91c5643";
     };
@@ -37284,21 +42153,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-static"."~1.3.2" =
-    self.by-version."serve-static"."1.3.2";
-  by-version."serve-static"."1.3.2" = self.buildNodePackage {
-    name = "serve-static-1.3.2";
-    version = "1.3.2";
+  by-spec."serve-static"."~1.10.0" =
+    self.by-version."serve-static"."1.10.2";
+  by-version."serve-static"."1.10.2" = self.buildNodePackage {
+    name = "serve-static-1.10.2";
+    version = "1.10.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.3.2.tgz";
-      name = "serve-static-1.3.2.tgz";
-      sha1 = "d904a6cbf55f511c78138f6f45ee6e69d9d105ca";
+      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.2.tgz";
+      name = "serve-static-1.10.2.tgz";
+      sha1 = "feb800d0e722124dd0b00333160c16e9caa8bcb3";
     };
     deps = {
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
-      "send-0.6.0" = self.by-version."send"."0.6.0";
+      "escape-html-1.0.3" = self.by-version."escape-html"."1.0.3";
+      "parseurl-1.3.1" = self.by-version."parseurl"."1.3.1";
+      "send-0.13.1" = self.by-version."send"."0.13.1";
     };
     optionalDependencies = {
     };
@@ -37306,70 +42175,23 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."serve-static"."~1.6.2" =
-    self.by-version."serve-static"."1.6.5";
-  by-version."serve-static"."1.6.5" = self.buildNodePackage {
-    name = "serve-static-1.6.5";
-    version = "1.6.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.5.tgz";
-      name = "serve-static-1.6.5.tgz";
-      sha1 = "aca17e0deac4a87729f6078781b7d27f63aa3d9c";
-    };
-    deps = {
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "send-0.9.3" = self.by-version."send"."0.9.3";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."serve-static"."~1.6.4" =
-    self.by-version."serve-static"."1.6.5";
-  by-spec."serve-static"."~1.7.1" =
-    self.by-version."serve-static"."1.7.2";
-  by-version."serve-static"."1.7.2" = self.buildNodePackage {
-    name = "serve-static-1.7.2";
-    version = "1.7.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.7.2.tgz";
-      name = "serve-static-1.7.2.tgz";
-      sha1 = "3164ce06d4e6c3459bdcc9d6018fb4fb35e84b39";
-    };
-    deps = {
-      "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "send-0.10.1" = self.by-version."send"."0.10.1";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."serve-static"."~1.9.2" =
-    self.by-version."serve-static"."1.9.2";
-  by-version."serve-static"."1.9.2" = self.buildNodePackage {
-    name = "serve-static-1.9.2";
-    version = "1.9.2";
+  by-spec."serve-static"."~1.10.2" =
+    self.by-version."serve-static"."1.10.2";
+  by-spec."serve-static"."~1.3.2" =
+    self.by-version."serve-static"."1.3.2";
+  by-version."serve-static"."1.3.2" = self.buildNodePackage {
+    name = "serve-static-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/serve-static/-/serve-static-1.9.2.tgz";
-      name = "serve-static-1.9.2.tgz";
-      sha1 = "069fa32453557b218ec2e39140c82d8905d5672c";
+      url = "https://registry.npmjs.org/serve-static/-/serve-static-1.3.2.tgz";
+      name = "serve-static-1.3.2.tgz";
+      sha1 = "d904a6cbf55f511c78138f6f45ee6e69d9d105ca";
     };
     deps = {
       "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1";
-      "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0";
-      "send-0.12.2" = self.by-version."send"."0.12.2";
-      "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0";
+      "parseurl-1.1.3" = self.by-version."parseurl"."1.1.3";
+      "send-0.6.0" = self.by-version."send"."0.6.0";
     };
     optionalDependencies = {
     };
@@ -37377,16 +42199,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."set-immediate-shim"."^1.0.0" =
-    self.by-version."set-immediate-shim"."1.0.1";
-  by-version."set-immediate-shim"."1.0.1" = self.buildNodePackage {
-    name = "set-immediate-shim-1.0.1";
+  by-spec."setimmediate"."1.0.1" =
+    self.by-version."setimmediate"."1.0.1";
+  by-version."setimmediate"."1.0.1" = self.buildNodePackage {
+    name = "setimmediate-1.0.1";
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz";
-      name = "set-immediate-shim-1.0.1.tgz";
-      sha1 = "4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61";
+      url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
+      name = "setimmediate-1.0.1.tgz";
+      sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
     };
     deps = {
     };
@@ -37396,16 +42218,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."setimmediate"."1.0.1" =
-    self.by-version."setimmediate"."1.0.1";
-  by-version."setimmediate"."1.0.1" = self.buildNodePackage {
-    name = "setimmediate-1.0.1";
-    version = "1.0.1";
+  by-spec."setprototypeof"."1.0.0" =
+    self.by-version."setprototypeof"."1.0.0";
+  by-version."setprototypeof"."1.0.0" = self.buildNodePackage {
+    name = "setprototypeof-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.1.tgz";
-      name = "setimmediate-1.0.1.tgz";
-      sha1 = "a9ca56ccbd6a4c3334855f060abcdece5c42ebb7";
+      url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.0.tgz";
+      name = "setprototypeof-1.0.0.tgz";
+      sha1 = "d5fafca01e1174d0079bd1bf881f09c8a339794c";
     };
     deps = {
     };
@@ -37422,7 +42244,7 @@
     version = "0.1.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sf/-/sf-0.1.7.tgz";
+      url = "https://registry.npmjs.org/sf/-/sf-0.1.7.tgz";
       name = "sf-0.1.7.tgz";
       sha1 = "806ed032d7225c7fb6394b0bdbfe1ea936fe6d74";
     };
@@ -37434,42 +42256,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sha"."~1.0.1" =
-    self.by-version."sha"."1.0.1";
-  by-version."sha"."1.0.1" = self.buildNodePackage {
-    name = "sha-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sha/-/sha-1.0.1.tgz";
-      name = "sha-1.0.1.tgz";
-      sha1 = "9b87a92113103e7406f7e7ef00006f3fa1975122";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-      "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sha"."~1.3.0" =
-    self.by-version."sha"."1.3.0";
-  by-version."sha"."1.3.0" = self.buildNodePackage {
-    name = "sha-1.3.0";
-    version = "1.3.0";
+  by-spec."sha"."~2.0.1" =
+    self.by-version."sha"."2.0.1";
+  by-version."sha"."2.0.1" = self.buildNodePackage {
+    name = "sha-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sha/-/sha-1.3.0.tgz";
-      name = "sha-1.3.0.tgz";
-      sha1 = "79f4787045d0ede7327d702c25c443460dbc6764";
+      url = "https://registry.npmjs.org/sha/-/sha-2.0.1.tgz";
+      name = "sha-2.0.1.tgz";
+      sha1 = "6030822fbd2c9823949f8f72ed6411ee5cf25aae";
     };
     deps = {
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     peerDependencies = [];
     os = [ ];
@@ -37482,7 +42284,7 @@
     version = "2.2.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
+      url = "https://registry.npmjs.org/sha.js/-/sha.js-2.2.6.tgz";
       name = "sha.js-2.2.6.tgz";
       sha1 = "17ddeddc5f722fb66501658895461977867315ba";
     };
@@ -37495,35 +42297,15 @@
     cpu = [ ];
   };
   by-spec."sha.js"."^2.3.6" =
-    self.by-version."sha.js"."2.4.0";
-  by-version."sha.js"."2.4.0" = self.buildNodePackage {
-    name = "sha.js-2.4.0";
-    version = "2.4.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sha.js/-/sha.js-2.4.0.tgz";
-      name = "sha.js-2.4.0.tgz";
-      sha1 = "ba7f1a4fe312a88b90dab80f228ab24ef31a7ac3";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sha.js"."~2.3.0" =
-    self.by-version."sha.js"."2.3.6";
-  by-version."sha.js"."2.3.6" = self.buildNodePackage {
-    name = "sha.js-2.3.6";
-    version = "2.3.6";
+    self.by-version."sha.js"."2.4.5";
+  by-version."sha.js"."2.4.5" = self.buildNodePackage {
+    name = "sha.js-2.4.5";
+    version = "2.4.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sha.js/-/sha.js-2.3.6.tgz";
-      name = "sha.js-2.3.6.tgz";
-      sha1 = "10585a3f7fd8f1da715adac6f9d54516da0670cc";
+      url = "https://registry.npmjs.org/sha.js/-/sha.js-2.4.5.tgz";
+      name = "sha.js-2.4.5.tgz";
+      sha1 = "27d171efcc82a118b99639ff581660242b506e7c";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -37534,6 +42316,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sha.js"."~2.4.4" =
+    self.by-version."sha.js"."2.4.5";
   by-spec."shallow-copy"."0.0.1" =
     self.by-version."shallow-copy"."0.0.1";
   by-version."shallow-copy"."0.0.1" = self.buildNodePackage {
@@ -37541,7 +42325,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
+      url = "https://registry.npmjs.org/shallow-copy/-/shallow-copy-0.0.1.tgz";
       name = "shallow-copy-0.0.1.tgz";
       sha1 = "415f42702d73d810330292cc5ee86eae1a11a170";
     };
@@ -37554,19 +42338,19 @@
     cpu = [ ];
   };
   by-spec."shasum"."^1.0.0" =
-    self.by-version."shasum"."1.0.1";
-  by-version."shasum"."1.0.1" = self.buildNodePackage {
-    name = "shasum-1.0.1";
-    version = "1.0.1";
+    self.by-version."shasum"."1.0.2";
+  by-version."shasum"."1.0.2" = self.buildNodePackage {
+    name = "shasum-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/shasum/-/shasum-1.0.1.tgz";
-      name = "shasum-1.0.1.tgz";
-      sha1 = "0e0e8506a3b9e6c371ad9173845d04ff9126587f";
+      url = "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz";
+      name = "shasum-1.0.2.tgz";
+      sha1 = "e7012310d8f417f4deb5712150e5678b87ae565f";
     };
     deps = {
       "json-stable-stringify-0.0.1" = self.by-version."json-stable-stringify"."0.0.1";
-      "sha.js-2.3.6" = self.by-version."sha.js"."2.3.6";
+      "sha.js-2.4.5" = self.by-version."sha.js"."2.4.5";
     };
     optionalDependencies = {
     };
@@ -37574,16 +42358,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."shell-quote"."^1.4.2" =
-    self.by-version."shell-quote"."1.4.3";
-  by-version."shell-quote"."1.4.3" = self.buildNodePackage {
-    name = "shell-quote-1.4.3";
-    version = "1.4.3";
+  by-spec."shell-quote"."^1.4.3" =
+    self.by-version."shell-quote"."1.5.0";
+  by-version."shell-quote"."1.5.0" = self.buildNodePackage {
+    name = "shell-quote-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz";
-      name = "shell-quote-1.4.3.tgz";
-      sha1 = "952c44e0b1ed9013ef53958179cc643e8777466b";
+      url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.5.0.tgz";
+      name = "shell-quote-1.5.0.tgz";
+      sha1 = "8c0a7e9f4713716c21e962a6ed5faf830dc77a88";
     };
     deps = {
       "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
@@ -37604,7 +42388,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
+      url = "https://registry.npmjs.org/shell-quote/-/shell-quote-0.0.1.tgz";
       name = "shell-quote-0.0.1.tgz";
       sha1 = "1a41196f3c0333c482323593d6886ecf153dd986";
     };
@@ -37617,15 +42401,15 @@
     cpu = [ ];
   };
   by-spec."shelljs"."*" =
-    self.by-version."shelljs"."0.4.0";
-  by-version."shelljs"."0.4.0" = self.buildNodePackage {
-    name = "shelljs-0.4.0";
-    version = "0.4.0";
+    self.by-version."shelljs"."0.6.0";
+  by-version."shelljs"."0.6.0" = self.buildNodePackage {
+    name = "shelljs-0.6.0";
+    version = "0.6.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/shelljs/-/shelljs-0.4.0.tgz";
-      name = "shelljs-0.4.0.tgz";
-      sha1 = "199fe9e2de379efd03d345ff14062525e4b31ec2";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.6.0.tgz";
+      name = "shelljs-0.6.0.tgz";
+      sha1 = "ce1ed837b4b0e55b5ec3dab84251ab9dbdc0c7ec";
     };
     deps = {
     };
@@ -37635,7 +42419,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "shelljs" = self.by-version."shelljs"."0.4.0";
+  "shelljs" = self.by-version."shelljs"."0.6.0";
   by-spec."shelljs"."0.3.0" =
     self.by-version."shelljs"."0.3.0";
   by-version."shelljs"."0.3.0" = self.buildNodePackage {
@@ -37643,7 +42427,7 @@
     version = "0.3.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.3.0.tgz";
       name = "shelljs-0.3.0.tgz";
       sha1 = "3596e6307a781544f591f37da618360f31db57b1";
     };
@@ -37657,21 +42441,42 @@
   };
   by-spec."shelljs"."0.3.x" =
     self.by-version."shelljs"."0.3.0";
+  by-spec."shelljs"."^0.5.1" =
+    self.by-version."shelljs"."0.5.3";
+  by-version."shelljs"."0.5.3" = self.buildNodePackage {
+    name = "shelljs-0.5.3";
+    version = "0.5.3";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz";
+      name = "shelljs-0.5.3.tgz";
+      sha1 = "c54982b996c76ef0c1e6b59fbdc5825f5b713113";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."shelljs"."^0.6.0" =
+    self.by-version."shelljs"."0.6.0";
   by-spec."should"."*" =
-    self.by-version."should"."6.0.1";
-  by-version."should"."6.0.1" = self.buildNodePackage {
-    name = "should-6.0.1";
-    version = "6.0.1";
+    self.by-version."should"."8.3.0";
+  by-version."should"."8.3.0" = self.buildNodePackage {
+    name = "should-8.3.0";
+    version = "8.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/should/-/should-6.0.1.tgz";
-      name = "should-6.0.1.tgz";
-      sha1 = "3d93d1be4a2576797a695bc9335d985b75ff751d";
+      url = "https://registry.npmjs.org/should/-/should-8.3.0.tgz";
+      name = "should-8.3.0.tgz";
+      sha1 = "e94f988fac575f1bbb03f3befdc61059ff0e2c4a";
     };
     deps = {
-      "should-equal-0.3.1" = self.by-version."should-equal"."0.3.1";
-      "should-format-0.0.7" = self.by-version."should-format"."0.0.7";
-      "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
+      "should-equal-0.7.2" = self.by-version."should-equal"."0.7.2";
+      "should-format-0.3.2" = self.by-version."should-format"."0.3.2";
+      "should-type-0.2.0" = self.by-version."should-type"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -37679,20 +42484,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "should" = self.by-version."should"."6.0.1";
-  by-spec."should-equal"."0.3.1" =
-    self.by-version."should-equal"."0.3.1";
-  by-version."should-equal"."0.3.1" = self.buildNodePackage {
-    name = "should-equal-0.3.1";
-    version = "0.3.1";
+  "should" = self.by-version."should"."8.3.0";
+  by-spec."should-equal"."0.7.2" =
+    self.by-version."should-equal"."0.7.2";
+  by-version."should-equal"."0.7.2" = self.buildNodePackage {
+    name = "should-equal-0.7.2";
+    version = "0.7.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/should-equal/-/should-equal-0.3.1.tgz";
-      name = "should-equal-0.3.1.tgz";
-      sha1 = "bd8ea97a6748e39fad476a3be6fd72ebc2e72bf0";
+      url = "https://registry.npmjs.org/should-equal/-/should-equal-0.7.2.tgz";
+      name = "should-equal-0.7.2.tgz";
+      sha1 = "a6a963dbf501b93ed34b7807ae7d7f042fc24ca8";
     };
     deps = {
-      "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
+      "should-type-0.2.0" = self.by-version."should-type"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -37700,19 +42505,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."should-format"."0.0.7" =
-    self.by-version."should-format"."0.0.7";
-  by-version."should-format"."0.0.7" = self.buildNodePackage {
-    name = "should-format-0.0.7";
-    version = "0.0.7";
+  by-spec."should-format"."0.3.2" =
+    self.by-version."should-format"."0.3.2";
+  by-version."should-format"."0.3.2" = self.buildNodePackage {
+    name = "should-format-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/should-format/-/should-format-0.0.7.tgz";
-      name = "should-format-0.0.7.tgz";
-      sha1 = "1e2ef86bd91da9c2e0412335b56ababd9a2fde12";
+      url = "https://registry.npmjs.org/should-format/-/should-format-0.3.2.tgz";
+      name = "should-format-0.3.2.tgz";
+      sha1 = "a59831e01a2ddee149911bc7148be5c80319e1ff";
     };
     deps = {
-      "should-type-0.0.4" = self.by-version."should-type"."0.0.4";
+      "should-type-0.2.0" = self.by-version."should-type"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -37720,16 +42525,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."should-type"."0.0.4" =
-    self.by-version."should-type"."0.0.4";
-  by-version."should-type"."0.0.4" = self.buildNodePackage {
-    name = "should-type-0.0.4";
-    version = "0.0.4";
+  by-spec."should-type"."0.2.0" =
+    self.by-version."should-type"."0.2.0";
+  by-version."should-type"."0.2.0" = self.buildNodePackage {
+    name = "should-type-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/should-type/-/should-type-0.0.4.tgz";
-      name = "should-type-0.0.4.tgz";
-      sha1 = "0132a05417a6126866426acf116f1ed5623a5cd0";
+      url = "https://registry.npmjs.org/should-type/-/should-type-0.2.0.tgz";
+      name = "should-type-0.2.0.tgz";
+      sha1 = "6707ef95529d989dcc098fe0753ab1f9136bb7f6";
     };
     deps = {
     };
@@ -37739,16 +42544,56 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sigmund"."~1.0.0" =
-    self.by-version."sigmund"."1.0.0";
-  by-version."sigmund"."1.0.0" = self.buildNodePackage {
-    name = "sigmund-1.0.0";
+  by-spec."shush"."^1.0.0" =
+    self.by-version."shush"."1.0.0";
+  by-version."shush"."1.0.0" = self.buildNodePackage {
+    name = "shush-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.0.tgz";
-      name = "sigmund-1.0.0.tgz";
-      sha1 = "66a2b3a749ae8b5fb89efd4fcc01dc94fbe02296";
+      url = "https://registry.npmjs.org/shush/-/shush-1.0.0.tgz";
+      name = "shush-1.0.0.tgz";
+      sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431";
+    };
+    deps = {
+      "strip-json-comments-0.1.3" = self.by-version."strip-json-comments"."0.1.3";
+      "caller-0.0.1" = self.by-version."caller"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sigmund"."~1.0.0" =
+    self.by-version."sigmund"."1.0.1";
+  by-version."sigmund"."1.0.1" = self.buildNodePackage {
+    name = "sigmund-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
+      name = "sigmund-1.0.1.tgz";
+      sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."signal-exit"."^2.1.2" =
+    self.by-version."signal-exit"."2.1.2";
+  by-version."signal-exit"."2.1.2" = self.buildNodePackage {
+    name = "signal-exit-2.1.2";
+    version = "2.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz";
+      name = "signal-exit-2.1.2.tgz";
+      sha1 = "375879b1f92ebc3b334480d038dc546a6d558564";
     };
     deps = {
     };
@@ -37765,7 +42610,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
+      url = "https://registry.npmjs.org/signals/-/signals-1.0.0.tgz";
       name = "signals-1.0.0.tgz";
       sha1 = "65f0c1599352b35372ecaae5a250e6107376ed69";
     };
@@ -37788,7 +42633,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz";
+      url = "https://registry.npmjs.org/simple-fmt/-/simple-fmt-0.1.0.tgz";
       name = "simple-fmt-0.1.0.tgz";
       sha1 = "191bf566a59e6530482cb25ab53b4a8dc85c3a6b";
     };
@@ -37801,18 +42646,20 @@
     cpu = [ ];
   };
   by-spec."simple-get"."^1.3.0" =
-    self.by-version."simple-get"."1.3.3";
-  by-version."simple-get"."1.3.3" = self.buildNodePackage {
-    name = "simple-get-1.3.3";
-    version = "1.3.3";
+    self.by-version."simple-get"."1.4.3";
+  by-version."simple-get"."1.4.3" = self.buildNodePackage {
+    name = "simple-get-1.4.3";
+    version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-get/-/simple-get-1.3.3.tgz";
-      name = "simple-get-1.3.3.tgz";
-      sha1 = "03e4102ff8372034dbc92c2630a78f8440dbf81a";
+      url = "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz";
+      name = "simple-get-1.4.3.tgz";
+      sha1 = "e9755eda407e96da40c5e5158c9ea37b33becbeb";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "unzip-response-1.0.0" = self.by-version."unzip-response"."1.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -37821,7 +42668,29 @@
     cpu = [ ];
   };
   by-spec."simple-get"."^1.3.1" =
-    self.by-version."simple-get"."1.3.3";
+    self.by-version."simple-get"."1.4.3";
+  by-spec."simple-get"."^2.0.0" =
+    self.by-version."simple-get"."2.0.0";
+  by-version."simple-get"."2.0.0" = self.buildNodePackage {
+    name = "simple-get-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/simple-get/-/simple-get-2.0.0.tgz";
+      name = "simple-get-2.0.0.tgz";
+      sha1 = "3aadc50fd5ebeb64a41cd520e38e8226c3cd952f";
+    };
+    deps = {
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "unzip-response-1.0.0" = self.by-version."unzip-response"."1.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."simple-is"."~0.2.0" =
     self.by-version."simple-is"."0.2.0";
   by-version."simple-is"."0.2.0" = self.buildNodePackage {
@@ -37829,7 +42698,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz";
+      url = "https://registry.npmjs.org/simple-is/-/simple-is-0.2.0.tgz";
       name = "simple-is-0.2.0.tgz";
       sha1 = "2abb75aade39deb5cc815ce10e6191164850baf0";
     };
@@ -37841,18 +42710,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."simple-lru-cache"."0.0.x" =
-    self.by-version."simple-lru-cache"."0.0.2";
-  by-version."simple-lru-cache"."0.0.2" = self.buildNodePackage {
-    name = "simple-lru-cache-0.0.2";
-    version = "0.0.2";
+  by-spec."simple-peer"."^6.0.0" =
+    self.by-version."simple-peer"."6.0.3";
+  by-version."simple-peer"."6.0.3" = self.buildNodePackage {
+    name = "simple-peer-6.0.3";
+    version = "6.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-lru-cache/-/simple-lru-cache-0.0.2.tgz";
-      name = "simple-lru-cache-0.0.2.tgz";
-      sha1 = "d59cc3a193c1a5d0320f84ee732f6e4713e511dd";
+      url = "https://registry.npmjs.org/simple-peer/-/simple-peer-6.0.3.tgz";
+      name = "simple-peer-6.0.3.tgz";
+      sha1 = "5055c2db9ff7b829afee01a330c7a8c8ae023310";
     };
     deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "get-browser-rtc-1.0.2" = self.by-version."get-browser-rtc"."1.0.2";
+      "hat-0.0.3" = self.by-version."hat"."0.0.3";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -37861,18 +42736,41 @@
     cpu = [ ];
   };
   by-spec."simple-sha1"."^2.0.0" =
-    self.by-version."simple-sha1"."2.0.7";
-  by-version."simple-sha1"."2.0.7" = self.buildNodePackage {
-    name = "simple-sha1-2.0.7";
-    version = "2.0.7";
+    self.by-version."simple-sha1"."2.0.8";
+  by-version."simple-sha1"."2.0.8" = self.buildNodePackage {
+    name = "simple-sha1-2.0.8";
+    version = "2.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.7.tgz";
-      name = "simple-sha1-2.0.7.tgz";
-      sha1 = "765ef3f6a9ef4bf9b734e973cbd63a7a82f887b6";
+      url = "https://registry.npmjs.org/simple-sha1/-/simple-sha1-2.0.8.tgz";
+      name = "simple-sha1-2.0.8.tgz";
+      sha1 = "dabb4b17b9f06a4bbf0174b3b4b3a2cdd8e2785f";
     };
     deps = {
-      "rusha-0.8.2" = self.by-version."rusha"."0.8.2";
+      "rusha-0.8.3" = self.by-version."rusha"."0.8.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."simple-websocket"."^4.0.0" =
+    self.by-version."simple-websocket"."4.0.3";
+  by-version."simple-websocket"."4.0.3" = self.buildNodePackage {
+    name = "simple-websocket-4.0.3";
+    version = "4.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/simple-websocket/-/simple-websocket-4.0.3.tgz";
+      name = "simple-websocket-4.0.3.tgz";
+      sha1 = "fb296329cd05bd76fc64d2b929b0c92007f857b8";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -37887,7 +42785,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
+      url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
       name = "simplediff-0.1.1.tgz";
       sha1 = "b0caeeb093223370033c6c3aa1130dc86c6a087c";
     };
@@ -37906,7 +42804,7 @@
     version = "0.3.35";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz";
+      url = "https://registry.npmjs.org/simplesmtp/-/simplesmtp-0.3.35.tgz";
       name = "simplesmtp-0.3.35.tgz";
       sha1 = "017b1eb8b26317ac36d2a2a8a932631880736a03";
     };
@@ -37931,7 +42829,7 @@
     version = "0.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz";
+      url = "https://registry.npmjs.org/single-line-log/-/single-line-log-0.4.1.tgz";
       name = "single-line-log-0.4.1.tgz";
       sha1 = "87a55649f749d783ec0dcd804e8140d9873c7cee";
     };
@@ -37944,20 +42842,22 @@
     cpu = [ ];
   };
   by-spec."sinon"."*" =
-    self.by-version."sinon"."1.14.1";
-  by-version."sinon"."1.14.1" = self.buildNodePackage {
-    name = "sinon-1.14.1";
-    version = "1.14.1";
+    self.by-version."sinon"."2.0.0-pre";
+  by-version."sinon"."2.0.0-pre" = self.buildNodePackage {
+    name = "sinon-2.0.0-pre";
+    version = "2.0.0-pre";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sinon/-/sinon-1.14.1.tgz";
-      name = "sinon-1.14.1.tgz";
-      sha1 = "d82797841918734507c94b7a73e3f560904578ad";
+      url = "https://registry.npmjs.org/sinon/-/sinon-2.0.0-pre.tgz";
+      name = "sinon-2.0.0-pre.tgz";
+      sha1 = "18293b00fb2f155c99e8e5b46e31f7eade32815d";
     };
     deps = {
       "formatio-1.1.1" = self.by-version."formatio"."1.1.1";
       "util-0.10.3" = self.by-version."util"."0.10.3";
-      "lolex-1.1.0" = self.by-version."lolex"."1.1.0";
+      "lolex-1.3.2" = self.by-version."lolex"."1.3.2";
+      "samsam-1.1.2" = self.by-version."samsam"."1.1.2";
+      "text-encoding-0.5.2" = self.by-version."text-encoding"."0.5.2";
     };
     optionalDependencies = {
     };
@@ -37965,50 +42865,52 @@
     os = [ ];
     cpu = [ ];
   };
-  "sinon" = self.by-version."sinon"."1.14.1";
+  "sinon" = self.by-version."sinon"."2.0.0-pre";
   by-spec."sinopia"."*" =
-    self.by-version."sinopia"."1.2.1";
-  by-version."sinopia"."1.2.1" = self.buildNodePackage {
-    name = "sinopia-1.2.1";
-    version = "1.2.1";
+    self.by-version."sinopia"."1.4.0";
+  by-version."sinopia"."1.4.0" = self.buildNodePackage {
+    name = "sinopia-1.4.0";
+    version = "1.4.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sinopia/-/sinopia-1.2.1.tgz";
-      name = "sinopia-1.2.1.tgz";
-      sha1 = "3469d1b72607e70d213d12caafeefef473bbb231";
+      url = "https://registry.npmjs.org/sinopia/-/sinopia-1.4.0.tgz";
+      name = "sinopia-1.4.0.tgz";
+      sha1 = "36bf5209356facbf6cef18fa32274d116043ed24";
     };
     deps = {
-      "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1";
+      "express-5.0.0-alpha.2" = self.by-version."express"."5.0.0-alpha.2";
       "express-json5-0.1.0" = self.by-version."express-json5"."0.1.0";
-      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
-      "compression-1.4.3" = self.by-version."compression"."1.4.3";
-      "commander-2.8.0" = self.by-version."commander"."2.8.0";
-      "js-yaml-3.2.7" = self.by-version."js-yaml"."3.2.7";
-      "cookies-0.5.0" = self.by-version."cookies"."0.5.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "body-parser-1.15.0" = self.by-version."body-parser"."1.15.0";
+      "compression-1.6.1" = self.by-version."compression"."1.6.1";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "js-yaml-3.5.5" = self.by-version."js-yaml"."3.5.5";
+      "cookies-0.6.1" = self.by-version."cookies"."0.6.1";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
       "es6-shim-0.21.1" = self.by-version."es6-shim"."0.21.1";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
       "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
-      "bunyan-1.3.5" = self.by-version."bunyan"."1.3.5";
+      "bunyan-1.8.0" = self.by-version."bunyan"."1.8.0";
       "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0";
-      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
-      "lunr-0.5.8" = self.by-version."lunr"."0.5.8";
-      "render-readme-1.3.0" = self.by-version."render-readme"."1.3.0";
-      "jju-1.2.0" = self.by-version."jju"."1.2.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "highlight.js-8.9.1" = self.by-version."highlight.js"."8.9.1";
+      "lunr-0.7.0" = self.by-version."lunr"."0.7.0";
+      "render-readme-1.3.1" = self.by-version."render-readme"."1.3.1";
+      "jju-1.3.0" = self.by-version."jju"."1.3.0";
+      "JSONStream-1.1.1" = self.by-version."JSONStream"."1.1.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "sinopia-htpasswd-0.4.5" = self.by-version."sinopia-htpasswd"."0.4.5";
-      "http-errors-1.3.1" = self.by-version."http-errors"."1.3.1";
+      "http-errors-1.4.0" = self.by-version."http-errors"."1.4.0";
+      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
     };
     optionalDependencies = {
-      "fs-ext-0.4.4" = self.by-version."fs-ext"."0.4.4";
-      "crypt3-0.1.8" = self.by-version."crypt3"."0.1.8";
+      "fs-ext-0.5.0" = self.by-version."fs-ext"."0.5.0";
+      "crypt3-0.2.0" = self.by-version."crypt3"."0.2.0";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  "sinopia" = self.by-version."sinopia"."1.2.1";
+  "sinopia" = self.by-version."sinopia"."1.4.0";
   by-spec."sinopia-htpasswd".">= 0.4.3" =
     self.by-version."sinopia-htpasswd"."0.4.5";
   by-version."sinopia-htpasswd"."0.4.5" = self.buildNodePackage {
@@ -38016,15 +42918,15 @@
     version = "0.4.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz";
+      url = "https://registry.npmjs.org/sinopia-htpasswd/-/sinopia-htpasswd-0.4.5.tgz";
       name = "sinopia-htpasswd-0.4.5.tgz";
       sha1 = "2af824ae20eccb8f902325b1a2c27dd6619805c9";
     };
     deps = {
     };
     optionalDependencies = {
-      "crypt3-0.1.8" = self.by-version."crypt3"."0.1.8";
-      "fs-ext-0.4.4" = self.by-version."fs-ext"."0.4.4";
+      "crypt3-0.2.0" = self.by-version."crypt3"."0.2.0";
+      "fs-ext-0.5.0" = self.by-version."fs-ext"."0.5.0";
     };
     peerDependencies = [];
     os = [ ];
@@ -38037,7 +42939,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
+      url = "https://registry.npmjs.org/slasp/-/slasp-0.0.4.tgz";
       name = "slasp-0.0.4.tgz";
       sha1 = "9adc26ee729a0f95095851a5489f87a5258d57a9";
     };
@@ -38053,18 +42955,18 @@
   by-spec."slasp"."0.0.4" =
     self.by-version."slasp"."0.0.4";
   by-spec."sleep"."*" =
-    self.by-version."sleep"."2.0.0";
-  by-version."sleep"."2.0.0" = self.buildNodePackage {
-    name = "sleep-2.0.0";
-    version = "2.0.0";
+    self.by-version."sleep"."3.0.1";
+  by-version."sleep"."3.0.1" = self.buildNodePackage {
+    name = "sleep-3.0.1";
+    version = "3.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sleep/-/sleep-2.0.0.tgz";
-      name = "sleep-2.0.0.tgz";
-      sha1 = "96d8ef97970ecad464b146ea5e86dd5d6ceb65bc";
+      url = "https://registry.npmjs.org/sleep/-/sleep-3.0.1.tgz";
+      name = "sleep-3.0.1.tgz";
+      sha1 = "be4d17c579360e07e04ed8172ba2b10a69054df3";
     };
     deps = {
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -38072,20 +42974,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "sleep" = self.by-version."sleep"."2.0.0";
-  by-spec."sleep"."^1.2.0" =
-    self.by-version."sleep"."1.2.0";
-  by-version."sleep"."1.2.0" = self.buildNodePackage {
-    name = "sleep-1.2.0";
-    version = "1.2.0";
+  "sleep" = self.by-version."sleep"."3.0.1";
+  by-spec."sleep".">=1.2.0" =
+    self.by-version."sleep"."3.0.1";
+  by-spec."slice-ansi"."0.0.4" =
+    self.by-version."slice-ansi"."0.0.4";
+  by-version."slice-ansi"."0.0.4" = self.buildNodePackage {
+    name = "slice-ansi-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sleep/-/sleep-1.2.0.tgz";
-      name = "sleep-1.2.0.tgz";
-      sha1 = "5d99de85b8c9819ed2f66251a04ec462da8c66dc";
+      url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz";
+      name = "slice-ansi-0.0.4.tgz";
+      sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35";
     };
     deps = {
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
     optionalDependencies = {
     };
@@ -38100,7 +43003,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
+      url = "https://registry.npmjs.org/sliced/-/sliced-0.0.3.tgz";
       name = "sliced-0.0.3.tgz";
       sha1 = "4f0bac2171eb17162c3ba6df81f5cf040f7c7e50";
     };
@@ -38119,7 +43022,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
+      url = "https://registry.npmjs.org/sliced/-/sliced-0.0.4.tgz";
       name = "sliced-0.0.4.tgz";
       sha1 = "34f89a6db1f31fa525f5a570f5bcf877cf0955ee";
     };
@@ -38138,7 +43041,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
+      url = "https://registry.npmjs.org/sliced/-/sliced-0.0.5.tgz";
       name = "sliced-0.0.5.tgz";
       sha1 = "5edc044ca4eb6f7816d50ba2fc63e25d8fe4707f";
     };
@@ -38150,14 +43053,33 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."slide"."*" =
+  by-spec."sliced"."1.0.1" =
+    self.by-version."sliced"."1.0.1";
+  by-version."sliced"."1.0.1" = self.buildNodePackage {
+    name = "sliced-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz";
+      name = "sliced-1.0.1.tgz";
+      sha1 = "0b3a662b5d04c3177b1926bea82b03f837a2ef41";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."slide"."^1.1.3" =
     self.by-version."slide"."1.1.6";
   by-version."slide"."1.1.6" = self.buildNodePackage {
     name = "slide-1.1.6";
     version = "1.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
+      url = "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz";
       name = "slide-1.1.6.tgz";
       sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707";
     };
@@ -38169,32 +43091,48 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."slide"."^1.1.3" =
-    self.by-version."slide"."1.1.6";
   by-spec."slide"."^1.1.5" =
     self.by-version."slide"."1.1.6";
   by-spec."slide"."~1.1.3" =
     self.by-version."slide"."1.1.6";
-  by-spec."slide"."~1.1.4" =
-    self.by-version."slide"."1.1.6";
   by-spec."slide"."~1.1.6" =
     self.by-version."slide"."1.1.6";
   by-spec."sloc"."*" =
-    self.by-version."sloc"."0.1.9";
-  by-version."sloc"."0.1.9" = self.buildNodePackage {
-    name = "sloc-0.1.9";
-    version = "0.1.9";
+    self.by-version."sloc"."0.1.10";
+  by-version."sloc"."0.1.10" = self.buildNodePackage {
+    name = "sloc-0.1.10";
+    version = "0.1.10";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz";
-      name = "sloc-0.1.9.tgz";
-      sha1 = "af12b4f713d079c65056435fe67ff11580770873";
+      url = "https://registry.npmjs.org/sloc/-/sloc-0.1.10.tgz";
+      name = "sloc-0.1.10.tgz";
+      sha1 = "f6bc04c3e93bec75a66668954ac39eea0e1d2f8a";
     };
     deps = {
-      "commander-2.5.1" = self.by-version."commander"."2.5.1";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
       "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1";
-      "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "readdirp-2.0.0" = self.by-version."readdirp"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "sloc" = self.by-version."sloc"."0.1.10";
+  by-spec."smart-buffer"."^1.0.1" =
+    self.by-version."smart-buffer"."1.0.3";
+  by-version."smart-buffer"."1.0.3" = self.buildNodePackage {
+    name = "smart-buffer-1.0.3";
+    version = "1.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.3.tgz";
+      name = "smart-buffer-1.0.3.tgz";
+      sha1 = "0968621e5e8b849da26a3ed707f044ae39edd8f5";
+    };
+    deps = {
     };
     optionalDependencies = {
     };
@@ -38202,28 +43140,27 @@
     os = [ ];
     cpu = [ ];
   };
-  "sloc" = self.by-version."sloc"."0.1.9";
   by-spec."smartdc"."*" =
-    self.by-version."smartdc"."7.3.1";
-  by-version."smartdc"."7.3.1" = self.buildNodePackage {
-    name = "smartdc-7.3.1";
-    version = "7.3.1";
+    self.by-version."smartdc"."8.1.0";
+  by-version."smartdc"."8.1.0" = self.buildNodePackage {
+    name = "smartdc-8.1.0";
+    version = "8.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/smartdc/-/smartdc-7.3.1.tgz";
-      name = "smartdc-7.3.1.tgz";
-      sha1 = "c0edc6bd75dc63393d0bbfb8554f0f1136f1689c";
+      url = "https://registry.npmjs.org/smartdc/-/smartdc-8.1.0.tgz";
+      name = "smartdc-8.1.0.tgz";
+      sha1 = "c8dba4694307a0070b84a67ced76da6de73f3585";
     };
     deps = {
       "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
       "lru-cache-2.2.0" = self.by-version."lru-cache"."2.2.0";
       "nopt-2.0.0" = self.by-version."nopt"."2.0.0";
-      "restify-2.8.5" = self.by-version."restify"."2.8.5";
-      "bunyan-1.3.4" = self.by-version."bunyan"."1.3.4";
+      "restify-4.0.3" = self.by-version."restify"."4.0.3";
+      "bunyan-1.5.1" = self.by-version."bunyan"."1.5.1";
       "clone-0.1.6" = self.by-version."clone"."0.1.6";
-      "smartdc-auth-1.0.3" = self.by-version."smartdc-auth"."1.0.3";
-      "cmdln-1.3.2" = self.by-version."cmdln"."1.3.2";
-      "dashdash-1.5.0" = self.by-version."dashdash"."1.5.0";
+      "smartdc-auth-2.3.1" = self.by-version."smartdc-auth"."2.3.1";
+      "cmdln-3.2.1" = self.by-version."cmdln"."3.2.1";
+      "dashdash-1.7.3" = self.by-version."dashdash"."1.7.3";
       "vasync-1.6.2" = self.by-version."vasync"."1.6.2";
     };
     optionalDependencies = {
@@ -38232,23 +43169,27 @@
     os = [ ];
     cpu = [ ];
   };
-  "smartdc" = self.by-version."smartdc"."7.3.1";
-  by-spec."smartdc-auth"."1.0.3" =
-    self.by-version."smartdc-auth"."1.0.3";
-  by-version."smartdc-auth"."1.0.3" = self.buildNodePackage {
-    name = "smartdc-auth-1.0.3";
-    version = "1.0.3";
-    bin = false;
+  "smartdc" = self.by-version."smartdc"."8.1.0";
+  by-spec."smartdc-auth"."2.3.1" =
+    self.by-version."smartdc-auth"."2.3.1";
+  by-version."smartdc-auth"."2.3.1" = self.buildNodePackage {
+    name = "smartdc-auth-2.3.1";
+    version = "2.3.1";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/smartdc-auth/-/smartdc-auth-1.0.3.tgz";
-      name = "smartdc-auth-1.0.3.tgz";
-      sha1 = "cc14286b2dc74d0a4e3abb6351e083b40b98c1ad";
+      url = "https://registry.npmjs.org/smartdc-auth/-/smartdc-auth-2.3.1.tgz";
+      name = "smartdc-auth-2.3.1.tgz";
+      sha1 = "96568a565e9d9feb03b93a50651eee14d23adf44";
     };
     deps = {
       "assert-plus-0.1.2" = self.by-version."assert-plus"."0.1.2";
+      "bunyan-1.5.1" = self.by-version."bunyan"."1.5.1";
       "clone-0.1.5" = self.by-version."clone"."0.1.5";
-      "ssh-agent-0.2.3" = self.by-version."ssh-agent"."0.2.3";
+      "dashdash-1.10.1" = self.by-version."dashdash"."1.10.1";
+      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
       "once-1.3.0" = self.by-version."once"."1.3.0";
+      "sshpk-agent-1.2.1" = self.by-version."sshpk-agent"."1.2.1";
+      "sshpk-1.7.1" = self.by-version."sshpk"."1.7.1";
       "vasync-1.4.3" = self.by-version."vasync"."1.4.3";
     };
     optionalDependencies = {
@@ -38257,16 +43198,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."smtp-connection"."^1.0.0" =
-    self.by-version."smtp-connection"."1.2.0";
-  by-version."smtp-connection"."1.2.0" = self.buildNodePackage {
-    name = "smtp-connection-1.2.0";
-    version = "1.2.0";
+  by-spec."smtp-connection"."^1.3.1" =
+    self.by-version."smtp-connection"."1.3.8";
+  by-version."smtp-connection"."1.3.8" = self.buildNodePackage {
+    name = "smtp-connection-1.3.8";
+    version = "1.3.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/smtp-connection/-/smtp-connection-1.2.0.tgz";
-      name = "smtp-connection-1.2.0.tgz";
-      sha1 = "04bf0bcfc4a7417a201595781d2439dddbf0cd19";
+      url = "https://registry.npmjs.org/smtp-connection/-/smtp-connection-1.3.8.tgz";
+      name = "smtp-connection-1.3.8.tgz";
+      sha1 = "55832c2160cfb3086e1dcd87fd1c19fa61b7f536";
     };
     deps = {
     };
@@ -38276,8 +43217,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."smtp-connection"."^1.2.0" =
-    self.by-version."smtp-connection"."1.2.0";
+  by-spec."smtp-connection"."^1.3.7" =
+    self.by-version."smtp-connection"."1.3.8";
+  by-spec."snapsvg"."~0.4.0" =
+    self.by-version."snapsvg"."0.4.0";
+  by-version."snapsvg"."0.4.0" = self.buildNodePackage {
+    name = "snapsvg-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/snapsvg/-/snapsvg-0.4.0.tgz";
+      name = "snapsvg-0.4.0.tgz";
+      sha1 = "e0767014167825957de7e125c29b0fa89796ea03";
+    };
+    deps = {
+      "eve-0.4.2" = self.by-version."eve"."0.4.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sntp"."0.1.x" =
     self.by-version."sntp"."0.1.4";
   by-version."sntp"."0.1.4" = self.buildNodePackage {
@@ -38285,7 +43246,7 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
+      url = "https://registry.npmjs.org/sntp/-/sntp-0.1.4.tgz";
       name = "sntp-0.1.4.tgz";
       sha1 = "5ef481b951a7b29affdf4afd7f26838fc1120f84";
     };
@@ -38305,7 +43266,7 @@
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
+      url = "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz";
       name = "sntp-0.2.4.tgz";
       sha1 = "fb885f18b0f3aad189f824862536bceeec750900";
     };
@@ -38325,12 +43286,12 @@
     version = "1.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
+      url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz";
       name = "sntp-1.0.9.tgz";
       sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
     };
     optionalDependencies = {
     };
@@ -38345,7 +43306,7 @@
     version = "0.9.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.14.tgz";
       name = "socket.io-0.9.14.tgz";
       sha1 = "81af80ebf3ee8f7f6e71b1495db91f8fa53ff667";
     };
@@ -38368,7 +43329,7 @@
     version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-1.0.6.tgz";
       name = "socket.io-1.0.6.tgz";
       sha1 = "b566532888dae3ac9058a12f294015ebdfa8084a";
     };
@@ -38386,24 +43347,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."socket.io"."~0.9.16" =
-    self.by-version."socket.io"."0.9.17";
-  by-version."socket.io"."0.9.17" = self.buildNodePackage {
-    name = "socket.io-0.9.17";
-    version = "0.9.17";
+  by-spec."socket.io"."^1.4.5" =
+    self.by-version."socket.io"."1.4.5";
+  by-version."socket.io"."1.4.5" = self.buildNodePackage {
+    name = "socket.io-1.4.5";
+    version = "1.4.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
-      name = "socket.io-0.9.17.tgz";
-      sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz";
+      name = "socket.io-1.4.5.tgz";
+      sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7";
     };
     deps = {
-      "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
-      "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
-      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+      "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8";
+      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
+      "socket.io-client-1.4.5" = self.by-version."socket.io-client"."1.4.5";
+      "socket.io-adapter-0.4.0" = self.by-version."socket.io-adapter"."0.4.0";
+      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
     };
     optionalDependencies = {
-      "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
     peerDependencies = [];
     os = [ ];
@@ -38411,31 +43374,29 @@
   };
   by-spec."socket.io"."~0.9.17" =
     self.by-version."socket.io"."0.9.17";
-  by-spec."socket.io"."~1.3.0" =
-    self.by-version."socket.io"."1.3.5";
-  by-version."socket.io"."1.3.5" = self.buildNodePackage {
-    name = "socket.io-1.3.5";
-    version = "1.3.5";
+  by-version."socket.io"."0.9.17" = self.buildNodePackage {
+    name = "socket.io-0.9.17";
+    version = "0.9.17";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.3.5.tgz";
-      name = "socket.io-1.3.5.tgz";
-      sha1 = "bfd609f37626889e94df9d3526db79a84255f1d8";
+      url = "https://registry.npmjs.org/socket.io/-/socket.io-0.9.17.tgz";
+      name = "socket.io-0.9.17.tgz";
+      sha1 = "ca389268fb2cd5df4b59218490a08c907581c9ec";
     };
     deps = {
-      "engine.io-1.5.1" = self.by-version."engine.io"."1.5.1";
-      "socket.io-parser-2.2.4" = self.by-version."socket.io-parser"."2.2.4";
-      "socket.io-client-1.3.5" = self.by-version."socket.io-client"."1.3.5";
-      "socket.io-adapter-0.3.1" = self.by-version."socket.io-adapter"."0.3.1";
-      "has-binary-data-0.1.3" = self.by-version."has-binary-data"."0.1.3";
-      "debug-2.1.0" = self.by-version."debug"."2.1.0";
+      "socket.io-client-0.9.16" = self.by-version."socket.io-client"."0.9.16";
+      "policyfile-0.0.4" = self.by-version."policyfile"."0.0.4";
+      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
     };
     optionalDependencies = {
+      "redis-0.7.3" = self.by-version."redis"."0.7.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
+  by-spec."socket.io"."~1.4.5" =
+    self.by-version."socket.io"."1.4.5";
   by-spec."socket.io-adapter"."0.2.0" =
     self.by-version."socket.io-adapter"."0.2.0";
   by-version."socket.io-adapter"."0.2.0" = self.buildNodePackage {
@@ -38443,7 +43404,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz";
+      url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.2.0.tgz";
       name = "socket.io-adapter-0.2.0.tgz";
       sha1 = "bd39329b8961371787e24f345b074ec9cf000e33";
     };
@@ -38457,21 +43418,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."socket.io-adapter"."0.3.1" =
-    self.by-version."socket.io-adapter"."0.3.1";
-  by-version."socket.io-adapter"."0.3.1" = self.buildNodePackage {
-    name = "socket.io-adapter-0.3.1";
-    version = "0.3.1";
+  by-spec."socket.io-adapter"."0.4.0" =
+    self.by-version."socket.io-adapter"."0.4.0";
+  by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage {
+    name = "socket.io-adapter-0.4.0";
+    version = "0.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.3.1.tgz";
-      name = "socket.io-adapter-0.3.1.tgz";
-      sha1 = "df81f970b4df6493902d93e519c7b72755c3a958";
+      url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
+      name = "socket.io-adapter-0.4.0.tgz";
+      sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
     };
     deps = {
-      "debug-1.0.2" = self.by-version."debug"."1.0.2";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2";
-      "object-keys-1.0.1" = self.by-version."object-keys"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -38486,7 +43446,7 @@
     version = "0.9.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
+      url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.11.tgz";
       name = "socket.io-client-0.9.11.tgz";
       sha1 = "94defc1b29e0d8a8fe958c1cf33300f68d8a19c7";
     };
@@ -38509,7 +43469,7 @@
     version = "0.9.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
+      url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-0.9.16.tgz";
       name = "socket.io-client-0.9.16.tgz";
       sha1 = "4da7515c5e773041d1b423970415bcc430f35fc6";
     };
@@ -38532,7 +43492,7 @@
     version = "1.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz";
+      url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.0.6.tgz";
       name = "socket.io-client-1.0.6.tgz";
       sha1 = "c86cb3e507ab2f96da4500bd34fcf46a1e9dfe5e";
     };
@@ -38554,28 +43514,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."socket.io-client"."1.3.5" =
-    self.by-version."socket.io-client"."1.3.5";
-  by-version."socket.io-client"."1.3.5" = self.buildNodePackage {
-    name = "socket.io-client-1.3.5";
-    version = "1.3.5";
+  by-spec."socket.io-client"."1.4.5" =
+    self.by-version."socket.io-client"."1.4.5";
+  by-version."socket.io-client"."1.4.5" = self.buildNodePackage {
+    name = "socket.io-client-1.4.5";
+    version = "1.4.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.3.5.tgz";
-      name = "socket.io-client-1.3.5.tgz";
-      sha1 = "9c3a6fbdbd99420c3633a16b4e2543e73f1303ea";
+      url = "https://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz";
+      name = "socket.io-client-1.4.5.tgz";
+      sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e";
     };
     deps = {
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
-      "engine.io-client-1.5.1" = self.by-version."engine.io-client"."1.5.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "engine.io-client-1.6.8" = self.by-version."engine.io-client"."1.6.8";
       "component-bind-1.0.0" = self.by-version."component-bind"."1.0.0";
-      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "component-emitter-1.2.0" = self.by-version."component-emitter"."1.2.0";
       "object-component-0.0.3" = self.by-version."object-component"."0.0.3";
-      "socket.io-parser-2.2.4" = self.by-version."socket.io-parser"."2.2.4";
-      "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6";
+      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
+      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
       "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
-      "parseuri-0.0.2" = self.by-version."parseuri"."0.0.2";
-      "to-array-0.1.3" = self.by-version."to-array"."0.1.3";
+      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
+      "to-array-0.1.4" = self.by-version."to-array"."0.1.4";
       "backo2-1.0.2" = self.by-version."backo2"."1.0.2";
     };
     optionalDependencies = {
@@ -38591,7 +43551,7 @@
     version = "2.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz";
+      url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.1.2.tgz";
       name = "socket.io-parser-2.1.2.tgz";
       sha1 = "876655b9edd555c5bdf7301cedf30a436c67b8b0";
     };
@@ -38614,7 +43574,7 @@
     version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz";
+      url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.0.tgz";
       name = "socket.io-parser-2.2.0.tgz";
       sha1 = "2609601f59e6a7fab436a53be3d333fbbfcbd30a";
     };
@@ -38637,7 +43597,7 @@
     version = "2.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
+      url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
       name = "socket.io-parser-2.2.2.tgz";
       sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
     };
@@ -38654,20 +43614,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."socket.io-parser"."2.2.4" =
-    self.by-version."socket.io-parser"."2.2.4";
-  by-version."socket.io-parser"."2.2.4" = self.buildNodePackage {
-    name = "socket.io-parser-2.2.4";
-    version = "2.2.4";
+  by-spec."socket.io-parser"."2.2.6" =
+    self.by-version."socket.io-parser"."2.2.6";
+  by-version."socket.io-parser"."2.2.6" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.6";
+    version = "2.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.4.tgz";
-      name = "socket.io-parser-2.2.4.tgz";
-      sha1 = "f9ce19bf1909608ceb15d97721e23bfdd1e7cf65";
+      url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
+      name = "socket.io-parser-2.2.6.tgz";
+      sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
     };
     deps = {
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
-      "json3-3.2.6" = self.by-version."json3"."3.2.6";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "json3-3.3.2" = self.by-version."json3"."3.3.2";
       "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
@@ -38679,19 +43639,19 @@
     cpu = [ ];
   };
   by-spec."sockjs"."*" =
-    self.by-version."sockjs"."0.3.15";
-  by-version."sockjs"."0.3.15" = self.buildNodePackage {
-    name = "sockjs-0.3.15";
-    version = "0.3.15";
+    self.by-version."sockjs"."0.3.16";
+  by-version."sockjs"."0.3.16" = self.buildNodePackage {
+    name = "sockjs-0.3.16";
+    version = "0.3.16";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sockjs/-/sockjs-0.3.15.tgz";
-      name = "sockjs-0.3.15.tgz";
-      sha1 = "e19b577e59e0fbdb21a0ae4f46203ca24cad8db8";
+      url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.16.tgz";
+      name = "sockjs-0.3.16.tgz";
+      sha1 = "2bf5b90eb681b5216dfb98b8cf3e01a33ca271bc";
     };
     deps = {
-      "faye-websocket-0.9.4" = self.by-version."faye-websocket"."0.9.4";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
+      "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
+      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
     };
     optionalDependencies = {
     };
@@ -38699,22 +43659,83 @@
     os = [ ];
     cpu = [ ];
   };
-  "sockjs" = self.by-version."sockjs"."0.3.15";
-  by-spec."socks-proxy-agent"."0" =
-    self.by-version."socks-proxy-agent"."0.1.2";
-  by-version."socks-proxy-agent"."0.1.2" = self.buildNodePackage {
-    name = "socks-proxy-agent-0.1.2";
-    version = "0.1.2";
+  "sockjs" = self.by-version."sockjs"."0.3.16";
+  by-spec."socks"."~1.1.5" =
+    self.by-version."socks"."1.1.8";
+  by-version."socks"."1.1.8" = self.buildNodePackage {
+    name = "socks-1.1.8";
+    version = "1.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-0.1.2.tgz";
-      name = "socks-proxy-agent-0.1.2.tgz";
-      sha1 = "e8981486360896f692f600ba52a974c8b23dc121";
+      url = "https://registry.npmjs.org/socks/-/socks-1.1.8.tgz";
+      name = "socks-1.1.8.tgz";
+      sha1 = "dd731a23ea237680293b09a07b085a271b558d4b";
     };
     deps = {
-      "agent-base-1.0.1" = self.by-version."agent-base"."1.0.1";
-      "rainbowsocks-0.1.2" = self.by-version."rainbowsocks"."0.1.2";
+      "ip-0.3.3" = self.by-version."ip"."0.3.3";
+      "smart-buffer-1.0.3" = self.by-version."smart-buffer"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socks-proxy-agent"."1" =
+    self.by-version."socks-proxy-agent"."1.0.2";
+  by-version."socks-proxy-agent"."1.0.2" = self.buildNodePackage {
+    name = "socks-proxy-agent-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-1.0.2.tgz";
+      name = "socks-proxy-agent-1.0.2.tgz";
+      sha1 = "67e06b447fe5637417fde5733cbfdfec9ffe117f";
+    };
+    deps = {
+      "agent-base-1.0.2" = self.by-version."agent-base"."1.0.2";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
+      "socks-1.1.8" = self.by-version."socks"."1.1.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sort-keys"."^1.0.0" =
+    self.by-version."sort-keys"."1.1.1";
+  by-version."sort-keys"."1.1.1" = self.buildNodePackage {
+    name = "sort-keys-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.1.tgz";
+      name = "sort-keys-1.1.1.tgz";
+      sha1 = "a791c26071df66c356bf5dcad9cfb57a7b2f826e";
+    };
+    deps = {
+      "is-plain-obj-1.1.0" = self.by-version."is-plain-obj"."1.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sort-keys-length"."^1.0.0" =
+    self.by-version."sort-keys-length"."1.0.1";
+  by-version."sort-keys-length"."1.0.1" = self.buildNodePackage {
+    name = "sort-keys-length-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz";
+      name = "sort-keys-length-1.0.1.tgz";
+      sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
+    };
+    deps = {
+      "sort-keys-1.1.1" = self.by-version."sort-keys"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -38729,7 +43750,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
+      url = "https://registry.npmjs.org/sorted-object/-/sorted-object-1.0.0.tgz";
       name = "sorted-object-1.0.0.tgz";
       sha1 = "5d1f4f9c1fb2cd48965967304e212eb44cfb6d05";
     };
@@ -38741,6 +43762,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sorted-object"."~2.0.0" =
+    self.by-version."sorted-object"."2.0.0";
+  by-version."sorted-object"."2.0.0" = self.buildNodePackage {
+    name = "sorted-object-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sorted-object/-/sorted-object-2.0.0.tgz";
+      name = "sorted-object-2.0.0.tgz";
+      sha1 = "1cfea981609047d8043807a490a9d99b317faf7f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."sorted-union-stream"."^1.0.1" =
     self.by-version."sorted-union-stream"."1.0.2";
   by-version."sorted-union-stream"."1.0.2" = self.buildNodePackage {
@@ -38748,7 +43788,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz";
+      url = "https://registry.npmjs.org/sorted-union-stream/-/sorted-union-stream-1.0.2.tgz";
       name = "sorted-union-stream-1.0.2.tgz";
       sha1 = "558e7f57a5bf6baf6501baf2ae2c9076c4502006";
     };
@@ -38762,15 +43802,15 @@
     cpu = [ ];
   };
   by-spec."source-list-map"."~0.1.0" =
-    self.by-version."source-list-map"."0.1.5";
-  by-version."source-list-map"."0.1.5" = self.buildNodePackage {
-    name = "source-list-map-0.1.5";
-    version = "0.1.5";
+    self.by-version."source-list-map"."0.1.6";
+  by-version."source-list-map"."0.1.6" = self.buildNodePackage {
+    name = "source-list-map-0.1.6";
+    version = "0.1.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-list-map/-/source-list-map-0.1.5.tgz";
-      name = "source-list-map-0.1.5.tgz";
-      sha1 = "ddf32f5173faeca3010561dd7e9a682c027f459e";
+      url = "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.6.tgz";
+      name = "source-list-map-0.1.6.tgz";
+      sha1 = "e1e6f94f0b40c4d28dcf8f5b8766e0e45636877f";
     };
     deps = {
     };
@@ -38781,18 +43821,17 @@
     cpu = [ ];
   };
   by-spec."source-map"."*" =
-    self.by-version."source-map"."0.4.2";
-  by-version."source-map"."0.4.2" = self.buildNodePackage {
-    name = "source-map-0.4.2";
-    version = "0.4.2";
+    self.by-version."source-map"."0.5.3";
+  by-version."source-map"."0.5.3" = self.buildNodePackage {
+    name = "source-map-0.5.3";
+    version = "0.5.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz";
-      name = "source-map-0.4.2.tgz";
-      sha1 = "dc9f3114394ab7c1f9782972f3d11820fff06f1f";
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz";
+      name = "source-map-0.5.3.tgz";
+      sha1 = "82674b85a71b0be76c3e7416d15e9f5252eb3be0";
     };
     deps = {
-      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -38800,7 +43839,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "source-map" = self.by-version."source-map"."0.4.2";
+  "source-map" = self.by-version."source-map"."0.5.3";
   by-spec."source-map"."0.1.31" =
     self.by-version."source-map"."0.1.31";
   by-version."source-map"."0.1.31" = self.buildNodePackage {
@@ -38808,12 +43847,32 @@
     version = "0.1.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
       name = "source-map-0.1.31.tgz";
       sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
     };
     deps = {
-      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."0.1.32" =
+    self.by-version."source-map"."0.1.32";
+  by-version."source-map"."0.1.32" = self.buildNodePackage {
+    name = "source-map-0.1.32";
+    version = "0.1.32";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz";
+      name = "source-map-0.1.32.tgz";
+      sha1 = "c8b6c167797ba4740a8ea33252162ff08591b266";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -38828,12 +43887,12 @@
     version = "0.1.34";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz";
       name = "source-map-0.1.34.tgz";
       sha1 = "a7cfe89aec7b1682c3b198d0acfb47d7d090566b";
     };
     deps = {
-      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -38848,12 +43907,12 @@
     version = "0.1.43";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz";
       name = "source-map-0.1.43.tgz";
       sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346";
     };
     deps = {
-      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -38861,25 +43920,75 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."source-map"."0.4.x" =
-    self.by-version."source-map"."0.4.2";
-  by-spec."source-map".">= 0.1.2" =
+  by-spec."source-map"."0.4.2" =
     self.by-version."source-map"."0.4.2";
+  by-version."source-map"."0.4.2" = self.buildNodePackage {
+    name = "source-map-0.4.2";
+    version = "0.4.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.4.2.tgz";
+      name = "source-map-0.4.2.tgz";
+      sha1 = "dc9f3114394ab7c1f9782972f3d11820fff06f1f";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."source-map"."0.4.x" =
+    self.by-version."source-map"."0.4.4";
+  by-version."source-map"."0.4.4" = self.buildNodePackage {
+    name = "source-map-0.4.4";
+    version = "0.4.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
+      name = "source-map-0.4.4.tgz";
+      sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b";
+    };
+    deps = {
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."source-map"."^0.1.40" =
     self.by-version."source-map"."0.1.43";
-  by-spec."source-map"."^0.2.0" =
+  by-spec."source-map"."^0.4.2" =
+    self.by-version."source-map"."0.4.4";
+  by-spec."source-map"."^0.4.4" =
+    self.by-version."source-map"."0.4.4";
+  by-spec."source-map"."^0.5.1" =
+    self.by-version."source-map"."0.5.3";
+  by-spec."source-map"."^0.5.3" =
+    self.by-version."source-map"."0.5.3";
+  by-spec."source-map"."~0.1.31" =
+    self.by-version."source-map"."0.1.43";
+  by-spec."source-map"."~0.1.33" =
+    self.by-version."source-map"."0.1.43";
+  by-spec."source-map"."~0.1.7" =
+    self.by-version."source-map"."0.1.43";
+  by-spec."source-map"."~0.2.0" =
     self.by-version."source-map"."0.2.0";
   by-version."source-map"."0.2.0" = self.buildNodePackage {
     name = "source-map-0.2.0";
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz";
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz";
       name = "source-map-0.2.0.tgz";
       sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d";
     };
     deps = {
-      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -38887,16 +43996,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."source-map"."^0.4.2" =
-    self.by-version."source-map"."0.4.2";
-  by-spec."source-map"."~0.1.31" =
-    self.by-version."source-map"."0.1.43";
-  by-spec."source-map"."~0.1.33" =
-    self.by-version."source-map"."0.1.43";
-  by-spec."source-map"."~0.1.40" =
-    self.by-version."source-map"."0.1.43";
-  by-spec."source-map"."~0.1.7" =
-    self.by-version."source-map"."0.1.43";
   by-spec."source-map"."~0.3.0" =
     self.by-version."source-map"."0.3.0";
   by-version."source-map"."0.3.0" = self.buildNodePackage {
@@ -38904,12 +44003,12 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
+      url = "https://registry.npmjs.org/source-map/-/source-map-0.3.0.tgz";
       name = "source-map-0.3.0.tgz";
       sha1 = "8586fb9a5a005e5b501e21cd18b6f21b457ad1f9";
     };
     deps = {
-      "amdefine-0.1.0" = self.by-version."amdefine"."0.1.0";
+      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -38917,18 +44016,169 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."source-map"."~0.4.0" =
+    self.by-version."source-map"."0.4.4";
   by-spec."source-map"."~0.4.1" =
-    self.by-version."source-map"."0.4.2";
+    self.by-version."source-map"."0.4.4";
+  by-spec."source-map"."~0.4.2" =
+    self.by-version."source-map"."0.4.4";
+  by-spec."source-map"."~0.5.0" =
+    self.by-version."source-map"."0.5.3";
+  by-spec."source-map"."~0.5.1" =
+    self.by-version."source-map"."0.5.3";
+  by-spec."source-map"."~0.5.3" =
+    self.by-version."source-map"."0.5.3";
+  by-spec."source-map-support"."0.3.2" =
+    self.by-version."source-map-support"."0.3.2";
+  by-version."source-map-support"."0.3.2" = self.buildNodePackage {
+    name = "source-map-support-0.3.2";
+    version = "0.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.3.2.tgz";
+      name = "source-map-support-0.3.2.tgz";
+      sha1 = "737d5c901e0b78fdb53aca713d24f23ccbb10be1";
+    };
+    deps = {
+      "source-map-0.1.32" = self.by-version."source-map"."0.1.32";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sparkles"."^1.0.0" =
+    self.by-version."sparkles"."1.0.0";
+  by-version."sparkles"."1.0.0" = self.buildNodePackage {
+    name = "sparkles-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz";
+      name = "sparkles-1.0.0.tgz";
+      sha1 = "1acbbfb592436d10bbe8f785b7cc6f82815012c3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."spawn-please"."^0.1.0" =
+    self.by-version."spawn-please"."0.1.0";
+  by-version."spawn-please"."0.1.0" = self.buildNodePackage {
+    name = "spawn-please-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/spawn-please/-/spawn-please-0.1.0.tgz";
+      name = "spawn-please-0.1.0.tgz";
+      sha1 = "d4113ad6582445d076d1099997f0b250d7ddbaac";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."spdx-correct"."~1.0.0" =
+    self.by-version."spdx-correct"."1.0.2";
+  by-version."spdx-correct"."1.0.2" = self.buildNodePackage {
+    name = "spdx-correct-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz";
+      name = "spdx-correct-1.0.2.tgz";
+      sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
+    };
+    deps = {
+      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."spdx-exceptions"."^1.0.4" =
+    self.by-version."spdx-exceptions"."1.0.4";
+  by-version."spdx-exceptions"."1.0.4" = self.buildNodePackage {
+    name = "spdx-exceptions-1.0.4";
+    version = "1.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz";
+      name = "spdx-exceptions-1.0.4.tgz";
+      sha1 = "220b84239119ae9045a892db81a83f4ce16f80fd";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."spdx-expression-parse"."~1.0.0" =
+    self.by-version."spdx-expression-parse"."1.0.2";
+  by-version."spdx-expression-parse"."1.0.2" = self.buildNodePackage {
+    name = "spdx-expression-parse-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz";
+      name = "spdx-expression-parse-1.0.2.tgz";
+      sha1 = "d52b14b5e9670771440af225bcb563122ac452f6";
+    };
+    deps = {
+      "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4";
+      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."spdx-license-ids"."^1.0.0" =
+    self.by-version."spdx-license-ids"."1.2.0";
+  by-version."spdx-license-ids"."1.2.0" = self.buildNodePackage {
+    name = "spdx-license-ids-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz";
+      name = "spdx-license-ids-1.2.0.tgz";
+      sha1 = "b549dd0f63dcb745a17e2ea3a07402e0e332d1e2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."spdx-license-ids"."^1.0.2" =
+    self.by-version."spdx-license-ids"."1.2.0";
+  by-spec."spdx-license-ids"."~1.2.0" =
+    self.by-version."spdx-license-ids"."1.2.0";
   by-spec."spdy"."^1.26.5" =
-    self.by-version."spdy"."1.32.0";
-  by-version."spdy"."1.32.0" = self.buildNodePackage {
-    name = "spdy-1.32.0";
-    version = "1.32.0";
+    self.by-version."spdy"."1.32.5";
+  by-version."spdy"."1.32.5" = self.buildNodePackage {
+    name = "spdy-1.32.5";
+    version = "1.32.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/spdy/-/spdy-1.32.0.tgz";
-      name = "spdy-1.32.0.tgz";
-      sha1 = "3cd51f08734d441ef7122456638945a19ef18d3f";
+      url = "https://registry.npmjs.org/spdy/-/spdy-1.32.5.tgz";
+      name = "spdy-1.32.5.tgz";
+      sha1 = "70eff23cde4e97d52a445f65afddcc5695eb5edb";
     };
     deps = {
     };
@@ -38945,7 +44195,7 @@
     version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz";
+      url = "https://registry.npmjs.org/speedometer/-/speedometer-0.1.4.tgz";
       name = "speedometer-0.1.4.tgz";
       sha1 = "9876dbd2a169d3115402d48e6ea6329c8816a50d";
     };
@@ -38957,6 +44207,45 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."spin.js"."^2.0.1" =
+    self.by-version."spin.js"."2.3.2";
+  by-version."spin.js"."2.3.2" = self.buildNodePackage {
+    name = "spin.js-2.3.2";
+    version = "2.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/spin.js/-/spin.js-2.3.2.tgz";
+      name = "spin.js-2.3.2.tgz";
+      sha1 = "6caa56d520673450fd5cfbc6971e6d0772c37a1a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."split"."0.3" =
+    self.by-version."split"."0.3.3";
+  by-version."split"."0.3.3" = self.buildNodePackage {
+    name = "split-0.3.3";
+    version = "0.3.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/split/-/split-0.3.3.tgz";
+      name = "split-0.3.3.tgz";
+      sha1 = "cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f";
+    };
+    deps = {
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."split2"."^0.2.1" =
     self.by-version."split2"."0.2.1";
   by-version."split2"."0.2.1" = self.buildNodePackage {
@@ -38964,7 +44253,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/split2/-/split2-0.2.1.tgz";
+      url = "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz";
       name = "split2-0.2.1.tgz";
       sha1 = "02ddac9adc03ec0bb78c1282ec079ca6e85ae900";
     };
@@ -38984,7 +44273,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.1.tgz";
+      url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.1.tgz";
       name = "sprintf-0.1.1.tgz";
       sha1 = "e8925fc9894e1aa6899e9091c7f2a12130b70de5";
     };
@@ -38996,14 +44285,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sprintf".">=0.1.1" =
+  by-spec."sprintf"."0.1.5" =
     self.by-version."sprintf"."0.1.5";
   by-version."sprintf"."0.1.5" = self.buildNodePackage {
     name = "sprintf-0.1.5";
     version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
+      url = "https://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz";
       name = "sprintf-0.1.5.tgz";
       sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf";
     };
@@ -39015,20 +44304,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."sprintf"."~0.1.3" =
+  by-spec."sprintf".">=0.1.1" =
     self.by-version."sprintf"."0.1.5";
   by-spec."sprintf"."~0.1.4" =
     self.by-version."sprintf"."0.1.5";
   by-spec."sprintf-js"."~1.0.2" =
-    self.by-version."sprintf-js"."1.0.2";
-  by-version."sprintf-js"."1.0.2" = self.buildNodePackage {
-    name = "sprintf-js-1.0.2";
-    version = "1.0.2";
+    self.by-version."sprintf-js"."1.0.3";
+  by-version."sprintf-js"."1.0.3" = self.buildNodePackage {
+    name = "sprintf-js-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.2.tgz";
-      name = "sprintf-js-1.0.2.tgz";
-      sha1 = "11e4d84ff32144e35b0bf3a66f8587f38d8f9978";
+      url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
+      name = "sprintf-js-1.0.3.tgz";
+      sha1 = "04e6926f662895354f3dd015203633b857297e2c";
     };
     deps = {
     };
@@ -39038,20 +44327,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."srt2vtt"."^1.2.0" =
-    self.by-version."srt2vtt"."1.2.0";
-  by-version."srt2vtt"."1.2.0" = self.buildNodePackage {
-    name = "srt2vtt-1.2.0";
-    version = "1.2.0";
+  by-spec."srt2vtt"."^1.3.1" =
+    self.by-version."srt2vtt"."1.3.1";
+  by-version."srt2vtt"."1.3.1" = self.buildNodePackage {
+    name = "srt2vtt-1.3.1";
+    version = "1.3.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/srt2vtt/-/srt2vtt-1.2.0.tgz";
-      name = "srt2vtt-1.2.0.tgz";
-      sha1 = "f17bbae66d3a0368b1e3d8e1e547e7aad794e70a";
+      url = "https://registry.npmjs.org/srt2vtt/-/srt2vtt-1.3.1.tgz";
+      name = "srt2vtt-1.3.1.tgz";
+      sha1 = "c2b5047c2c297b693d3bab518765e4b7c24d8173";
     };
     deps = {
-      "codepage-1.3.8" = self.by-version."codepage"."1.3.8";
-      "utfx-1.0.0" = self.by-version."utfx"."1.0.0";
+      "codepage-1.4.0" = self.by-version."codepage"."1.4.0";
+      "utfx-1.0.1" = self.by-version."utfx"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -39059,20 +44348,75 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ssh-agent"."0.2.3" =
-    self.by-version."ssh-agent"."0.2.3";
-  by-version."ssh-agent"."0.2.3" = self.buildNodePackage {
-    name = "ssh-agent-0.2.3";
-    version = "0.2.3";
+  by-spec."sshpk"."1.7.1" =
+    self.by-version."sshpk"."1.7.1";
+  by-version."sshpk"."1.7.1" = self.buildNodePackage {
+    name = "sshpk-1.7.1";
+    version = "1.7.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ssh-agent/-/ssh-agent-0.2.3.tgz";
-      name = "ssh-agent-0.2.3.tgz";
-      sha1 = "74ac9ffad6b7eca3c1674686b5613824243f86a9";
+      url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.1.tgz";
+      name = "sshpk-1.7.1.tgz";
+      sha1 = "565e386c42a77e6062fbd14c0472ff21cd53398c";
     };
     deps = {
-      "ctype-0.5.4" = self.by-version."ctype"."0.5.4";
-      "posix-getopt-1.1.0" = self.by-version."posix-getopt"."1.1.0";
+      "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
+      "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0";
+    };
+    optionalDependencies = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+      "tweetnacl-0.14.3" = self.by-version."tweetnacl"."0.14.3";
+      "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2";
+      "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sshpk".">=1.7.0 <1.8" =
+    self.by-version."sshpk"."1.7.4";
+  by-version."sshpk"."1.7.4" = self.buildNodePackage {
+    name = "sshpk-1.7.4";
+    version = "1.7.4";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz";
+      name = "sshpk-1.7.4.tgz";
+      sha1 = "ad7b47defca61c8415d964243b62b0ce60fbca38";
+    };
+    deps = {
+      "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
+      "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0";
+    };
+    optionalDependencies = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+      "tweetnacl-0.14.3" = self.by-version."tweetnacl"."0.14.3";
+      "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2";
+      "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1";
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."sshpk"."^1.7.0" =
+    self.by-version."sshpk"."1.7.4";
+  by-spec."sshpk-agent"."1.2.1" =
+    self.by-version."sshpk-agent"."1.2.1";
+  by-version."sshpk-agent"."1.2.1" = self.buildNodePackage {
+    name = "sshpk-agent-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/sshpk-agent/-/sshpk-agent-1.2.1.tgz";
+      name = "sshpk-agent-1.2.1.tgz";
+      sha1 = "62e143c18530fda103320b3403e8ad42786d9718";
+    };
+    deps = {
+      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -39087,13 +44431,13 @@
     version = "1.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.10.tgz";
+      url = "https://registry.npmjs.org/ssl-root-cas/-/ssl-root-cas-1.1.10.tgz";
       name = "ssl-root-cas-1.1.10.tgz";
       sha1 = "00b238105568f60b1bb98621e52f94efb7b7acad";
     };
     deps = {
-      "es6-promise-2.1.0" = self.by-version."es6-promise"."2.1.0";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "es6-promise-2.3.0" = self.by-version."es6-promise"."2.3.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -39108,7 +44452,7 @@
     version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stable/-/stable-0.1.5.tgz";
+      url = "https://registry.npmjs.org/stable/-/stable-0.1.5.tgz";
       name = "stable-0.1.5.tgz";
       sha1 = "08232f60c732e9890784b5bed0734f8b32a887b9";
     };
@@ -39127,7 +44471,7 @@
     version = "0.0.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
+      url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.7.tgz";
       name = "stack-trace-0.0.7.tgz";
       sha1 = "c72e089744fc3659f508cdce3621af5634ec0fff";
     };
@@ -39146,7 +44490,7 @@
     version = "0.0.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
+      url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz";
       name = "stack-trace-0.0.9.tgz";
       sha1 = "a8f6eaeca90674c333e7c43953f275b451510695";
     };
@@ -39158,26 +44502,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."stackdriver-statsd-backend"."*" =
-    self.by-version."stackdriver-statsd-backend"."0.2.3";
-  by-version."stackdriver-statsd-backend"."0.2.3" = self.buildNodePackage {
-    name = "stackdriver-statsd-backend-0.2.3";
-    version = "0.2.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/stackdriver-statsd-backend/-/stackdriver-statsd-backend-0.2.3.tgz";
-      name = "stackdriver-statsd-backend-0.2.3.tgz";
-      sha1 = "6ffead71e5655d4d787c39da8d1c9eaaa59c91d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "stackdriver-statsd-backend" = self.by-version."stackdriver-statsd-backend"."0.2.3";
   by-spec."static-favicon"."1.0.2" =
     self.by-version."static-favicon"."1.0.2";
   by-version."static-favicon"."1.0.2" = self.buildNodePackage {
@@ -39185,7 +44509,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
+      url = "https://registry.npmjs.org/static-favicon/-/static-favicon-1.0.2.tgz";
       name = "static-favicon-1.0.2.tgz";
       sha1 = "7c15920dda2bf33f414b0e60aebbd65cdd2a1d2f";
     };
@@ -39197,69 +44521,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."statsd"."https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e" =
-    self.by-version."statsd"."0.7.2";
-  by-version."statsd"."0.7.2" = self.buildNodePackage {
-    name = "statsd-0.7.2";
-    version = "0.7.2";
-    bin = true;
-    src = fetchurl {
-      url = "https://github.com/etsy/statsd/tarball/23b331895cc4b22b64a19fd0e7b6def6f6f30d9e";
-      name = "statsd-0.7.2.tgz";
-      sha256 = "ddfbd70fb5f54281cd1cb4b339ebdb16bde8a657c4876d477396275f8cf05670";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-      "node-syslog-1.1.7" = self.by-version."node-syslog"."1.1.7";
-      "hashring-3.1.0" = self.by-version."hashring"."3.1.0";
-      "winser-0.1.6" = self.by-version."winser"."0.1.6";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "statsd" = self.by-version."statsd"."0.7.2";
-  by-spec."statsd-influxdb-backend"."*" =
-    self.by-version."statsd-influxdb-backend"."0.5.0";
-  by-version."statsd-influxdb-backend"."0.5.0" = self.buildNodePackage {
-    name = "statsd-influxdb-backend-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/statsd-influxdb-backend/-/statsd-influxdb-backend-0.5.0.tgz";
-      name = "statsd-influxdb-backend-0.5.0.tgz";
-      sha1 = "7e62819f5c2e0438e9225b231478d776f1c2e461";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "statsd-influxdb-backend" = self.by-version."statsd-influxdb-backend"."0.5.0";
-  by-spec."statsd-librato-backend"."*" =
-    self.by-version."statsd-librato-backend"."0.1.6";
-  by-version."statsd-librato-backend"."0.1.6" = self.buildNodePackage {
-    name = "statsd-librato-backend-0.1.6";
-    version = "0.1.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/statsd-librato-backend/-/statsd-librato-backend-0.1.6.tgz";
-      name = "statsd-librato-backend-0.1.6.tgz";
-      sha1 = "04467674959cf61986fe16896f9a62f38d0e12f3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "statsd-librato-backend" = self.by-version."statsd-librato-backend"."0.1.6";
   by-spec."statuses"."1" =
     self.by-version."statuses"."1.2.1";
   by-version."statuses"."1.2.1" = self.buildNodePackage {
@@ -39267,7 +44528,7 @@
     version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
+      url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz";
       name = "statuses-1.2.1.tgz";
       sha1 = "dded45cc18256d51ed40aec142489d5c61026d28";
     };
@@ -39279,8 +44540,12 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."statuses".">= 1.2.1 < 2" =
+    self.by-version."statuses"."1.2.1";
   by-spec."statuses"."^1.2.1" =
     self.by-version."statuses"."1.2.1";
+  by-spec."statuses"."~1.2.1" =
+    self.by-version."statuses"."1.2.1";
   by-spec."stream-browserify"."^1.0.0" =
     self.by-version."stream-browserify"."1.0.0";
   by-version."stream-browserify"."1.0.0" = self.buildNodePackage {
@@ -39288,7 +44553,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
+      url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz";
       name = "stream-browserify-1.0.0.tgz";
       sha1 = "bf9b4abfb42b274d751479e44e0ff2656b6f1193";
     };
@@ -39302,20 +44567,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."stream-browserify"."~0.1.0" =
-    self.by-version."stream-browserify"."0.1.3";
-  by-version."stream-browserify"."0.1.3" = self.buildNodePackage {
-    name = "stream-browserify-0.1.3";
-    version = "0.1.3";
+  by-spec."stream-browserify"."^2.0.0" =
+    self.by-version."stream-browserify"."2.0.1";
+  by-version."stream-browserify"."2.0.1" = self.buildNodePackage {
+    name = "stream-browserify-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-browserify/-/stream-browserify-0.1.3.tgz";
-      name = "stream-browserify-0.1.3.tgz";
-      sha1 = "95cf1b369772e27adaf46352265152689c6c4be9";
+      url = "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz";
+      name = "stream-browserify-2.0.1.tgz";
+      sha1 = "66266ee5f9bdb9940a4e4514cafb43bb71e5c9db";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "process-0.5.2" = self.by-version."process"."0.5.2";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
     };
     optionalDependencies = {
     };
@@ -39323,6 +44588,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-browserify"."^2.0.1" =
+    self.by-version."stream-browserify"."2.0.1";
   by-spec."stream-collector"."^1.0.1" =
     self.by-version."stream-collector"."1.0.1";
   by-version."stream-collector"."1.0.1" = self.buildNodePackage {
@@ -39330,12 +44597,12 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz";
+      url = "https://registry.npmjs.org/stream-collector/-/stream-collector-1.0.1.tgz";
       name = "stream-collector-1.0.1.tgz";
       sha1 = "4d4e55f171356121b2c5f6559f944705ab28db15";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -39343,14 +44610,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."stream-combiner"."~0.0.2" =
+  by-spec."stream-combiner"."~0.0.4" =
     self.by-version."stream-combiner"."0.0.4";
   by-version."stream-combiner"."0.0.4" = self.buildNodePackage {
     name = "stream-combiner-0.0.4";
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
+      url = "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz";
       name = "stream-combiner-0.0.4.tgz";
       sha1 = "4d5e433c185261dde623ca3f44c586bcf5c4ad14";
     };
@@ -39363,6 +44630,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-combiner2"."^1.1.1" =
+    self.by-version."stream-combiner2"."1.1.1";
+  by-version."stream-combiner2"."1.1.1" = self.buildNodePackage {
+    name = "stream-combiner2-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz";
+      name = "stream-combiner2-1.1.1.tgz";
+      sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe";
+    };
+    deps = {
+      "duplexer2-0.1.4" = self.by-version."duplexer2"."0.1.4";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stream-combiner2"."~1.0.0" =
     self.by-version."stream-combiner2"."1.0.2";
   by-version."stream-combiner2"."1.0.2" = self.buildNodePackage {
@@ -39370,7 +44658,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
+      url = "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.0.2.tgz";
       name = "stream-combiner2-1.0.2.tgz";
       sha1 = "ba72a6b50cbfabfa950fc8bc87604bd01eb60671";
     };
@@ -39384,14 +44672,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."stream-consume"."~0.1.0" =
+  by-spec."stream-consume"."^0.1.0" =
     self.by-version."stream-consume"."0.1.0";
   by-version."stream-consume"."0.1.0" = self.buildNodePackage {
     name = "stream-consume-0.1.0";
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz";
+      url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.0.tgz";
       name = "stream-consume-0.1.0.tgz";
       sha1 = "a41ead1a6d6081ceb79f65b061901b6d8f3d1d0f";
     };
@@ -39403,6 +44691,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-consume"."~0.1.0" =
+    self.by-version."stream-consume"."0.1.0";
   by-spec."stream-counter"."^1.0.0" =
     self.by-version."stream-counter"."1.0.0";
   by-version."stream-counter"."1.0.0" = self.buildNodePackage {
@@ -39410,7 +44700,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
+      url = "https://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz";
       name = "stream-counter-1.0.0.tgz";
       sha1 = "91cf2569ce4dc5061febcd7acb26394a5a114751";
     };
@@ -39429,7 +44719,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
+      url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz";
       name = "stream-counter-0.2.0.tgz";
       sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de";
     };
@@ -39449,7 +44739,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-events/-/stream-events-1.0.1.tgz";
+      url = "https://registry.npmjs.org/stream-events/-/stream-events-1.0.1.tgz";
       name = "stream-events-1.0.1.tgz";
       sha1 = "4fe7b2bbfcc53e6af31087e8c540483f412ce8c6";
     };
@@ -39462,16 +44752,39 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-http"."^2.0.0" =
+    self.by-version."stream-http"."2.2.1";
+  by-version."stream-http"."2.2.1" = self.buildNodePackage {
+    name = "stream-http-2.2.1";
+    version = "2.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stream-http/-/stream-http-2.2.1.tgz";
+      name = "stream-http-2.2.1.tgz";
+      sha1 = "c0d29dd8546341c66a4880a78272cd4661a956a6";
+    };
+    deps = {
+      "builtin-status-codes-2.0.0" = self.by-version."builtin-status-codes"."2.0.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "to-arraybuffer-1.0.1" = self.by-version."to-arraybuffer"."1.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stream-splicer"."^1.1.0" =
-    self.by-version."stream-splicer"."1.3.1";
-  by-version."stream-splicer"."1.3.1" = self.buildNodePackage {
-    name = "stream-splicer-1.3.1";
-    version = "1.3.1";
+    self.by-version."stream-splicer"."1.3.2";
+  by-version."stream-splicer"."1.3.2" = self.buildNodePackage {
+    name = "stream-splicer-1.3.2";
+    version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.1.tgz";
-      name = "stream-splicer-1.3.1.tgz";
-      sha1 = "87737a08777aa00d6a27d92562e7bc88070c081d";
+      url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-1.3.2.tgz";
+      name = "stream-splicer-1.3.2.tgz";
+      sha1 = "3c0441be15b9bf4e226275e6dc83964745546661";
     };
     deps = {
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -39487,6 +44800,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."stream-splicer"."^2.0.0" =
+    self.by-version."stream-splicer"."2.0.0";
+  by-version."stream-splicer"."2.0.0" = self.buildNodePackage {
+    name = "stream-splicer-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz";
+      name = "stream-splicer-2.0.0.tgz";
+      sha1 = "1b63be438a133e4b671cc1935197600175910d83";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."stream-to-array"."~1.0.0" =
     self.by-version."stream-to-array"."1.0.0";
   by-version."stream-to-array"."1.0.0" = self.buildNodePackage {
@@ -39494,7 +44828,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-to-array/-/stream-to-array-1.0.0.tgz";
+      url = "https://registry.npmjs.org/stream-to-array/-/stream-to-array-1.0.0.tgz";
       name = "stream-to-array-1.0.0.tgz";
       sha1 = "94166bb29f3ea24f082d2f8cd3ebb2cc0d6eca2c";
     };
@@ -39513,7 +44847,7 @@
     version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz";
+      url = "https://registry.npmjs.org/stream-transcoder/-/stream-transcoder-0.0.5.tgz";
       name = "stream-transcoder-0.0.5.tgz";
       sha1 = "68261be4efb48840239b5791af23ee3b8bd79808";
     };
@@ -39525,16 +44859,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."stream-transform"."*" =
-    self.by-version."stream-transform"."0.0.7";
-  by-version."stream-transform"."0.0.7" = self.buildNodePackage {
-    name = "stream-transform-0.0.7";
-    version = "0.0.7";
+  by-spec."stream-transform"."^0.1.0" =
+    self.by-version."stream-transform"."0.1.1";
+  by-version."stream-transform"."0.1.1" = self.buildNodePackage {
+    name = "stream-transform-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stream-transform/-/stream-transform-0.0.7.tgz";
-      name = "stream-transform-0.0.7.tgz";
-      sha1 = "f7f1dd009de4db7eb772f116b33341003d461907";
+      url = "https://registry.npmjs.org/stream-transform/-/stream-transform-0.1.1.tgz";
+      name = "stream-transform-0.1.1.tgz";
+      sha1 = "0a54a2b81eea88da55a50df2441cb63edc101c71";
     };
     deps = {
     };
@@ -39551,7 +44885,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
+      url = "https://registry.npmjs.org/streamsearch/-/streamsearch-0.1.2.tgz";
       name = "streamsearch-0.1.2.tgz";
       sha1 = "808b9d0e56fc273d809ba57338e929919a1a9f1a";
     };
@@ -39570,7 +44904,7 @@
     version = "1.6.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string/-/string-1.6.1.tgz";
+      url = "https://registry.npmjs.org/string/-/string-1.6.1.tgz";
       name = "string-1.6.1.tgz";
       sha1 = "eabe0956da7a8291c6de7486f7b35e58d031cd55";
     };
@@ -39583,18 +44917,18 @@
     cpu = [ ];
   };
   by-spec."string-length"."^1.0.0" =
-    self.by-version."string-length"."1.0.0";
-  by-version."string-length"."1.0.0" = self.buildNodePackage {
-    name = "string-length-1.0.0";
-    version = "1.0.0";
+    self.by-version."string-length"."1.0.1";
+  by-version."string-length"."1.0.1" = self.buildNodePackage {
+    name = "string-length-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz";
-      name = "string-length-1.0.0.tgz";
-      sha1 = "5f0564b174feb299595a763da71513266370d3a9";
+      url = "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz";
+      name = "string-length-1.0.1.tgz";
+      sha1 = "56970fb1c38558e9e70b728bf3de269ac45adfac";
     };
     deps = {
-      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -39603,18 +44937,17 @@
     cpu = [ ];
   };
   by-spec."string-template"."~0.2.0" =
-    self.by-version."string-template"."0.2.0";
-  by-version."string-template"."0.2.0" = self.buildNodePackage {
-    name = "string-template-0.2.0";
-    version = "0.2.0";
+    self.by-version."string-template"."0.2.1";
+  by-version."string-template"."0.2.1" = self.buildNodePackage {
+    name = "string-template-0.2.1";
+    version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string-template/-/string-template-0.2.0.tgz";
-      name = "string-template-0.2.0.tgz";
-      sha1 = "7fd73e64316666552808af4508956987addc5f5b";
+      url = "https://registry.npmjs.org/string-template/-/string-template-0.2.1.tgz";
+      name = "string-template-0.2.1.tgz";
+      sha1 = "42932e598a352d01fc22ec3367d9d84eec6c9add";
     };
     deps = {
-      "js-string-escape-1.0.0" = self.by-version."js-string-escape"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -39622,20 +44955,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."string2compact"."^1.1.1" =
-    self.by-version."string2compact"."1.2.1";
-  by-version."string2compact"."1.2.1" = self.buildNodePackage {
-    name = "string2compact-1.2.1";
-    version = "1.2.1";
+  by-spec."string-width"."^1.0.1" =
+    self.by-version."string-width"."1.0.1";
+  by-version."string-width"."1.0.1" = self.buildNodePackage {
+    name = "string-width-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz";
-      name = "string2compact-1.2.1.tgz";
-      sha1 = "a560cd737415e380f2518b83c38bb97093e981af";
+      url = "https://registry.npmjs.org/string-width/-/string-width-1.0.1.tgz";
+      name = "string-width-1.0.1.tgz";
+      sha1 = "c92129b6f1d7f52acf9af424a26e3864a05ceb0a";
     };
     deps = {
-      "addr-to-ip-port-1.4.1" = self.by-version."addr-to-ip-port"."1.4.1";
-      "ipaddr.js-0.1.9" = self.by-version."ipaddr.js"."0.1.9";
+      "code-point-at-1.0.0" = self.by-version."code-point-at"."1.0.0";
+      "is-fullwidth-code-point-1.0.0" = self.by-version."is-fullwidth-code-point"."1.0.0";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
     };
     optionalDependencies = {
     };
@@ -39643,16 +44977,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."string_decoder"."~0.0.0" =
-    self.by-version."string_decoder"."0.0.1";
-  by-version."string_decoder"."0.0.1" = self.buildNodePackage {
-    name = "string_decoder-0.0.1";
-    version = "0.0.1";
+  by-spec."string.prototype.startswith"."^0.2.0" =
+    self.by-version."string.prototype.startswith"."0.2.0";
+  by-version."string.prototype.startswith"."0.2.0" = self.buildNodePackage {
+    name = "string.prototype.startswith-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.0.1.tgz";
-      name = "string_decoder-0.0.1.tgz";
-      sha1 = "f5472d0a8d1650ec823752d24e6fd627b39bf141";
+      url = "https://registry.npmjs.org/string.prototype.startswith/-/string.prototype.startswith-0.2.0.tgz";
+      name = "string.prototype.startswith-0.2.0.tgz";
+      sha1 = "da68982e353a4e9ac4a43b450a2045d1c445ae7b";
     };
     deps = {
     };
@@ -39662,18 +44996,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."string_decoder"."~0.10.0" =
-    self.by-version."string_decoder"."0.10.31";
-  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
-    name = "string_decoder-0.10.31";
-    version = "0.10.31";
+  by-spec."string2compact"."^1.1.1" =
+    self.by-version."string2compact"."1.2.2";
+  by-version."string2compact"."1.2.2" = self.buildNodePackage {
+    name = "string2compact-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
-      name = "string_decoder-0.10.31.tgz";
-      sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
+      url = "https://registry.npmjs.org/string2compact/-/string2compact-1.2.2.tgz";
+      name = "string2compact-1.2.2.tgz";
+      sha1 = "420b3a9ee1c46854919b4a2aeac65c43fa50597b";
     };
     deps = {
+      "addr-to-ip-port-1.4.2" = self.by-version."addr-to-ip-port"."1.4.2";
+      "ipaddr.js-1.1.0" = self.by-version."ipaddr.js"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -39681,20 +45017,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."string_decoder"."~0.10.25" =
-    self.by-version."string_decoder"."0.10.31";
-  by-spec."string_decoder"."~0.10.x" =
+  by-spec."string_decoder"."~0.10.0" =
     self.by-version."string_decoder"."0.10.31";
-  by-spec."stringify-object"."^1.0.0" =
-    self.by-version."stringify-object"."1.0.1";
-  by-version."stringify-object"."1.0.1" = self.buildNodePackage {
-    name = "stringify-object-1.0.1";
-    version = "1.0.1";
+  by-version."string_decoder"."0.10.31" = self.buildNodePackage {
+    name = "string_decoder-0.10.31";
+    version = "0.10.31";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stringify-object/-/stringify-object-1.0.1.tgz";
-      name = "stringify-object-1.0.1.tgz";
-      sha1 = "86d35e7dbfbce9aa45637d7ecdd7847e159db8a2";
+      url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz";
+      name = "string_decoder-0.10.31.tgz";
+      sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94";
     };
     deps = {
     };
@@ -39704,6 +45036,10 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."string_decoder"."~0.10.25" =
+    self.by-version."string_decoder"."0.10.31";
+  by-spec."string_decoder"."~0.10.x" =
+    self.by-version."string_decoder"."0.10.31";
   by-spec."stringmap"."~0.2.2" =
     self.by-version."stringmap"."0.2.2";
   by-version."stringmap"."0.2.2" = self.buildNodePackage {
@@ -39711,7 +45047,7 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz";
+      url = "https://registry.npmjs.org/stringmap/-/stringmap-0.2.2.tgz";
       name = "stringmap-0.2.2.tgz";
       sha1 = "556c137b258f942b8776f5b2ef582aa069d7d1b1";
     };
@@ -39730,7 +45066,7 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz";
+      url = "https://registry.npmjs.org/stringset/-/stringset-0.2.1.tgz";
       name = "stringset-0.2.1.tgz";
       sha1 = "ef259c4e349344377fcd1c913dd2e848c9c042b5";
     };
@@ -39743,15 +45079,15 @@
     cpu = [ ];
   };
   by-spec."stringstream"."~0.0.4" =
-    self.by-version."stringstream"."0.0.4";
-  by-version."stringstream"."0.0.4" = self.buildNodePackage {
-    name = "stringstream-0.0.4";
-    version = "0.0.4";
+    self.by-version."stringstream"."0.0.5";
+  by-version."stringstream"."0.0.5" = self.buildNodePackage {
+    name = "stringstream-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
-      name = "stringstream-0.0.4.tgz";
-      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+      url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+      name = "stringstream-0.0.5.tgz";
+      sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
     };
     deps = {
     };
@@ -39768,7 +45104,7 @@
     version = "0.3.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
+      url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz";
       name = "strip-ansi-0.3.0.tgz";
       sha1 = "25f48ea22ca79187f3174a4db8759347bb126220";
     };
@@ -39781,14 +45117,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."strip-ansi"."^2.0.0" =
+  by-spec."strip-ansi"."^2.0.1" =
     self.by-version."strip-ansi"."2.0.1";
   by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
     name = "strip-ansi-2.0.1";
     version = "2.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
+      url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
       name = "strip-ansi-2.0.1.tgz";
       sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
     };
@@ -39801,10 +45137,30 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."strip-ansi"."^2.0.1" =
-    self.by-version."strip-ansi"."2.0.1";
-  by-spec."strip-ansi"."~2.0.1" =
-    self.by-version."strip-ansi"."2.0.1";
+  by-spec."strip-ansi"."^3.0.0" =
+    self.by-version."strip-ansi"."3.0.1";
+  by-version."strip-ansi"."3.0.1" = self.buildNodePackage {
+    name = "strip-ansi-3.0.1";
+    version = "3.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
+      name = "strip-ansi-3.0.1.tgz";
+      sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
+    };
+    deps = {
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-ansi"."^3.0.1" =
+    self.by-version."strip-ansi"."3.0.1";
+  by-spec."strip-ansi"."~3.0.1" =
+    self.by-version."strip-ansi"."3.0.1";
   by-spec."strip-bom"."^1.0.0" =
     self.by-version."strip-bom"."1.0.0";
   by-version."strip-bom"."1.0.0" = self.buildNodePackage {
@@ -39812,13 +45168,53 @@
     version = "1.0.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz";
+      url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz";
       name = "strip-bom-1.0.0.tgz";
       sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794";
     };
     deps = {
       "first-chunk-stream-1.0.0" = self.by-version."first-chunk-stream"."1.0.0";
-      "is-utf8-0.2.0" = self.by-version."is-utf8"."0.2.0";
+      "is-utf8-0.2.1" = self.by-version."is-utf8"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-bom"."^2.0.0" =
+    self.by-version."strip-bom"."2.0.0";
+  by-version."strip-bom"."2.0.0" = self.buildNodePackage {
+    name = "strip-bom-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
+      name = "strip-bom-2.0.0.tgz";
+      sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
+    };
+    deps = {
+      "is-utf8-0.2.1" = self.by-version."is-utf8"."0.2.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."strip-indent"."^1.0.1" =
+    self.by-version."strip-indent"."1.0.1";
+  by-version."strip-indent"."1.0.1" = self.buildNodePackage {
+    name = "strip-indent-1.0.1";
+    version = "1.0.1";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz";
+      name = "strip-indent-1.0.1.tgz";
+      sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
+    };
+    deps = {
+      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -39833,7 +45229,7 @@
     version = "0.1.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
+      url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-0.1.3.tgz";
       name = "strip-json-comments-0.1.3.tgz";
       sha1 = "164c64e370a8a3cc00c9e01b539e569823f0ee54";
     };
@@ -39846,15 +45242,15 @@
     cpu = [ ];
   };
   by-spec."strip-json-comments"."1.0.x" =
-    self.by-version."strip-json-comments"."1.0.2";
-  by-version."strip-json-comments"."1.0.2" = self.buildNodePackage {
-    name = "strip-json-comments-1.0.2";
-    version = "1.0.2";
+    self.by-version."strip-json-comments"."1.0.4";
+  by-version."strip-json-comments"."1.0.4" = self.buildNodePackage {
+    name = "strip-json-comments-1.0.4";
+    version = "1.0.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.2.tgz";
-      name = "strip-json-comments-1.0.2.tgz";
-      sha1 = "5a48ab96023dbac1b7b8d0ffabf6f63f1677be9f";
+      url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
+      name = "strip-json-comments-1.0.4.tgz";
+      sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
     };
     deps = {
     };
@@ -39864,19 +45260,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."strong-data-uri"."~0.1.0" =
-    self.by-version."strong-data-uri"."0.1.1";
-  by-version."strong-data-uri"."0.1.1" = self.buildNodePackage {
-    name = "strong-data-uri-0.1.1";
-    version = "0.1.1";
+  by-spec."strip-json-comments"."~0.1.1" =
+    self.by-version."strip-json-comments"."0.1.3";
+  by-spec."strip-json-comments"."~1.0.1" =
+    self.by-version."strip-json-comments"."1.0.4";
+  by-spec."strip-json-comments"."~1.0.4" =
+    self.by-version."strip-json-comments"."1.0.4";
+  by-spec."strong-data-uri"."^1.0.0" =
+    self.by-version."strong-data-uri"."1.0.3";
+  by-version."strong-data-uri"."1.0.3" = self.buildNodePackage {
+    name = "strong-data-uri-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strong-data-uri/-/strong-data-uri-0.1.1.tgz";
-      name = "strong-data-uri-0.1.1.tgz";
-      sha1 = "8660241807461d1d2dd247c70563f2f33e66c8ab";
+      url = "https://registry.npmjs.org/strong-data-uri/-/strong-data-uri-1.0.3.tgz";
+      name = "strong-data-uri-1.0.3.tgz";
+      sha1 = "0edbd175e7900ae28c939dea9d4d31c03afbd6b6";
     };
     deps = {
-      "truncate-1.0.4" = self.by-version."truncate"."1.0.4";
+      "truncate-1.0.5" = self.by-version."truncate"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -39891,7 +45293,7 @@
     version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stubs/-/stubs-1.1.2.tgz";
+      url = "https://registry.npmjs.org/stubs/-/stubs-1.1.2.tgz";
       name = "stubs-1.1.2.tgz";
       sha1 = "945a08975016318762f8f7060731002ab2a0960c";
     };
@@ -39904,20 +45306,20 @@
     cpu = [ ];
   };
   by-spec."stylus"."*" =
-    self.by-version."stylus"."0.50.0";
-  by-version."stylus"."0.50.0" = self.buildNodePackage {
-    name = "stylus-0.50.0";
-    version = "0.50.0";
+    self.by-version."stylus"."0.54.2";
+  by-version."stylus"."0.54.2" = self.buildNodePackage {
+    name = "stylus-0.54.2";
+    version = "0.54.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stylus/-/stylus-0.50.0.tgz";
-      name = "stylus-0.50.0.tgz";
-      sha1 = "2391f0df1ce1dde55a5a8df26b6906a9425ced05";
+      url = "https://registry.npmjs.org/stylus/-/stylus-0.54.2.tgz";
+      name = "stylus-0.54.2.tgz";
+      sha1 = "77f0da93cde5a55ab917496850b7ab5214474a0b";
     };
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
@@ -39928,31 +45330,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "stylus" = self.by-version."stylus"."0.50.0";
-  by-spec."stylus"."0.42.2" =
-    self.by-version."stylus"."0.42.2";
-  by-version."stylus"."0.42.2" = self.buildNodePackage {
-    name = "stylus-0.42.2";
-    version = "0.42.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/stylus/-/stylus-0.42.2.tgz";
-      name = "stylus-0.42.2.tgz";
-      sha1 = "bed29107803129bed1983efc4c7e33f4fd34fee7";
-    };
-    deps = {
-      "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "sax-0.5.8" = self.by-version."sax"."0.5.8";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  "stylus" = self.by-version."stylus"."0.54.2";
   by-spec."stylus"."0.49.x" =
     self.by-version."stylus"."0.49.3";
   by-version."stylus"."0.49.3" = self.buildNodePackage {
@@ -39960,14 +45338,14 @@
     version = "0.49.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
+      url = "https://registry.npmjs.org/stylus/-/stylus-0.49.3.tgz";
       name = "stylus-0.49.3.tgz";
       sha1 = "1fbdabe479ed460872c71a6252a67f95040ba511";
     };
     deps = {
       "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "sax-0.5.8" = self.by-version."sax"."0.5.8";
       "glob-3.2.11" = self.by-version."glob"."3.2.11";
       "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
@@ -39978,19 +45356,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."subarg"."0.0.1" =
-    self.by-version."subarg"."0.0.1";
-  by-version."subarg"."0.0.1" = self.buildNodePackage {
-    name = "subarg-0.0.1";
-    version = "0.0.1";
-    bin = false;
+  by-spec."stylus"."~0.52.4" =
+    self.by-version."stylus"."0.52.4";
+  by-version."stylus"."0.52.4" = self.buildNodePackage {
+    name = "stylus-0.52.4";
+    version = "0.52.4";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/subarg/-/subarg-0.0.1.tgz";
-      name = "subarg-0.0.1.tgz";
-      sha1 = "3d56b07dacfbc45bbb63f7672b43b63e46368e3a";
+      url = "https://registry.npmjs.org/stylus/-/stylus-0.52.4.tgz";
+      name = "stylus-0.52.4.tgz";
+      sha1 = "6551b5f0bfdcf29ee7f0fe0a59b7eb6ff26d2539";
     };
     deps = {
-      "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
+      "css-parse-1.7.0" = self.by-version."css-parse"."1.7.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "sax-0.5.8" = self.by-version."sax"."0.5.8";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
     };
     optionalDependencies = {
     };
@@ -40005,12 +45388,12 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz";
+      url = "https://registry.npmjs.org/subarg/-/subarg-1.0.0.tgz";
       name = "subarg-1.0.0.tgz";
       sha1 = "f62cf17581e996b48fc965699f54c06ae268b8d2";
     };
     deps = {
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -40025,7 +45408,7 @@
     version = "1.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sugar/-/sugar-1.4.1.tgz";
+      url = "https://registry.npmjs.org/sugar/-/sugar-1.4.1.tgz";
       name = "sugar-1.4.1.tgz";
       sha1 = "1310d4dedc699e5a173183718541b0d7844a7598";
     };
@@ -40044,7 +45427,7 @@
     version = "0.21.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
+      url = "https://registry.npmjs.org/superagent/-/superagent-0.21.0.tgz";
       name = "superagent-0.21.0.tgz";
       sha1 = "fb15027984751ee7152200e6cd21cd6e19a5de87";
     };
@@ -40055,7 +45438,7 @@
       "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
       "methods-1.0.1" = self.by-version."methods"."1.0.1";
       "cookiejar-2.0.1" = self.by-version."cookiejar"."2.0.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "reduce-component-1.0.1" = self.by-version."reduce-component"."1.0.1";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
       "form-data-0.1.3" = self.by-version."form-data"."0.1.3";
@@ -40071,20 +45454,18 @@
     self.by-version."superagent"."0.21.0";
   by-spec."superagent"."~0.21.0" =
     self.by-version."superagent"."0.21.0";
-  by-spec."supertest"."*" =
-    self.by-version."supertest"."0.15.0";
-  by-version."supertest"."0.15.0" = self.buildNodePackage {
-    name = "supertest-0.15.0";
-    version = "0.15.0";
-    bin = false;
+  by-spec."supports-color"."1.2.0" =
+    self.by-version."supports-color"."1.2.0";
+  by-version."supports-color"."1.2.0" = self.buildNodePackage {
+    name = "supports-color-1.2.0";
+    version = "1.2.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/supertest/-/supertest-0.15.0.tgz";
-      name = "supertest-0.15.0.tgz";
-      sha1 = "86118695de4be58869b3ee94c45e1d084ca7fac5";
+      url = "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz";
+      name = "supports-color-1.2.0.tgz";
+      sha1 = "ff1ed1e61169d06b3cf2d588e188b18d8847e17e";
     };
     deps = {
-      "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
-      "methods-1.1.1" = self.by-version."methods"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -40092,15 +45473,33 @@
     os = [ ];
     cpu = [ ];
   };
-  "supertest" = self.by-version."supertest"."0.15.0";
-  by-spec."supports-color"."1.3.x" =
+  by-spec."supports-color"."^0.2.0" =
+    self.by-version."supports-color"."0.2.0";
+  by-version."supports-color"."0.2.0" = self.buildNodePackage {
+    name = "supports-color-0.2.0";
+    version = "0.2.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
+      name = "supports-color-0.2.0.tgz";
+      sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."supports-color"."^1.3.0" =
     self.by-version."supports-color"."1.3.1";
   by-version."supports-color"."1.3.1" = self.buildNodePackage {
     name = "supports-color-1.3.1";
     version = "1.3.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
+      url = "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
       name = "supports-color-1.3.1.tgz";
       sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
     };
@@ -40112,16 +45511,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."supports-color"."^0.2.0" =
-    self.by-version."supports-color"."0.2.0";
-  by-version."supports-color"."0.2.0" = self.buildNodePackage {
-    name = "supports-color-0.2.0";
-    version = "0.2.0";
-    bin = true;
+  by-spec."supports-color"."^2.0.0" =
+    self.by-version."supports-color"."2.0.0";
+  by-version."supports-color"."2.0.0" = self.buildNodePackage {
+    name = "supports-color-2.0.0";
+    version = "2.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz";
-      name = "supports-color-0.2.0.tgz";
-      sha1 = "d92de2694eb3f67323973d7ae3d8b55b4c22190a";
+      url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+      name = "supports-color-2.0.0.tgz";
+      sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
     };
     deps = {
     };
@@ -40131,22 +45530,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."supports-color"."^1.2.0" =
-    self.by-version."supports-color"."1.3.1";
-  by-spec."supports-color"."^1.3.0" =
-    self.by-version."supports-color"."1.3.1";
-  by-spec."supports-color"."~1.2.0" =
-    self.by-version."supports-color"."1.2.1";
-  by-version."supports-color"."1.2.1" = self.buildNodePackage {
-    name = "supports-color-1.2.1";
-    version = "1.2.1";
-    bin = true;
+  by-spec."supports-color"."^3.1.0" =
+    self.by-version."supports-color"."3.1.2";
+  by-version."supports-color"."3.1.2" = self.buildNodePackage {
+    name = "supports-color-3.1.2";
+    version = "3.1.2";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.2.1.tgz";
-      name = "supports-color-1.2.1.tgz";
-      sha1 = "12ee21507086cd98c1058d9ec0f4ac476b7af3b2";
+      url = "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz";
+      name = "supports-color-3.1.2.tgz";
+      sha1 = "72a262894d9d408b956ca05ff37b2ed8a6e2a2d5";
     };
     deps = {
+      "has-flag-1.0.0" = self.by-version."has-flag"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -40154,6 +45550,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."supports-color"."^3.1.2" =
+    self.by-version."supports-color"."3.1.2";
   by-spec."swig"."0.14.x" =
     self.by-version."swig"."0.14.0";
   by-version."swig"."0.14.0" = self.buildNodePackage {
@@ -40161,7 +45559,7 @@
     version = "0.14.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
+      url = "https://registry.npmjs.org/swig/-/swig-0.14.0.tgz";
       name = "swig-0.14.0.tgz";
       sha1 = "544bfb3bd837608873eed6a72c672a28cb1f1b3f";
     };
@@ -40182,7 +45580,7 @@
     version = "0.0.21";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
+      url = "https://registry.npmjs.org/sylvester/-/sylvester-0.0.21.tgz";
       name = "sylvester-0.0.21.tgz";
       sha1 = "2987b1ce2bd2f38b0dce2a34388884bfa4400ea7";
     };
@@ -40196,19 +45594,18 @@
   };
   by-spec."sylvester".">= 0.0.8" =
     self.by-version."sylvester"."0.0.21";
-  by-spec."syntax-error"."^1.1.1" =
-    self.by-version."syntax-error"."1.1.2";
-  by-version."syntax-error"."1.1.2" = self.buildNodePackage {
-    name = "syntax-error-1.1.2";
-    version = "1.1.2";
+  by-spec."sync-exec"."0.6.2" =
+    self.by-version."sync-exec"."0.6.2";
+  by-version."sync-exec"."0.6.2" = self.buildNodePackage {
+    name = "sync-exec-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/syntax-error/-/syntax-error-1.1.2.tgz";
-      name = "syntax-error-1.1.2.tgz";
-      sha1 = "660f025b170b7eb944efc2a889d451312bcef451";
+      url = "https://registry.npmjs.org/sync-exec/-/sync-exec-0.6.2.tgz";
+      name = "sync-exec-0.6.2.tgz";
+      sha1 = "717d22cc53f0ce1def5594362f3a89a2ebb91105";
     };
     deps = {
-      "acorn-0.9.0" = self.by-version."acorn"."0.9.0";
     };
     optionalDependencies = {
     };
@@ -40216,19 +45613,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."syntax-error"."~0.0.0" =
-    self.by-version."syntax-error"."0.0.1";
-  by-version."syntax-error"."0.0.1" = self.buildNodePackage {
-    name = "syntax-error-0.0.1";
-    version = "0.0.1";
-    bin = true;
+  by-spec."syntax-error"."^1.1.1" =
+    self.by-version."syntax-error"."1.1.6";
+  by-version."syntax-error"."1.1.6" = self.buildNodePackage {
+    name = "syntax-error-1.1.6";
+    version = "1.1.6";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.0.1.tgz";
-      name = "syntax-error-0.0.1.tgz";
-      sha1 = "019d075348cd8c5b79f0603c73e53891a7c5235d";
+      url = "https://registry.npmjs.org/syntax-error/-/syntax-error-1.1.6.tgz";
+      name = "syntax-error-1.1.6.tgz";
+      sha1 = "b4549706d386cc1c1dc7c2423f18579b6cade710";
     };
     deps = {
-      "esprima-0.9.9" = self.by-version."esprima"."0.9.9";
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
     };
     optionalDependencies = {
     };
@@ -40236,19 +45633,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."syntax-error"."~0.1.0" =
-    self.by-version."syntax-error"."0.1.0";
-  by-version."syntax-error"."0.1.0" = self.buildNodePackage {
-    name = "syntax-error-0.1.0";
-    version = "0.1.0";
+  by-spec."table"."^3.7.8" =
+    self.by-version."table"."3.7.8";
+  by-version."table"."3.7.8" = self.buildNodePackage {
+    name = "table-3.7.8";
+    version = "3.7.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/syntax-error/-/syntax-error-0.1.0.tgz";
-      name = "syntax-error-0.1.0.tgz";
-      sha1 = "8cb515e730fe4f19d3a887035f8630e6494aac65";
+      url = "https://registry.npmjs.org/table/-/table-3.7.8.tgz";
+      name = "table-3.7.8.tgz";
+      sha1 = "b424433ef596851922b2fd77224a69a1951618eb";
     };
     deps = {
-      "esprima-six-0.0.3" = self.by-version."esprima-six"."0.0.3";
+      "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+      "slice-ansi-0.0.4" = self.by-version."slice-ansi"."0.0.4";
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
+      "tv4-1.2.7" = self.by-version."tv4"."1.2.7";
+      "xregexp-3.1.0" = self.by-version."xregexp"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -40275,44 +45679,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tap"."~0.3.3" =
-    self.by-version."tap"."0.3.3";
-  by-version."tap"."0.3.3" = self.buildNodePackage {
-    name = "tap-0.3.3";
-    version = "0.3.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tap/-/tap-0.3.3.tgz";
-      name = "tap-0.3.3.tgz";
-      sha1 = "c862237af0a213f97fff46594bd1d44eca705d63";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "yamlish-0.0.6" = self.by-version."yamlish"."0.0.6";
-      "slide-1.1.6" = self.by-version."slide"."1.1.6";
-      "runforcover-0.0.2" = self.by-version."runforcover"."0.0.2";
-      "nopt-2.2.1" = self.by-version."nopt"."2.2.1";
-      "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "difflet-0.2.6" = self.by-version."difflet"."0.2.6";
-      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
-      "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."tapable"."^0.1.8" =
-    self.by-version."tapable"."0.1.9";
-  by-version."tapable"."0.1.9" = self.buildNodePackage {
-    name = "tapable-0.1.9";
-    version = "0.1.9";
+    self.by-version."tapable"."0.1.10";
+  by-version."tapable"."0.1.10" = self.buildNodePackage {
+    name = "tapable-0.1.10";
+    version = "0.1.10";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tapable/-/tapable-0.1.9.tgz";
-      name = "tapable-0.1.9.tgz";
-      sha1 = "1003d9499c344ba238cb32329c8d2c8babc92e54";
+      url = "https://registry.npmjs.org/tapable/-/tapable-0.1.10.tgz";
+      name = "tapable-0.1.10.tgz";
+      sha1 = "29c35707c2b70e50d07482b5d202e8ed446dafd4";
     };
     deps = {
     };
@@ -40322,27 +45698,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tapable"."~0.1.8" =
-    self.by-version."tapable"."0.1.9";
-  by-spec."tape"."^3.5.0" =
-    self.by-version."tape"."3.5.0";
-  by-version."tape"."3.5.0" = self.buildNodePackage {
-    name = "tape-3.5.0";
-    version = "3.5.0";
-    bin = true;
+  by-spec."tapable"."^0.2.3" =
+    self.by-version."tapable"."0.2.4";
+  by-version."tapable"."0.2.4" = self.buildNodePackage {
+    name = "tapable-0.2.4";
+    version = "0.2.4";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tape/-/tape-3.5.0.tgz";
-      name = "tape-3.5.0.tgz";
-      sha1 = "aebb061388104ad0cb407be842782049d64624f8";
+      url = "https://registry.npmjs.org/tapable/-/tapable-0.2.4.tgz";
+      name = "tapable-0.2.4.tgz";
+      sha1 = "a7814605089d4ba896c33c7e3566e13dcd194aa5";
     };
     deps = {
-      "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
-      "defined-0.0.0" = self.by-version."defined"."0.0.0";
-      "glob-3.2.11" = self.by-version."glob"."3.2.11";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "object-inspect-0.4.0" = self.by-version."object-inspect"."0.4.0";
-      "resumer-0.0.0" = self.by-version."resumer"."0.0.0";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
     };
     optionalDependencies = {
     };
@@ -40350,42 +45717,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tape"."~0.2.2" =
-    self.by-version."tape"."0.2.2";
-  by-version."tape"."0.2.2" = self.buildNodePackage {
-    name = "tape-0.2.2";
-    version = "0.2.2";
+  by-spec."tapable"."~0.1.8" =
+    self.by-version."tapable"."0.1.10";
+  by-spec."tapable"."~0.2.3" =
+    self.by-version."tapable"."0.2.4";
+  by-spec."tape"."~2.3.2" =
+    self.by-version."tape"."2.3.3";
+  by-version."tape"."2.3.3" = self.buildNodePackage {
+    name = "tape-2.3.3";
+    version = "2.3.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tape/-/tape-0.2.2.tgz";
-      name = "tape-0.2.2.tgz";
-      sha1 = "64ccfa4b7ecf4a0060007e61716d424781671637";
+      url = "https://registry.npmjs.org/tape/-/tape-2.3.3.tgz";
+      name = "tape-2.3.3.tgz";
+      sha1 = "2e7ce0a31df09f8d6851664a71842e0ca5057af7";
     };
     deps = {
       "jsonify-0.0.0" = self.by-version."jsonify"."0.0.0";
-      "deep-equal-0.0.0" = self.by-version."deep-equal"."0.0.0";
+      "deep-equal-0.1.2" = self.by-version."deep-equal"."0.1.2";
       "defined-0.0.0" = self.by-version."defined"."0.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tar"."*" =
-    self.by-version."tar"."2.1.0";
-  by-version."tar"."2.1.0" = self.buildNodePackage {
-    name = "tar-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/tar-2.1.0.tgz";
-      name = "tar-2.1.0.tgz";
-      sha1 = "d287aad12e947c766e319ac364f3c234900f65ec";
-    };
-    deps = {
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
+      "through-2.3.8" = self.by-version."through"."2.3.8";
+      "resumer-0.0.0" = self.by-version."resumer"."0.0.0";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -40394,21 +45746,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "tar" = self.by-version."tar"."2.1.0";
-  by-spec."tar"."0" =
-    self.by-version."tar"."0.1.20";
-  by-version."tar"."0.1.20" = self.buildNodePackage {
-    name = "tar-0.1.20";
-    version = "0.1.20";
+  by-spec."tar"."*" =
+    self.by-version."tar"."2.2.1";
+  by-version."tar"."2.2.1" = self.buildNodePackage {
+    name = "tar-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/tar-0.1.20.tgz";
-      name = "tar-0.1.20.tgz";
-      sha1 = "42940bae5b5f22c74483699126f9f3f27449cb13";
+      url = "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz";
+      name = "tar-2.2.1.tgz";
+      sha1 = "8e4d2a256c0e2185c6b18ad694aec968b83cb1d1";
     };
     deps = {
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
+      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
+      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -40417,6 +45768,7 @@
     os = [ ];
     cpu = [ ];
   };
+  "tar" = self.by-version."tar"."2.2.1";
   by-spec."tar"."0.1.17" =
     self.by-version."tar"."0.1.17";
   by-version."tar"."0.1.17" = self.buildNodePackage {
@@ -40424,13 +45776,13 @@
     version = "0.1.17";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
+      url = "https://registry.npmjs.org/tar/-/tar-0.1.17.tgz";
       name = "tar-0.1.17.tgz";
       sha1 = "408c8a95deb8e78a65b59b1a51a333183a32badc";
     };
     deps = {
-      "inherits-1.0.0" = self.by-version."inherits"."1.0.0";
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
+      "inherits-1.0.2" = self.by-version."inherits"."1.0.2";
+      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
       "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
     };
     optionalDependencies = {
@@ -40446,35 +45798,13 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/tar-1.0.2.tgz";
+      url = "https://registry.npmjs.org/tar/-/tar-1.0.2.tgz";
       name = "tar-1.0.2.tgz";
       sha1 = "8b0f6740f9946259de26a3ed9c9a22890dff023f";
     };
     deps = {
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tar"."^1.0.0" =
-    self.by-version."tar"."1.0.3";
-  by-version."tar"."1.0.3" = self.buildNodePackage {
-    name = "tar-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tar/-/tar-1.0.3.tgz";
-      name = "tar-1.0.3.tgz";
-      sha1 = "15bcdab244fa4add44e4244a0176edb8aa9a2b44";
-    };
-    deps = {
-      "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7";
-      "fstream-1.0.4" = self.by-version."fstream"."1.0.4";
+      "block-stream-0.0.8" = self.by-version."block-stream"."0.0.8";
+      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
     };
     optionalDependencies = {
@@ -40483,80 +45813,55 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tar"."~0.1.17" =
-    self.by-version."tar"."0.1.20";
-  by-spec."tar"."~1.0.1" =
-    self.by-version."tar"."1.0.3";
-  by-spec."tar"."~1.0.2" =
-    self.by-version."tar"."1.0.3";
-  by-spec."tar"."~2.1.0" =
-    self.by-version."tar"."2.1.0";
-  by-spec."tar-fs"."^1.4.1" =
-    self.by-version."tar-fs"."1.5.0";
-  by-version."tar-fs"."1.5.0" = self.buildNodePackage {
-    name = "tar-fs-1.5.0";
-    version = "1.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tar-fs/-/tar-fs-1.5.0.tgz";
-      name = "tar-fs-1.5.0.tgz";
-      sha1 = "461da12f3a756adcfe781afbc0c13694d9c5d613";
-    };
-    deps = {
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "pump-1.0.0" = self.by-version."pump"."1.0.0";
-      "tar-stream-1.1.4" = self.by-version."tar-stream"."1.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tar-pack"."~2.0.0" =
-    self.by-version."tar-pack"."2.0.0";
-  by-version."tar-pack"."2.0.0" = self.buildNodePackage {
-    name = "tar-pack-2.0.0";
-    version = "2.0.0";
+  by-spec."tar"."^2.0.0" =
+    self.by-version."tar"."2.2.1";
+  by-spec."tar"."~2.2.0" =
+    self.by-version."tar"."2.2.1";
+  by-spec."tar"."~2.2.1" =
+    self.by-version."tar"."2.2.1";
+  by-spec."tar-pack"."~3.1.0" =
+    self.by-version."tar-pack"."3.1.3";
+  by-version."tar-pack"."3.1.3" = self.buildNodePackage {
+    name = "tar-pack-3.1.3";
+    version = "3.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz";
-      name = "tar-pack-2.0.0.tgz";
-      sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab";
+      url = "https://registry.npmjs.org/tar-pack/-/tar-pack-3.1.3.tgz";
+      name = "tar-pack-3.1.3.tgz";
+      sha1 = "611b7e62eb2f27aeda64554f7a7fb48900c7e157";
     };
     deps = {
-      "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3";
-      "once-1.1.1" = self.by-version."once"."1.1.1";
-      "debug-0.7.4" = self.by-version."debug"."0.7.4";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "fstream-0.1.31" = self.by-version."fstream"."0.1.31";
-      "tar-0.1.20" = self.by-version."tar"."0.1.20";
-      "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "fstream-1.0.8" = self.by-version."fstream"."1.0.8";
+      "fstream-ignore-1.0.3" = self.by-version."fstream-ignore"."1.0.3";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "tar-2.2.1" = self.by-version."tar"."2.2.1";
+      "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6";
     };
     optionalDependencies = {
-      "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."tar-stream"."^1.0.0" =
-    self.by-version."tar-stream"."1.1.4";
-  by-version."tar-stream"."1.1.4" = self.buildNodePackage {
-    name = "tar-stream-1.1.4";
-    version = "1.1.4";
+    self.by-version."tar-stream"."1.4.0";
+  by-version."tar-stream"."1.4.0" = self.buildNodePackage {
+    name = "tar-stream-1.4.0";
+    version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.1.4.tgz";
-      name = "tar-stream-1.1.4.tgz";
-      sha1 = "e6c3ffc4305f7d537b6ec697823dd86e4d61ca63";
+      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.4.0.tgz";
+      name = "tar-stream-1.4.0.tgz";
+      sha1 = "19f7fbc0868b3ec283fa87df4ca906d4b16854f2";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-1.1.2" = self.by-version."bl"."1.1.2";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -40564,24 +45869,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tar-stream"."^1.1.2" =
-    self.by-version."tar-stream"."1.1.4";
-  by-spec."tar-stream"."~1.0.0" =
-    self.by-version."tar-stream"."1.0.2";
-  by-version."tar-stream"."1.0.2" = self.buildNodePackage {
-    name = "tar-stream-1.0.2";
-    version = "1.0.2";
+  by-spec."tar-stream"."~1.1.0" =
+    self.by-version."tar-stream"."1.1.5";
+  by-version."tar-stream"."1.1.5" = self.buildNodePackage {
+    name = "tar-stream-1.1.5";
+    version = "1.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tar-stream/-/tar-stream-1.0.2.tgz";
-      name = "tar-stream-1.0.2.tgz";
-      sha1 = "fd19b4a17900fa704f6a133e3045aead0562ab95";
+      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.1.5.tgz";
+      name = "tar-stream-1.1.5.tgz";
+      sha1 = "be9218c130c20029e107b0f967fb23de0579d13c";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "end-of-stream-1.1.0" = self.by-version."end-of-stream"."1.1.0";
-      "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -40590,17 +45893,18 @@
     cpu = [ ];
   };
   by-spec."temp"."*" =
-    self.by-version."temp"."0.8.1";
-  by-version."temp"."0.8.1" = self.buildNodePackage {
-    name = "temp-0.8.1";
-    version = "0.8.1";
+    self.by-version."temp"."0.8.3";
+  by-version."temp"."0.8.3" = self.buildNodePackage {
+    name = "temp-0.8.3";
+    version = "0.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/temp/-/temp-0.8.1.tgz";
-      name = "temp-0.8.1.tgz";
-      sha1 = "4b7b4ffde85bb09f2dd6ba6cc43b44213c94fd3a";
+      url = "https://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
+      name = "temp-0.8.3.tgz";
+      sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
     };
     deps = {
+      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
       "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
     };
     optionalDependencies = {
@@ -40609,7 +45913,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "temp" = self.by-version."temp"."0.8.1";
+  "temp" = self.by-version."temp"."0.8.3";
   by-spec."temp"."0.6.0" =
     self.by-version."temp"."0.6.0";
   by-version."temp"."0.6.0" = self.buildNodePackage {
@@ -40617,7 +45921,7 @@
     version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
+      url = "https://registry.npmjs.org/temp/-/temp-0.6.0.tgz";
       name = "temp-0.6.0.tgz";
       sha1 = "6b13df5cddf370f2e3a606ca40f202c419173f07";
     };
@@ -40631,21 +45935,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."temp"."0.8.3" =
+    self.by-version."temp"."0.8.3";
   by-spec."temp".">=0.5.0" =
-    self.by-version."temp"."0.8.1";
-  by-spec."temp"."~0.5.1" =
-    self.by-version."temp"."0.5.1";
-  by-version."temp"."0.5.1" = self.buildNodePackage {
-    name = "temp-0.5.1";
-    version = "0.5.1";
+    self.by-version."temp"."0.8.3";
+  by-spec."temp"."^0.8.1" =
+    self.by-version."temp"."0.8.3";
+  by-spec."temp"."~0.8.3" =
+    self.by-version."temp"."0.8.3";
+  by-spec."text-encoding"."0.5.2" =
+    self.by-version."text-encoding"."0.5.2";
+  by-version."text-encoding"."0.5.2" = self.buildNodePackage {
+    name = "text-encoding-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/temp/-/temp-0.5.1.tgz";
-      name = "temp-0.5.1.tgz";
-      sha1 = "77ab19c79aa7b593cbe4fac2441768cad987b8df";
+      url = "https://registry.npmjs.org/text-encoding/-/text-encoding-0.5.2.tgz";
+      name = "text-encoding-0.5.2.tgz";
+      sha1 = "85b4660819f088777609465551690fea137d824a";
     };
     deps = {
-      "rimraf-2.1.4" = self.by-version."rimraf"."2.1.4";
     };
     optionalDependencies = {
     };
@@ -40653,10 +45962,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."temp"."~0.6.0" =
-    self.by-version."temp"."0.6.0";
-  by-spec."temp"."~0.8.1" =
-    self.by-version."temp"."0.8.1";
   by-spec."text-table"."~0.2.0" =
     self.by-version."text-table"."0.2.0";
   by-version."text-table"."0.2.0" = self.buildNodePackage {
@@ -40664,7 +45969,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
+      url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz";
       name = "text-table-0.2.0.tgz";
       sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4";
     };
@@ -40676,19 +45981,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."thenify"."3" =
-    self.by-version."thenify"."3.1.0";
-  by-version."thenify"."3.1.0" = self.buildNodePackage {
-    name = "thenify-3.1.0";
-    version = "3.1.0";
+  by-spec."thirty-two"."^0.0.2" =
+    self.by-version."thirty-two"."0.0.2";
+  by-version."thirty-two"."0.0.2" = self.buildNodePackage {
+    name = "thirty-two-0.0.2";
+    version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/thenify/-/thenify-3.1.0.tgz";
-      name = "thenify-3.1.0.tgz";
-      sha1 = "c27cbbc62b7c287edf1a1a3d5cc8426d8aed49f0";
+      url = "https://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz";
+      name = "thirty-two-0.0.2.tgz";
+      sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a";
     };
     deps = {
-      "native-or-bluebird-1.2.0" = self.by-version."native-or-bluebird"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -40696,21 +46000,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."thenify".">= 3.1.0 < 4" =
-    self.by-version."thenify"."3.1.0";
-  by-spec."thenify-all"."1" =
-    self.by-version."thenify-all"."1.6.0";
-  by-version."thenify-all"."1.6.0" = self.buildNodePackage {
-    name = "thenify-all-1.6.0";
-    version = "1.6.0";
+  by-spec."thirty-two"."^1.0.1" =
+    self.by-version."thirty-two"."1.0.1";
+  by-version."thirty-two"."1.0.1" = self.buildNodePackage {
+    name = "thirty-two-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz";
-      name = "thenify-all-1.6.0.tgz";
-      sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726";
+      url = "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.1.tgz";
+      name = "thirty-two-1.0.1.tgz";
+      sha1 = "fa500a927cfba6cfb4e767712b18106d395baf1d";
     };
     deps = {
-      "thenify-3.1.0" = self.by-version."thenify"."3.1.0";
     };
     optionalDependencies = {
     };
@@ -40718,16 +46019,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."thirty-two"."^0.0.2" =
+  by-spec."thirty-two"."~0.0.1" =
     self.by-version."thirty-two"."0.0.2";
-  by-version."thirty-two"."0.0.2" = self.buildNodePackage {
-    name = "thirty-two-0.0.2";
-    version = "0.0.2";
+  by-spec."throttleit"."^1.0.0" =
+    self.by-version."throttleit"."1.0.0";
+  by-version."throttleit"."1.0.0" = self.buildNodePackage {
+    name = "throttleit-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/thirty-two/-/thirty-two-0.0.2.tgz";
-      name = "thirty-two-0.0.2.tgz";
-      sha1 = "4253e29d8cb058f0480267c5698c0e4927e54b6a";
+      url = "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz";
+      name = "throttleit-1.0.0.tgz";
+      sha1 = "9e785836daf46743145a5984b6268d828528ac6c";
     };
     deps = {
     };
@@ -40737,8 +46040,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."thirty-two"."~0.0.1" =
-    self.by-version."thirty-two"."0.0.2";
   by-spec."throttleit"."~0.0.2" =
     self.by-version."throttleit"."0.0.2";
   by-version."throttleit"."0.0.2" = self.buildNodePackage {
@@ -40746,7 +46047,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
+      url = "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz";
       name = "throttleit-0.0.2.tgz";
       sha1 = "cfedf88e60c00dd9697b61fdd2a8343a9b680eaf";
     };
@@ -40758,16 +46059,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."through"."2.3.4" =
-    self.by-version."through"."2.3.4";
-  by-version."through"."2.3.4" = self.buildNodePackage {
-    name = "through-2.3.4";
-    version = "2.3.4";
+  by-spec."through"."2" =
+    self.by-version."through"."2.3.8";
+  by-version."through"."2.3.8" = self.buildNodePackage {
+    name = "through-2.3.8";
+    version = "2.3.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through/-/through-2.3.4.tgz";
-      name = "through-2.3.4.tgz";
-      sha1 = "495e40e8d8a8eaebc7c275ea88c2b8fc14c56455";
+      url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz";
+      name = "through-2.3.8.tgz";
+      sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
     };
     deps = {
     };
@@ -40778,51 +46079,19 @@
     cpu = [ ];
   };
   by-spec."through".">=2.2.7 <3" =
-    self.by-version."through"."2.3.7";
-  by-version."through"."2.3.7" = self.buildNodePackage {
-    name = "through-2.3.7";
-    version = "2.3.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/through/-/through-2.3.7.tgz";
-      name = "through-2.3.7.tgz";
-      sha1 = "5fcc3690fed2fdf98c6fc88b4d207a4624ac3b87";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."through"."2.3.8";
   by-spec."through"."^2.3.6" =
-    self.by-version."through"."2.3.7";
-  by-spec."through"."~2.2.0" =
-    self.by-version."through"."2.2.7";
-  by-version."through"."2.2.7" = self.buildNodePackage {
-    name = "through-2.2.7";
-    version = "2.2.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/through/-/through-2.2.7.tgz";
-      name = "through-2.2.7.tgz";
-      sha1 = "6e8e21200191d4eb6a99f6f010df46aa1c6eb2bd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."through"."~2.2.7" =
-    self.by-version."through"."2.2.7";
+    self.by-version."through"."2.3.8";
+  by-spec."through"."^2.3.7" =
+    self.by-version."through"."2.3.8";
+  by-spec."through"."~2.3" =
+    self.by-version."through"."2.3.8";
+  by-spec."through"."~2.3.1" =
+    self.by-version."through"."2.3.8";
   by-spec."through"."~2.3.4" =
-    self.by-version."through"."2.3.7";
-  by-spec."through"."~2.3.6" =
-    self.by-version."through"."2.3.7";
+    self.by-version."through"."2.3.8";
+  by-spec."through"."~2.3.8" =
+    self.by-version."through"."2.3.8";
   by-spec."through2"."0.6.3" =
     self.by-version."through2"."0.6.3";
   by-version."through2"."0.6.3" = self.buildNodePackage {
@@ -40830,13 +46099,13 @@
     version = "0.6.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through2/-/through2-0.6.3.tgz";
+      url = "https://registry.npmjs.org/through2/-/through2-0.6.3.tgz";
       name = "through2-0.6.3.tgz";
       sha1 = "795292fde9f254c2a368b38f9cc5d1bd4663afb6";
     };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -40851,13 +46120,13 @@
     version = "0.6.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz";
+      url = "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz";
       name = "through2-0.6.5.tgz";
       sha1 = "41ab9c67b29d57209071410e1d7a7a968cd3ad48";
     };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -40878,13 +46147,13 @@
     version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
+      url = "https://registry.npmjs.org/through2/-/through2-1.1.1.tgz";
       name = "through2-1.1.1.tgz";
       sha1 = "0847cbc4449f3405574dbdccd9bb841b83ac3545";
     };
     deps = {
       "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -40892,20 +46161,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."through2"."~0.4.1" =
-    self.by-version."through2"."0.4.2";
-  by-version."through2"."0.4.2" = self.buildNodePackage {
-    name = "through2-0.4.2";
-    version = "0.4.2";
+  by-spec."through2"."^2.0.0" =
+    self.by-version."through2"."2.0.1";
+  by-version."through2"."2.0.1" = self.buildNodePackage {
+    name = "through2-2.0.1";
+    version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through2/-/through2-0.4.2.tgz";
-      name = "through2-0.4.2.tgz";
-      sha1 = "dbf5866031151ec8352bb6c4db64a2292a840b9b";
+      url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz";
+      name = "through2-2.0.1.tgz";
+      sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9";
     };
     deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-      "xtend-2.1.2" = self.by-version."xtend"."2.1.2";
+      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -40920,7 +46189,7 @@
     version = "0.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
+      url = "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz";
       name = "through2-0.5.1.tgz";
       sha1 = "dfdd012eb9c700e2323fd334f38ac622ab372da7";
     };
@@ -40945,7 +46214,7 @@
     version = "2.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz";
+      url = "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz";
       name = "thunkify-2.1.2.tgz";
       sha1 = "faa0e9d230c51acc95ca13a361ac05ca7e04553d";
     };
@@ -40964,7 +46233,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz";
+      url = "https://registry.npmjs.org/thunky/-/thunky-0.1.0.tgz";
       name = "thunky-0.1.0.tgz";
       sha1 = "bf30146824e2b6e67b0f2d7a4ac8beb26908684e";
     };
@@ -40979,18 +46248,18 @@
   by-spec."thunky"."~0.1.0" =
     self.by-version."thunky"."0.1.0";
   by-spec."tildify"."^1.0.0" =
-    self.by-version."tildify"."1.0.0";
-  by-version."tildify"."1.0.0" = self.buildNodePackage {
-    name = "tildify-1.0.0";
-    version = "1.0.0";
+    self.by-version."tildify"."1.1.2";
+  by-version."tildify"."1.1.2" = self.buildNodePackage {
+    name = "tildify-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tildify/-/tildify-1.0.0.tgz";
-      name = "tildify-1.0.0.tgz";
-      sha1 = "2a021db5e8fbde0a8f8b4df37adaa8fb1d39d7dd";
+      url = "https://registry.npmjs.org/tildify/-/tildify-1.1.2.tgz";
+      name = "tildify-1.1.2.tgz";
+      sha1 = "9f611d8a2e93a5e50756db040f1cd2b7fd80859d";
     };
     deps = {
-      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
+      "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -40999,20 +46268,20 @@
     cpu = [ ];
   };
   by-spec."time".">=0.9.2" =
-    self.by-version."time"."0.11.2";
-  by-version."time"."0.11.2" = self.buildNodePackage {
-    name = "time-0.11.2";
-    version = "0.11.2";
+    self.by-version."time"."0.11.4";
+  by-version."time"."0.11.4" = self.buildNodePackage {
+    name = "time-0.11.4";
+    version = "0.11.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/time/-/time-0.11.2.tgz";
-      name = "time-0.11.2.tgz";
-      sha1 = "6fb23a1df2267db88366fc640f894f33f10424d4";
+      url = "https://registry.npmjs.org/time/-/time-0.11.4.tgz";
+      name = "time-0.11.4.tgz";
+      sha1 = "ec3c8947d7fa488f3b1978b8110a68186f5d340f";
     };
     deps = {
-      "bindings-1.2.0" = self.by-version."bindings"."1.2.0";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -41027,7 +46296,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz";
+      url = "https://registry.npmjs.org/time-line/-/time-line-1.0.1.tgz";
       name = "time-line-1.0.1.tgz";
       sha1 = "afb89542301c3b5010d118c66b5d63920f5e9a7a";
     };
@@ -41039,38 +46308,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."timed-out"."^2.0.0" =
-    self.by-version."timed-out"."2.0.0";
-  by-version."timed-out"."2.0.0" = self.buildNodePackage {
-    name = "timed-out-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz";
-      name = "timed-out-2.0.0.tgz";
-      sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."timers-browserify"."^1.0.1" =
-    self.by-version."timers-browserify"."1.4.0";
-  by-version."timers-browserify"."1.4.0" = self.buildNodePackage {
-    name = "timers-browserify-1.4.0";
-    version = "1.4.0";
+  by-spec."time-stamp"."^1.0.0" =
+    self.by-version."time-stamp"."1.0.0";
+  by-version."time-stamp"."1.0.0" = self.buildNodePackage {
+    name = "time-stamp-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.0.tgz";
-      name = "timers-browserify-1.4.0.tgz";
-      sha1 = "6b424b07688cd1978c2a3333ee618c46036d6ddb";
+      url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.0.tgz";
+      name = "time-stamp-1.0.0.tgz";
+      sha1 = "56b152e07ec2442c23d9ea690944076f38c535a1";
     };
     deps = {
-      "process-0.10.1" = self.by-version."process"."0.10.1";
     };
     optionalDependencies = {
     };
@@ -41078,19 +46327,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."timers-browserify"."~1.0.1" =
-    self.by-version."timers-browserify"."1.0.3";
-  by-version."timers-browserify"."1.0.3" = self.buildNodePackage {
-    name = "timers-browserify-1.0.3";
-    version = "1.0.3";
+  by-spec."timed-out"."^2.0.0" =
+    self.by-version."timed-out"."2.0.0";
+  by-version."timed-out"."2.0.0" = self.buildNodePackage {
+    name = "timed-out-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.0.3.tgz";
-      name = "timers-browserify-1.0.3.tgz";
-      sha1 = "ffba70c9c12eed916fd67318e629ac6f32295551";
+      url = "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz";
+      name = "timed-out-2.0.0.tgz";
+      sha1 = "f38b0ae81d3747d628001f41dafc652ace671c0a";
     };
     deps = {
-      "process-0.5.2" = self.by-version."process"."0.5.2";
     };
     optionalDependencies = {
     };
@@ -41098,20 +46346,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."timers-ext"."0.1" =
-    self.by-version."timers-ext"."0.1.0";
-  by-version."timers-ext"."0.1.0" = self.buildNodePackage {
-    name = "timers-ext-0.1.0";
-    version = "0.1.0";
+  by-spec."timers-browserify"."^1.0.1" =
+    self.by-version."timers-browserify"."1.4.2";
+  by-version."timers-browserify"."1.4.2" = self.buildNodePackage {
+    name = "timers-browserify-1.4.2";
+    version = "1.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz";
-      name = "timers-ext-0.1.0.tgz";
-      sha1 = "00345a2ca93089d1251322054389d263e27b77e2";
+      url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz";
+      name = "timers-browserify-1.4.2.tgz";
+      sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d";
     };
     deps = {
-      "es5-ext-0.10.6" = self.by-version."es5-ext"."0.10.6";
-      "next-tick-0.2.2" = self.by-version."next-tick"."0.2.2";
+      "process-0.11.2" = self.by-version."process"."0.11.2";
     };
     optionalDependencies = {
     };
@@ -41119,14 +46366,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."timespan"."2.x.x" =
+  by-spec."timespan"."~2.3.0" =
     self.by-version."timespan"."2.3.0";
   by-version."timespan"."2.3.0" = self.buildNodePackage {
     name = "timespan-2.3.0";
     version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz";
+      url = "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz";
       name = "timespan-2.3.0.tgz";
       sha1 = "4902ce040bd13d845c8f59b27e9d59bad6f39929";
     };
@@ -41138,18 +46385,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."timespan"."~2.3.0" =
-    self.by-version."timespan"."2.3.0";
   by-spec."timezone"."*" =
-    self.by-version."timezone"."0.0.41";
-  by-version."timezone"."0.0.41" = self.buildNodePackage {
-    name = "timezone-0.0.41";
-    version = "0.0.41";
+    self.by-version."timezone"."1.0.1";
+  by-version."timezone"."1.0.1" = self.buildNodePackage {
+    name = "timezone-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/timezone/-/timezone-0.0.41.tgz";
-      name = "timezone-0.0.41.tgz";
-      sha1 = "e32c7eb54932e29949d44e4e7ca91199cb345c0a";
+      url = "https://registry.npmjs.org/timezone/-/timezone-1.0.1.tgz";
+      name = "timezone-1.0.1.tgz";
+      sha1 = "3521e855fb33f90ef14cd2090ee1e1021ad902f4";
     };
     deps = {
     };
@@ -41159,7 +46404,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "timezone" = self.by-version."timezone"."0.0.41";
+  "timezone" = self.by-version."timezone"."1.0.1";
   by-spec."tinycolor"."0.x" =
     self.by-version."tinycolor"."0.0.1";
   by-version."tinycolor"."0.0.1" = self.buildNodePackage {
@@ -41167,7 +46412,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
+      url = "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz";
       name = "tinycolor-0.0.1.tgz";
       sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164";
     };
@@ -41180,31 +46425,29 @@
     cpu = [ ];
   };
   by-spec."titanium"."*" =
-    self.by-version."titanium"."4.0.0-beta7";
-  by-version."titanium"."4.0.0-beta7" = self.buildNodePackage {
-    name = "titanium-4.0.0-beta7";
-    version = "4.0.0-beta7";
+    self.by-version."titanium"."5.0.7";
+  by-version."titanium"."5.0.7" = self.buildNodePackage {
+    name = "titanium-5.0.7";
+    version = "5.0.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/titanium/-/titanium-4.0.0-beta7.tgz";
-      name = "titanium-4.0.0-beta7.tgz";
-      sha1 = "966a1eb3170fe377e1144d7b93e4e4b9bb4a9848";
+      url = "https://registry.npmjs.org/titanium/-/titanium-5.0.7.tgz";
+      name = "titanium-5.0.7.tgz";
+      sha1 = "84270842a582aa0b2738cf827566af570f6f711e";
     };
     deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "fields-0.1.23" = self.by-version."fields"."0.1.23";
+      "async-1.4.2" = self.by-version."async"."1.4.2";
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "fields-0.1.24" = self.by-version."fields"."0.1.24";
       "humanize-0.0.9" = self.by-version."humanize"."0.0.9";
-      "jade-0.35.0" = self.by-version."jade"."0.35.0";
-      "longjohn-0.2.4" = self.by-version."longjohn"."0.2.4";
-      "moment-2.4.0" = self.by-version."moment"."2.4.0";
-      "node-appc-0.2.26" = self.by-version."node-appc"."0.2.26";
-      "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "request-2.27.0" = self.by-version."request"."2.27.0";
-      "semver-2.2.1" = self.by-version."semver"."2.2.1";
+      "longjohn-0.2.9" = self.by-version."longjohn"."0.2.9";
+      "moment-2.10.6" = self.by-version."moment"."2.10.6";
+      "node-appc-0.2.31" = self.by-version."node-appc"."0.2.31";
+      "request-2.62.0" = self.by-version."request"."2.62.0";
+      "semver-5.0.3" = self.by-version."semver"."5.0.3";
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
-      "temp-0.6.0" = self.by-version."temp"."0.6.0";
-      "winston-0.6.2" = self.by-version."winston"."0.6.2";
+      "temp-0.8.3" = self.by-version."temp"."0.8.3";
+      "winston-1.0.2" = self.by-version."winston"."1.0.2";
       "wrench-1.5.8" = self.by-version."wrench"."1.5.8";
     };
     optionalDependencies = {
@@ -41213,7 +46456,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "titanium" = self.by-version."titanium"."4.0.0-beta7";
+  "titanium" = self.by-version."titanium"."5.0.7";
   by-spec."tldtools"."0.0.19" =
     self.by-version."tldtools"."0.0.19";
   by-version."tldtools"."0.0.19" = self.buildNodePackage {
@@ -41221,12 +46464,12 @@
     version = "0.0.19";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.19.tgz";
+      url = "https://registry.npmjs.org/tldtools/-/tldtools-0.0.19.tgz";
       name = "tldtools-0.0.19.tgz";
       sha1 = "1df2277a43e291fd0a929c0e096a0a0917d75b1b";
     };
     deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -41241,12 +46484,12 @@
     version = "0.0.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tldtools/-/tldtools-0.0.24.tgz";
+      url = "https://registry.npmjs.org/tldtools/-/tldtools-0.0.24.tgz";
       name = "tldtools-0.0.24.tgz";
       sha1 = "c9c793d04d7fbdccb90b1c02c019f7259375d612";
     };
     deps = {
-      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
     };
     optionalDependencies = {
     };
@@ -41263,7 +46506,7 @@
     version = "0.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tls-connect/-/tls-connect-0.2.2.tgz";
+      url = "https://registry.npmjs.org/tls-connect/-/tls-connect-0.2.2.tgz";
       name = "tls-connect-0.2.2.tgz";
       sha1 = "1d88d4f4cb829a0741b6acd05d1df73e0d566fd0";
     };
@@ -41275,8 +46518,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tls-connect"."~0.x" =
-    self.by-version."tls-connect"."0.2.2";
   by-spec."tmp"."0.0.24" =
     self.by-version."tmp"."0.0.24";
   by-version."tmp"."0.0.24" = self.buildNodePackage {
@@ -41284,7 +46525,7 @@
     version = "0.0.24";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
+      url = "https://registry.npmjs.org/tmp/-/tmp-0.0.24.tgz";
       name = "tmp-0.0.24.tgz";
       sha1 = "d6a5e198d14a9835cc6f2d7c3d9e302428c8cf12";
     };
@@ -41297,17 +46538,18 @@
     cpu = [ ];
   };
   by-spec."tmp"."~0.0.20" =
-    self.by-version."tmp"."0.0.25";
-  by-version."tmp"."0.0.25" = self.buildNodePackage {
-    name = "tmp-0.0.25";
-    version = "0.0.25";
+    self.by-version."tmp"."0.0.28";
+  by-version."tmp"."0.0.28" = self.buildNodePackage {
+    name = "tmp-0.0.28";
+    version = "0.0.28";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tmp/-/tmp-0.0.25.tgz";
-      name = "tmp-0.0.25.tgz";
-      sha1 = "b29629768c55f38df0bff33f6dfde052443da27d";
+      url = "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz";
+      name = "tmp-0.0.28.tgz";
+      sha1 = "172735b7f614ea7af39664fa84cf0de4e515d120";
     };
     deps = {
+      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -41322,7 +46564,7 @@
     version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz";
+      url = "https://registry.npmjs.org/to-array/-/to-array-0.1.3.tgz";
       name = "to-array-0.1.3.tgz";
       sha1 = "d45dadc6363417f60f28474fea50ecddbb4f4991";
     };
@@ -41334,16 +46576,35 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."to-utf8"."0.0.1" =
-    self.by-version."to-utf8"."0.0.1";
-  by-version."to-utf8"."0.0.1" = self.buildNodePackage {
-    name = "to-utf8-0.0.1";
-    version = "0.0.1";
+  by-spec."to-array"."0.1.4" =
+    self.by-version."to-array"."0.1.4";
+  by-version."to-array"."0.1.4" = self.buildNodePackage {
+    name = "to-array-0.1.4";
+    version = "0.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/to-utf8/-/to-utf8-0.0.1.tgz";
-      name = "to-utf8-0.0.1.tgz";
-      sha1 = "d17aea72ff2fba39b9e43601be7b3ff72e089852";
+      url = "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+      name = "to-array-0.1.4.tgz";
+      sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."to-arraybuffer"."^1.0.0" =
+    self.by-version."to-arraybuffer"."1.0.1";
+  by-version."to-arraybuffer"."1.0.1" = self.buildNodePackage {
+    name = "to-arraybuffer-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz";
+      name = "to-arraybuffer-1.0.1.tgz";
+      sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43";
     };
     deps = {
     };
@@ -41360,7 +46621,7 @@
     version = "0.1.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tomahawk/-/tomahawk-0.1.6.tgz";
+      url = "https://registry.npmjs.org/tomahawk/-/tomahawk-0.1.6.tgz";
       name = "tomahawk-0.1.6.tgz";
       sha1 = "9726580ec9f51c148cf2030c6255c110243d49a5";
     };
@@ -41387,7 +46648,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tomahawk-plugin-kv-memory-store/-/tomahawk-plugin-kv-memory-store-0.0.3.tgz";
+      url = "https://registry.npmjs.org/tomahawk-plugin-kv-memory-store/-/tomahawk-plugin-kv-memory-store-0.0.3.tgz";
       name = "tomahawk-plugin-kv-memory-store-0.0.3.tgz";
       sha1 = "120547598bd72ca72bd2eedb0ee03ae85c667b02";
     };
@@ -41399,16 +46660,81 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."toobusy-js"."^0.4.1" =
-    self.by-version."toobusy-js"."0.4.1";
-  by-version."toobusy-js"."0.4.1" = self.buildNodePackage {
-    name = "toobusy-js-0.4.1";
-    version = "0.4.1";
+  by-spec."toobusy-js"."^0.4.2" =
+    self.by-version."toobusy-js"."0.4.3";
+  by-version."toobusy-js"."0.4.3" = self.buildNodePackage {
+    name = "toobusy-js-0.4.3";
+    version = "0.4.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/toobusy-js/-/toobusy-js-0.4.3.tgz";
+      name = "toobusy-js-0.4.3.tgz";
+      sha1 = "0db1a2ca73701b3f8c3b7df093801bfdad4ba5a7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."topo"."1.x.x" =
+    self.by-version."topo"."1.1.0";
+  by-version."topo"."1.1.0" = self.buildNodePackage {
+    name = "topo-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/topo/-/topo-1.1.0.tgz";
+      name = "topo-1.1.0.tgz";
+      sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."torrent-discovery"."^5.2.0" =
+    self.by-version."torrent-discovery"."5.4.0";
+  by-version."torrent-discovery"."5.4.0" = self.buildNodePackage {
+    name = "torrent-discovery-5.4.0";
+    version = "5.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/toobusy-js/-/toobusy-js-0.4.1.tgz";
-      name = "toobusy-js-0.4.1.tgz";
-      sha1 = "272be860c2302dbb56c63b77069b58ef620c18e9";
+      url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-5.4.0.tgz";
+      name = "torrent-discovery-5.4.0.tgz";
+      sha1 = "2d17d82cf669ada7f9dfe75db4b31f7034b71e29";
+    };
+    deps = {
+      "bittorrent-dht-6.4.2" = self.by-version."bittorrent-dht"."6.4.2";
+      "bittorrent-tracker-7.7.0" = self.by-version."bittorrent-tracker"."7.7.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "re-emitter-1.1.3" = self.by-version."re-emitter"."1.1.3";
+      "run-parallel-1.1.6" = self.by-version."run-parallel"."1.1.6";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."torrent-piece"."^1.0.0" =
+    self.by-version."torrent-piece"."1.1.0";
+  by-version."torrent-piece"."1.1.0" = self.buildNodePackage {
+    name = "torrent-piece-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/torrent-piece/-/torrent-piece-1.1.0.tgz";
+      name = "torrent-piece-1.1.0.tgz";
+      sha1 = "dd3ae8dba3e58df5c9ed3457c055177849d82854";
     };
     deps = {
     };
@@ -41425,26 +46751,26 @@
     version = "0.18.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.18.1.tgz";
+      url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-0.18.1.tgz";
       name = "torrent-stream-0.18.1.tgz";
       sha1 = "e2e8ca44d81f16fbe5646e0ebb05f5418fea9bf6";
     };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
-      "bittorrent-dht-3.0.8" = self.by-version."bittorrent-dht"."3.0.8";
+      "bittorrent-dht-3.2.6" = self.by-version."bittorrent-dht"."3.2.6";
       "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1";
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
       "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
       "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "ip-0.3.2" = self.by-version."ip"."0.3.2";
+      "ip-0.3.3" = self.by-version."ip"."0.3.3";
       "ip-set-1.0.0" = self.by-version."ip-set"."1.0.0";
       "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "parse-torrent-4.0.0" = self.by-version."parse-torrent"."4.0.0";
+      "parse-torrent-4.1.0" = self.by-version."parse-torrent"."4.1.0";
       "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2";
-      "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "random-access-file-0.3.2" = self.by-version."random-access-file"."0.3.2";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
     };
     optionalDependencies = {
@@ -41453,33 +46779,31 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."torrent-stream"."~0.13.3" =
-    self.by-version."torrent-stream"."0.13.5";
-  by-version."torrent-stream"."0.13.5" = self.buildNodePackage {
-    name = "torrent-stream-0.13.5";
-    version = "0.13.5";
+  by-spec."torrent-stream"."^1.0.1" =
+    self.by-version."torrent-stream"."1.0.2";
+  by-version."torrent-stream"."1.0.2" = self.buildNodePackage {
+    name = "torrent-stream-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/torrent-stream/-/torrent-stream-0.13.5.tgz";
-      name = "torrent-stream-0.13.5.tgz";
-      sha1 = "13127bc81f668ad4dbd26cf3e984c3dd1cd70d40";
+      url = "https://registry.npmjs.org/torrent-stream/-/torrent-stream-1.0.2.tgz";
+      name = "torrent-stream-1.0.2.tgz";
+      sha1 = "99642b93c4eca1ad182fc807b5bcaa6ec40bb93e";
     };
     deps = {
       "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0";
-      "bittorrent-dht-1.5.0" = self.by-version."bittorrent-dht"."1.5.0";
-      "bittorrent-tracker-2.12.1" = self.by-version."bittorrent-tracker"."2.12.1";
       "bncode-0.5.3" = self.by-version."bncode"."0.5.3";
-      "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0";
       "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5";
+      "fs-chunk-store-1.4.0" = self.by-version."fs-chunk-store"."1.4.0";
       "hat-0.0.3" = self.by-version."hat"."0.0.3";
-      "ip-0.3.2" = self.by-version."ip"."0.3.2";
-      "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1";
+      "immediate-chunk-store-1.0.8" = self.by-version."immediate-chunk-store"."1.0.8";
+      "ip-set-1.0.0" = self.by-version."ip-set"."1.0.0";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
-      "parse-torrent-1.7.0" = self.by-version."parse-torrent"."1.7.0";
-      "peer-wire-swarm-0.9.2" = self.by-version."peer-wire-swarm"."0.9.2";
-      "random-access-file-0.3.1" = self.by-version."random-access-file"."0.3.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
+      "parse-torrent-4.1.0" = self.by-version."parse-torrent"."4.1.0";
+      "peer-wire-swarm-0.12.1" = self.by-version."peer-wire-swarm"."0.12.1";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "torrent-discovery-5.4.0" = self.by-version."torrent-discovery"."5.4.0";
+      "torrent-piece-1.1.0" = self.by-version."torrent-piece"."1.1.0";
     };
     optionalDependencies = {
     };
@@ -41487,16 +46811,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."touch"."0.0.3" =
-    self.by-version."touch"."0.0.3";
-  by-version."touch"."0.0.3" = self.buildNodePackage {
-    name = "touch-0.0.3";
-    version = "0.0.3";
-    bin = false;
+  by-spec."touch"."1.0.0" =
+    self.by-version."touch"."1.0.0";
+  by-version."touch"."1.0.0" = self.buildNodePackage {
+    name = "touch-1.0.0";
+    version = "1.0.0";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/touch/-/touch-0.0.3.tgz";
-      name = "touch-0.0.3.tgz";
-      sha1 = "51aef3d449571d4f287a5d87c9c8b49181a0db1d";
+      url = "https://registry.npmjs.org/touch/-/touch-1.0.0.tgz";
+      name = "touch-1.0.0.tgz";
+      sha1 = "449cbe2dbae5a8c8038e30d71fa0ff464947c4de";
     };
     deps = {
       "nopt-1.0.10" = self.by-version."nopt"."1.0.10";
@@ -41507,65 +46831,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."touch"."~0.0.3" =
-    self.by-version."touch"."0.0.3";
   by-spec."tough-cookie".">=0.12.0" =
-    self.by-version."tough-cookie"."0.12.1";
-  by-version."tough-cookie"."0.12.1" = self.buildNodePackage {
-    name = "tough-cookie-0.12.1";
-    version = "0.12.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz";
-      name = "tough-cookie-0.12.1.tgz";
-      sha1 = "8220c7e21abd5b13d96804254bd5a81ebf2c7d62";
-    };
-    deps = {
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tough-cookie"."^0.12.1" =
-    self.by-version."tough-cookie"."0.12.1";
-  by-spec."tough-cookie"."~0.9.15" =
-    self.by-version."tough-cookie"."0.9.15";
-  by-version."tough-cookie"."0.9.15" = self.buildNodePackage {
-    name = "tough-cookie-0.9.15";
-    version = "0.9.15";
+    self.by-version."tough-cookie"."2.2.2";
+  by-version."tough-cookie"."2.2.2" = self.buildNodePackage {
+    name = "tough-cookie-2.2.2";
+    version = "2.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz";
-      name = "tough-cookie-0.9.15.tgz";
-      sha1 = "75617ac347e3659052b0350131885829677399f6";
+      url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
+      name = "tough-cookie-2.2.2.tgz";
+      sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
     };
     deps = {
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."traceur"."0.0.55" =
-    self.by-version."traceur"."0.0.55";
-  by-version."traceur"."0.0.55" = self.buildNodePackage {
-    name = "traceur-0.0.55";
-    version = "0.0.55";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/traceur/-/traceur-0.0.55.tgz";
-      name = "traceur-0.0.55.tgz";
-      sha1 = "b1a44b69bfbabb9db2c7c284713f4ebacf46f733";
-    };
-    deps = {
-      "commander-2.8.0" = self.by-version."commander"."2.8.0";
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "semver-2.3.2" = self.by-version."semver"."2.3.2";
     };
     optionalDependencies = {
     };
@@ -41573,6 +46850,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."tough-cookie"."~2.2.0" =
+    self.by-version."tough-cookie"."2.2.2";
   by-spec."transformers"."2.1.0" =
     self.by-version."transformers"."2.1.0";
   by-version."transformers"."2.1.0" = self.buildNodePackage {
@@ -41580,7 +46859,7 @@
     version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
+      url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz";
       name = "transformers-2.1.0.tgz";
       sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7";
     };
@@ -41595,39 +46874,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."trash"."*" =
-    self.by-version."trash"."1.4.1";
-  by-version."trash"."1.4.1" = self.buildNodePackage {
-    name = "trash-1.4.1";
-    version = "1.4.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/trash/-/trash-1.4.1.tgz";
-      name = "trash-1.4.1.tgz";
-      sha1 = "aa8e0ae39c9764ea1b2dcb9ebc324cbcd8d1a928";
-    };
-    deps = {
-      "meow-3.1.0" = self.by-version."meow"."3.1.0";
-      "osx-trash-1.0.0" = self.by-version."osx-trash"."1.0.0";
-      "update-notifier-0.3.2" = self.by-version."update-notifier"."0.3.2";
-      "win-trash-1.0.0" = self.by-version."win-trash"."1.0.0";
-      "xdg-trash-1.1.0" = self.by-version."xdg-trash"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "trash" = self.by-version."trash"."1.4.1";
-  by-spec."traverse"."0.6.x" =
+  by-spec."traverse".">=0.2.4" =
     self.by-version."traverse"."0.6.6";
   by-version."traverse"."0.6.6" = self.buildNodePackage {
     name = "traverse-0.6.6";
     version = "0.6.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
+      url = "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz";
       name = "traverse-0.6.6.tgz";
       sha1 = "cbdf560fd7b9af632502fed40f918c157ea97137";
     };
@@ -41639,18 +46893,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."traverse".">=0.2.4" =
-    self.by-version."traverse"."0.6.6";
-  by-spec."traverse".">=0.3.0 <0.4" =
-    self.by-version."traverse"."0.3.9";
-  by-version."traverse"."0.3.9" = self.buildNodePackage {
-    name = "traverse-0.3.9";
-    version = "0.3.9";
+  by-spec."trim-newlines"."^1.0.0" =
+    self.by-version."trim-newlines"."1.0.0";
+  by-version."trim-newlines"."1.0.0" = self.buildNodePackage {
+    name = "trim-newlines-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz";
-      name = "traverse-0.3.9.tgz";
-      sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9";
+      url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz";
+      name = "trim-newlines-1.0.0.tgz";
+      sha1 = "5887966bb582a4503a41eb524f7d35011815a613";
     };
     deps = {
     };
@@ -41660,16 +46912,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."traverse"."~0.5.1" =
-    self.by-version."traverse"."0.5.2";
-  by-version."traverse"."0.5.2" = self.buildNodePackage {
-    name = "traverse-0.5.2";
-    version = "0.5.2";
+  by-spec."truncate"."~1.0.2" =
+    self.by-version."truncate"."1.0.5";
+  by-version."truncate"."1.0.5" = self.buildNodePackage {
+    name = "truncate-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/traverse/-/traverse-0.5.2.tgz";
-      name = "traverse-0.5.2.tgz";
-      sha1 = "e203c58d5f7f0e37db6e74c0acb929bb09b61d85";
+      url = "https://registry.npmjs.org/truncate/-/truncate-1.0.5.tgz";
+      name = "truncate-1.0.5.tgz";
+      sha1 = "c636c6c1f50eed7c927af06c1dbffab53c7abe28";
     };
     deps = {
     };
@@ -41679,16 +46931,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."truncate"."~1.0.2" =
-    self.by-version."truncate"."1.0.4";
-  by-version."truncate"."1.0.4" = self.buildNodePackage {
-    name = "truncate-1.0.4";
-    version = "1.0.4";
+  by-spec."tryit"."^1.0.1" =
+    self.by-version."tryit"."1.0.2";
+  by-version."tryit"."1.0.2" = self.buildNodePackage {
+    name = "tryit-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/truncate/-/truncate-1.0.4.tgz";
-      name = "truncate-1.0.4.tgz";
-      sha1 = "2bcfbbff4a97b9089b693c1ae37c5105ec8775aa";
+      url = "https://registry.npmjs.org/tryit/-/tryit-1.0.2.tgz";
+      name = "tryit-1.0.2.tgz";
+      sha1 = "c196b0073e6b1c595d93c9c830855b7acc32a453";
     };
     deps = {
     };
@@ -41705,7 +46957,7 @@
     version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz";
+      url = "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz";
       name = "tryor-0.1.2.tgz";
       sha1 = "8145e4ca7caff40acde3ccf946e8b8bb75b4172b";
     };
@@ -41724,7 +46976,7 @@
     version = "0.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
+      url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz";
       name = "tty-browserify-0.0.0.tgz";
       sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6";
     };
@@ -41739,15 +46991,15 @@
   by-spec."tty-browserify"."~0.0.0" =
     self.by-version."tty-browserify"."0.0.0";
   by-spec."tunnel-agent"."^0.4.0" =
-    self.by-version."tunnel-agent"."0.4.0";
-  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
-    name = "tunnel-agent-0.4.0";
-    version = "0.4.0";
+    self.by-version."tunnel-agent"."0.4.2";
+  by-version."tunnel-agent"."0.4.2" = self.buildNodePackage {
+    name = "tunnel-agent-0.4.2";
+    version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
-      name = "tunnel-agent-0.4.0.tgz";
-      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+      url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz";
+      name = "tunnel-agent-0.4.2.tgz";
+      sha1 = "1104e3f36ac87125c287270067d582d18133bfee";
     };
     deps = {
     };
@@ -41764,7 +47016,7 @@
     version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
+      url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.2.0.tgz";
       name = "tunnel-agent-0.2.0.tgz";
       sha1 = "6853c2afb1b2109e45629e492bde35f459ea69e8";
     };
@@ -41783,7 +47035,7 @@
     version = "0.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
+      url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.3.0.tgz";
       name = "tunnel-agent-0.3.0.tgz";
       sha1 = "ad681b68f5321ad2827c4cfb1b7d5df2cfe942ee";
     };
@@ -41796,24 +47048,67 @@
     cpu = [ ];
   };
   by-spec."tunnel-agent"."~0.4.0" =
-    self.by-version."tunnel-agent"."0.4.0";
+    self.by-version."tunnel-agent"."0.4.2";
+  by-spec."tunnel-agent"."~0.4.1" =
+    self.by-version."tunnel-agent"."0.4.2";
+  by-spec."tv4"."^1.2.7" =
+    self.by-version."tv4"."1.2.7";
+  by-version."tv4"."1.2.7" = self.buildNodePackage {
+    name = "tv4-1.2.7";
+    version = "1.2.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz";
+      name = "tv4-1.2.7.tgz";
+      sha1 = "bd29389afc73ade49ae5f48142b5d544bf68d120";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."tweetnacl".">=0.13.0 <1.0.0" =
+    self.by-version."tweetnacl"."0.14.3";
+  by-version."tweetnacl"."0.14.3" = self.buildNodePackage {
+    name = "tweetnacl-0.14.3";
+    version = "0.14.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz";
+      name = "tweetnacl-0.14.3.tgz";
+      sha1 = "3da382f670f25ded78d7b3d1792119bca0b7132d";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."twilio".">=1.1.4" =
-    self.by-version."twilio"."2.0.0";
-  by-version."twilio"."2.0.0" = self.buildNodePackage {
-    name = "twilio-2.0.0";
-    version = "2.0.0";
+    self.by-version."twilio"."2.9.1";
+  by-version."twilio"."2.9.1" = self.buildNodePackage {
+    name = "twilio-2.9.1";
+    version = "2.9.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/twilio/-/twilio-2.0.0.tgz";
-      name = "twilio-2.0.0.tgz";
-      sha1 = "2b762e4890509514c295d152c22a596924f37bdd";
+      url = "https://registry.npmjs.org/twilio/-/twilio-2.9.1.tgz";
+      name = "twilio-2.9.1.tgz";
+      sha1 = "043bfa240ccb33f5f76b771434c2421a0144bc85";
     };
     deps = {
-      "request-2.27.0" = self.by-version."request"."2.27.0";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "jsonwebtoken-5.4.1" = self.by-version."jsonwebtoken"."5.4.1";
       "jwt-simple-0.1.0" = self.by-version."jwt-simple"."0.1.0";
       "q-0.9.7" = self.by-version."q"."0.9.7";
       "scmp-0.0.3" = self.by-version."scmp"."0.0.3";
+      "deprecate-0.1.0" = self.by-version."deprecate"."0.1.0";
+      "string.prototype.startswith-0.2.0" = self.by-version."string.prototype.startswith"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -41828,12 +47123,12 @@
     version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz";
+      url = "https://registry.npmjs.org/twitter-ng/-/twitter-ng-0.6.2.tgz";
       name = "twitter-ng-0.6.2.tgz";
       sha1 = "13707115dd04c9bd1f2c646da976589be4d64bc4";
     };
     deps = {
-      "oauth-0.9.12" = self.by-version."oauth"."0.9.12";
+      "oauth-0.9.14" = self.by-version."oauth"."0.9.14";
     };
     optionalDependencies = {
     };
@@ -41842,18 +47137,18 @@
     cpu = [ ];
   };
   by-spec."type-check"."~0.3.1" =
-    self.by-version."type-check"."0.3.1";
-  by-version."type-check"."0.3.1" = self.buildNodePackage {
-    name = "type-check-0.3.1";
-    version = "0.3.1";
+    self.by-version."type-check"."0.3.2";
+  by-version."type-check"."0.3.2" = self.buildNodePackage {
+    name = "type-check-0.3.2";
+    version = "0.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz";
-      name = "type-check-0.3.1.tgz";
-      sha1 = "9233923c4da174d0ac5480ecfd6ef84c349eb58d";
+      url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
+      name = "type-check-0.3.2.tgz";
+      sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72";
     };
     deps = {
-      "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1";
+      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -41861,6 +47156,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."type-check"."~0.3.2" =
+    self.by-version."type-check"."0.3.2";
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
   by-version."type-detect"."0.1.1" = self.buildNodePackage {
@@ -41868,7 +47165,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
+      url = "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz";
       name = "type-detect-0.1.1.tgz";
       sha1 = "0ba5ec2a885640e470ea4e8505971900dac58822";
     };
@@ -41880,6 +47177,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."type-detect"."^1.0.0" =
+    self.by-version."type-detect"."1.0.0";
+  by-version."type-detect"."1.0.0" = self.buildNodePackage {
+    name = "type-detect-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz";
+      name = "type-detect-1.0.0.tgz";
+      sha1 = "762217cc06db258ec48908a1298e8b95121e8ea2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."type-is"."~1.3.2" =
     self.by-version."type-is"."1.3.2";
   by-version."type-is"."1.3.2" = self.buildNodePackage {
@@ -41887,7 +47203,7 @@
     version = "1.3.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
+      url = "https://registry.npmjs.org/type-is/-/type-is-1.3.2.tgz";
       name = "type-is-1.3.2.tgz";
       sha1 = "4f2a5dc58775ca1630250afc7186f8b36309d1bb";
     };
@@ -41901,20 +47217,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."type-is"."~1.5.1" =
+  by-spec."type-is"."~1.5.2" =
     self.by-version."type-is"."1.5.7";
   by-version."type-is"."1.5.7" = self.buildNodePackage {
     name = "type-is-1.5.7";
     version = "1.5.7";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz";
+      url = "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz";
       name = "type-is-1.5.7.tgz";
       sha1 = "b9368a593cc6ef7d0645e78b2f4c64cbecd05e90";
     };
     deps = {
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
     };
     optionalDependencies = {
     };
@@ -41922,22 +47238,45 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."type-is"."~1.5.2" =
-    self.by-version."type-is"."1.5.7";
-  by-spec."type-is"."~1.6.1" =
-    self.by-version."type-is"."1.6.1";
-  by-version."type-is"."1.6.1" = self.buildNodePackage {
-    name = "type-is-1.6.1";
-    version = "1.6.1";
+  by-spec."type-is"."~1.6.10" =
+    self.by-version."type-is"."1.6.12";
+  by-version."type-is"."1.6.12" = self.buildNodePackage {
+    name = "type-is-1.6.12";
+    version = "1.6.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/type-is/-/type-is-1.6.1.tgz";
-      name = "type-is-1.6.1.tgz";
-      sha1 = "49addecb0f6831cbc1d34ba929f0f3a4f21b0f2e";
+      url = "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz";
+      name = "type-is-1.6.12.tgz";
+      sha1 = "0352a9dfbfff040fe668cc153cc95829c354173e";
     };
     deps = {
       "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."type-is"."~1.6.11" =
+    self.by-version."type-is"."1.6.12";
+  by-spec."type-is"."~1.6.4" =
+    self.by-version."type-is"."1.6.12";
+  by-spec."type-is"."~1.6.6" =
+    self.by-version."type-is"."1.6.12";
+  by-spec."type-of-is"."^3.4.0" =
+    self.by-version."type-of-is"."3.4.0";
+  by-version."type-of-is"."3.4.0" = self.buildNodePackage {
+    name = "type-of-is-3.4.0";
+    version = "3.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/type-of-is/-/type-of-is-3.4.0.tgz";
+      name = "type-of-is-3.4.0.tgz";
+      sha1 = "700dc096fbc9b86e4f79687beeb99e953d471508";
+    };
+    deps = {
     };
     optionalDependencies = {
     };
@@ -41952,7 +47291,7 @@
     version = "2.0.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
+      url = "https://registry.npmjs.org/typechecker/-/typechecker-2.0.8.tgz";
       name = "typechecker-2.0.8.tgz";
       sha1 = "e83da84bb64c584ccb345838576c40b0337db82e";
     };
@@ -41971,7 +47310,7 @@
     version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
+      url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz";
       name = "typedarray-0.0.6.tgz";
       sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777";
     };
@@ -41983,14 +47322,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-version."typescript"."1.5.0-alpha" = self.buildNodePackage {
-    name = "typescript-1.5.0-alpha";
-    version = "1.5.0-alpha";
+  by-spec."typescript"."*" =
+    self.by-version."typescript"."1.9.0-dev.20160405";
+  by-version."typescript"."1.9.0-dev.20160405" = self.buildNodePackage {
+    name = "typescript-1.9.0-dev.20160405";
+    version = "1.9.0-dev.20160405";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/typescript/-/typescript-1.5.0-alpha.tgz";
-      name = "typescript-1.5.0-alpha.tgz";
-      sha1 = "3186ae01d409d9dd924eb35c57e90c2013b97497";
+      url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160405.tgz";
+      name = "typescript-1.9.0-dev.20160405.tgz";
+      sha1 = "72db1600a5b884c528cc389ecb15b6d3cbfd35c5";
     };
     deps = {
     };
@@ -42000,16 +47341,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-version."typescript"."1.8.9" = self.buildNodePackage {
-    name = "typescript-1.8.9";
-    version = "1.8.9";
-    bin = true;
+  "typescript" = self.by-version."typescript"."1.9.0-dev.20160405";
+  by-spec."typewise"."^1.0.3" =
+    self.by-version."typewise"."1.0.3";
+  by-version."typewise"."1.0.3" = self.buildNodePackage {
+    name = "typewise-1.0.3";
+    version = "1.0.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/typescript/-/typescript-1.8.9.tgz";
-      name = "typescript-1.8.9.tgz";
-      sha1 = "b3b3a74059fd31cbd3ecad95d62465939e7ed5fa";
+      url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz";
+      name = "typewise-1.0.3.tgz";
+      sha1 = "1067936540af97937cc5dcf9922486e9fa284651";
     };
     deps = {
+      "typewise-core-1.2.0" = self.by-version."typewise-core"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -42017,11 +47362,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."typescript"."*" =
-    self.by-version."typescript"."1.8.9";
-  by-spec."typescript"."~1.8.9" =
-    self.by-version."typescript"."1.8.9";
-  "typescript" = self.by-version."typescript"."1.8.9";
+  by-spec."typewise-core"."^1.2" =
+    self.by-version."typewise-core"."1.2.0";
+  by-version."typewise-core"."1.2.0" = self.buildNodePackage {
+    name = "typewise-core-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz";
+      name = "typewise-core-1.2.0.tgz";
+      sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."typewise-core"."^1.2.0" =
+    self.by-version."typewise-core"."1.2.0";
   by-spec."typewiselite"."~1.0.0" =
     self.by-version."typewiselite"."1.0.0";
   by-version."typewiselite"."1.0.0" = self.buildNodePackage {
@@ -42029,7 +47390,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz";
+      url = "https://registry.npmjs.org/typewiselite/-/typewiselite-1.0.0.tgz";
       name = "typewiselite-1.0.0.tgz";
       sha1 = "c8882fa1bb1092c06005a97f34ef5c8508e3664e";
     };
@@ -42041,6 +47402,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ua-parser-js"."^0.7.9" =
+    self.by-version."ua-parser-js"."0.7.10";
+  by-version."ua-parser-js"."0.7.10" = self.buildNodePackage {
+    name = "ua-parser-js-0.7.10";
+    version = "0.7.10";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.10.tgz";
+      name = "ua-parser-js-0.7.10.tgz";
+      sha1 = "917559ddcce07cbc09ece7d80495e4c268f4ef9f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."uc.micro"."^1.0.0" =
     self.by-version."uc.micro"."1.0.0";
   by-version."uc.micro"."1.0.0" = self.buildNodePackage {
@@ -42048,7 +47428,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uc.micro/-/uc.micro-1.0.0.tgz";
+      url = "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.0.tgz";
       name = "uc.micro-1.0.0.tgz";
       sha1 = "4c5a6dee941b515a5bd5cf5d05b121e0e49c5fb7";
     };
@@ -42061,21 +47441,21 @@
     cpu = [ ];
   };
   by-spec."uglify-js"."*" =
-    self.by-version."uglify-js"."2.4.20";
-  by-version."uglify-js"."2.4.20" = self.buildNodePackage {
-    name = "uglify-js-2.4.20";
-    version = "2.4.20";
+    self.by-version."uglify-js"."2.6.2";
+  by-version."uglify-js"."2.6.2" = self.buildNodePackage {
+    name = "uglify-js-2.6.2";
+    version = "2.6.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.20.tgz";
-      name = "uglify-js-2.4.20.tgz";
-      sha1 = "f4e9c0ac1d61c0a71d7eb85b3477c3af4cf4a3f2";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.2.tgz";
+      name = "uglify-js-2.6.2.tgz";
+      sha1 = "f50be88a42cd396a6251dc52ab372f71cc12fef0";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
-      "source-map-0.1.34" = self.by-version."source-map"."0.1.34";
-      "yargs-3.5.4" = self.by-version."yargs"."3.5.4";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+      "yargs-3.10.0" = self.by-version."yargs"."3.10.0";
     };
     optionalDependencies = {
     };
@@ -42083,7 +47463,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "uglify-js" = self.by-version."uglify-js"."2.4.20";
+  "uglify-js" = self.by-version."uglify-js"."2.6.2";
   by-spec."uglify-js"."1.2.5" =
     self.by-version."uglify-js"."1.2.5";
   by-version."uglify-js"."1.2.5" = self.buildNodePackage {
@@ -42091,7 +47471,7 @@
     version = "1.2.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-1.2.5.tgz";
       name = "uglify-js-1.2.5.tgz";
       sha1 = "b542c2c76f78efb34b200b20177634330ff702b6";
     };
@@ -42103,45 +47483,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uglify-js"."2.4.0" =
-    self.by-version."uglify-js"."2.4.0";
-  by-version."uglify-js"."2.4.0" = self.buildNodePackage {
-    name = "uglify-js-2.4.0";
-    version = "2.4.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.0.tgz";
-      name = "uglify-js-2.4.0.tgz";
-      sha1 = "a5f2b6b1b817fb34c16a04234328c89ba1e77137";
-    };
-    deps = {
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-      "source-map-0.1.43" = self.by-version."source-map"."0.1.43";
-      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
-      "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."uglify-js"."2.4.16" =
-    self.by-version."uglify-js"."2.4.16";
-  by-version."uglify-js"."2.4.16" = self.buildNodePackage {
-    name = "uglify-js-2.4.16";
-    version = "2.4.16";
+  by-spec."uglify-js"."2.4.24" =
+    self.by-version."uglify-js"."2.4.24";
+  by-version."uglify-js"."2.4.24" = self.buildNodePackage {
+    name = "uglify-js-2.4.24";
+    version = "2.4.24";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz";
-      name = "uglify-js-2.4.16.tgz";
-      sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz";
+      name = "uglify-js-2.4.24.tgz";
+      sha1 = "fad5755c1e1577658bb06ff9ab6e548c95bebd6e";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
       "source-map-0.1.34" = self.by-version."source-map"."0.1.34";
-      "optimist-0.3.7" = self.by-version."optimist"."0.3.7";
       "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2";
+      "yargs-3.5.4" = self.by-version."yargs"."3.5.4";
     };
     optionalDependencies = {
     };
@@ -42149,37 +47506,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uglify-js"."^2.4.15" =
-    self.by-version."uglify-js"."2.4.20";
+  by-spec."uglify-js"."2.6.2" =
+    self.by-version."uglify-js"."2.6.2";
   by-spec."uglify-js"."^2.4.19" =
-    self.by-version."uglify-js"."2.4.20";
-  by-spec."uglify-js"."~1.1.1" =
-    self.by-version."uglify-js"."1.1.1";
-  by-version."uglify-js"."1.1.1" = self.buildNodePackage {
-    name = "uglify-js-1.1.1";
-    version = "1.1.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-1.1.1.tgz";
-      name = "uglify-js-1.1.1.tgz";
-      sha1 = "ee71a97c4cefd06a1a9b20437f34118982aa035b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."uglify-js"."~2.2" =
+    self.by-version."uglify-js"."2.6.2";
+  by-spec."uglify-js"."^2.6" =
+    self.by-version."uglify-js"."2.6.2";
+  by-spec."uglify-js"."~2.2.5" =
     self.by-version."uglify-js"."2.2.5";
   by-version."uglify-js"."2.2.5" = self.buildNodePackage {
     name = "uglify-js-2.2.5";
     version = "2.2.5";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz";
       name = "uglify-js-2.2.5.tgz";
       sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7";
     };
@@ -42193,8 +47533,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uglify-js"."~2.2.5" =
-    self.by-version."uglify-js"."2.2.5";
   by-spec."uglify-js"."~2.3" =
     self.by-version."uglify-js"."2.3.6";
   by-version."uglify-js"."2.3.6" = self.buildNodePackage {
@@ -42202,7 +47540,7 @@
     version = "2.3.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
+      url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz";
       name = "uglify-js-2.3.6.tgz";
       sha1 = "fa0984770b428b7a9b2a8058f46355d14fef211a";
     };
@@ -42217,12 +47555,10 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uglify-js"."~2.4.0" =
-    self.by-version."uglify-js"."2.4.20";
-  by-spec."uglify-js"."~2.4.13" =
-    self.by-version."uglify-js"."2.4.20";
-  by-spec."uglify-js"."~2.4.15" =
-    self.by-version."uglify-js"."2.4.20";
+  by-spec."uglify-js"."~2.6.0" =
+    self.by-version."uglify-js"."2.6.2";
+  by-spec."uglify-js"."~2.6.2" =
+    self.by-version."uglify-js"."2.6.2";
   by-spec."uglify-to-browserify"."~1.0.0" =
     self.by-version."uglify-to-browserify"."1.0.2";
   by-version."uglify-to-browserify"."1.0.2" = self.buildNodePackage {
@@ -42230,7 +47566,7 @@
     version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
+      url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz";
       name = "uglify-to-browserify-1.0.2.tgz";
       sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7";
     };
@@ -42249,7 +47585,7 @@
     version = "0.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uid/-/uid-0.0.2.tgz";
+      url = "https://registry.npmjs.org/uid/-/uid-0.0.2.tgz";
       name = "uid-0.0.2.tgz";
       sha1 = "5e4a5d4b78138b4f70f89fd3c76fc59aa9d2f103";
     };
@@ -42261,35 +47597,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uid-number"."0" =
-    self.by-version."uid-number"."0.0.6";
-  by-version."uid-number"."0.0.6" = self.buildNodePackage {
-    name = "uid-number-0.0.6";
-    version = "0.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
-      name = "uid-number-0.0.6.tgz";
-      sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."uid-number"."0.0.3" =
-    self.by-version."uid-number"."0.0.3";
-  by-version."uid-number"."0.0.3" = self.buildNodePackage {
-    name = "uid-number-0.0.3";
-    version = "0.0.3";
+  by-spec."uid-number"."0.0.5" =
+    self.by-version."uid-number"."0.0.5";
+  by-version."uid-number"."0.0.5" = self.buildNodePackage {
+    name = "uid-number-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz";
-      name = "uid-number-0.0.3.tgz";
-      sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc";
+      url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
+      name = "uid-number-0.0.5.tgz";
+      sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
     };
     deps = {
     };
@@ -42299,16 +47616,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uid-number"."0.0.5" =
-    self.by-version."uid-number"."0.0.5";
-  by-version."uid-number"."0.0.5" = self.buildNodePackage {
-    name = "uid-number-0.0.5";
-    version = "0.0.5";
+  by-spec."uid-number"."0.0.6" =
+    self.by-version."uid-number"."0.0.6";
+  by-version."uid-number"."0.0.6" = self.buildNodePackage {
+    name = "uid-number-0.0.6";
+    version = "0.0.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz";
-      name = "uid-number-0.0.5.tgz";
-      sha1 = "5a3db23ef5dbd55b81fce0ec9a2ac6fccdebb81e";
+      url = "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz";
+      name = "uid-number-0.0.6.tgz";
+      sha1 = "0ea10e8035e8eb5b8e4449f06da1c730663baa81";
     };
     deps = {
     };
@@ -42318,22 +47635,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uid-number"."0.0.6" =
+  by-spec."uid-number"."~0.0.6" =
     self.by-version."uid-number"."0.0.6";
-  by-spec."uid-safe"."1.0.1" =
-    self.by-version."uid-safe"."1.0.1";
-  by-version."uid-safe"."1.0.1" = self.buildNodePackage {
-    name = "uid-safe-1.0.1";
-    version = "1.0.1";
+  by-spec."uid-safe"."2.1.0" =
+    self.by-version."uid-safe"."2.1.0";
+  by-version."uid-safe"."2.1.0" = self.buildNodePackage {
+    name = "uid-safe-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.0.1.tgz";
-      name = "uid-safe-1.0.1.tgz";
-      sha1 = "5bd148460a2e84f54f193fd20352c8c3d7de6ac8";
+      url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.0.tgz";
+      name = "uid-safe-2.1.0.tgz";
+      sha1 = "d00ce22aeb721dfe7c25bb2df49fd00966d38a64";
     };
     deps = {
-      "mz-1.3.0" = self.by-version."mz"."1.3.0";
       "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
+      "random-bytes-1.0.0" = self.by-version."random-bytes"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -42341,20 +47658,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uid-safe"."1.1.0" =
-    self.by-version."uid-safe"."1.1.0";
-  by-version."uid-safe"."1.1.0" = self.buildNodePackage {
-    name = "uid-safe-1.1.0";
-    version = "1.1.0";
+  by-spec."uid-safe"."~2.0.0" =
+    self.by-version."uid-safe"."2.0.0";
+  by-version."uid-safe"."2.0.0" = self.buildNodePackage {
+    name = "uid-safe-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uid-safe/-/uid-safe-1.1.0.tgz";
-      name = "uid-safe-1.1.0.tgz";
-      sha1 = "58d6c5dabf8dfbd8d52834839806c03fd6143232";
+      url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz";
+      name = "uid-safe-2.0.0.tgz";
+      sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137";
     };
     deps = {
       "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
-      "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -42362,8 +47678,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uid-safe"."~1.1.0" =
-    self.by-version."uid-safe"."1.1.0";
   by-spec."uid2"."0.0.3" =
     self.by-version."uid2"."0.0.3";
   by-version."uid2"."0.0.3" = self.buildNodePackage {
@@ -42371,7 +47685,7 @@
     version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
+      url = "https://registry.npmjs.org/uid2/-/uid2-0.0.3.tgz";
       name = "uid2-0.0.3.tgz";
       sha1 = "483126e11774df2f71b8b639dcd799c376162b82";
     };
@@ -42388,15 +47702,15 @@
   by-spec."uid2"."~0.0.2" =
     self.by-version."uid2"."0.0.3";
   by-spec."ultron"."1.0.x" =
-    self.by-version."ultron"."1.0.1";
-  by-version."ultron"."1.0.1" = self.buildNodePackage {
-    name = "ultron-1.0.1";
-    version = "1.0.1";
+    self.by-version."ultron"."1.0.2";
+  by-version."ultron"."1.0.2" = self.buildNodePackage {
+    name = "ultron-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ultron/-/ultron-1.0.1.tgz";
-      name = "ultron-1.0.1.tgz";
-      sha1 = "c9d8d86c9cf2823028eb45629ab725897dd65dc5";
+      url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
+      name = "ultron-1.0.2.tgz";
+      sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
     };
     deps = {
     };
@@ -42413,7 +47727,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/umask/-/umask-1.1.0.tgz";
+      url = "https://registry.npmjs.org/umask/-/umask-1.1.0.tgz";
       name = "umask-1.1.0.tgz";
       sha1 = "f29cebf01df517912bb58ff9c4e50fde8e33320d";
     };
@@ -42425,39 +47739,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."umd"."^2.1.0" =
-    self.by-version."umd"."2.1.0";
-  by-version."umd"."2.1.0" = self.buildNodePackage {
-    name = "umd-2.1.0";
-    version = "2.1.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/umd/-/umd-2.1.0.tgz";
-      name = "umd-2.1.0.tgz";
-      sha1 = "4a6307b762f17f02d201b5fa154e673396c263cf";
-    };
-    deps = {
-      "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
-      "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."umd"."^3.0.0" =
-    self.by-version."umd"."3.0.0";
-  by-version."umd"."3.0.0" = self.buildNodePackage {
-    name = "umd-3.0.0";
-    version = "3.0.0";
+    self.by-version."umd"."3.0.1";
+  by-version."umd"."3.0.1" = self.buildNodePackage {
+    name = "umd-3.0.1";
+    version = "3.0.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/umd/-/umd-3.0.0.tgz";
-      name = "umd-3.0.0.tgz";
-      sha1 = "328de29bf1004abb4d6309d7fff1b84b9f823b83";
+      url = "https://registry.npmjs.org/umd/-/umd-3.0.1.tgz";
+      name = "umd-3.0.1.tgz";
+      sha1 = "8ae556e11011f63c2596708a8837259f01b3d60e";
     };
     deps = {
     };
@@ -42467,22 +47758,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."umd"."~2.0.0" =
-    self.by-version."umd"."2.0.0";
-  by-version."umd"."2.0.0" = self.buildNodePackage {
-    name = "umd-2.0.0";
-    version = "2.0.0";
-    bin = true;
+  by-spec."undefsafe"."0.0.3" =
+    self.by-version."undefsafe"."0.0.3";
+  by-version."undefsafe"."0.0.3" = self.buildNodePackage {
+    name = "undefsafe-0.0.3";
+    version = "0.0.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/umd/-/umd-2.0.0.tgz";
-      name = "umd-2.0.0.tgz";
-      sha1 = "749683b0d514728ae0e1b6195f5774afc0ad4f8f";
+      url = "https://registry.npmjs.org/undefsafe/-/undefsafe-0.0.3.tgz";
+      name = "undefsafe-0.0.3.tgz";
+      sha1 = "ecca3a03e56b9af17385baac812ac83b994a962f";
     };
     deps = {
-      "rfile-1.0.0" = self.by-version."rfile"."1.0.0";
-      "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0";
-      "through-2.3.7" = self.by-version."through"."2.3.7";
-      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
     };
     optionalDependencies = {
     };
@@ -42490,8 +47777,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."umd"."~2.1.0" =
-    self.by-version."umd"."2.1.0";
   by-spec."underscore"."*" =
     self.by-version."underscore"."1.8.3";
   by-version."underscore"."1.8.3" = self.buildNodePackage {
@@ -42499,7 +47784,7 @@
     version = "1.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
+      url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz";
       name = "underscore-1.8.3.tgz";
       sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022";
     };
@@ -42519,7 +47804,7 @@
     version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz";
+      url = "https://registry.npmjs.org/underscore/-/underscore-1.2.1.tgz";
       name = "underscore-1.2.1.tgz";
       sha1 = "fc5c6b0765673d92a2d4ac8b4dc0aa88702e2bd4";
     };
@@ -42531,25 +47816,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."underscore"."1.3.3" =
-    self.by-version."underscore"."1.3.3";
-  by-version."underscore"."1.3.3" = self.buildNodePackage {
-    name = "underscore-1.3.3";
-    version = "1.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.3.3.tgz";
-      name = "underscore-1.3.3.tgz";
-      sha1 = "47ac53683daf832bfa952e1774417da47817ae42";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."underscore"."1.6.x" =
     self.by-version."underscore"."1.6.0";
   by-version."underscore"."1.6.0" = self.buildNodePackage {
@@ -42557,7 +47823,7 @@
     version = "1.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
+      url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz";
       name = "underscore-1.6.0.tgz";
       sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8";
     };
@@ -42576,7 +47842,7 @@
     version = "1.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
+      url = "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz";
       name = "underscore-1.7.0.tgz";
       sha1 = "6bbaf0877500d36be34ecaa584e0db9fef035209";
     };
@@ -42588,25 +47854,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."underscore"."1.8.2" =
-    self.by-version."underscore"."1.8.2";
-  by-version."underscore"."1.8.2" = self.buildNodePackage {
-    name = "underscore-1.8.2";
-    version = "1.8.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.8.2.tgz";
-      name = "underscore-1.8.2.tgz";
-      sha1 = "64df2eb590899de950782f3735190ba42ebf311d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."underscore"."1.x" =
     self.by-version."underscore"."1.8.3";
   by-spec."underscore".">= 1.3.3" =
@@ -42615,14 +47862,14 @@
     self.by-version."underscore"."1.8.3";
   by-spec."underscore".">=1.3.1" =
     self.by-version."underscore"."1.8.3";
-  by-spec."underscore".">=1.5.0" =
-    self.by-version."underscore"."1.8.3";
   by-spec."underscore".">=1.5.2" =
     self.by-version."underscore"."1.8.3";
-  by-spec."underscore"."^1.6.0" =
+  by-spec."underscore".">=1.8.3" =
     self.by-version."underscore"."1.8.3";
   by-spec."underscore"."^1.7.0" =
     self.by-version."underscore"."1.8.3";
+  by-spec."underscore"."^1.8.3" =
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore"."~1.4.3" =
     self.by-version."underscore"."1.4.4";
   by-version."underscore"."1.4.4" = self.buildNodePackage {
@@ -42630,7 +47877,7 @@
     version = "1.4.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
+      url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
       name = "underscore-1.4.4.tgz";
       sha1 = "61a6a32010622afa07963bf325203cf12239d604";
     };
@@ -42651,7 +47898,7 @@
     version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
+      url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz";
       name = "underscore-1.5.2.tgz";
       sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08";
     };
@@ -42672,7 +47919,7 @@
     version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
+      url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.2.1.tgz";
       name = "underscore.string-2.2.1.tgz";
       sha1 = "d7c0fa2af5d5a1a67f4253daee98132e733f0f19";
     };
@@ -42691,7 +47938,7 @@
     version = "2.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
+      url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.3.3.tgz";
       name = "underscore.string-2.3.3.tgz";
       sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d";
     };
@@ -42712,7 +47959,7 @@
     version = "2.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
+      url = "https://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz";
       name = "underscore.string-2.4.0.tgz";
       sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b";
     };
@@ -42724,6 +47971,44 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."underscore.string"."~3.0.3" =
+    self.by-version."underscore.string"."3.0.3";
+  by-version."underscore.string"."3.0.3" = self.buildNodePackage {
+    name = "underscore.string-3.0.3";
+    version = "3.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/underscore.string/-/underscore.string-3.0.3.tgz";
+      name = "underscore.string-3.0.3.tgz";
+      sha1 = "4617b8c1a250cf6e5064fbbb363d0fa96cf14552";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."underscore.string"."~3.2.3" =
+    self.by-version."underscore.string"."3.2.3";
+  by-version."underscore.string"."3.2.3" = self.buildNodePackage {
+    name = "underscore.string-3.2.3";
+    version = "3.2.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/underscore.string/-/underscore.string-3.2.3.tgz";
+      name = "underscore.string-3.2.3.tgz";
+      sha1 = "806992633665d5e5fcb4db1fb3a862eb68e9e6da";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."unfunk-diff"."~0.0.1" =
     self.by-version."unfunk-diff"."0.0.2";
   by-version."unfunk-diff"."0.0.2" = self.buildNodePackage {
@@ -42731,7 +48016,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
+      url = "https://registry.npmjs.org/unfunk-diff/-/unfunk-diff-0.0.2.tgz";
       name = "unfunk-diff-0.0.2.tgz";
       sha1 = "8560d6b5cb3dcb1ed4d541e7fe59cea514697578";
     };
@@ -42747,51 +48032,115 @@
     cpu = [ ];
   };
   by-spec."ungit"."*" =
-    self.by-version."ungit"."0.9.1";
-  by-version."ungit"."0.9.1" = self.buildNodePackage {
-    name = "ungit-0.9.1";
-    version = "0.9.1";
+    self.by-version."ungit"."0.10.1";
+  by-version."ungit"."0.10.1" = self.buildNodePackage {
+    name = "ungit-0.10.1";
+    version = "0.10.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ungit/-/ungit-0.9.1.tgz";
-      name = "ungit-0.9.1.tgz";
-      sha1 = "e2148e21aa8c488aaecab0c293f97134aca6c348";
+      url = "https://registry.npmjs.org/ungit/-/ungit-0.10.1.tgz";
+      name = "ungit-0.10.1.tgz";
+      sha1 = "46baa2bbdb767bbd0c4ecc64b1167052b06dab28";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "blueimp-md5-1.1.0" = self.by-version."blueimp-md5"."1.1.0";
-      "body-parser-1.12.3" = self.by-version."body-parser"."1.12.3";
-      "color-0.8.0" = self.by-version."color"."0.8.0";
-      "cookie-parser-1.3.4" = self.by-version."cookie-parser"."1.3.4";
-      "crossroads-0.12.0" = self.by-version."crossroads"."0.12.0";
-      "diff2html-0.1.9" = self.by-version."diff2html"."0.1.9";
-      "express-4.12.3" = self.by-version."express"."4.12.3";
-      "express-session-1.10.4" = self.by-version."express-session"."1.10.4";
-      "forever-monitor-1.5.2" = self.by-version."forever-monitor"."1.5.2";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "bluebird-3.2.2" = self.by-version."bluebird"."3.2.2";
+      "blueimp-md5-2.1.0" = self.by-version."blueimp-md5"."2.1.0";
+      "body-parser-1.14.2" = self.by-version."body-parser"."1.14.2";
+      "color-0.11.1" = self.by-version."color"."0.11.1";
+      "cookie-parser-1.4.1" = self.by-version."cookie-parser"."1.4.1";
+      "crossroads-0.12.2" = self.by-version."crossroads"."0.12.2";
+      "diff2html-1.2.0" = self.by-version."diff2html"."1.2.0";
+      "express-4.13.4" = self.by-version."express"."4.13.4";
+      "express-session-1.13.0" = self.by-version."express-session"."1.13.0";
+      "forever-monitor-1.1.0" = self.by-version."forever-monitor"."1.1.0";
       "getmac-1.0.7" = self.by-version."getmac"."1.0.7";
       "hasher-1.2.0" = self.by-version."hasher"."1.2.0";
       "keen.io-0.1.3" = self.by-version."keen.io"."0.1.3";
-      "knockout-3.3.0" = self.by-version."knockout"."3.3.0";
-      "lodash-3.6.0" = self.by-version."lodash"."3.6.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "moment-2.9.0" = self.by-version."moment"."2.9.0";
-      "npm-registry-client-6.1.2" = self.by-version."npm-registry-client"."6.1.2";
-      "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1";
+      "knockout-3.4.0" = self.by-version."knockout"."3.4.0";
+      "lodash-4.2.1" = self.by-version."lodash"."4.2.1";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "moment-2.11.2" = self.by-version."moment"."2.11.2";
+      "npm-registry-client-7.0.9" = self.by-version."npm-registry-client"."7.0.9";
+      "npmconf-2.1.2" = self.by-version."npmconf"."2.1.2";
+      "octicons-3.4.1" = self.by-version."octicons"."3.4.1";
       "open-0.0.5" = self.by-version."open"."0.0.5";
-      "passport-0.2.1" = self.by-version."passport"."0.2.1";
+      "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
+      "passport-0.3.2" = self.by-version."passport"."0.3.2";
       "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0";
-      "raven-0.7.3" = self.by-version."raven"."0.7.3";
-      "rc-1.0.1" = self.by-version."rc"."1.0.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
-      "serve-static-1.9.2" = self.by-version."serve-static"."1.9.2";
+      "raven-0.10.0" = self.by-version."raven"."0.10.0";
+      "rc-1.1.6" = self.by-version."rc"."1.1.6";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+      "serve-static-1.10.2" = self.by-version."serve-static"."1.10.2";
       "signals-1.0.0" = self.by-version."signals"."1.0.0";
-      "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17";
+      "snapsvg-0.4.0" = self.by-version."snapsvg"."0.4.0";
+      "socket.io-1.4.5" = self.by-version."socket.io"."1.4.5";
       "superagent-0.21.0" = self.by-version."superagent"."0.21.0";
-      "temp-0.8.1" = self.by-version."temp"."0.8.1";
+      "temp-0.8.3" = self.by-version."temp"."0.8.3";
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
-      "winston-0.9.0" = self.by-version."winston"."0.9.0";
-      "yargs-3.6.0" = self.by-version."yargs"."3.6.0";
+      "winston-2.1.1" = self.by-version."winston"."2.1.1";
+      "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "ungit" = self.by-version."ungit"."0.10.1";
+  by-spec."uniq"."^1.0.1" =
+    self.by-version."uniq"."1.0.1";
+  by-version."uniq"."1.0.1" = self.buildNodePackage {
+    name = "uniq-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz";
+      name = "uniq-1.0.1.tgz";
+      sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."unique-filename"."~1.1.0" =
+    self.by-version."unique-filename"."1.1.0";
+  by-version."unique-filename"."1.1.0" = self.buildNodePackage {
+    name = "unique-filename-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz";
+      name = "unique-filename-1.1.0.tgz";
+      sha1 = "d05f2fe4032560871f30e93cbe735eea201514f3";
+    };
+    deps = {
+      "unique-slug-2.0.0" = self.by-version."unique-slug"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."unique-slug"."^2.0.0" =
+    self.by-version."unique-slug"."2.0.0";
+  by-version."unique-slug"."2.0.0" = self.buildNodePackage {
+    name = "unique-slug-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz";
+      name = "unique-slug-2.0.0.tgz";
+      sha1 = "db6676e7c7cc0629878ff196097c78855ae9f4ab";
+    };
+    deps = {
+      "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
     };
     optionalDependencies = {
     };
@@ -42799,7 +48148,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "ungit" = self.by-version."ungit"."0.9.1";
   by-spec."unique-stream"."^1.0.0" =
     self.by-version."unique-stream"."1.0.0";
   by-version."unique-stream"."1.0.0" = self.buildNodePackage {
@@ -42807,7 +48155,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
+      url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz";
       name = "unique-stream-1.0.0.tgz";
       sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b";
     };
@@ -42826,7 +48174,7 @@
     version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz";
+      url = "https://registry.npmjs.org/unorm/-/unorm-1.3.3.tgz";
       name = "unorm-1.3.3.tgz";
       sha1 = "16a8772671ebd6f7cde6f8c5e49bb60ac47dba93";
     };
@@ -42838,19 +48186,37 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."untildify"."^1.0.0" =
-    self.by-version."untildify"."1.0.0";
-  by-version."untildify"."1.0.0" = self.buildNodePackage {
-    name = "untildify-1.0.0";
+  by-spec."unorm"."^1.3.3" =
+    self.by-version."unorm"."1.4.1";
+  by-version."unorm"."1.4.1" = self.buildNodePackage {
+    name = "unorm-1.4.1";
+    version = "1.4.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz";
+      name = "unorm-1.4.1.tgz";
+      sha1 = "364200d5f13646ca8bcd44490271335614792300";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."unpipe"."1.0.0" =
+    self.by-version."unpipe"."1.0.0";
+  by-version."unpipe"."1.0.0" = self.buildNodePackage {
+    name = "unpipe-1.0.0";
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/untildify/-/untildify-1.0.0.tgz";
-      name = "untildify-1.0.0.tgz";
-      sha1 = "4d8031d1806f4fbd7c42b0237aaf213686262635";
+      url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz";
+      name = "unpipe-1.0.0.tgz";
+      sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec";
     };
     deps = {
-      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -42858,24 +48224,66 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."update-notifier"."^0.3.0" =
-    self.by-version."update-notifier"."0.3.2";
-  by-version."update-notifier"."0.3.2" = self.buildNodePackage {
-    name = "update-notifier-0.3.2";
-    version = "0.3.2";
+  by-spec."unpipe"."~1.0.0" =
+    self.by-version."unpipe"."1.0.0";
+  by-spec."untildify"."^2.0.0" =
+    self.by-version."untildify"."2.1.0";
+  by-version."untildify"."2.1.0" = self.buildNodePackage {
+    name = "untildify-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.3.2.tgz";
-      name = "update-notifier-0.3.2.tgz";
-      sha1 = "22a8735baadef3320e2db928f693da898dc87777";
+      url = "https://registry.npmjs.org/untildify/-/untildify-2.1.0.tgz";
+      name = "untildify-2.1.0.tgz";
+      sha1 = "17eb2807987f76952e9c0485fc311d06a826a2e0";
     };
     deps = {
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
+      "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."unzip-response"."^1.0.0" =
+    self.by-version."unzip-response"."1.0.0";
+  by-version."unzip-response"."1.0.0" = self.buildNodePackage {
+    name = "unzip-response-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.0.tgz";
+      name = "unzip-response-1.0.0.tgz";
+      sha1 = "bfda54eeec658f00c2df4d4494b9dca0ca00f3e4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."update-notifier"."0.5.0" =
+    self.by-version."update-notifier"."0.5.0";
+  by-version."update-notifier"."0.5.0" = self.buildNodePackage {
+    name = "update-notifier-0.5.0";
+    version = "0.5.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/update-notifier/-/update-notifier-0.5.0.tgz";
+      name = "update-notifier-0.5.0.tgz";
+      sha1 = "07b5dc2066b3627ab3b4f530130f7eddda07a4cc";
+    };
+    deps = {
+      "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
+      "configstore-1.4.0" = self.by-version."configstore"."1.4.0";
       "is-npm-1.0.0" = self.by-version."is-npm"."1.0.0";
-      "latest-version-1.0.0" = self.by-version."latest-version"."1.0.0";
-      "semver-diff-2.0.0" = self.by-version."semver-diff"."2.0.0";
-      "string-length-1.0.0" = self.by-version."string-length"."1.0.0";
+      "latest-version-1.0.1" = self.by-version."latest-version"."1.0.1";
+      "repeating-1.1.3" = self.by-version."repeating"."1.1.3";
+      "semver-diff-2.1.0" = self.by-version."semver-diff"."2.1.0";
+      "string-length-1.0.1" = self.by-version."string-length"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -42883,16 +48291,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."uri-path"."0.0.2" =
-    self.by-version."uri-path"."0.0.2";
-  by-version."uri-path"."0.0.2" = self.buildNodePackage {
-    name = "uri-path-0.0.2";
-    version = "0.0.2";
+  by-spec."update-notifier"."^0.5.0" =
+    self.by-version."update-notifier"."0.5.0";
+  by-spec."uri-path"."^1.0.0" =
+    self.by-version."uri-path"."1.0.0";
+  by-version."uri-path"."1.0.0" = self.buildNodePackage {
+    name = "uri-path-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uri-path/-/uri-path-0.0.2.tgz";
-      name = "uri-path-0.0.2.tgz";
-      sha1 = "803eb01f2feb17927dcce0f6187e72b75f53f554";
+      url = "https://registry.npmjs.org/uri-path/-/uri-path-1.0.0.tgz";
+      name = "uri-path-1.0.0.tgz";
+      sha1 = "9747f018358933c31de0fccfd82d138e67262e32";
     };
     deps = {
     };
@@ -42909,7 +48319,7 @@
     version = "0.10.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/url/-/url-0.10.3.tgz";
+      url = "https://registry.npmjs.org/url/-/url-0.10.3.tgz";
       name = "url-0.10.3.tgz";
       sha1 = "021e4d9c7705f21bbf37d03ceb58767402774c64";
     };
@@ -42923,20 +48333,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."url"."~0.7.9" =
-    self.by-version."url"."0.7.9";
-  by-version."url"."0.7.9" = self.buildNodePackage {
-    name = "url-0.7.9";
-    version = "0.7.9";
+  by-spec."url"."~0.11.0" =
+    self.by-version."url"."0.11.0";
+  by-version."url"."0.11.0" = self.buildNodePackage {
+    name = "url-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/url/-/url-0.7.9.tgz";
-      name = "url-0.7.9.tgz";
-      sha1 = "1959b1a8b361fc017b59513a7c7fa9827f5e4ed0";
+      url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz";
+      name = "url-0.11.0.tgz";
+      sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1";
     };
     deps = {
-      "querystring-0.1.0" = self.by-version."querystring"."0.1.0";
-      "punycode-1.0.0" = self.by-version."punycode"."1.0.0";
+      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
+      "querystring-0.2.0" = self.by-version."querystring"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -42951,7 +48361,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz";
+      url = "https://registry.npmjs.org/url-join/-/url-join-0.0.1.tgz";
       name = "url-join-0.0.1.tgz";
       sha1 = "1db48ad422d3402469a87f7d97bdebfe4fb1e3c8";
     };
@@ -42963,14 +48373,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."user-home"."^1.0.0" =
+  by-spec."user-home"."^1.1.1" =
     self.by-version."user-home"."1.1.1";
   by-version."user-home"."1.1.1" = self.buildNodePackage {
     name = "user-home-1.1.1";
     version = "1.1.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz";
+      url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz";
       name = "user-home-1.1.1.tgz";
       sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190";
     };
@@ -42982,20 +48392,36 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."user-home"."^1.1.0" =
-    self.by-version."user-home"."1.1.1";
-  by-spec."user-home"."^1.1.1" =
-    self.by-version."user-home"."1.1.1";
-  by-spec."useragent"."~2.0.4" =
-    self.by-version."useragent"."2.0.10";
-  by-version."useragent"."2.0.10" = self.buildNodePackage {
-    name = "useragent-2.0.10";
-    version = "2.0.10";
+  by-spec."user-home"."^2.0.0" =
+    self.by-version."user-home"."2.0.0";
+  by-version."user-home"."2.0.0" = self.buildNodePackage {
+    name = "user-home-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/useragent/-/useragent-2.0.10.tgz";
-      name = "useragent-2.0.10.tgz";
-      sha1 = "af2c1cc641159361e4d830866eb716ba4679de33";
+      url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz";
+      name = "user-home-2.0.0.tgz";
+      sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f";
+    };
+    deps = {
+      "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."useragent"."^2.1.6" =
+    self.by-version."useragent"."2.1.9";
+  by-version."useragent"."2.1.9" = self.buildNodePackage {
+    name = "useragent-2.1.9";
+    version = "2.1.9";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/useragent/-/useragent-2.1.9.tgz";
+      name = "useragent-2.1.9.tgz";
+      sha1 = "4dba2bc4dad1875777ab15de3ff8098b475000b7";
     };
     deps = {
       "lru-cache-2.2.4" = self.by-version."lru-cache"."2.2.4";
@@ -43006,20 +48432,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."utf-8-validate"."1.0.x" =
-    self.by-version."utf-8-validate"."1.0.1";
-  by-version."utf-8-validate"."1.0.1" = self.buildNodePackage {
-    name = "utf-8-validate-1.0.1";
-    version = "1.0.1";
+  by-spec."utf-8-validate"."1.2.x" =
+    self.by-version."utf-8-validate"."1.2.1";
+  by-version."utf-8-validate"."1.2.1" = self.buildNodePackage {
+    name = "utf-8-validate-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.0.1.tgz";
-      name = "utf-8-validate-1.0.1.tgz";
-      sha1 = "d15eb67e28f6bb93c9401eeb7eac7030a183e8d1";
+      url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-1.2.1.tgz";
+      name = "utf-8-validate-1.2.1.tgz";
+      sha1 = "44cb7c6eead73d6b40448f71f745904357b9f72c";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
-      "nan-1.6.2" = self.by-version."nan"."1.6.2";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
     };
     optionalDependencies = {
     };
@@ -43034,7 +48460,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz";
+      url = "https://registry.npmjs.org/utf7/-/utf7-1.0.0.tgz";
       name = "utf7-1.0.0.tgz";
       sha1 = "70c895de9d85b8ee7ef5a1fa8e169241c46e72cc";
     };
@@ -43053,7 +48479,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz";
+      url = "https://registry.npmjs.org/utf8/-/utf8-2.0.0.tgz";
       name = "utf8-2.0.0.tgz";
       sha1 = "79ce59eced874809cab9a71fc7102c7d45d4118d";
     };
@@ -43065,16 +48491,35 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."utf8"."2.1.0" =
+    self.by-version."utf8"."2.1.0";
+  by-version."utf8"."2.1.0" = self.buildNodePackage {
+    name = "utf8-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
+      name = "utf8-2.1.0.tgz";
+      sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."utfx"."~1.0.0" =
-    self.by-version."utfx"."1.0.0";
-  by-version."utfx"."1.0.0" = self.buildNodePackage {
-    name = "utfx-1.0.0";
-    version = "1.0.0";
+    self.by-version."utfx"."1.0.1";
+  by-version."utfx"."1.0.1" = self.buildNodePackage {
+    name = "utfx-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/utfx/-/utfx-1.0.0.tgz";
-      name = "utfx-1.0.0.tgz";
-      sha1 = "a6ecdd5c70b2bf1f7fe2381afd1a806d0343b6e1";
+      url = "https://registry.npmjs.org/utfx/-/utfx-1.0.1.tgz";
+      name = "utfx-1.0.1.tgz";
+      sha1 = "d52b2fd632a99eca8d9d4a39eece014a6a2b0048";
     };
     deps = {
     };
@@ -43091,7 +48536,7 @@
     version = "0.10.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/util/-/util-0.10.3.tgz";
+      url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz";
       name = "util-0.10.3.tgz";
       sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9";
     };
@@ -43111,7 +48556,7 @@
     version = "0.4.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/util/-/util-0.4.9.tgz";
+      url = "https://registry.npmjs.org/util/-/util-0.4.9.tgz";
       name = "util-0.4.9.tgz";
       sha1 = "d95d5830d2328ec17dee3c80bfc50c33562b75a3";
     };
@@ -43130,16 +48575,16 @@
     self.by-version."util"."0.10.3";
   by-spec."util"."~0.10.3" =
     self.by-version."util"."0.10.3";
-  by-spec."util-deprecate"."1.0.0" =
-    self.by-version."util-deprecate"."1.0.0";
-  by-version."util-deprecate"."1.0.0" = self.buildNodePackage {
-    name = "util-deprecate-1.0.0";
-    version = "1.0.0";
+  by-spec."util-deprecate"."1.0.2" =
+    self.by-version."util-deprecate"."1.0.2";
+  by-version."util-deprecate"."1.0.2" = self.buildNodePackage {
+    name = "util-deprecate-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.0.tgz";
-      name = "util-deprecate-1.0.0.tgz";
-      sha1 = "3007af012c140eae26de05576ec22785cac3abf2";
+      url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+      name = "util-deprecate-1.0.2.tgz";
+      sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
     };
     deps = {
     };
@@ -43149,16 +48594,18 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."util-deprecate"."~1.0.1" =
+    self.by-version."util-deprecate"."1.0.2";
   by-spec."util-extend"."^1.0.1" =
-    self.by-version."util-extend"."1.0.1";
-  by-version."util-extend"."1.0.1" = self.buildNodePackage {
-    name = "util-extend-1.0.1";
-    version = "1.0.1";
+    self.by-version."util-extend"."1.0.3";
+  by-version."util-extend"."1.0.3" = self.buildNodePackage {
+    name = "util-extend-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/util-extend/-/util-extend-1.0.1.tgz";
-      name = "util-extend-1.0.1.tgz";
-      sha1 = "bb703b79480293ddcdcfb3c6a9fea20f483415bc";
+      url = "https://registry.npmjs.org/util-extend/-/util-extend-1.0.3.tgz";
+      name = "util-extend-1.0.3.tgz";
+      sha1 = "a7c216d267545169637b3b6edc6ca9119e2ff93f";
     };
     deps = {
     };
@@ -43168,6 +48615,31 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."utile"."0.1.x" =
+    self.by-version."utile"."0.1.7";
+  by-version."utile"."0.1.7" = self.buildNodePackage {
+    name = "utile-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/utile/-/utile-0.1.7.tgz";
+      name = "utile-0.1.7.tgz";
+      sha1 = "55db180d54475339fd6dd9e2d14a4c0b52624b69";
+    };
+    deps = {
+      "async-0.1.22" = self.by-version."async"."0.1.22";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
+      "i-0.3.4" = self.by-version."i"."0.3.4";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "ncp-0.2.7" = self.by-version."ncp"."0.2.7";
+      "rimraf-1.0.9" = self.by-version."rimraf"."1.0.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."utile"."0.2.1" =
     self.by-version."utile"."0.2.1";
   by-version."utile"."0.2.1" = self.buildNodePackage {
@@ -43175,17 +48647,17 @@
     version = "0.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
+      url = "https://registry.npmjs.org/utile/-/utile-0.2.1.tgz";
       name = "utile-0.2.1.tgz";
       sha1 = "930c88e99098d6220834c356cbd9a770522d90d7";
     };
     deps = {
       "async-0.2.10" = self.by-version."async"."0.2.10";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "i-0.3.3" = self.by-version."i"."0.3.3";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
+      "i-0.3.4" = self.by-version."i"."0.3.4";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "ncp-0.4.2" = self.by-version."ncp"."0.4.2";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -43204,7 +48676,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
+      url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz";
       name = "utils-merge-1.0.0.tgz";
       sha1 = "0294fb922bb9375153541c4f7096231f287c8af8";
     };
@@ -43218,6 +48690,26 @@
   };
   by-spec."utils-merge"."1.x.x" =
     self.by-version."utils-merge"."1.0.0";
+  by-spec."utp"."0.0.7" =
+    self.by-version."utp"."0.0.7";
+  by-version."utp"."0.0.7" = self.buildNodePackage {
+    name = "utp-0.0.7";
+    version = "0.0.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/utp/-/utp-0.0.7.tgz";
+      name = "utp-0.0.7.tgz";
+      sha1 = "ae43eb7745f5fe63dcc2f277cb4164ad27087f30";
+    };
+    deps = {
+      "cyclist-0.1.1" = self.by-version."cyclist"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."uuid"."^2.0.1" =
     self.by-version."uuid"."2.0.1";
   by-version."uuid"."2.0.1" = self.buildNodePackage {
@@ -43225,7 +48717,7 @@
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
+      url = "https://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz";
       name = "uuid-2.0.1.tgz";
       sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac";
     };
@@ -43239,20 +48731,20 @@
   };
   by-spec."uuid"."~2.0.1" =
     self.by-version."uuid"."2.0.1";
-  by-spec."v8-debug"."~0.4.2" =
-    self.by-version."v8-debug"."0.4.2";
-  by-version."v8-debug"."0.4.2" = self.buildNodePackage {
-    name = "v8-debug-0.4.2";
-    version = "0.4.2";
+  by-spec."v8-debug"."~0.7.1" =
+    self.by-version."v8-debug"."0.7.1";
+  by-version."v8-debug"."0.7.1" = self.buildNodePackage {
+    name = "v8-debug-0.7.1";
+    version = "0.7.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.4.2.tgz";
-      name = "v8-debug-0.4.2.tgz";
-      sha1 = "a43ec4699f7760828bcd6520f9d7938ccf612dfe";
+      url = "https://registry.npmjs.org/v8-debug/-/v8-debug-0.7.1.tgz";
+      name = "v8-debug-0.7.1.tgz";
+      sha1 = "705e65fa77f936dfef6b70a770df11eefde6580e";
     };
     deps = {
-      "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4";
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nan-2.2.1" = self.by-version."nan"."2.2.1";
+      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
     };
     optionalDependencies = {
     };
@@ -43260,20 +48752,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."v8-profiler"."~5.2.4" =
-    self.by-version."v8-profiler"."5.2.4";
-  by-version."v8-profiler"."5.2.4" = self.buildNodePackage {
-    name = "v8-profiler-5.2.4";
-    version = "5.2.4";
+  by-spec."v8-profiler"."~5.6.0" =
+    self.by-version."v8-profiler"."5.6.0";
+  by-version."v8-profiler"."5.6.0" = self.buildNodePackage {
+    name = "v8-profiler-5.6.0";
+    version = "5.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.4.tgz";
-      name = "v8-profiler-5.2.4.tgz";
-      sha1 = "858df0a98dffb79f5df5de74c21a05f57051d977";
+      url = "https://registry.npmjs.org/v8-profiler/-/v8-profiler-5.6.0.tgz";
+      name = "v8-profiler-5.6.0.tgz";
+      sha1 = "e85bbcd71a94a827ca42a33f63f7d01f54f1c24d";
     };
     deps = {
-      "node-pre-gyp-0.6.4" = self.by-version."node-pre-gyp"."0.6.4";
-      "nan-1.5.3" = self.by-version."nan"."1.5.3";
+      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "nan-2.0.9" = self.by-version."nan"."2.0.9";
     };
     optionalDependencies = {
     };
@@ -43282,15 +48774,15 @@
     cpu = [ ];
   };
   by-spec."v8flags"."^2.0.2" =
-    self.by-version."v8flags"."2.0.5";
-  by-version."v8flags"."2.0.5" = self.buildNodePackage {
-    name = "v8flags-2.0.5";
-    version = "2.0.5";
+    self.by-version."v8flags"."2.0.11";
+  by-version."v8flags"."2.0.11" = self.buildNodePackage {
+    name = "v8flags-2.0.11";
+    version = "2.0.11";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/v8flags/-/v8flags-2.0.5.tgz";
-      name = "v8flags-2.0.5.tgz";
-      sha1 = "006e90eeba5f9c861f34a3b75fdb1fa26f8da629";
+      url = "https://registry.npmjs.org/v8flags/-/v8flags-2.0.11.tgz";
+      name = "v8flags-2.0.11.tgz";
+      sha1 = "bca8f30f0d6d60612cc2c00641e6962d42ae6881";
     };
     deps = {
       "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
@@ -43308,7 +48800,7 @@
     version = "0.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz";
+      url = "https://registry.npmjs.org/valid-identifier/-/valid-identifier-0.0.1.tgz";
       name = "valid-identifier-0.0.1.tgz";
       sha1 = "ef1d7093a9d3287e3fce92df916f8616b23f90b4";
     };
@@ -43320,16 +48812,41 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."validate-npm-package-license"."*" =
+    self.by-version."validate-npm-package-license"."3.0.1";
+  by-version."validate-npm-package-license"."3.0.1" = self.buildNodePackage {
+    name = "validate-npm-package-license-3.0.1";
+    version = "3.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
+      name = "validate-npm-package-license-3.0.1.tgz";
+      sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
+    };
+    deps = {
+      "spdx-correct-1.0.2" = self.by-version."spdx-correct"."1.0.2";
+      "spdx-expression-parse-1.0.2" = self.by-version."spdx-expression-parse"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."validate-npm-package-license"."^3.0.1" =
+    self.by-version."validate-npm-package-license"."3.0.1";
+  by-spec."validate-npm-package-license"."~3.0.1" =
+    self.by-version."validate-npm-package-license"."3.0.1";
   by-spec."validate-npm-package-name"."^2.0.1" =
-    self.by-version."validate-npm-package-name"."2.0.1";
-  by-version."validate-npm-package-name"."2.0.1" = self.buildNodePackage {
-    name = "validate-npm-package-name-2.0.1";
-    version = "2.0.1";
+    self.by-version."validate-npm-package-name"."2.2.2";
+  by-version."validate-npm-package-name"."2.2.2" = self.buildNodePackage {
+    name = "validate-npm-package-name-2.2.2";
+    version = "2.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.0.1.tgz";
-      name = "validate-npm-package-name-2.0.1.tgz";
-      sha1 = "ca006761b2b325f107fab172fb0cfcfc5e412c58";
+      url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-2.2.2.tgz";
+      name = "validate-npm-package-name-2.2.2.tgz";
+      sha1 = "f65695b22f7324442019a3c7fa39a6e7fd299085";
     };
     deps = {
       "builtins-0.0.7" = self.by-version."builtins"."0.0.7";
@@ -43340,6 +48857,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."validate-npm-package-name"."~2.2.2" =
+    self.by-version."validate-npm-package-name"."2.2.2";
   by-spec."validator"."1.5.1" =
     self.by-version."validator"."1.5.1";
   by-version."validator"."1.5.1" = self.buildNodePackage {
@@ -43347,7 +48866,7 @@
     version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/validator/-/validator-1.5.1.tgz";
+      url = "https://registry.npmjs.org/validator/-/validator-1.5.1.tgz";
       name = "validator-1.5.1.tgz";
       sha1 = "7ab356cbbcbbb000ab85c43b8cda12621b1344c0";
     };
@@ -43366,7 +48885,7 @@
     version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/validator/-/validator-2.1.0.tgz";
+      url = "https://registry.npmjs.org/validator/-/validator-2.1.0.tgz";
       name = "validator-2.1.0.tgz";
       sha1 = "63276570def208adcf1c032c1f4e6a17d2bd8d8b";
     };
@@ -43378,8 +48897,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."validator"."~1.5.1" =
-    self.by-version."validator"."1.5.1";
   by-spec."vargs"."~0.1.0" =
     self.by-version."vargs"."0.1.0";
   by-version."vargs"."0.1.0" = self.buildNodePackage {
@@ -43387,7 +48904,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
+      url = "https://registry.npmjs.org/vargs/-/vargs-0.1.0.tgz";
       name = "vargs-0.1.0.tgz";
       sha1 = "6b6184da6520cc3204ce1b407cac26d92609ebff";
     };
@@ -43406,7 +48923,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
+      url = "https://registry.npmjs.org/vary/-/vary-0.1.0.tgz";
       name = "vary-0.1.0.tgz";
       sha1 = "df0945899e93c0cc5bd18cc8321d9d21e74f6176";
     };
@@ -43419,15 +48936,15 @@
     cpu = [ ];
   };
   by-spec."vary"."^1" =
-    self.by-version."vary"."1.0.0";
-  by-version."vary"."1.0.0" = self.buildNodePackage {
-    name = "vary-1.0.0";
-    version = "1.0.0";
+    self.by-version."vary"."1.1.0";
+  by-version."vary"."1.1.0" = self.buildNodePackage {
+    name = "vary-1.1.0";
+    version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vary/-/vary-1.0.0.tgz";
-      name = "vary-1.0.0.tgz";
-      sha1 = "c5e76cec20d3820d8f2a96e7bee38731c34da1e7";
+      url = "https://registry.npmjs.org/vary/-/vary-1.1.0.tgz";
+      name = "vary-1.1.0.tgz";
+      sha1 = "e1e5affbbd16ae768dd2674394b9ad3022653140";
     };
     deps = {
     };
@@ -43438,7 +48955,28 @@
     cpu = [ ];
   };
   by-spec."vary"."~1.0.0" =
-    self.by-version."vary"."1.0.0";
+    self.by-version."vary"."1.0.1";
+  by-version."vary"."1.0.1" = self.buildNodePackage {
+    name = "vary-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz";
+      name = "vary-1.0.1.tgz";
+      sha1 = "99e4981566a286118dfb2b817357df7993376d10";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."vary"."~1.0.1" =
+    self.by-version."vary"."1.0.1";
+  by-spec."vary"."~1.1.0" =
+    self.by-version."vary"."1.1.0";
   by-spec."vasync"."1.4.0" =
     self.by-version."vasync"."1.4.0";
   by-version."vasync"."1.4.0" = self.buildNodePackage {
@@ -43446,7 +48984,7 @@
     version = "1.4.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vasync/-/vasync-1.4.0.tgz";
+      url = "https://registry.npmjs.org/vasync/-/vasync-1.4.0.tgz";
       name = "vasync-1.4.0.tgz";
       sha1 = "6ea5a63582358868d8743cbdd6ffadc9083b910f";
     };
@@ -43467,7 +49005,7 @@
     version = "1.4.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
+      url = "https://registry.npmjs.org/vasync/-/vasync-1.4.3.tgz";
       name = "vasync-1.4.3.tgz";
       sha1 = "c86d52e2b71613d29eedf159f3135dbe749cee37";
     };
@@ -43488,7 +49026,7 @@
     version = "1.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz";
+      url = "https://registry.npmjs.org/vasync/-/vasync-1.6.2.tgz";
       name = "vasync-1.6.2.tgz";
       sha1 = "568edcf40b2b5c35b1cc048cad085de4739703fb";
     };
@@ -43501,6 +49039,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."vasync"."1.6.3" =
+    self.by-version."vasync"."1.6.3";
+  by-version."vasync"."1.6.3" = self.buildNodePackage {
+    name = "vasync-1.6.3";
+    version = "1.6.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vasync/-/vasync-1.6.3.tgz";
+      name = "vasync-1.6.3.tgz";
+      sha1 = "4a69d7052a47f4ce85503d7641df1cbf40432a94";
+    };
+    deps = {
+      "verror-1.6.0" = self.by-version."verror"."1.6.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."verror"."1.1.0" =
     self.by-version."verror"."1.1.0";
   by-version."verror"."1.1.0" = self.buildNodePackage {
@@ -43508,7 +49066,7 @@
     version = "1.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
+      url = "https://registry.npmjs.org/verror/-/verror-1.1.0.tgz";
       name = "verror-1.1.0.tgz";
       sha1 = "2a4b4eb14a207051e75a6f94ee51315bf173a1b0";
     };
@@ -43528,7 +49086,7 @@
     version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
+      url = "https://registry.npmjs.org/verror/-/verror-1.3.3.tgz";
       name = "verror-1.3.3.tgz";
       sha1 = "8a6a4ac3a8c774b6f687fece49bdffd78552e2cd";
     };
@@ -43548,7 +49106,7 @@
     version = "1.3.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+      url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
       name = "verror-1.3.6.tgz";
       sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
     };
@@ -43561,14 +49119,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."verror"."^1.4.0" =
+  by-spec."verror"."1.6.0" =
     self.by-version."verror"."1.6.0";
   by-version."verror"."1.6.0" = self.buildNodePackage {
     name = "verror-1.6.0";
     version = "1.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
+      url = "https://registry.npmjs.org/verror/-/verror-1.6.0.tgz";
       name = "verror-1.6.0.tgz";
       sha1 = "7d13b27b1facc2e2da90405eb5ea6e5bdd252ea5";
     };
@@ -43581,6 +49139,29 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."verror"."^1.4.0" =
+    self.by-version."verror"."1.6.1";
+  by-version."verror"."1.6.1" = self.buildNodePackage {
+    name = "verror-1.6.1";
+    version = "1.6.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/verror/-/verror-1.6.1.tgz";
+      name = "verror-1.6.1.tgz";
+      sha1 = "236402060648c219d1162c2451d1c341a0e1c9ce";
+    };
+    deps = {
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
+      "extsprintf-1.2.0" = self.by-version."extsprintf"."1.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."verror"."^1.6.0" =
+    self.by-version."verror"."1.6.1";
   by-spec."vhost"."1.0.0" =
     self.by-version."vhost"."1.0.0";
   by-version."vhost"."1.0.0" = self.buildNodePackage {
@@ -43588,7 +49169,7 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
+      url = "https://registry.npmjs.org/vhost/-/vhost-1.0.0.tgz";
       name = "vhost-1.0.0.tgz";
       sha1 = "654513f289a4f898aab745bbd633e40180c9c4c0";
     };
@@ -43600,16 +49181,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."vhost"."~3.0.0" =
-    self.by-version."vhost"."3.0.0";
-  by-version."vhost"."3.0.0" = self.buildNodePackage {
-    name = "vhost-3.0.0";
-    version = "3.0.0";
+  by-spec."vhost"."~3.0.1" =
+    self.by-version."vhost"."3.0.2";
+  by-version."vhost"."3.0.2" = self.buildNodePackage {
+    name = "vhost-3.0.2";
+    version = "3.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vhost/-/vhost-3.0.0.tgz";
-      name = "vhost-3.0.0.tgz";
-      sha1 = "2d0ec59a3e012278b65adbe17c1717a5a5023045";
+      url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz";
+      name = "vhost-3.0.2.tgz";
+      sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5";
     };
     deps = {
     };
@@ -43626,7 +49207,7 @@
     version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
+      url = "https://registry.npmjs.org/view-helpers/-/view-helpers-0.1.5.tgz";
       name = "view-helpers-0.1.5.tgz";
       sha1 = "175d220a6afeca8e3b497b003e2337bcc596f761";
     };
@@ -43646,7 +49227,7 @@
     version = "0.4.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz";
+      url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz";
       name = "vinyl-0.4.6.tgz";
       sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847";
     };
@@ -43660,27 +49241,47 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."vinyl"."^0.4.3" =
-    self.by-version."vinyl"."0.4.6";
   by-spec."vinyl"."^0.4.6" =
     self.by-version."vinyl"."0.4.6";
+  by-spec."vinyl"."^0.5.0" =
+    self.by-version."vinyl"."0.5.3";
+  by-version."vinyl"."0.5.3" = self.buildNodePackage {
+    name = "vinyl-0.5.3";
+    version = "0.5.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz";
+      name = "vinyl-0.5.3.tgz";
+      sha1 = "b0455b38fc5e0cf30d4325132e461970c2091cde";
+    };
+    deps = {
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1";
+      "replace-ext-0.0.1" = self.by-version."replace-ext"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."vinyl-fs"."^0.3.0" =
-    self.by-version."vinyl-fs"."0.3.13";
-  by-version."vinyl-fs"."0.3.13" = self.buildNodePackage {
-    name = "vinyl-fs-0.3.13";
-    version = "0.3.13";
+    self.by-version."vinyl-fs"."0.3.14";
+  by-version."vinyl-fs"."0.3.14" = self.buildNodePackage {
+    name = "vinyl-fs-0.3.14";
+    version = "0.3.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.13.tgz";
-      name = "vinyl-fs-0.3.13.tgz";
-      sha1 = "3d384c5b3032e356cd388023e3a085303382ac23";
+      url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz";
+      name = "vinyl-fs-0.3.14.tgz";
+      sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6";
     };
     deps = {
-      "defaults-1.0.2" = self.by-version."defaults"."1.0.2";
+      "defaults-1.0.3" = self.by-version."defaults"."1.0.3";
       "glob-stream-3.1.18" = self.by-version."glob-stream"."3.1.18";
       "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
+      "graceful-fs-3.0.8" = self.by-version."graceful-fs"."3.0.8";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6";
@@ -43692,7 +49293,7 @@
     cpu = [ ];
   };
   by-spec."vinyl-fs"."^0.3.13" =
-    self.by-version."vinyl-fs"."0.3.13";
+    self.by-version."vinyl-fs"."0.3.14";
   by-spec."vm-browserify"."0.0.4" =
     self.by-version."vm-browserify"."0.0.4";
   by-version."vm-browserify"."0.0.4" = self.buildNodePackage {
@@ -43700,7 +49301,7 @@
     version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
+      url = "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz";
       name = "vm-browserify-0.0.4.tgz";
       sha1 = "5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73";
     };
@@ -43722,7 +49323,7 @@
     version = "0.5.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/voc/-/voc-0.5.0.tgz";
+      url = "https://registry.npmjs.org/voc/-/voc-0.5.0.tgz";
       name = "voc-0.5.0.tgz";
       sha1 = "be6ca7c76e4a57d930cc80f6b31fbd80ca86045c";
     };
@@ -43734,14 +49335,14 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."void-elements"."~2.0.1" =
+  by-spec."void-elements"."^2.0.0" =
     self.by-version."void-elements"."2.0.1";
   by-version."void-elements"."2.0.1" = self.buildNodePackage {
     name = "void-elements-2.0.1";
     version = "2.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
+      url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz";
       name = "void-elements-2.0.1.tgz";
       sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec";
     };
@@ -43753,6 +49354,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."void-elements"."~2.0.1" =
+    self.by-version."void-elements"."2.0.1";
   by-spec."vows".">=0.5.13" =
     self.by-version."vows"."0.8.1";
   by-version."vows"."0.8.1" = self.buildNodePackage {
@@ -43760,7 +49363,7 @@
     version = "0.8.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/vows/-/vows-0.8.1.tgz";
+      url = "https://registry.npmjs.org/vows/-/vows-0.8.1.tgz";
       name = "vows-0.8.1.tgz";
       sha1 = "e09e988ce594ca05a08d72abcca34e88db559131";
     };
@@ -43784,7 +49387,7 @@
     version = "2.3.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
+      url = "https://registry.npmjs.org/walk/-/walk-2.3.9.tgz";
       name = "walk-2.3.9.tgz";
       sha1 = "31b4db6678f2ae01c39ea9fb8725a9031e558a7b";
     };
@@ -43801,18 +49404,18 @@
   by-spec."walk"."^2.3.9" =
     self.by-version."walk"."2.3.9";
   by-spec."ware"."^1.2.0" =
-    self.by-version."ware"."1.2.0";
-  by-version."ware"."1.2.0" = self.buildNodePackage {
-    name = "ware-1.2.0";
-    version = "1.2.0";
+    self.by-version."ware"."1.3.0";
+  by-version."ware"."1.3.0" = self.buildNodePackage {
+    name = "ware-1.3.0";
+    version = "1.3.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ware/-/ware-1.2.0.tgz";
-      name = "ware-1.2.0.tgz";
-      sha1 = "6c18d599312ca1d0fa8065f0d5a6b651313d9974";
+      url = "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz";
+      name = "ware-1.3.0.tgz";
+      sha1 = "d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4";
     };
     deps = {
-      "wrap-fn-0.1.4" = self.by-version."wrap-fn"."0.1.4";
+      "wrap-fn-0.1.5" = self.by-version."wrap-fn"."0.1.5";
     };
     optionalDependencies = {
     };
@@ -43820,19 +49423,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."watch"."~0.13.0" =
-    self.by-version."watch"."0.13.0";
-  by-version."watch"."0.13.0" = self.buildNodePackage {
-    name = "watch-0.13.0";
-    version = "0.13.0";
-    bin = true;
+  by-spec."watch"."0.5.x" =
+    self.by-version."watch"."0.5.1";
+  by-version."watch"."0.5.1" = self.buildNodePackage {
+    name = "watch-0.5.1";
+    version = "0.5.1";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/watch/-/watch-0.13.0.tgz";
-      name = "watch-0.13.0.tgz";
-      sha1 = "fcc6d2b3f0e8c73482eb54239a19fd5bcf9a753c";
+      url = "https://registry.npmjs.org/watch/-/watch-0.5.1.tgz";
+      name = "watch-0.5.1.tgz";
+      sha1 = "50ea3a056358c98073e0bca59956de4afd20b213";
     };
     deps = {
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
     };
     optionalDependencies = {
     };
@@ -43841,20 +49443,42 @@
     cpu = [ ];
   };
   by-spec."watchpack"."^0.2.1" =
-    self.by-version."watchpack"."0.2.4";
-  by-version."watchpack"."0.2.4" = self.buildNodePackage {
-    name = "watchpack-0.2.4";
-    version = "0.2.4";
+    self.by-version."watchpack"."0.2.9";
+  by-version."watchpack"."0.2.9" = self.buildNodePackage {
+    name = "watchpack-0.2.9";
+    version = "0.2.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/watchpack/-/watchpack-0.2.4.tgz";
-      name = "watchpack-0.2.4.tgz";
-      sha1 = "4af6c10f756e731b001645d34e637aa9201e97e8";
+      url = "https://registry.npmjs.org/watchpack/-/watchpack-0.2.9.tgz";
+      name = "watchpack-0.2.9.tgz";
+      sha1 = "62eaa4ab5e5ba35fdfc018275626e3c0f5e3fb0b";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "chokidar-1.0.1" = self.by-version."chokidar"."1.0.1";
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."watchpack"."^1.0.0" =
+    self.by-version."watchpack"."1.0.1";
+  by-version."watchpack"."1.0.1" = self.buildNodePackage {
+    name = "watchpack-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/watchpack/-/watchpack-1.0.1.tgz";
+      name = "watchpack-1.0.1.tgz";
+      sha1 = "3e37162267624543da11d9cf4cce5d0f455841e6";
+    };
+    deps = {
+      "async-0.9.2" = self.by-version."async"."0.9.2";
+      "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
     };
     optionalDependencies = {
     };
@@ -43869,12 +49493,12 @@
     version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz";
+      url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.0.tgz";
       name = "wcwidth-1.0.0.tgz";
       sha1 = "02d059ff7a8fc741e0f6b5da1e69b2b40daeca6f";
     };
     deps = {
-      "defaults-1.0.2" = self.by-version."defaults"."1.0.2";
+      "defaults-1.0.3" = self.by-version."defaults"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -43882,24 +49506,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."wd"."~0.3.4" =
-    self.by-version."wd"."0.3.11";
-  by-version."wd"."0.3.11" = self.buildNodePackage {
-    name = "wd-0.3.11";
-    version = "0.3.11";
+  by-spec."wd"."^0.3.4" =
+    self.by-version."wd"."0.3.12";
+  by-version."wd"."0.3.12" = self.buildNodePackage {
+    name = "wd-0.3.12";
+    version = "0.3.12";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wd/-/wd-0.3.11.tgz";
-      name = "wd-0.3.11.tgz";
-      sha1 = "522716c79a7a10e781acbb2c6cafe588f701fcc0";
+      url = "https://registry.npmjs.org/wd/-/wd-0.3.12.tgz";
+      name = "wd-0.3.12.tgz";
+      sha1 = "3fb4f1d759f8c85dde5393d17334ffe03e9bb329";
     };
     deps = {
-      "archiver-0.12.0" = self.by-version."archiver"."0.12.0";
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "q-1.0.1" = self.by-version."q"."1.0.1";
-      "request-2.46.0" = self.by-version."request"."2.46.0";
-      "underscore.string-2.3.3" = self.by-version."underscore.string"."2.3.3";
+      "archiver-0.14.4" = self.by-version."archiver"."0.14.4";
+      "async-1.0.0" = self.by-version."async"."1.0.0";
+      "lodash-3.9.3" = self.by-version."lodash"."3.9.3";
+      "q-1.4.1" = self.by-version."q"."1.4.1";
+      "request-2.55.0" = self.by-version."request"."2.55.0";
+      "underscore.string-3.0.3" = self.by-version."underscore.string"."3.0.3";
       "vargs-0.1.0" = self.by-version."vargs"."0.1.0";
     };
     optionalDependencies = {
@@ -43915,7 +49539,7 @@
     version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
+      url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz";
       name = "weak-map-1.0.5.tgz";
       sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb";
     };
@@ -43934,7 +49558,7 @@
     version = "2.43.0-1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-1.tgz";
+      url = "https://registry.npmjs.org/webdrvr/-/webdrvr-2.43.0-1.tgz";
       name = "webdrvr-2.43.0-1.tgz";
       sha1 = "17c442b94c0a6a3a68293d6ea4deb408f8cb9225";
     };
@@ -43943,8 +49567,8 @@
       "kew-0.1.7" = self.by-version."kew"."0.1.7";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
       "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16";
-      "phantomjs-1.9.16" = self.by-version."phantomjs"."1.9.16";
-      "tmp-0.0.25" = self.by-version."tmp"."0.0.25";
+      "phantomjs-1.9.20" = self.by-version."phantomjs"."1.9.20";
+      "tmp-0.0.28" = self.by-version."tmp"."0.0.28";
       "follow-redirects-0.0.3" = self.by-version."follow-redirects"."0.0.3";
     };
     optionalDependencies = {
@@ -43954,20 +49578,36 @@
     cpu = [ ];
   };
   "webdrvr" = self.by-version."webdrvr"."2.43.0-1";
-  by-spec."webkit-devtools-agent"."^0.2.4" =
-    self.by-version."webkit-devtools-agent"."0.2.5";
-  by-version."webkit-devtools-agent"."0.2.5" = self.buildNodePackage {
-    name = "webkit-devtools-agent-0.2.5";
-    version = "0.2.5";
-    bin = false;
+  by-spec."webpack"."*" =
+    self.by-version."webpack"."2.1.0-beta.4";
+  by-version."webpack"."2.1.0-beta.4" = self.buildNodePackage {
+    name = "webpack-2.1.0-beta.4";
+    version = "2.1.0-beta.4";
+    bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/webkit-devtools-agent/-/webkit-devtools-agent-0.2.5.tgz";
-      name = "webkit-devtools-agent-0.2.5.tgz";
-      sha1 = "f93e2948bd1a5171d368be65b3676604104c4f90";
+      url = "https://registry.npmjs.org/webpack/-/webpack-2.1.0-beta.4.tgz";
+      name = "webpack-2.1.0-beta.4.tgz";
+      sha1 = "934a5d4fc43d2a7b1ef2f2d1a07d33e8f5f3be95";
     };
     deps = {
-      "ws-0.4.31" = self.by-version."ws"."0.4.31";
-      "underscore-1.3.3" = self.by-version."underscore"."1.3.3";
+      "acorn-3.0.4" = self.by-version."acorn"."3.0.4";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "enhanced-resolve-2.2.2" = self.by-version."enhanced-resolve"."2.2.2";
+      "interpret-1.0.0" = self.by-version."interpret"."1.0.0";
+      "loader-runner-2.1.1" = self.by-version."loader-runner"."2.1.1";
+      "loader-utils-0.2.13" = self.by-version."loader-utils"."0.2.13";
+      "memory-fs-0.3.0" = self.by-version."memory-fs"."0.3.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "node-libs-browser-1.0.0" = self.by-version."node-libs-browser"."1.0.0";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "supports-color-3.1.2" = self.by-version."supports-color"."3.1.2";
+      "tapable-0.2.4" = self.by-version."tapable"."0.2.4";
+      "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
+      "watchpack-1.0.1" = self.by-version."watchpack"."1.0.1";
+      "webpack-sources-0.1.1" = self.by-version."webpack-sources"."0.1.1";
+      "yargs-3.32.0" = self.by-version."yargs"."3.32.0";
     };
     optionalDependencies = {
     };
@@ -43975,32 +49615,34 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."webpack"."*" =
-    self.by-version."webpack"."1.8.5";
-  by-version."webpack"."1.8.5" = self.buildNodePackage {
-    name = "webpack-1.8.5";
-    version = "1.8.5";
+  "webpack" = self.by-version."webpack"."2.1.0-beta.4";
+  by-spec."webpack"."^1.12.9" =
+    self.by-version."webpack"."1.12.14";
+  by-version."webpack"."1.12.14" = self.buildNodePackage {
+    name = "webpack-1.12.14";
+    version = "1.12.14";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/webpack/-/webpack-1.8.5.tgz";
-      name = "webpack-1.8.5.tgz";
-      sha1 = "d08873b8ca10c54a7aa4513a363ee21244752a9e";
+      url = "https://registry.npmjs.org/webpack/-/webpack-1.12.14.tgz";
+      name = "webpack-1.12.14.tgz";
+      sha1 = "365517443abfb3cb43299ea444655be89aff91d5";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "clone-0.1.19" = self.by-version."clone"."0.1.19";
-      "enhanced-resolve-0.8.5" = self.by-version."enhanced-resolve"."0.8.5";
-      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
-      "interpret-0.5.2" = self.by-version."interpret"."0.5.2";
-      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
-      "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0";
-      "node-libs-browser-0.4.3" = self.by-version."node-libs-browser"."0.4.3";
+      "async-1.5.2" = self.by-version."async"."1.5.2";
+      "clone-1.0.2" = self.by-version."clone"."1.0.2";
+      "enhanced-resolve-0.9.1" = self.by-version."enhanced-resolve"."0.9.1";
+      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
+      "interpret-0.6.6" = self.by-version."interpret"."0.6.6";
+      "loader-utils-0.2.13" = self.by-version."loader-utils"."0.2.13";
+      "memory-fs-0.3.0" = self.by-version."memory-fs"."0.3.0";
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+      "node-libs-browser-0.5.3" = self.by-version."node-libs-browser"."0.5.3";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
-      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
-      "tapable-0.1.9" = self.by-version."tapable"."0.1.9";
-      "uglify-js-2.4.20" = self.by-version."uglify-js"."2.4.20";
-      "watchpack-0.2.4" = self.by-version."watchpack"."0.2.4";
-      "webpack-core-0.6.3" = self.by-version."webpack-core"."0.6.3";
+      "supports-color-3.1.2" = self.by-version."supports-color"."3.1.2";
+      "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
+      "uglify-js-2.6.2" = self.by-version."uglify-js"."2.6.2";
+      "watchpack-0.2.9" = self.by-version."watchpack"."0.2.9";
+      "webpack-core-0.6.8" = self.by-version."webpack-core"."0.6.8";
     };
     optionalDependencies = {
     };
@@ -44008,21 +49650,20 @@
     os = [ ];
     cpu = [ ];
   };
-  "webpack" = self.by-version."webpack"."1.8.5";
   by-spec."webpack-core"."~0.6.0" =
-    self.by-version."webpack-core"."0.6.3";
-  by-version."webpack-core"."0.6.3" = self.buildNodePackage {
-    name = "webpack-core-0.6.3";
-    version = "0.6.3";
+    self.by-version."webpack-core"."0.6.8";
+  by-version."webpack-core"."0.6.8" = self.buildNodePackage {
+    name = "webpack-core-0.6.8";
+    version = "0.6.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/webpack-core/-/webpack-core-0.6.3.tgz";
-      name = "webpack-core-0.6.3.tgz";
-      sha1 = "a47283b688f66504797173d8eacb1df7ba6f0c5f";
+      url = "https://registry.npmjs.org/webpack-core/-/webpack-core-0.6.8.tgz";
+      name = "webpack-core-0.6.8.tgz";
+      sha1 = "edf9135de00a6a3c26dd0f14b208af0aa4af8d0a";
     };
     deps = {
-      "source-map-0.4.2" = self.by-version."source-map"."0.4.2";
-      "source-list-map-0.1.5" = self.by-version."source-list-map"."0.1.5";
+      "source-map-0.4.4" = self.by-version."source-map"."0.4.4";
+      "source-list-map-0.1.6" = self.by-version."source-list-map"."0.1.6";
     };
     optionalDependencies = {
     };
@@ -44030,19 +49671,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."websocket-driver".">=0.3.6" =
-    self.by-version."websocket-driver"."0.5.4";
-  by-version."websocket-driver"."0.5.4" = self.buildNodePackage {
-    name = "websocket-driver-0.5.4";
-    version = "0.5.4";
+  by-spec."webpack-sources"."^0.1.0" =
+    self.by-version."webpack-sources"."0.1.1";
+  by-version."webpack-sources"."0.1.1" = self.buildNodePackage {
+    name = "webpack-sources-0.1.1";
+    version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.4.tgz";
-      name = "websocket-driver-0.5.4.tgz";
-      sha1 = "4c65278c92929384eacfcd908d3e9e0a5691c29e";
+      url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.1.tgz";
+      name = "webpack-sources-0.1.1.tgz";
+      sha1 = "a71dd7c0ca3e264af088804bc384d93fad0442b6";
     };
     deps = {
-      "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
+      "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
+      "source-list-map-0.1.6" = self.by-version."source-list-map"."0.1.6";
     };
     optionalDependencies = {
     };
@@ -44051,7 +49693,25 @@
     cpu = [ ];
   };
   by-spec."websocket-driver".">=0.5.1" =
-    self.by-version."websocket-driver"."0.5.4";
+    self.by-version."websocket-driver"."0.6.4";
+  by-version."websocket-driver"."0.6.4" = self.buildNodePackage {
+    name = "websocket-driver-0.6.4";
+    version = "0.6.4";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.4.tgz";
+      name = "websocket-driver-0.6.4.tgz";
+      sha1 = "65b84d02113480d3fc05e63e809322042bdc940b";
+    };
+    deps = {
+      "websocket-extensions-0.1.1" = self.by-version."websocket-extensions"."0.1.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."websocket-extensions".">=0.1.1" =
     self.by-version."websocket-extensions"."0.1.1";
   by-version."websocket-extensions"."0.1.1" = self.buildNodePackage {
@@ -44059,7 +49719,7 @@
     version = "0.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
+      url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz";
       name = "websocket-extensions-0.1.1.tgz";
       sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7";
     };
@@ -44071,16 +49731,59 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."when"."3.7.2" =
-    self.by-version."when"."3.7.2";
-  by-version."when"."3.7.2" = self.buildNodePackage {
-    name = "when-3.7.2";
-    version = "3.7.2";
+  by-spec."websocket-stream"."^3.0.1" =
+    self.by-version."websocket-stream"."3.1.0";
+  by-version."websocket-stream"."3.1.0" = self.buildNodePackage {
+    name = "websocket-stream-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/when/-/when-3.7.2.tgz";
-      name = "when-3.7.2.tgz";
-      sha1 = "06bed1296df3a0bfd83f7f31c5e1d779bd97eae8";
+      url = "https://registry.npmjs.org/websocket-stream/-/websocket-stream-3.1.0.tgz";
+      name = "websocket-stream-3.1.0.tgz";
+      sha1 = "c6d9d13230b77e474c4b6736c295bba77cdd7f87";
+    };
+    deps = {
+      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "through2-2.0.1" = self.by-version."through2"."2.0.1";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."whatwg-fetch".">=0.10.0" =
+    self.by-version."whatwg-fetch"."0.11.0";
+  by-version."whatwg-fetch"."0.11.0" = self.buildNodePackage {
+    name = "whatwg-fetch-0.11.0";
+    version = "0.11.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-0.11.0.tgz";
+      name = "whatwg-fetch-0.11.0.tgz";
+      sha1 = "46b1d18d0aa99955971ef1a2f5aac506add28815";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."when"."3.7.7" =
+    self.by-version."when"."3.7.7";
+  by-version."when"."3.7.7" = self.buildNodePackage {
+    name = "when-3.7.7";
+    version = "3.7.7";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/when/-/when-3.7.7.tgz";
+      name = "when-3.7.7.tgz";
+      sha1 = "aba03fc3bb736d6c88b091d013d8a8e590d84718";
     };
     deps = {
     };
@@ -44097,7 +49800,7 @@
     version = "3.4.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/when/-/when-3.4.6.tgz";
+      url = "https://registry.npmjs.org/when/-/when-3.4.6.tgz";
       name = "when-3.4.6.tgz";
       sha1 = "8fbcb7cc1439d2c3a68c431f1516e6dcce9ad28c";
     };
@@ -44110,17 +49813,19 @@
     cpu = [ ];
   };
   by-spec."which"."1" =
-    self.by-version."which"."1.0.9";
-  by-version."which"."1.0.9" = self.buildNodePackage {
-    name = "which-1.0.9";
-    version = "1.0.9";
+    self.by-version."which"."1.2.4";
+  by-version."which"."1.2.4" = self.buildNodePackage {
+    name = "which-1.2.4";
+    version = "1.2.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/which/-/which-1.0.9.tgz";
-      name = "which-1.0.9.tgz";
-      sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
+      url = "https://registry.npmjs.org/which/-/which-1.2.4.tgz";
+      name = "which-1.2.4.tgz";
+      sha1 = "1557f96080604e5b11b3599eb9f45b50a9efd722";
     };
     deps = {
+      "is-absolute-0.1.7" = self.by-version."is-absolute"."0.1.7";
+      "isexe-1.1.2" = self.by-version."isexe"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -44128,54 +49833,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."which"."1.0.x" =
-    self.by-version."which"."1.0.9";
-  by-spec."which"."^1.0.5" =
-    self.by-version."which"."1.0.9";
   by-spec."which"."^1.0.7" =
-    self.by-version."which"."1.0.9";
-  by-spec."which"."^1.0.8" =
-    self.by-version."which"."1.0.9";
-  by-spec."which"."^1.0.9" =
-    self.by-version."which"."1.0.9";
+    self.by-version."which"."1.2.4";
+  by-spec."which"."^1.1.1" =
+    self.by-version."which"."1.2.4";
+  by-spec."which"."^1.2.1" =
+    self.by-version."which"."1.2.4";
   by-spec."which"."~1.0.5" =
     self.by-version."which"."1.0.9";
-  by-spec."which"."~1.0.9" =
-    self.by-version."which"."1.0.9";
-  by-spec."win-detect-browsers"."^1.0.1" =
-    self.by-version."win-detect-browsers"."1.0.1";
-  by-version."win-detect-browsers"."1.0.1" = self.buildNodePackage {
-    name = "win-detect-browsers-1.0.1";
-    version = "1.0.1";
+  by-version."which"."1.0.9" = self.buildNodePackage {
+    name = "which-1.0.9";
+    version = "1.0.9";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.1.tgz";
-      name = "win-detect-browsers-1.0.1.tgz";
-      sha1 = "fd85b27aa8c7af8573a6aa7dbc10ff9692642b99";
-    };
-    deps = {
-      "after-0.8.1" = self.by-version."after"."0.8.1";
-      "debug-2.1.3" = self.by-version."debug"."2.1.3";
-      "which-1.0.9" = self.by-version."which"."1.0.9";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
-      "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."win-release"."^1.0.0" =
-    self.by-version."win-release"."1.0.0";
-  by-version."win-release"."1.0.0" = self.buildNodePackage {
-    name = "win-release-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/win-release/-/win-release-1.0.0.tgz";
-      name = "win-release-1.0.0.tgz";
-      sha1 = "8993308dedbd8d30ad5594b6b7382a8c1d96ae5a";
+      url = "https://registry.npmjs.org/which/-/which-1.0.9.tgz";
+      name = "which-1.0.9.tgz";
+      sha1 = "460c1da0f810103d0321a9b633af9e575e64486f";
     };
     deps = {
     };
@@ -44185,18 +49858,29 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."win-trash"."^1.0.0" =
-    self.by-version."win-trash"."1.0.0";
-  by-version."win-trash"."1.0.0" = self.buildNodePackage {
-    name = "win-trash-1.0.0";
-    version = "1.0.0";
+  by-spec."which"."~1.2.1" =
+    self.by-version."which"."1.2.4";
+  by-spec."which"."~1.2.2" =
+    self.by-version."which"."1.2.4";
+  by-spec."which"."~1.2.4" =
+    self.by-version."which"."1.2.4";
+  by-spec."win-detect-browsers"."^1.0.1" =
+    self.by-version."win-detect-browsers"."1.0.2";
+  by-version."win-detect-browsers"."1.0.2" = self.buildNodePackage {
+    name = "win-detect-browsers-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/win-trash/-/win-trash-1.0.0.tgz";
-      name = "win-trash-1.0.0.tgz";
-      sha1 = "1153a7a5e1aa703f4b449458674312de2fa3589c";
+      url = "https://registry.npmjs.org/win-detect-browsers/-/win-detect-browsers-1.0.2.tgz";
+      name = "win-detect-browsers-1.0.2.tgz";
+      sha1 = "f45f10d141086c5d94ae14c03b2098440a7e71b0";
     };
     deps = {
+      "after-0.8.1" = self.by-version."after"."0.8.1";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "which-1.2.4" = self.by-version."which"."1.2.4";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
+      "yargs-1.3.3" = self.by-version."yargs"."1.3.3";
     };
     optionalDependencies = {
     };
@@ -44211,7 +49895,7 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
+      url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz";
       name = "window-size-0.1.0.tgz";
       sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
     };
@@ -44223,16 +49907,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."windows-no-runnable"."~0.0.6" =
-    self.by-version."windows-no-runnable"."0.0.6";
-  by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage {
-    name = "windows-no-runnable-0.0.6";
-    version = "0.0.6";
+  by-spec."window-size"."^0.1.2" =
+    self.by-version."window-size"."0.1.4";
+  by-version."window-size"."0.1.4" = self.buildNodePackage {
+    name = "window-size-0.1.4";
+    version = "0.1.4";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz";
-      name = "windows-no-runnable-0.0.6.tgz";
-      sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
+      url = "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz";
+      name = "window-size-0.1.4.tgz";
+      sha1 = "f8e1aa1ee5a53ec5bf151ffa09742a6ad7697876";
     };
     deps = {
     };
@@ -44242,20 +49926,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."winser"."=0.1.6" =
-    self.by-version."winser"."0.1.6";
-  by-version."winser"."0.1.6" = self.buildNodePackage {
-    name = "winser-0.1.6";
-    version = "0.1.6";
+  by-spec."window-size"."^0.1.4" =
+    self.by-version."window-size"."0.1.4";
+  by-spec."windows-no-runnable"."~0.0.6" =
+    self.by-version."windows-no-runnable"."0.0.6";
+  by-version."windows-no-runnable"."0.0.6" = self.buildNodePackage {
+    name = "windows-no-runnable-0.0.6";
+    version = "0.0.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winser/-/winser-0.1.6.tgz";
-      name = "winser-0.1.6.tgz";
-      sha1 = "08663dc32878a12bbce162d840da5097b48466c9";
+      url = "https://registry.npmjs.org/windows-no-runnable/-/windows-no-runnable-0.0.6.tgz";
+      name = "windows-no-runnable-0.0.6.tgz";
+      sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb";
     };
     deps = {
-      "sequence-2.2.1" = self.by-version."sequence"."2.2.1";
-      "commander-1.3.1" = self.by-version."commander"."1.3.1";
     };
     optionalDependencies = {
     };
@@ -44264,23 +49948,23 @@
     cpu = [ ];
   };
   by-spec."winston"."*" =
-    self.by-version."winston"."1.0.0";
-  by-version."winston"."1.0.0" = self.buildNodePackage {
-    name = "winston-1.0.0";
-    version = "1.0.0";
+    self.by-version."winston"."2.2.0";
+  by-version."winston"."2.2.0" = self.buildNodePackage {
+    name = "winston-2.2.0";
+    version = "2.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-1.0.0.tgz";
-      name = "winston-1.0.0.tgz";
-      sha1 = "30e36e0041fc0a864b0029565719e4dc41d026a4";
+      url = "https://registry.npmjs.org/winston/-/winston-2.2.0.tgz";
+      name = "winston-2.2.0.tgz";
+      sha1 = "2c853dd87ab552a8e8485d72cbbf9a2286f029b7";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-1.0.0" = self.by-version."async"."1.0.0";
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -44289,24 +49973,25 @@
     os = [ ];
     cpu = [ ];
   };
-  "winston" = self.by-version."winston"."1.0.0";
-  by-spec."winston"."0.5.1" =
-    self.by-version."winston"."0.5.1";
-  by-version."winston"."0.5.1" = self.buildNodePackage {
-    name = "winston-0.5.1";
-    version = "0.5.1";
+  "winston" = self.by-version."winston"."2.2.0";
+  by-spec."winston"."0.6.2" =
+    self.by-version."winston"."0.6.2";
+  by-version."winston"."0.6.2" = self.buildNodePackage {
+    name = "winston-0.6.2";
+    version = "0.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.5.1.tgz";
-      name = "winston-0.5.1.tgz";
-      sha1 = "2b2f40cdbf469b60f1885cc549757c4b9973e5ea";
+      url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
+      name = "winston-0.6.2.tgz";
+      sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
     };
     deps = {
       "async-0.1.22" = self.by-version."async"."0.1.22";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
+      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "loggly-0.3.11" = self.by-version."loggly"."0.3.11";
       "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
+      "request-2.9.203" = self.by-version."request"."2.9.203";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -44315,24 +50000,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."winston"."0.6.2" =
+  by-spec."winston"."0.6.x" =
     self.by-version."winston"."0.6.2";
-  by-version."winston"."0.6.2" = self.buildNodePackage {
-    name = "winston-0.6.2";
-    version = "0.6.2";
+  by-spec."winston"."0.7.2" =
+    self.by-version."winston"."0.7.2";
+  by-version."winston"."0.7.2" = self.buildNodePackage {
+    name = "winston-0.7.2";
+    version = "0.7.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
-      name = "winston-0.6.2.tgz";
-      sha1 = "4144fe2586cdc19a612bf8c035590132c9064bd2";
+      url = "https://registry.npmjs.org/winston/-/winston-0.7.2.tgz";
+      name = "winston-0.7.2.tgz";
+      sha1 = "2570ae1aa1d8a9401e8d5a88362e1cf936550ceb";
     };
     deps = {
-      "async-0.1.22" = self.by-version."async"."0.1.22";
+      "async-0.2.10" = self.by-version."async"."0.2.10";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "pkginfo-0.2.3" = self.by-version."pkginfo"."0.2.3";
-      "request-2.9.203" = self.by-version."request"."2.9.203";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
+      "request-2.16.6" = self.by-version."request"."2.16.6";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -44341,8 +50028,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."winston"."0.6.x" =
-    self.by-version."winston"."0.6.2";
   by-spec."winston"."0.7.3" =
     self.by-version."winston"."0.7.3";
   by-version."winston"."0.7.3" = self.buildNodePackage {
@@ -44350,7 +50035,7 @@
     version = "0.7.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
+      url = "https://registry.npmjs.org/winston/-/winston-0.7.3.tgz";
       name = "winston-0.7.3.tgz";
       sha1 = "7ae313ba73fcdc2ecb4aa2f9cd446e8298677266";
     };
@@ -44359,7 +50044,7 @@
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "request-2.16.6" = self.by-version."request"."2.16.6";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
@@ -44376,7 +50061,7 @@
     version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
+      url = "https://registry.npmjs.org/winston/-/winston-0.8.0.tgz";
       name = "winston-0.8.0.tgz";
       sha1 = "61d0830fa699706212206b0a2b5ca69a93043668";
     };
@@ -44385,7 +50070,7 @@
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -44401,7 +50086,7 @@
     version = "0.8.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
+      url = "https://registry.npmjs.org/winston/-/winston-0.8.3.tgz";
       name = "winston-0.8.3.tgz";
       sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0";
     };
@@ -44411,7 +50096,7 @@
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -44420,26 +50105,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."winston"."~0.8.1" =
-    self.by-version."winston"."0.8.3";
-  by-spec."winston"."~0.9.0" =
-    self.by-version."winston"."0.9.0";
-  by-version."winston"."0.9.0" = self.buildNodePackage {
-    name = "winston-0.9.0";
-    version = "0.9.0";
+  by-spec."winston"."1.0.0" =
+    self.by-version."winston"."1.0.0";
+  by-version."winston"."1.0.0" = self.buildNodePackage {
+    name = "winston-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/winston/-/winston-0.9.0.tgz";
-      name = "winston-0.9.0.tgz";
-      sha1 = "b5726e6c42291e305e36286ce7ae9f3b74a527a8";
+      url = "https://registry.npmjs.org/winston/-/winston-1.0.0.tgz";
+      name = "winston-1.0.0.tgz";
+      sha1 = "30e36e0041fc0a864b0029565719e4dc41d026a4";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
+      "async-0.9.2" = self.by-version."async"."0.9.2";
       "colors-1.0.3" = self.by-version."colors"."1.0.3";
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -44448,19 +50131,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."with"."~1.1.0" =
-    self.by-version."with"."1.1.1";
-  by-version."with"."1.1.1" = self.buildNodePackage {
-    name = "with-1.1.1";
-    version = "1.1.1";
+  by-spec."winston"."1.0.x" =
+    self.by-version."winston"."1.0.2";
+  by-version."winston"."1.0.2" = self.buildNodePackage {
+    name = "winston-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/with/-/with-1.1.1.tgz";
-      name = "with-1.1.1.tgz";
-      sha1 = "66bd6664deb318b2482dd0424ccdebe822434ac0";
+      url = "https://registry.npmjs.org/winston/-/winston-1.0.2.tgz";
+      name = "winston-1.0.2.tgz";
+      sha1 = "351c58e2323f8a4ca29a45195aa9aa3b4c35d76f";
     };
     deps = {
-      "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
+      "async-1.0.0" = self.by-version."async"."1.0.0";
+      "colors-1.0.3" = self.by-version."colors"."1.0.3";
+      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
     };
@@ -44468,19 +50157,27 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."with"."~2.0.0" =
-    self.by-version."with"."2.0.0";
-  by-version."with"."2.0.0" = self.buildNodePackage {
-    name = "with-2.0.0";
-    version = "2.0.0";
+  by-spec."winston"."~0.8.1" =
+    self.by-version."winston"."0.8.3";
+  by-spec."winston"."~2.1.1" =
+    self.by-version."winston"."2.1.1";
+  by-version."winston"."2.1.1" = self.buildNodePackage {
+    name = "winston-2.1.1";
+    version = "2.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/with/-/with-2.0.0.tgz";
-      name = "with-2.0.0.tgz";
-      sha1 = "ec01ff021db9df05639047147ede012f5e6d0afd";
+      url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz";
+      name = "winston-2.1.1.tgz";
+      sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e";
     };
     deps = {
-      "uglify-js-2.4.0" = self.by-version."uglify-js"."2.4.0";
+      "async-1.0.0" = self.by-version."async"."1.0.0";
+      "colors-1.0.3" = self.by-version."colors"."1.0.3";
+      "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
+      "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
+      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
+      "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
     };
@@ -44495,13 +50192,13 @@
     version = "4.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/with/-/with-4.0.3.tgz";
+      url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz";
       name = "with-4.0.3.tgz";
       sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e";
     };
     deps = {
-      "acorn-1.0.3" = self.by-version."acorn"."1.0.3";
-      "acorn-globals-1.0.4" = self.by-version."acorn-globals"."1.0.4";
+      "acorn-1.2.2" = self.by-version."acorn"."1.2.2";
+      "acorn-globals-1.0.9" = self.by-version."acorn-globals"."1.0.9";
     };
     optionalDependencies = {
     };
@@ -44516,7 +50213,7 @@
     version = "0.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
+      url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
       name = "wordwrap-0.0.2.tgz";
       sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
     };
@@ -44528,22 +50225,78 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."wordwrap"."0.0.x" =
-    self.by-version."wordwrap"."0.0.2";
   by-spec."wordwrap".">=0.0.1 <0.1.0" =
-    self.by-version."wordwrap"."0.0.2";
+    self.by-version."wordwrap"."0.0.3";
+  by-version."wordwrap"."0.0.3" = self.buildNodePackage {
+    name = "wordwrap-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+      name = "wordwrap-0.0.3.tgz";
+      sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."wordwrap"."^1.0.0" =
+    self.by-version."wordwrap"."1.0.0";
+  by-version."wordwrap"."1.0.0" = self.buildNodePackage {
+    name = "wordwrap-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz";
+      name = "wordwrap-1.0.0.tgz";
+      sha1 = "27584810891456a4171c8d0226441ade90cbcaeb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."wordwrap"."~0.0.2" =
-    self.by-version."wordwrap"."0.0.2";
+    self.by-version."wordwrap"."0.0.3";
+  by-spec."wordwrap"."~1.0.0" =
+    self.by-version."wordwrap"."1.0.0";
+  by-spec."wrap-ansi"."^2.0.0" =
+    self.by-version."wrap-ansi"."2.0.0";
+  by-version."wrap-ansi"."2.0.0" = self.buildNodePackage {
+    name = "wrap-ansi-2.0.0";
+    version = "2.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz";
+      name = "wrap-ansi-2.0.0.tgz";
+      sha1 = "7d30f8f873f9a5bbc3a64dabc8d177e071ae426f";
+    };
+    deps = {
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."wrap-fn"."^0.1.0" =
-    self.by-version."wrap-fn"."0.1.4";
-  by-version."wrap-fn"."0.1.4" = self.buildNodePackage {
-    name = "wrap-fn-0.1.4";
-    version = "0.1.4";
+    self.by-version."wrap-fn"."0.1.5";
+  by-version."wrap-fn"."0.1.5" = self.buildNodePackage {
+    name = "wrap-fn-0.1.5";
+    version = "0.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.4.tgz";
-      name = "wrap-fn-0.1.4.tgz";
-      sha1 = "03eba5d07ac55c2a93fa2d37a2b01f81c07bddb2";
+      url = "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz";
+      name = "wrap-fn-0.1.5.tgz";
+      sha1 = "f21b6e41016ff4a7e31720dbc63a09016bdf9845";
     };
     deps = {
       "co-3.1.0" = self.by-version."co"."3.1.0";
@@ -44561,7 +50314,7 @@
     version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
+      url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz";
       name = "wrappy-1.0.1.tgz";
       sha1 = "1e65969965ccbc2db4548c6b84a6f2c5aedd4739";
     };
@@ -44575,14 +50328,14 @@
   };
   by-spec."wrappy"."~1.0.1" =
     self.by-version."wrappy"."1.0.1";
-  by-spec."wrench"."~1.5.4" =
+  by-spec."wrench"."1.5.8" =
     self.by-version."wrench"."1.5.8";
   by-version."wrench"."1.5.8" = self.buildNodePackage {
     name = "wrench-1.5.8";
     version = "1.5.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
+      url = "https://registry.npmjs.org/wrench/-/wrench-1.5.8.tgz";
       name = "wrench-1.5.8.tgz";
       sha1 = "7a31c97f7869246d76c5cf2f5c977a1c4c8e5ab5";
     };
@@ -44594,21 +50347,40 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."wrench"."~1.5.8" =
-    self.by-version."wrench"."1.5.8";
-  by-spec."write-file-atomic"."~1.1.0" =
-    self.by-version."write-file-atomic"."1.1.0";
-  by-version."write-file-atomic"."1.1.0" = self.buildNodePackage {
-    name = "write-file-atomic-1.1.0";
-    version = "1.1.0";
+  by-spec."write"."^0.2.1" =
+    self.by-version."write"."0.2.1";
+  by-version."write"."0.2.1" = self.buildNodePackage {
+    name = "write-0.2.1";
+    version = "0.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz";
+      name = "write-0.2.1.tgz";
+      sha1 = "5fc03828e264cea3fe91455476f7a3c566cb0757";
+    };
+    deps = {
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."write-file-atomic"."^1.1.2" =
+    self.by-version."write-file-atomic"."1.1.4";
+  by-version."write-file-atomic"."1.1.4" = self.buildNodePackage {
+    name = "write-file-atomic-1.1.4";
+    version = "1.1.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.0.tgz";
-      name = "write-file-atomic-1.1.0.tgz";
-      sha1 = "e114cfb8f82188353f98217c5945451c9b4dc060";
+      url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.1.4.tgz";
+      name = "write-file-atomic-1.1.4.tgz";
+      sha1 = "b1f52dc2e8dc0e3cb04d187a25f758a38a90ca3b";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+      "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
     };
     optionalDependencies = {
@@ -44617,6 +50389,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."write-file-atomic"."~1.1.4" =
+    self.by-version."write-file-atomic"."1.1.4";
   by-spec."ws"."0.4.31" =
     self.by-version."ws"."0.4.31";
   by-version."ws"."0.4.31" = self.buildNodePackage {
@@ -44624,7 +50398,7 @@
     version = "0.4.31";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ws/-/ws-0.4.31.tgz";
+      url = "https://registry.npmjs.org/ws/-/ws-0.4.31.tgz";
       name = "ws-0.4.31.tgz";
       sha1 = "5a4849e7a9ccd1ed5a81aeb4847c9fedf3122927";
     };
@@ -44647,7 +50421,7 @@
     version = "0.4.32";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
+      url = "https://registry.npmjs.org/ws/-/ws-0.4.32.tgz";
       name = "ws-0.4.32.tgz";
       sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32";
     };
@@ -44663,70 +50437,68 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ws"."0.5.0" =
-    self.by-version."ws"."0.5.0";
-  by-version."ws"."0.5.0" = self.buildNodePackage {
-    name = "ws-0.5.0";
-    version = "0.5.0";
+  by-spec."ws"."0.8.1" =
+    self.by-version."ws"."0.8.1";
+  by-version."ws"."0.8.1" = self.buildNodePackage {
+    name = "ws-0.8.1";
+    version = "0.8.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ws/-/ws-0.5.0.tgz";
-      name = "ws-0.5.0.tgz";
-      sha1 = "b3980391dc4777d83974718aa361e808d86cf9ca";
+      url = "https://registry.npmjs.org/ws/-/ws-0.8.1.tgz";
+      name = "ws-0.8.1.tgz";
+      sha1 = "6b65273b99193c5f067a4cf5809598f777e3b759";
     };
     deps = {
-      "nan-1.4.3" = self.by-version."nan"."1.4.3";
       "options-0.0.6" = self.by-version."options"."0.0.6";
-      "ultron-1.0.1" = self.by-version."ultron"."1.0.1";
+      "ultron-1.0.2" = self.by-version."ultron"."1.0.2";
     };
     optionalDependencies = {
+      "bufferutil-1.2.1" = self.by-version."bufferutil"."1.2.1";
+      "utf-8-validate-1.2.1" = self.by-version."utf-8-validate"."1.2.1";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ws"."0.7.1" =
-    self.by-version."ws"."0.7.1";
-  by-version."ws"."0.7.1" = self.buildNodePackage {
-    name = "ws-0.7.1";
-    version = "0.7.1";
+  by-spec."ws"."1.0.1" =
+    self.by-version."ws"."1.0.1";
+  by-version."ws"."1.0.1" = self.buildNodePackage {
+    name = "ws-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ws/-/ws-0.7.1.tgz";
-      name = "ws-0.7.1.tgz";
-      sha1 = "8f1c7864ca08081be3cd0ac330df0d29c5fcd0da";
+      url = "https://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
+      name = "ws-1.0.1.tgz";
+      sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
     };
     deps = {
       "options-0.0.6" = self.by-version."options"."0.0.6";
-      "ultron-1.0.1" = self.by-version."ultron"."1.0.1";
+      "ultron-1.0.2" = self.by-version."ultron"."1.0.2";
     };
     optionalDependencies = {
-      "bufferutil-1.0.1" = self.by-version."bufferutil"."1.0.1";
-      "utf-8-validate-1.0.1" = self.by-version."utf-8-validate"."1.0.1";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ws"."^0.7.1" =
-    self.by-version."ws"."0.7.1";
-  by-spec."ws"."~0.4.31" =
-    self.by-version."ws"."0.4.32";
-  by-spec."ws"."~0.7.1" =
-    self.by-version."ws"."0.7.1";
+  by-spec."ws"."^0.8.0" =
+    self.by-version."ws"."0.8.1";
+  by-spec."ws"."^1.0.0" =
+    self.by-version."ws"."1.0.1";
+  by-spec."ws"."^1.0.1" =
+    self.by-version."ws"."1.0.1";
   by-spec."wu"."*" =
-    self.by-version."wu"."2.0.0";
-  by-version."wu"."2.0.0" = self.buildNodePackage {
-    name = "wu-2.0.0";
-    version = "2.0.0";
+    self.by-version."wu"."2.1.0";
+  by-version."wu"."2.1.0" = self.buildNodePackage {
+    name = "wu-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wu/-/wu-2.0.0.tgz";
-      name = "wu-2.0.0.tgz";
-      sha1 = "abda06a014dd1c54c2163862f5c2c5230721bc27";
+      url = "https://registry.npmjs.org/wu/-/wu-2.1.0.tgz";
+      name = "wu-2.1.0.tgz";
+      sha1 = "7e72e3fba23e0ff669ddd537e1c857d3d4b1614f";
     };
     deps = {
-      "traceur-0.0.55" = self.by-version."traceur"."0.0.55";
     };
     optionalDependencies = {
     };
@@ -44734,40 +50506,40 @@
     os = [ ];
     cpu = [ ];
   };
-  "wu" = self.by-version."wu"."2.0.0";
-  by-spec."x-default-browser"."0.3.0" =
-    self.by-version."x-default-browser"."0.3.0";
-  by-version."x-default-browser"."0.3.0" = self.buildNodePackage {
-    name = "x-default-browser-0.3.0";
-    version = "0.3.0";
+  "wu" = self.by-version."wu"."2.1.0";
+  by-spec."x-default-browser"."~0.3.0" =
+    self.by-version."x-default-browser"."0.3.1";
+  by-version."x-default-browser"."0.3.1" = self.buildNodePackage {
+    name = "x-default-browser-0.3.1";
+    version = "0.3.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.0.tgz";
-      name = "x-default-browser-0.3.0.tgz";
-      sha1 = "850d5137bc97b78176e69ae916417fe3d4e97d5d";
+      url = "https://registry.npmjs.org/x-default-browser/-/x-default-browser-0.3.1.tgz";
+      name = "x-default-browser-0.3.1.tgz";
+      sha1 = "7f6194154fd1786cf261e68b5488c47127a04977";
     };
     deps = {
     };
     optionalDependencies = {
-      "default-browser-id-1.0.2" = self.by-version."default-browser-id"."1.0.2";
+      "default-browser-id-1.0.4" = self.by-version."default-browser-id"."1.0.4";
     };
     peerDependencies = [];
     os = [ ];
     cpu = [ ];
   };
   by-spec."x509"."*" =
-    self.by-version."x509"."0.1.4";
-  by-version."x509"."0.1.4" = self.buildNodePackage {
-    name = "x509-0.1.4";
-    version = "0.1.4";
+    self.by-version."x509"."0.2.4";
+  by-version."x509"."0.2.4" = self.buildNodePackage {
+    name = "x509-0.2.4";
+    version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/x509/-/x509-0.1.4.tgz";
-      name = "x509-0.1.4.tgz";
-      sha1 = "08d016ed165db0c68a192edeb1cdca0f5d43cb22";
+      url = "https://registry.npmjs.org/x509/-/x509-0.2.4.tgz";
+      name = "x509-0.2.4.tgz";
+      sha1 = "f3310792471f85122640a7206d88d3d1fa1956b5";
     };
     deps = {
-      "nan-1.7.0" = self.by-version."nan"."1.7.0";
+      "nan-2.0.9" = self.by-version."nan"."2.0.9";
     };
     optionalDependencies = {
     };
@@ -44775,17 +50547,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "x509" = self.by-version."x509"."0.1.4";
-  by-spec."xcode"."0.6.7" =
-    self.by-version."xcode"."0.6.7";
-  by-version."xcode"."0.6.7" = self.buildNodePackage {
-    name = "xcode-0.6.7";
-    version = "0.6.7";
+  "x509" = self.by-version."x509"."0.2.4";
+  by-spec."xcode"."0.8.0" =
+    self.by-version."xcode"."0.8.0";
+  by-version."xcode"."0.8.0" = self.buildNodePackage {
+    name = "xcode-0.8.0";
+    version = "0.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xcode/-/xcode-0.6.7.tgz";
-      name = "xcode-0.6.7.tgz";
-      sha1 = "df11a8615e43dfa397cbf593b0fd14ebeadf4e7a";
+      url = "https://registry.npmjs.org/xcode/-/xcode-0.8.0.tgz";
+      name = "xcode-0.8.0.tgz";
+      sha1 = "fe61edf9cb14f2bb07ca6cafdc864a4b4c1beed9";
     };
     deps = {
       "pegjs-0.6.2" = self.by-version."pegjs"."0.6.2";
@@ -44797,85 +50569,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xdg-basedir"."^1.0.0" =
-    self.by-version."xdg-basedir"."1.0.1";
-  by-version."xdg-basedir"."1.0.1" = self.buildNodePackage {
-    name = "xdg-basedir-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz";
-      name = "xdg-basedir-1.0.1.tgz";
-      sha1 = "14ff8f63a4fdbcb05d5b6eea22b36f3033b9f04e";
-    };
-    deps = {
-      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."xdg-empty-trash"."^1.0.0" =
-    self.by-version."xdg-empty-trash"."1.0.0";
-  by-version."xdg-empty-trash"."1.0.0" = self.buildNodePackage {
-    name = "xdg-empty-trash-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz";
-      name = "xdg-empty-trash-1.0.0.tgz";
-      sha1 = "007ec95403863f705ec09335b8c9166858021959";
-    };
-    deps = {
-      "each-async-1.1.1" = self.by-version."each-async"."1.1.1";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."xdg-trash"."^1.0.0" =
-    self.by-version."xdg-trash"."1.1.0";
-  by-version."xdg-trash"."1.1.0" = self.buildNodePackage {
-    name = "xdg-trash-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.1.0.tgz";
-      name = "xdg-trash-1.1.0.tgz";
-      sha1 = "219d24c1417ead112d875131e6cde303cb44c51a";
-    };
-    deps = {
-      "each-async-1.1.1" = self.by-version."each-async"."1.1.1";
-      "fs-extra-0.18.2" = self.by-version."fs-extra"."0.18.2";
-      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
-      "xdg-trashdir-1.1.1" = self.by-version."xdg-trashdir"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."xdg-trashdir"."^1.0.0" =
-    self.by-version."xdg-trashdir"."1.1.1";
-  by-version."xdg-trashdir"."1.1.1" = self.buildNodePackage {
-    name = "xdg-trashdir-1.1.1";
-    version = "1.1.1";
+  by-spec."xdg-basedir"."^2.0.0" =
+    self.by-version."xdg-basedir"."2.0.0";
+  by-version."xdg-basedir"."2.0.0" = self.buildNodePackage {
+    name = "xdg-basedir-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.1.1.tgz";
-      name = "xdg-trashdir-1.1.1.tgz";
-      sha1 = "3cbdc8de596642396725de40a20bcf402b6d5db5";
+      url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
+      name = "xdg-basedir-2.0.0.tgz";
+      sha1 = "edbc903cc385fc04523d966a335504b5504d1bd2";
     };
     deps = {
-      "mount-point-1.0.3" = self.by-version."mount-point"."1.0.3";
-      "user-home-1.1.1" = self.by-version."user-home"."1.1.1";
-      "xdg-basedir-1.0.1" = self.by-version."xdg-basedir"."1.0.1";
+      "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -44884,15 +50590,15 @@
     cpu = [ ];
   };
   by-spec."xhr2".">= 0.0.5" =
-    self.by-version."xhr2"."0.1.2";
-  by-version."xhr2"."0.1.2" = self.buildNodePackage {
-    name = "xhr2-0.1.2";
-    version = "0.1.2";
+    self.by-version."xhr2"."0.1.3";
+  by-version."xhr2"."0.1.3" = self.buildNodePackage {
+    name = "xhr2-0.1.3";
+    version = "0.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xhr2/-/xhr2-0.1.2.tgz";
-      name = "xhr2-0.1.2.tgz";
-      sha1 = "5f9f78c042e5ad1c0dbfcf0deb3aae7c95defc6f";
+      url = "https://registry.npmjs.org/xhr2/-/xhr2-0.1.3.tgz";
+      name = "xhr2-0.1.3.tgz";
+      sha1 = "cbfc4759a69b4a888e78cf4f20b051038757bd11";
     };
     deps = {
     };
@@ -44903,15 +50609,15 @@
     cpu = [ ];
   };
   by-spec."xml"."^1.0.0" =
-    self.by-version."xml"."1.0.0";
-  by-version."xml"."1.0.0" = self.buildNodePackage {
-    name = "xml-1.0.0";
-    version = "1.0.0";
+    self.by-version."xml"."1.0.1";
+  by-version."xml"."1.0.1" = self.buildNodePackage {
+    name = "xml-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml/-/xml-1.0.0.tgz";
-      name = "xml-1.0.0.tgz";
-      sha1 = "de3ee912477be2f250b60f612f34a8c4da616efe";
+      url = "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz";
+      name = "xml-1.0.1.tgz";
+      sha1 = "78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5";
     };
     deps = {
     };
@@ -44921,20 +50627,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xml2js"."*" =
-    self.by-version."xml2js"."0.4.8";
-  by-version."xml2js"."0.4.8" = self.buildNodePackage {
-    name = "xml2js-0.4.8";
-    version = "0.4.8";
+  by-spec."xml-name-validator"."^1.0.0" =
+    self.by-version."xml-name-validator"."1.0.0";
+  by-version."xml-name-validator"."1.0.0" = self.buildNodePackage {
+    name = "xml-name-validator-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.8.tgz";
-      name = "xml2js-0.4.8.tgz";
-      sha1 = "9fe56bdb2a4931fdfcefb4cedfdb29d89c32f5a1";
+      url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-1.0.0.tgz";
+      name = "xml-name-validator-1.0.0.tgz";
+      sha1 = "dcf82ee092322951ef8cc1ba596c9cbfd14a83f1";
     };
     deps = {
-      "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-2.6.2" = self.by-version."xmlbuilder"."2.6.2";
     };
     optionalDependencies = {
     };
@@ -44949,12 +50653,12 @@
     version = "0.1.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
+      url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz";
       name = "xml2js-0.1.14.tgz";
       sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
     };
     deps = {
-      "sax-0.6.1" = self.by-version."sax"."0.6.1";
+      "sax-1.2.1" = self.by-version."sax"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -44969,12 +50673,12 @@
     version = "0.2.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
+      url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.4.tgz";
       name = "xml2js-0.2.4.tgz";
       sha1 = "9a5b577fa1e6cdf8923d5e1372f7a3188436e44d";
     };
     deps = {
-      "sax-0.6.1" = self.by-version."sax"."0.6.1";
+      "sax-1.2.1" = self.by-version."sax"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -44989,7 +50693,7 @@
     version = "0.2.6";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
+      url = "https://registry.npmjs.org/xml2js/-/xml2js-0.2.6.tgz";
       name = "xml2js-0.2.6.tgz";
       sha1 = "d209c4e4dda1fc9c452141ef41c077f5adfdf6c4";
     };
@@ -45002,19 +50706,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xml2js"."0.2.8" =
-    self.by-version."xml2js"."0.2.8";
-  by-version."xml2js"."0.2.8" = self.buildNodePackage {
-    name = "xml2js-0.2.8";
-    version = "0.2.8";
+  by-spec."xml2js"."0.4.15" =
+    self.by-version."xml2js"."0.4.15";
+  by-version."xml2js"."0.4.15" = self.buildNodePackage {
+    name = "xml2js-0.4.15";
+    version = "0.4.15";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.2.8.tgz";
-      name = "xml2js-0.2.8.tgz";
-      sha1 = "9b81690931631ff09d1957549faf54f4f980b3c2";
+      url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.15.tgz";
+      name = "xml2js-0.4.15.tgz";
+      sha1 = "95cd03ff2dd144ec28bc6273bf2b2890c581ad0c";
     };
     deps = {
-      "sax-0.5.8" = self.by-version."sax"."0.5.8";
+      "sax-1.2.1" = self.by-version."sax"."1.2.1";
+      "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xml2js"."0.4.16" =
+    self.by-version."xml2js"."0.4.16";
+  by-version."xml2js"."0.4.16" = self.buildNodePackage {
+    name = "xml2js-0.4.16";
+    version = "0.4.16";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.16.tgz";
+      name = "xml2js-0.4.16.tgz";
+      sha1 = "f82fccd2f9540d7e0a9b5dac163e7471195c9db3";
+    };
+    deps = {
+      "sax-1.2.1" = self.by-version."sax"."1.2.1";
+      "xmlbuilder-4.2.1" = self.by-version."xmlbuilder"."4.2.1";
     };
     optionalDependencies = {
     };
@@ -45029,13 +50755,13 @@
     version = "0.4.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
+      url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.4.tgz";
       name = "xml2js-0.4.4.tgz";
       sha1 = "3111010003008ae19240eba17497b57c729c555d";
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-2.6.2" = self.by-version."xmlbuilder"."2.6.2";
+      "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0";
     };
     optionalDependencies = {
     };
@@ -45044,24 +50770,28 @@
     cpu = [ ];
   };
   by-spec."xml2js".">= 0.0.1" =
-    self.by-version."xml2js"."0.4.8";
+    self.by-version."xml2js"."0.4.16";
   by-spec."xml2js".">=0.1.7" =
-    self.by-version."xml2js"."0.4.8";
+    self.by-version."xml2js"."0.4.16";
+  by-spec."xml2js"."^0.4.15" =
+    self.by-version."xml2js"."0.4.16";
   by-spec."xml2js"."^0.4.4" =
-    self.by-version."xml2js"."0.4.8";
+    self.by-version."xml2js"."0.4.16";
   by-spec."xml2json".">=0.3.2" =
-    self.by-version."xml2json"."0.6.1";
-  by-version."xml2json"."0.6.1" = self.buildNodePackage {
-    name = "xml2json-0.6.1";
-    version = "0.6.1";
+    self.by-version."xml2json"."0.9.0";
+  by-version."xml2json"."0.9.0" = self.buildNodePackage {
+    name = "xml2json-0.9.0";
+    version = "0.9.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2json/-/xml2json-0.6.1.tgz";
-      name = "xml2json-0.6.1.tgz";
-      sha1 = "43883d09e4369f96b83316df833cf1fc20d6c3f1";
+      url = "https://registry.npmjs.org/xml2json/-/xml2json-0.9.0.tgz";
+      name = "xml2json-0.9.0.tgz";
+      sha1 = "cf85a24b1ab0291a409d79bba5c5da720c01ec31";
     };
     deps = {
-      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "joi-6.10.1" = self.by-version."joi"."6.10.1";
+      "node-expat-2.3.13" = self.by-version."node-expat"."2.3.13";
     };
     optionalDependencies = {
     };
@@ -45076,12 +50806,12 @@
     version = "0.5.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xml2json/-/xml2json-0.5.1.tgz";
+      url = "https://registry.npmjs.org/xml2json/-/xml2json-0.5.1.tgz";
       name = "xml2json-0.5.1.tgz";
       sha1 = "4667011bf0b34e8ec9830cf83e9476659a94d9ba";
     };
     deps = {
-      "node-expat-2.3.7" = self.by-version."node-expat"."2.3.7";
+      "node-expat-2.3.13" = self.by-version."node-expat"."2.3.13";
     };
     optionalDependencies = {
     };
@@ -45096,7 +50826,7 @@
     version = "0.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.2.tgz";
       name = "xmlbuilder-0.4.2.tgz";
       sha1 = "1776d65f3fdbad470a08d8604cdeb1c4e540ff83";
     };
@@ -45108,18 +50838,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xmlbuilder"."0.4.x" =
-    self.by-version."xmlbuilder"."0.4.3";
-  by-version."xmlbuilder"."0.4.3" = self.buildNodePackage {
-    name = "xmlbuilder-0.4.3";
-    version = "0.4.3";
+  by-spec."xmlbuilder"."2.6.2" =
+    self.by-version."xmlbuilder"."2.6.2";
+  by-version."xmlbuilder"."2.6.2" = self.buildNodePackage {
+    name = "xmlbuilder-2.6.2";
+    version = "2.6.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-0.4.3.tgz";
-      name = "xmlbuilder-0.4.3.tgz";
-      sha1 = "c4614ba74e0ad196e609c9272cd9e1ddb28a8a58";
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz";
+      name = "xmlbuilder-2.6.2.tgz";
+      sha1 = "f916f6d10d45dc171b1be2e6e673fb6e0cc35d0a";
     };
     deps = {
+      "lodash-3.5.0" = self.by-version."lodash"."3.5.0";
     };
     optionalDependencies = {
     };
@@ -45127,19 +50858,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xmlbuilder"."2.2.1" =
-    self.by-version."xmlbuilder"."2.2.1";
-  by-version."xmlbuilder"."2.2.1" = self.buildNodePackage {
-    name = "xmlbuilder-2.2.1";
-    version = "2.2.1";
+  by-spec."xmlbuilder"."3.1.0" =
+    self.by-version."xmlbuilder"."3.1.0";
+  by-version."xmlbuilder"."3.1.0" = self.buildNodePackage {
+    name = "xmlbuilder-3.1.0";
+    version = "3.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz";
+      name = "xmlbuilder-3.1.0.tgz";
+      sha1 = "2c86888f2d4eade850fa38ca7f7223f7209516e1";
+    };
+    deps = {
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xmlbuilder"."4.0.0" =
+    self.by-version."xmlbuilder"."4.0.0";
+  by-version."xmlbuilder"."4.0.0" = self.buildNodePackage {
+    name = "xmlbuilder-4.0.0";
+    version = "4.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.2.1.tgz";
-      name = "xmlbuilder-2.2.1.tgz";
-      sha1 = "9326430f130d87435d4c4086643aa2926e105a32";
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.0.0.tgz";
+      name = "xmlbuilder-4.0.0.tgz";
+      sha1 = "98b8f651ca30aa624036f127d11cc66dc7b907a3";
     };
     deps = {
-      "lodash-node-2.4.1" = self.by-version."lodash-node"."2.4.1";
+      "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
     };
     optionalDependencies = {
     };
@@ -45148,18 +50899,17 @@
     cpu = [ ];
   };
   by-spec."xmlbuilder".">=1.0.0" =
-    self.by-version."xmlbuilder"."2.6.2";
-  by-version."xmlbuilder"."2.6.2" = self.buildNodePackage {
-    name = "xmlbuilder-2.6.2";
-    version = "2.6.2";
+    self.by-version."xmlbuilder"."8.2.0";
+  by-version."xmlbuilder"."8.2.0" = self.buildNodePackage {
+    name = "xmlbuilder-8.2.0";
+    version = "8.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlbuilder/-/xmlbuilder-2.6.2.tgz";
-      name = "xmlbuilder-2.6.2.tgz";
-      sha1 = "f916f6d10d45dc171b1be2e6e673fb6e0cc35d0a";
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.0.tgz";
+      name = "xmlbuilder-8.2.0.tgz";
+      sha1 = "abf6e49feedd3296676b69c2de37c364dde1e263";
     };
     deps = {
-      "lodash-3.5.0" = self.by-version."lodash"."3.5.0";
     };
     optionalDependencies = {
     };
@@ -45168,15 +50918,35 @@
     cpu = [ ];
   };
   by-spec."xmlbuilder".">=2.4.6" =
-    self.by-version."xmlbuilder"."2.6.2";
-  by-spec."xmldom"."0.1.x" =
+    self.by-version."xmlbuilder"."8.2.0";
+  by-spec."xmlbuilder"."^4.1.0" =
+    self.by-version."xmlbuilder"."4.2.1";
+  by-version."xmlbuilder"."4.2.1" = self.buildNodePackage {
+    name = "xmlbuilder-4.2.1";
+    version = "4.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-4.2.1.tgz";
+      name = "xmlbuilder-4.2.1.tgz";
+      sha1 = "aa58a3041a066f90eaa16c2f5389ff19f3f461a5";
+    };
+    deps = {
+      "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xmldom"."0.1.19" =
     self.by-version."xmldom"."0.1.19";
   by-version."xmldom"."0.1.19" = self.buildNodePackage {
     name = "xmldom-0.1.19";
     version = "0.1.19";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
+      url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.19.tgz";
       name = "xmldom-0.1.19.tgz";
       sha1 = "631fc07776efd84118bf25171b37ed4d075a0abc";
     };
@@ -45188,8 +50958,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xmldom"."~0.1.19" =
-    self.by-version."xmldom"."0.1.19";
+  by-spec."xmldom"."0.1.x" =
+    self.by-version."xmldom"."0.1.22";
+  by-version."xmldom"."0.1.22" = self.buildNodePackage {
+    name = "xmldom-0.1.22";
+    version = "0.1.22";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+      name = "xmldom-0.1.22.tgz";
+      sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."xmlhttprequest"."1.4.2" =
     self.by-version."xmlhttprequest"."1.4.2";
   by-version."xmlhttprequest"."1.4.2" = self.buildNodePackage {
@@ -45197,7 +50984,7 @@
     version = "1.4.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
+      url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz";
       name = "xmlhttprequest-1.4.2.tgz";
       sha1 = "01453a1d9bed1e8f172f6495bbf4c8c426321500";
     };
@@ -45209,16 +50996,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xmlhttprequest".">=1.5.0" =
-    self.by-version."xmlhttprequest"."1.7.0";
-  by-version."xmlhttprequest"."1.7.0" = self.buildNodePackage {
-    name = "xmlhttprequest-1.7.0";
-    version = "1.7.0";
+  by-spec."xmlhttprequest".">= 1.6.0 < 2.0.0" =
+    self.by-version."xmlhttprequest"."1.8.0";
+  by-version."xmlhttprequest"."1.8.0" = self.buildNodePackage {
+    name = "xmlhttprequest-1.8.0";
+    version = "1.8.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.7.0.tgz";
-      name = "xmlhttprequest-1.7.0.tgz";
-      sha1 = "dc697a8df0258afacad526c1c296b1bdd12c4ab3";
+      url = "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz";
+      name = "xmlhttprequest-1.8.0.tgz";
+      sha1 = "67fe075c5c24fef39f9d65f5f7b7fe75171968fc";
     };
     deps = {
     };
@@ -45228,6 +51015,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."xmlhttprequest".">=1.5.0" =
+    self.by-version."xmlhttprequest"."1.8.0";
   by-spec."xmlhttprequest"."https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz" =
     self.by-version."xmlhttprequest"."1.5.0";
   by-version."xmlhttprequest"."1.5.0" = self.buildNodePackage {
@@ -45235,9 +51024,28 @@
     version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz";
+      url = "https://github.com/LearnBoost/node-XMLHttpRequest/archive/0f36d0b5ebc03d85f860d42a64ae9791e1daa433.tar.gz";
       name = "xmlhttprequest-1.5.0.tgz";
-      sha256 = "f29574bb6dad260b7856b8dcfd432fc9ceb52161b8ee02f387440bb7f6e39f92";
+      sha256 = "28dd0394d85befe8be4e9cd9f6803102780c62cbb09298cb174b52ff9777624f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."xmlhttprequest-ssl"."1.5.1" =
+    self.by-version."xmlhttprequest-ssl"."1.5.1";
+  by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage {
+    name = "xmlhttprequest-ssl-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
+      name = "xmlhttprequest-ssl-1.5.1.tgz";
+      sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
     };
     deps = {
     };
@@ -45247,8 +51055,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xmlhttprequest"."https://github.com/rase-/node-XMLHttpRequest/archive/a6b6f2.tar.gz" =
-    self.by-version."xmlhttprequest"."1.5.0";
   by-spec."xoauth2"."~0.1.8" =
     self.by-version."xoauth2"."0.1.8";
   by-version."xoauth2"."0.1.8" = self.buildNodePackage {
@@ -45256,7 +51062,7 @@
     version = "0.1.8";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
+      url = "https://registry.npmjs.org/xoauth2/-/xoauth2-0.1.8.tgz";
       name = "xoauth2-0.1.8.tgz";
       sha1 = "b916ff10ecfb54320f16f24a3e975120653ab0d2";
     };
@@ -45275,7 +51081,7 @@
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz";
+      url = "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz";
       name = "xregexp-2.0.0.tgz";
       sha1 = "52a63e56ca0b84a7f3a5f3d61872f126ad7a5943";
     };
@@ -45287,16 +51093,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xtend".">=4.0.0 <4.1.0-0" =
-    self.by-version."xtend"."4.0.0";
-  by-version."xtend"."4.0.0" = self.buildNodePackage {
-    name = "xtend-4.0.0";
-    version = "4.0.0";
+  by-spec."xregexp"."^3.0.0" =
+    self.by-version."xregexp"."3.1.0";
+  by-version."xregexp"."3.1.0" = self.buildNodePackage {
+    name = "xregexp-3.1.0";
+    version = "3.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
-      name = "xtend-4.0.0.tgz";
-      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+      url = "https://registry.npmjs.org/xregexp/-/xregexp-3.1.0.tgz";
+      name = "xregexp-3.1.0.tgz";
+      sha1 = "14d8461e0bdd38224bfee5039a0898fc42fcd336";
     };
     deps = {
     };
@@ -45306,16 +51112,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xtend"."^3.0.0" =
-    self.by-version."xtend"."3.0.0";
-  by-version."xtend"."3.0.0" = self.buildNodePackage {
-    name = "xtend-3.0.0";
-    version = "3.0.0";
+  by-spec."xtend".">=4.0.0 <4.1.0-0" =
+    self.by-version."xtend"."4.0.1";
+  by-version."xtend"."4.0.1" = self.buildNodePackage {
+    name = "xtend-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
-      name = "xtend-3.0.0.tgz";
-      sha1 = "5cce7407baf642cba7becda568111c493f59665a";
+      url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+      name = "xtend-4.0.1.tgz";
+      sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
     };
     deps = {
     };
@@ -45326,20 +51132,21 @@
     cpu = [ ];
   };
   by-spec."xtend"."^4.0.0" =
-    self.by-version."xtend"."4.0.0";
-  by-spec."xtend"."~2.1.1" =
-    self.by-version."xtend"."2.1.2";
-  by-version."xtend"."2.1.2" = self.buildNodePackage {
-    name = "xtend-2.1.2";
-    version = "2.1.2";
+    self.by-version."xtend"."4.0.1";
+  by-spec."xtend"."^4.0.1" =
+    self.by-version."xtend"."4.0.1";
+  by-spec."xtend"."~3.0.0" =
+    self.by-version."xtend"."3.0.0";
+  by-version."xtend"."3.0.0" = self.buildNodePackage {
+    name = "xtend-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz";
-      name = "xtend-2.1.2.tgz";
-      sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b";
+      url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz";
+      name = "xtend-3.0.0.tgz";
+      sha1 = "5cce7407baf642cba7becda568111c493f59665a";
     };
     deps = {
-      "object-keys-0.4.0" = self.by-version."object-keys"."0.4.0";
     };
     optionalDependencies = {
     };
@@ -45347,10 +51154,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."xtend"."~3.0.0" =
-    self.by-version."xtend"."3.0.0";
   by-spec."xtend"."~4.0.0" =
-    self.by-version."xtend"."4.0.0";
+    self.by-version."xtend"."4.0.1";
   by-spec."xtraverse"."0.1.x" =
     self.by-version."xtraverse"."0.1.0";
   by-version."xtraverse"."0.1.0" = self.buildNodePackage {
@@ -45358,12 +51163,12 @@
     version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz";
+      url = "https://registry.npmjs.org/xtraverse/-/xtraverse-0.1.0.tgz";
       name = "xtraverse-0.1.0.tgz";
       sha1 = "b741bad018ef78d8a9d2e83ade007b3f7959c732";
     };
     deps = {
-      "xmldom-0.1.19" = self.by-version."xmldom"."0.1.19";
+      "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22";
     };
     optionalDependencies = {
     };
@@ -45371,16 +51176,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."yamlish"."*" =
-    self.by-version."yamlish"."0.0.6";
-  by-version."yamlish"."0.0.6" = self.buildNodePackage {
-    name = "yamlish-0.0.6";
-    version = "0.0.6";
+  by-spec."y18n"."^3.2.0" =
+    self.by-version."y18n"."3.2.1";
+  by-version."y18n"."3.2.1" = self.buildNodePackage {
+    name = "y18n-3.2.1";
+    version = "3.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/yamlish/-/yamlish-0.0.6.tgz";
-      name = "yamlish-0.0.6.tgz";
-      sha1 = "c5df8f7661731351e39eb52223f83a46659452e3";
+      url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz";
+      name = "y18n-3.2.1.tgz";
+      sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41";
     };
     deps = {
     };
@@ -45390,16 +51195,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."yargs"."^1.2.1" =
-    self.by-version."yargs"."1.3.3";
-  by-version."yargs"."1.3.3" = self.buildNodePackage {
-    name = "yargs-1.3.3";
-    version = "1.3.3";
+  by-spec."yallist"."^2.0.0" =
+    self.by-version."yallist"."2.0.0";
+  by-version."yallist"."2.0.0" = self.buildNodePackage {
+    name = "yallist-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
-      name = "yargs-1.3.3.tgz";
-      sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
+      url = "https://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz";
+      name = "yallist-2.0.0.tgz";
+      sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4";
     };
     deps = {
     };
@@ -45411,227 +51216,14 @@
   };
   by-spec."yargs"."^1.3.3" =
     self.by-version."yargs"."1.3.3";
-  by-spec."yargs"."~1.3.1" =
-    self.by-version."yargs"."1.3.3";
-  by-spec."yargs"."~1.3.2" =
-    self.by-version."yargs"."1.3.3";
-  by-spec."yargs"."~3.5.4" =
-    self.by-version."yargs"."3.5.4";
-  by-version."yargs"."3.5.4" = self.buildNodePackage {
-    name = "yargs-3.5.4";
-    version = "3.5.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
-      name = "yargs-3.5.4.tgz";
-      sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
-    };
-    deps = {
-      "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2";
-      "decamelize-1.0.0" = self.by-version."decamelize"."1.0.0";
-      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."yargs"."~3.6.0" =
-    self.by-version."yargs"."3.6.0";
-  by-version."yargs"."3.6.0" = self.buildNodePackage {
-    name = "yargs-3.6.0";
-    version = "3.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yargs/-/yargs-3.6.0.tgz";
-      name = "yargs-3.6.0.tgz";
-      sha1 = "587e098615d8f627ffbf53ebb61eac827268e51a";
-    };
-    deps = {
-      "camelcase-1.0.2" = self.by-version."camelcase"."1.0.2";
-      "decamelize-1.0.0" = self.by-version."decamelize"."1.0.0";
-      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."zeparser"."0.0.5" =
-    self.by-version."zeparser"."0.0.5";
-  by-version."zeparser"."0.0.5" = self.buildNodePackage {
-    name = "zeparser-0.0.5";
-    version = "0.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
-      name = "zeparser-0.0.5.tgz";
-      sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."zip-stream"."~0.4.0" =
-    self.by-version."zip-stream"."0.4.1";
-  by-version."zip-stream"."0.4.1" = self.buildNodePackage {
-    name = "zip-stream-0.4.1";
-    version = "0.4.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/zip-stream/-/zip-stream-0.4.1.tgz";
-      name = "zip-stream-0.4.1.tgz";
-      sha1 = "4ea795a8ce19e9fab49a31d1d0877214159f03a3";
-    };
-    deps = {
-      "compress-commons-0.1.6" = self.by-version."compress-commons"."0.1.6";
-      "lodash-2.4.1" = self.by-version."lodash"."2.4.1";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."zlib-browserify"."~0.0.3" =
-    self.by-version."zlib-browserify"."0.0.3";
-  by-version."zlib-browserify"."0.0.3" = self.buildNodePackage {
-    name = "zlib-browserify-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/zlib-browserify/-/zlib-browserify-0.0.3.tgz";
-      name = "zlib-browserify-0.0.3.tgz";
-      sha1 = "240ccdbfd0203fa842b130deefb1414122c8cc50";
-    };
-    deps = {
-      "tape-0.2.2" = self.by-version."tape"."0.2.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ansi-regex"."^2.0.0" =
-    self.by-version."ansi-regex"."2.0.0";
-  by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
-    name = "ansi-regex-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
-      name = "ansi-regex-2.0.0.tgz";
-      sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ansi-styles"."^2.1.0" =
-    self.by-version."ansi-styles"."2.2.0";
-  by-version."ansi-styles"."2.2.0" = self.buildNodePackage {
-    name = "ansi-styles-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.0.tgz";
-      name = "ansi-styles-2.2.0.tgz";
-      sha1 = "c59191936e6ed1c1315a4b6b6b97f3acfbfa68b0";
-    };
-    deps = {
-      "color-convert-1.0.0" = self.by-version."color-convert"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."argparse"."1.0.4" =
-    self.by-version."argparse"."1.0.4";
-  by-version."argparse"."1.0.4" = self.buildNodePackage {
-    name = "argparse-1.0.4";
-    version = "1.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/argparse/-/argparse-1.0.4.tgz";
-      name = "argparse-1.0.4.tgz";
-      sha1 = "2b12247b933001971addcbfe4e67d20fd395bbf4";
-    };
-    deps = {
-      "lodash-4.6.1" = self.by-version."lodash"."4.6.1";
-      "sprintf-js-1.0.3" = self.by-version."sprintf-js"."1.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "argparse" = self.by-version."argparse"."1.0.4";
-  by-spec."argparse"."^1.0.2" =
-    self.by-version."argparse"."1.0.7";
-  by-version."argparse"."1.0.7" = self.buildNodePackage {
-    name = "argparse-1.0.7";
-    version = "1.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz";
-      name = "argparse-1.0.7.tgz";
-      sha1 = "c289506480557810f14a8bc62d7a06f63ed7f951";
-    };
-    deps = {
-      "sprintf-js-1.0.3" = self.by-version."sprintf-js"."1.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."array-find-index"."^1.0.0" =
-    self.by-version."array-find-index"."1.0.1";
-  by-version."array-find-index"."1.0.1" = self.buildNodePackage {
-    name = "array-find-index-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/array-find-index/-/array-find-index-1.0.1.tgz";
-      name = "array-find-index-1.0.1.tgz";
-      sha1 = "0bc25ddac941ec8a496ae258fd4ac188003ef3af";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."asn1".">=0.2.3 <0.3.0" =
-    self.by-version."asn1"."0.2.3";
-  by-version."asn1"."0.2.3" = self.buildNodePackage {
-    name = "asn1-0.2.3";
-    version = "0.2.3";
+  by-version."yargs"."1.3.3" = self.buildNodePackage {
+    name = "yargs-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
-      name = "asn1-0.2.3.tgz";
-      sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
+      url = "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz";
+      name = "yargs-1.3.3.tgz";
+      sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a";
     };
     deps = {
     };
@@ -45641,18 +51233,25 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus".">=0.2.0 <0.3.0" =
-    self.by-version."assert-plus"."0.2.0";
-  by-version."assert-plus"."0.2.0" = self.buildNodePackage {
-    name = "assert-plus-0.2.0";
-    version = "0.2.0";
+  by-spec."yargs"."^3.19.0" =
+    self.by-version."yargs"."3.32.0";
+  by-version."yargs"."3.32.0" = self.buildNodePackage {
+    name = "yargs-3.32.0";
+    version = "3.32.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
-      name = "assert-plus-0.2.0.tgz";
-      sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
+      url = "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz";
+      name = "yargs-3.32.0.tgz";
+      sha1 = "03088e9ebf9e756b69751611d2a5ef591482c995";
     };
     deps = {
+      "camelcase-2.1.1" = self.by-version."camelcase"."2.1.1";
+      "cliui-3.1.2" = self.by-version."cliui"."3.1.2";
+      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+      "os-locale-1.4.0" = self.by-version."os-locale"."1.4.0";
+      "string-width-1.0.1" = self.by-version."string-width"."1.0.1";
+      "window-size-0.1.4" = self.by-version."window-size"."0.1.4";
+      "y18n-3.2.1" = self.by-version."y18n"."3.2.1";
     };
     optionalDependencies = {
     };
@@ -45660,20 +51259,28 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus"."^0.2.0" =
-    self.by-version."assert-plus"."0.2.0";
-  by-spec."assert-plus"."^1.0.0" =
-    self.by-version."assert-plus"."1.0.0";
-  by-version."assert-plus"."1.0.0" = self.buildNodePackage {
-    name = "assert-plus-1.0.0";
-    version = "1.0.0";
+  by-spec."yargs"."^3.31.0" =
+    self.by-version."yargs"."3.32.0";
+  by-spec."yargs"."^3.9.0" =
+    self.by-version."yargs"."3.32.0";
+  by-spec."yargs"."~1.3.1" =
+    self.by-version."yargs"."1.3.3";
+  by-spec."yargs"."~3.10.0" =
+    self.by-version."yargs"."3.10.0";
+  by-version."yargs"."3.10.0" = self.buildNodePackage {
+    name = "yargs-3.10.0";
+    version = "3.10.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz";
-      name = "assert-plus-1.0.0.tgz";
-      sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525";
+      url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz";
+      name = "yargs-3.10.0.tgz";
+      sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1";
     };
     deps = {
+      "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1";
+      "cliui-2.1.0" = self.by-version."cliui"."2.1.0";
+      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
     };
     optionalDependencies = {
     };
@@ -45681,18 +51288,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assertion-error"."^1.0.0" =
-    self.by-version."assertion-error"."1.0.1";
-  by-version."assertion-error"."1.0.1" = self.buildNodePackage {
-    name = "assertion-error-1.0.1";
-    version = "1.0.1";
+  by-spec."yargs"."~3.27.0" =
+    self.by-version."yargs"."3.27.0";
+  by-version."yargs"."3.27.0" = self.buildNodePackage {
+    name = "yargs-3.27.0";
+    version = "3.27.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assertion-error/-/assertion-error-1.0.1.tgz";
-      name = "assertion-error-1.0.1.tgz";
-      sha1 = "35aaeec33097f11f42399ecadf33faccd27f5c4c";
+      url = "https://registry.npmjs.org/yargs/-/yargs-3.27.0.tgz";
+      name = "yargs-3.27.0.tgz";
+      sha1 = "21205469316e939131d59f2da0c6d7f98221ea40";
     };
     deps = {
+      "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1";
+      "cliui-2.1.0" = self.by-version."cliui"."2.1.0";
+      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+      "os-locale-1.4.0" = self.by-version."os-locale"."1.4.0";
+      "window-size-0.1.4" = self.by-version."window-size"."0.1.4";
+      "y18n-3.2.1" = self.by-version."y18n"."3.2.1";
     };
     optionalDependencies = {
     };
@@ -45700,18 +51313,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."async"."^1.5.2" =
-    self.by-version."async"."1.5.2";
-  by-version."async"."1.5.2" = self.buildNodePackage {
-    name = "async-1.5.2";
-    version = "1.5.2";
+  by-spec."yargs"."~3.32.0" =
+    self.by-version."yargs"."3.32.0";
+  by-spec."yargs"."~3.5.4" =
+    self.by-version."yargs"."3.5.4";
+  by-version."yargs"."3.5.4" = self.buildNodePackage {
+    name = "yargs-3.5.4";
+    version = "3.5.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz";
-      name = "async-1.5.2.tgz";
-      sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
+      url = "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz";
+      name = "yargs-3.5.4.tgz";
+      sha1 = "d8aff8f665e94c34bd259bdebd1bfaf0ddd35361";
     };
     deps = {
+      "camelcase-1.2.1" = self.by-version."camelcase"."1.2.1";
+      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
+      "window-size-0.1.0" = self.by-version."window-size"."0.1.0";
+      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
     };
     optionalDependencies = {
     };
@@ -45719,18 +51338,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."aws-sign2"."~0.6.0" =
-    self.by-version."aws-sign2"."0.6.0";
-  by-version."aws-sign2"."0.6.0" = self.buildNodePackage {
-    name = "aws-sign2-0.6.0";
-    version = "0.6.0";
+  by-spec."yauzl"."2.4.1" =
+    self.by-version."yauzl"."2.4.1";
+  by-version."yauzl"."2.4.1" = self.buildNodePackage {
+    name = "yauzl-2.4.1";
+    version = "2.4.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
-      name = "aws-sign2-0.6.0.tgz";
-      sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
+      url = "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz";
+      name = "yauzl-2.4.1.tgz";
+      sha1 = "9528f442dab1b2284e58b4379bb194e22e0c4005";
     };
     deps = {
+      "fd-slicer-1.0.1" = self.by-version."fd-slicer"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -45738,19 +51358,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."aws4"."^1.2.1" =
-    self.by-version."aws4"."1.3.2";
-  by-version."aws4"."1.3.2" = self.buildNodePackage {
-    name = "aws4-1.3.2";
-    version = "1.3.2";
+  by-spec."yeast"."0.1.2" =
+    self.by-version."yeast"."0.1.2";
+  by-version."yeast"."0.1.2" = self.buildNodePackage {
+    name = "yeast-0.1.2";
+    version = "0.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws4/-/aws4-1.3.2.tgz";
-      name = "aws4-1.3.2.tgz";
-      sha1 = "d39e0bee412ced0e8ed94a23e314f313a95b9fd1";
+      url = "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
+      name = "yeast-0.1.2.tgz";
+      sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
     };
     deps = {
-      "lru-cache-4.0.1" = self.by-version."lru-cache"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -45758,16 +51377,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."balanced-match"."^0.3.0" =
-    self.by-version."balanced-match"."0.3.0";
-  by-version."balanced-match"."0.3.0" = self.buildNodePackage {
-    name = "balanced-match-0.3.0";
-    version = "0.3.0";
+  by-spec."zeparser"."0.0.5" =
+    self.by-version."zeparser"."0.0.5";
+  by-version."zeparser"."0.0.5" = self.buildNodePackage {
+    name = "zeparser-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz";
-      name = "balanced-match-0.3.0.tgz";
-      sha1 = "a91cdd1ebef1a86659e70ff4def01625fc2d6756";
+      url = "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz";
+      name = "zeparser-0.0.5.tgz";
+      sha1 = "03726561bc268f2e5444f54c665b7fd4a8c029e2";
     };
     deps = {
     };
@@ -45777,18 +51396,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bl"."^0.9.3" =
-    self.by-version."bl"."0.9.5";
-  by-version."bl"."0.9.5" = self.buildNodePackage {
-    name = "bl-0.9.5";
-    version = "0.9.5";
+  by-spec."zip-stream"."~0.5.0" =
+    self.by-version."zip-stream"."0.5.2";
+  by-version."zip-stream"."0.5.2" = self.buildNodePackage {
+    name = "zip-stream-0.5.2";
+    version = "0.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.9.5.tgz";
-      name = "bl-0.9.5.tgz";
-      sha1 = "c06b797af085ea00bc527afc8efcf11de2232054";
+      url = "https://registry.npmjs.org/zip-stream/-/zip-stream-0.5.2.tgz";
+      name = "zip-stream-0.5.2.tgz";
+      sha1 = "32dcbc506d0dab4d21372625bd7ebaac3c2fff56";
     };
     deps = {
+      "compress-commons-0.2.9" = self.by-version."compress-commons"."0.2.9";
+      "lodash-3.2.0" = self.by-version."lodash"."3.2.0";
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
     };
     optionalDependencies = {
@@ -45797,3642 +51418,4 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bl"."~1.0.0" =
-    self.by-version."bl"."1.0.3";
-  by-version."bl"."1.0.3" = self.buildNodePackage {
-    name = "bl-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-1.0.3.tgz";
-      name = "bl-1.0.3.tgz";
-      sha1 = "fc5421a28fd4226036c3b3891a66a25bc64d226e";
-    };
-    deps = {
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bluebird"."~1.2.4" =
-    self.by-version."bluebird"."1.2.4";
-  by-version."bluebird"."1.2.4" = self.buildNodePackage {
-    name = "bluebird-1.2.4";
-    version = "1.2.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-1.2.4.tgz";
-      name = "bluebird-1.2.4.tgz";
-      sha1 = "5985ec23cb6ff1a5834cc6447b3c5ef010fd321a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."boom"."2.10.1" = self.buildNodePackage {
-    name = "boom-2.10.1";
-    version = "2.10.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
-      name = "boom-2.10.1.tgz";
-      sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
-    };
-    deps = {
-      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "bower-endpoint-parser" = self.by-version."bower-endpoint-parser"."0.2.1";
-  by-spec."bower-json"."0.6.0" =
-    self.by-version."bower-json"."0.6.0";
-  by-version."bower-json"."0.6.0" = self.buildNodePackage {
-    name = "bower-json-0.6.0";
-    version = "0.6.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bower-json/-/bower-json-0.6.0.tgz";
-      name = "bower-json-0.6.0.tgz";
-      sha1 = "326579b23c33e4ea828e4763c55cd81fd7650329";
-    };
-    deps = {
-      "deep-extend-0.4.1" = self.by-version."deep-extend"."0.4.1";
-      "ext-name-3.0.0" = self.by-version."ext-name"."3.0.0";
-      "graceful-fs-3.0.8" = self.by-version."graceful-fs"."3.0.8";
-      "intersect-1.0.1" = self.by-version."intersect"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "bower-json" = self.by-version."bower-json"."0.6.0";
-  "bower-logger" = self.by-version."bower-logger"."0.2.1";
-  by-version."brace-expansion"."1.1.3" = self.buildNodePackage {
-    name = "brace-expansion-1.1.3";
-    version = "1.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz";
-      name = "brace-expansion-1.1.3.tgz";
-      sha1 = "46bff50115d47fc9ab89854abb87d98078a10991";
-    };
-    deps = {
-      "balanced-match-0.3.0" = self.by-version."balanced-match"."0.3.0";
-      "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."builtin-modules"."^1.0.0" =
-    self.by-version."builtin-modules"."1.1.1";
-  by-version."builtin-modules"."1.1.1" = self.buildNodePackage {
-    name = "builtin-modules-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz";
-      name = "builtin-modules-1.1.1.tgz";
-      sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."camelcase"."^2.0.0" =
-    self.by-version."camelcase"."2.1.1";
-  by-version."camelcase"."2.1.1" = self.buildNodePackage {
-    name = "camelcase-2.1.1";
-    version = "2.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz";
-      name = "camelcase-2.1.1.tgz";
-      sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."camelcase-keys"."^2.0.0" =
-    self.by-version."camelcase-keys"."2.1.0";
-  by-version."camelcase-keys"."2.1.0" = self.buildNodePackage {
-    name = "camelcase-keys-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz";
-      name = "camelcase-keys-2.1.0.tgz";
-      sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7";
-    };
-    deps = {
-      "camelcase-2.1.1" = self.by-version."camelcase"."2.1.1";
-      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."caseless"."~0.11.0" =
-    self.by-version."caseless"."0.11.0";
-  by-version."caseless"."0.11.0" = self.buildNodePackage {
-    name = "caseless-0.11.0";
-    version = "0.11.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
-      name = "caseless-0.11.0.tgz";
-      sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."chalk"."1.1.1" = self.buildNodePackage {
-    name = "chalk-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";
-      name = "chalk-1.1.1.tgz";
-      sha1 = "509afb67066e7499f7eb3535c77445772ae2d019";
-    };
-    deps = {
-      "ansi-styles-2.2.0" = self.by-version."ansi-styles"."2.2.0";
-      "escape-string-regexp-1.0.5" = self.by-version."escape-string-regexp"."1.0.5";
-      "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0";
-      "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
-      "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."chalk"."^1.1.1" =
-    self.by-version."chalk"."1.1.1";
-  by-spec."color-convert"."^1.0.0" =
-    self.by-version."color-convert"."1.0.0";
-  by-version."color-convert"."1.0.0" = self.buildNodePackage {
-    name = "color-convert-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/color-convert/-/color-convert-1.0.0.tgz";
-      name = "color-convert-1.0.0.tgz";
-      sha1 = "3c26fcd885d272d45beacf6e41baba75c89a8579";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."colors"."^1.1.0" =
-    self.by-version."colors"."1.1.2";
-  by-version."colors"."1.1.2" = self.buildNodePackage {
-    name = "colors-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
-      name = "colors-1.1.2.tgz";
-      sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."combined-stream"."^1.0.5" =
-    self.by-version."combined-stream"."1.0.5";
-  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
-    name = "combined-stream-1.0.5";
-    version = "1.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
-      name = "combined-stream-1.0.5.tgz";
-      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
-    };
-    deps = {
-      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."combined-stream"."~1.0.5" =
-    self.by-version."combined-stream"."1.0.5";
-  by-spec."commander"."^2.9.0" =
-    self.by-version."commander"."2.9.0";
-  by-version."commander"."2.9.0" = self.buildNodePackage {
-    name = "commander-2.9.0";
-    version = "2.9.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
-      name = "commander-2.9.0.tgz";
-      sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
-    };
-    deps = {
-      "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."core-util-is"."1.0.2" = self.buildNodePackage {
-    name = "core-util-is-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
-      name = "core-util-is-1.0.2.tgz";
-      sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."cryptiles"."2.0.5" = self.buildNodePackage {
-    name = "cryptiles-2.0.5";
-    version = "2.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
-      name = "cryptiles-2.0.5.tgz";
-      sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
-    };
-    deps = {
-      "boom-2.10.1" = self.by-version."boom"."2.10.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."dashdash".">=1.10.1 <2.0.0" =
-    self.by-version."dashdash"."1.13.0";
-  by-version."dashdash"."1.13.0" = self.buildNodePackage {
-    name = "dashdash-1.13.0";
-    version = "1.13.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz";
-      name = "dashdash-1.13.0.tgz";
-      sha1 = "a5aae6fd9d8e156624eb0dd9259eb12ba245385a";
-    };
-    deps = {
-      "assert-plus-1.0.0" = self.by-version."assert-plus"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."debug"."2.2.0" = self.buildNodePackage {
-    name = "debug-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
-      name = "debug-2.2.0.tgz";
-      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
-    };
-    deps = {
-      "ms-0.7.1" = self.by-version."ms"."0.7.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."decamelize"."^1.1.2" =
-    self.by-version."decamelize"."1.2.0";
-  by-version."decamelize"."1.2.0" = self.buildNodePackage {
-    name = "decamelize-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz";
-      name = "decamelize-1.2.0.tgz";
-      sha1 = "f6534d15148269b20352e7bee26f501f9a191290";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."deep-extend"."^0.4.0" =
-    self.by-version."deep-extend"."0.4.1";
-  by-version."deep-extend"."0.4.1" = self.buildNodePackage {
-    name = "deep-extend-0.4.1";
-    version = "0.4.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/deep-extend/-/deep-extend-0.4.1.tgz";
-      name = "deep-extend-0.4.1.tgz";
-      sha1 = "efe4113d08085f4e6f9687759810f807469e2253";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."deep-extend"."~0.4.0" =
-    self.by-version."deep-extend"."0.4.1";
-  by-spec."deep-freeze"."0.0.1" =
-    self.by-version."deep-freeze"."0.0.1";
-  by-version."deep-freeze"."0.0.1" = self.buildNodePackage {
-    name = "deep-freeze-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz";
-      name = "deep-freeze-0.0.1.tgz";
-      sha1 = "3a0b0005de18672819dfd38cd31f91179c893e84";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."definition-header"."~0.1.0" =
-    self.by-version."definition-header"."0.1.0";
-  by-version."definition-header"."0.1.0" = self.buildNodePackage {
-    name = "definition-header-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/definition-header/-/definition-header-0.1.0.tgz";
-      name = "definition-header-0.1.0.tgz";
-      sha1 = "01445ff4ca663114cbf2c5a1131f13bb544eb5dd";
-    };
-    deps = {
-      "joi-4.9.0" = self.by-version."joi"."4.9.0";
-      "joi-assert-0.0.3" = self.by-version."joi-assert"."0.0.3";
-      "parsimmon-0.5.1" = self.by-version."parsimmon"."0.5.1";
-      "xregexp-2.0.0" = self.by-version."xregexp"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."delayed-stream"."~1.0.0" =
-    self.by-version."delayed-stream"."1.0.0";
-  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
-    name = "delayed-stream-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
-      name = "delayed-stream-1.0.0.tgz";
-      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."detect-indent"."^0.2.0" =
-    self.by-version."detect-indent"."0.2.0";
-  by-version."detect-indent"."0.2.0" = self.buildNodePackage {
-    name = "detect-indent-0.2.0";
-    version = "0.2.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/detect-indent/-/detect-indent-0.2.0.tgz";
-      name = "detect-indent-0.2.0.tgz";
-      sha1 = "042914498979ac2d9f3c73e4ff3e6877d3bc92b6";
-    };
-    deps = {
-      "get-stdin-0.1.0" = self.by-version."get-stdin"."0.1.0";
-      "minimist-0.1.0" = self.by-version."minimist"."0.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."diff"."^1.4.0" =
-    self.by-version."diff"."1.4.0";
-  by-version."diff"."1.4.0" = self.buildNodePackage {
-    name = "diff-1.4.0";
-    version = "1.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/diff/-/diff-1.4.0.tgz";
-      name = "diff-1.4.0.tgz";
-      sha1 = "7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."duplexify"."3.4.3" = self.buildNodePackage {
-    name = "duplexify-3.4.3";
-    version = "3.4.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/duplexify/-/duplexify-3.4.3.tgz";
-      name = "duplexify-3.4.3.tgz";
-      sha1 = "af6a7b10d928b095f8ad854d072bb90998db850d";
-    };
-    deps = {
-      "end-of-stream-1.0.0" = self.by-version."end-of-stream"."1.0.0";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ecc-jsbn".">=0.0.1 <1.0.0" =
-    self.by-version."ecc-jsbn"."0.1.1";
-  by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage {
-    name = "ecc-jsbn-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
-      name = "ecc-jsbn-0.1.1.tgz";
-      sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
-    };
-    deps = {
-      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ends-with"."^0.2.0" =
-    self.by-version."ends-with"."0.2.0";
-  by-version."ends-with"."0.2.0" = self.buildNodePackage {
-    name = "ends-with-0.2.0";
-    version = "0.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ends-with/-/ends-with-0.2.0.tgz";
-      name = "ends-with-0.2.0.tgz";
-      sha1 = "2f9da98d57a50cfda4571ce4339000500f4e6b8a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."error-ex"."^1.2.0" =
-    self.by-version."error-ex"."1.3.0";
-  by-version."error-ex"."1.3.0" = self.buildNodePackage {
-    name = "error-ex-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/error-ex/-/error-ex-1.3.0.tgz";
-      name = "error-ex-1.3.0.tgz";
-      sha1 = "e67b43f3e82c96ea3a584ffee0b9fc3325d802d9";
-    };
-    deps = {
-      "is-arrayish-0.2.1" = self.by-version."is-arrayish"."0.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."escape-string-regexp"."1.0.5" = self.buildNodePackage {
-    name = "escape-string-regexp-1.0.5";
-    version = "1.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz";
-      name = "escape-string-regexp-1.0.5.tgz";
-      sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."esprima"."^2.6.0" =
-    self.by-version."esprima"."2.7.2";
-  by-version."esprima"."2.7.2" = self.buildNodePackage {
-    name = "esprima-2.7.2";
-    version = "2.7.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz";
-      name = "esprima-2.7.2.tgz";
-      sha1 = "f43be543609984eae44c933ac63352a6af35f339";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."event-stream"."~3.1.5" =
-    self.by-version."event-stream"."3.1.7";
-  by-version."event-stream"."3.1.7" = self.buildNodePackage {
-    name = "event-stream-3.1.7";
-    version = "3.1.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/event-stream/-/event-stream-3.1.7.tgz";
-      name = "event-stream-3.1.7.tgz";
-      sha1 = "b4c540012d0fe1498420f3d8946008db6393c37a";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-      "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
-      "from-0.1.3" = self.by-version."from"."0.1.3";
-      "map-stream-0.1.0" = self.by-version."map-stream"."0.1.0";
-      "pause-stream-0.0.11" = self.by-version."pause-stream"."0.0.11";
-      "split-0.2.10" = self.by-version."split"."0.2.10";
-      "stream-combiner-0.0.4" = self.by-version."stream-combiner"."0.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ext-list"."^2.0.0" =
-    self.by-version."ext-list"."2.2.0";
-  by-version."ext-list"."2.2.0" = self.buildNodePackage {
-    name = "ext-list-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ext-list/-/ext-list-2.2.0.tgz";
-      name = "ext-list-2.2.0.tgz";
-      sha1 = "a3e6fdeab978bca7a320c7e786f537083fc30055";
-    };
-    deps = {
-      "got-2.9.2" = self.by-version."got"."2.9.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ext-name"."^3.0.0" =
-    self.by-version."ext-name"."3.0.0";
-  by-version."ext-name"."3.0.0" = self.buildNodePackage {
-    name = "ext-name-3.0.0";
-    version = "3.0.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ext-name/-/ext-name-3.0.0.tgz";
-      name = "ext-name-3.0.0.tgz";
-      sha1 = "07e4418737cb1f513c32c6ea48d8b8c8e0471abb";
-    };
-    deps = {
-      "ends-with-0.2.0" = self.by-version."ends-with"."0.2.0";
-      "ext-list-2.2.0" = self.by-version."ext-list"."2.2.0";
-      "meow-3.7.0" = self.by-version."meow"."3.7.0";
-      "sort-keys-length-1.0.1" = self.by-version."sort-keys-length"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."extend"."~3.0.0" =
-    self.by-version."extend"."3.0.0";
-  by-version."extend"."3.0.0" = self.buildNodePackage {
-    name = "extend-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
-      name = "extend-3.0.0.tgz";
-      sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."extsprintf"."1.0.3" =
-    self.by-version."extsprintf"."1.0.3";
-  by-version."extsprintf"."1.0.3" = self.buildNodePackage {
-    name = "extsprintf-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.3.tgz";
-      name = "extsprintf-1.0.3.tgz";
-      sha1 = "3310ca8ced5205e5234766b0b2744ea5b2788d67";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."find-up"."^1.0.0" =
-    self.by-version."find-up"."1.1.2";
-  by-version."find-up"."1.1.2" = self.buildNodePackage {
-    name = "find-up-1.1.2";
-    version = "1.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz";
-      name = "find-up-1.1.2.tgz";
-      sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f";
-    };
-    deps = {
-      "path-exists-2.1.0" = self.by-version."path-exists"."2.1.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."foreach"."^2.0.4" =
-    self.by-version."foreach"."2.0.5";
-  by-version."foreach"."2.0.5" = self.buildNodePackage {
-    name = "foreach-2.0.5";
-    version = "2.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz";
-      name = "foreach-2.0.5.tgz";
-      sha1 = "0bee005018aeb260d0a3af3ae658dd0136ec1b99";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."form-data"."~1.0.0-rc3" =
-    self.by-version."form-data"."1.0.0-rc4";
-  by-version."form-data"."1.0.0-rc4" = self.buildNodePackage {
-    name = "form-data-1.0.0-rc4";
-    version = "1.0.0-rc4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz";
-      name = "form-data-1.0.0-rc4.tgz";
-      sha1 = "05ac6bc22227b43e4461f488161554699d4f8b5e";
-    };
-    deps = {
-      "async-1.5.2" = self.by-version."async"."1.5.2";
-      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."from"."~0" =
-    self.by-version."from"."0.1.3";
-  by-version."from"."0.1.3" = self.buildNodePackage {
-    name = "from-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/from/-/from-0.1.3.tgz";
-      name = "from-0.1.3.tgz";
-      sha1 = "ef63ac2062ac32acf7862e0d40b44b896f22f3bc";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."fs-extra"."~0.26.5" =
-    self.by-version."fs-extra"."0.26.7";
-  by-version."fs-extra"."0.26.7" = self.buildNodePackage {
-    name = "fs-extra-0.26.7";
-    version = "0.26.7";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz";
-      name = "fs-extra-0.26.7.tgz";
-      sha1 = "9ae1fdd94897798edab76d0918cf42d0c3184fa9";
-    };
-    deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "jsonfile-2.2.3" = self.by-version."jsonfile"."2.2.3";
-      "klaw-1.1.3" = self.by-version."klaw"."1.1.3";
-      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
-      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "fs-extra" = self.by-version."fs-extra"."0.26.7";
-  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
-    name = "generate-object-property-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
-      name = "generate-object-property-1.2.0.tgz";
-      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
-    };
-    deps = {
-      "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."get-stdin"."^0.1.0" =
-    self.by-version."get-stdin"."0.1.0";
-  by-version."get-stdin"."0.1.0" = self.buildNodePackage {
-    name = "get-stdin-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-0.1.0.tgz";
-      name = "get-stdin-0.1.0.tgz";
-      sha1 = "5998af24aafc802d15c82c685657eeb8b10d4a91";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."glob"."6.0.4" =
-    self.by-version."glob"."6.0.4";
-  by-version."glob"."6.0.4" = self.buildNodePackage {
-    name = "glob-6.0.4";
-    version = "6.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-6.0.4.tgz";
-      name = "glob-6.0.4.tgz";
-      sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
-    };
-    deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
-      "once-1.3.3" = self.by-version."once"."1.3.3";
-      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "glob" = self.by-version."glob"."6.0.4";
-  by-spec."glob"."^4.0.6" =
-    self.by-version."glob"."4.5.3";
-  by-spec."glob"."^7.0.0" =
-    self.by-version."glob"."7.0.3";
-  by-version."glob"."7.0.3" = self.buildNodePackage {
-    name = "glob-7.0.3";
-    version = "7.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-7.0.3.tgz";
-      name = "glob-7.0.3.tgz";
-      sha1 = "0aa235931a4a96ac13d60ffac2fb877bd6ed4f58";
-    };
-    deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
-      "once-1.3.3" = self.by-version."once"."1.3.3";
-      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."got"."^2.7.2" =
-    self.by-version."got"."2.9.2";
-  by-version."got"."2.9.2" = self.buildNodePackage {
-    name = "got-2.9.2";
-    version = "2.9.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/got/-/got-2.9.2.tgz";
-      name = "got-2.9.2.tgz";
-      sha1 = "2e1ee58ea1e8d201e25ae580b96e63c15fefd4ee";
-    };
-    deps = {
-      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
-      "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3";
-      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
-      "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0";
-      "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2";
-      "object-assign-2.1.1" = self.by-version."object-assign"."2.1.1";
-      "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3";
-      "read-all-stream-2.2.0" = self.by-version."read-all-stream"."2.2.0";
-      "statuses-1.2.1" = self.by-version."statuses"."1.2.1";
-      "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."got"."^3.2.0" =
-    self.by-version."got"."3.3.1";
-  by-version."got"."3.3.1" = self.buildNodePackage {
-    name = "got-3.3.1";
-    version = "3.3.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/got/-/got-3.3.1.tgz";
-      name = "got-3.3.1.tgz";
-      sha1 = "e5d0ed4af55fc3eef4d56007769d98192bcb2eca";
-    };
-    deps = {
-      "duplexify-3.4.3" = self.by-version."duplexify"."3.4.3";
-      "infinity-agent-2.0.3" = self.by-version."infinity-agent"."2.0.3";
-      "is-redirect-1.0.0" = self.by-version."is-redirect"."1.0.0";
-      "is-stream-1.0.1" = self.by-version."is-stream"."1.0.1";
-      "lowercase-keys-1.0.0" = self.by-version."lowercase-keys"."1.0.0";
-      "nested-error-stacks-1.0.2" = self.by-version."nested-error-stacks"."1.0.2";
-      "object-assign-3.0.0" = self.by-version."object-assign"."3.0.0";
-      "prepend-http-1.0.3" = self.by-version."prepend-http"."1.0.3";
-      "read-all-stream-3.1.0" = self.by-version."read-all-stream"."3.1.0";
-      "timed-out-2.0.0" = self.by-version."timed-out"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."graceful-fs"."3.0.8" = self.buildNodePackage {
-    name = "graceful-fs-3.0.8";
-    version = "3.0.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz";
-      name = "graceful-fs-3.0.8.tgz";
-      sha1 = "ce813e725fa82f7e6147d51c9a5ca68270551c22";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."graceful-fs"."^4.1.2" =
-    self.by-version."graceful-fs"."4.1.3";
-  by-version."graceful-fs"."4.1.3" = self.buildNodePackage {
-    name = "graceful-fs-4.1.3";
-    version = "4.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz";
-      name = "graceful-fs-4.1.3.tgz";
-      sha1 = "92033ce11113c41e2628d61fdfa40bc10dc0155c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."har-validator"."~2.0.6" =
-    self.by-version."har-validator"."2.0.6";
-  by-version."har-validator"."2.0.6" = self.buildNodePackage {
-    name = "har-validator-2.0.6";
-    version = "2.0.6";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
-      name = "har-validator-2.0.6.tgz";
-      sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
-    };
-    deps = {
-      "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
-      "commander-2.9.0" = self.by-version."commander"."2.9.0";
-      "is-my-json-valid-2.13.1" = self.by-version."is-my-json-valid"."2.13.1";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."has-ansi"."^2.0.0" =
-    self.by-version."has-ansi"."2.0.0";
-  by-version."has-ansi"."2.0.0" = self.buildNodePackage {
-    name = "has-ansi-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
-      name = "has-ansi-2.0.0.tgz";
-      sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
-    };
-    deps = {
-      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hawk"."~3.1.0" =
-    self.by-version."hawk"."3.1.3";
-  by-version."hawk"."3.1.3" = self.buildNodePackage {
-    name = "hawk-3.1.3";
-    version = "3.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
-      name = "hawk-3.1.3.tgz";
-      sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
-    };
-    deps = {
-      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
-      "boom-2.10.1" = self.by-version."boom"."2.10.1";
-      "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5";
-      "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."hoek"."2.16.3" = self.buildNodePackage {
-    name = "hoek-2.16.3";
-    version = "2.16.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
-      name = "hoek-2.16.3.tgz";
-      sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hoek"."^2.2.x" =
-    self.by-version."hoek"."2.16.3";
-  by-spec."hosted-git-info"."^2.1.4" =
-    self.by-version."hosted-git-info"."2.1.4";
-  by-version."hosted-git-info"."2.1.4" = self.buildNodePackage {
-    name = "hosted-git-info-2.1.4";
-    version = "2.1.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz";
-      name = "hosted-git-info-2.1.4.tgz";
-      sha1 = "d9e953b26988be88096c46e926494d9604c300f8";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."http-signature"."~1.1.0" =
-    self.by-version."http-signature"."1.1.1";
-  by-version."http-signature"."1.1.1" = self.buildNodePackage {
-    name = "http-signature-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
-      name = "http-signature-1.1.1.tgz";
-      sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
-    };
-    deps = {
-      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
-      "jsprim-1.2.2" = self.by-version."jsprim"."1.2.2";
-      "sshpk-1.7.4" = self.by-version."sshpk"."1.7.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."indent-string"."^2.1.0" =
-    self.by-version."indent-string"."2.1.0";
-  by-version."indent-string"."2.1.0" = self.buildNodePackage {
-    name = "indent-string-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz";
-      name = "indent-string-2.1.0.tgz";
-      sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80";
-    };
-    deps = {
-      "repeating-2.0.0" = self.by-version."repeating"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."infinity-agent"."^2.0.0" =
-    self.by-version."infinity-agent"."2.0.3";
-  by-version."infinity-agent"."2.0.3" = self.buildNodePackage {
-    name = "infinity-agent-2.0.3";
-    version = "2.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz";
-      name = "infinity-agent-2.0.3.tgz";
-      sha1 = "45e0e2ff7a9eb030b27d62b74b3744b7a7ac4216";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."ini"."1.3.4" = self.buildNodePackage {
-    name = "ini-1.3.4";
-    version = "1.3.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ini/-/ini-1.3.4.tgz";
-      name = "ini-1.3.4.tgz";
-      sha1 = "0537cb79daf59b59a1a517dff706c86ec039162e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."intersect"."^1.0.1" =
-    self.by-version."intersect"."1.0.1";
-  by-version."intersect"."1.0.1" = self.buildNodePackage {
-    name = "intersect-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/intersect/-/intersect-1.0.1.tgz";
-      name = "intersect-1.0.1.tgz";
-      sha1 = "332650e10854d8c0ac58c192bdc27a8bf7e7a30c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-arrayish"."^0.2.1" =
-    self.by-version."is-arrayish"."0.2.1";
-  by-version."is-arrayish"."0.2.1" = self.buildNodePackage {
-    name = "is-arrayish-0.2.1";
-    version = "0.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz";
-      name = "is-arrayish-0.2.1.tgz";
-      sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-builtin-module"."^1.0.0" =
-    self.by-version."is-builtin-module"."1.0.0";
-  by-version."is-builtin-module"."1.0.0" = self.buildNodePackage {
-    name = "is-builtin-module-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz";
-      name = "is-builtin-module-1.0.0.tgz";
-      sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe";
-    };
-    deps = {
-      "builtin-modules-1.1.1" = self.by-version."builtin-modules"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."is-finite"."1.0.1" = self.buildNodePackage {
-    name = "is-finite-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-finite/-/is-finite-1.0.1.tgz";
-      name = "is-finite-1.0.1.tgz";
-      sha1 = "6438603eaebe2793948ff4a4262ec8db3d62597b";
-    };
-    deps = {
-      "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-my-json-valid"."^2.12.4" =
-    self.by-version."is-my-json-valid"."2.13.1";
-  by-version."is-my-json-valid"."2.13.1" = self.buildNodePackage {
-    name = "is-my-json-valid-2.13.1";
-    version = "2.13.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.13.1.tgz";
-      name = "is-my-json-valid-2.13.1.tgz";
-      sha1 = "d55778a82feb6b0963ff4be111d5d1684e890707";
-    };
-    deps = {
-      "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
-      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
-      "jsonpointer-2.0.0" = self.by-version."jsonpointer"."2.0.0";
-      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-plain-obj"."^1.0.0" =
-    self.by-version."is-plain-obj"."1.1.0";
-  by-version."is-plain-obj"."1.1.0" = self.buildNodePackage {
-    name = "is-plain-obj-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz";
-      name = "is-plain-obj-1.1.0.tgz";
-      sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-redirect"."^1.0.0" =
-    self.by-version."is-redirect"."1.0.0";
-  by-version."is-redirect"."1.0.0" = self.buildNodePackage {
-    name = "is-redirect-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz";
-      name = "is-redirect-1.0.0.tgz";
-      sha1 = "1d03dded53bd8db0f30c26e4f95d36fc7c87dc24";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."is-typedarray"."~1.0.0" =
-    self.by-version."is-typedarray"."1.0.0";
-  by-version."is-typedarray"."1.0.0" = self.buildNodePackage {
-    name = "is-typedarray-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
-      name = "is-typedarray-1.0.0.tgz";
-      sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."is-utf8"."0.2.1" = self.buildNodePackage {
-    name = "is-utf8-0.2.1";
-    version = "0.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz";
-      name = "is-utf8-0.2.1.tgz";
-      sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isarray"."~1.0.0" =
-    self.by-version."isarray"."1.0.0";
-  by-version."isarray"."1.0.0" = self.buildNodePackage {
-    name = "isarray-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz";
-      name = "isarray-1.0.0.tgz";
-      sha1 = "bb935d48582cba168c06834957a54a3e07124f11";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isemail"."1.x.x" =
-    self.by-version."isemail"."1.2.0";
-  by-version."isemail"."1.2.0" = self.buildNodePackage {
-    name = "isemail-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/isemail/-/isemail-1.2.0.tgz";
-      name = "isemail-1.2.0.tgz";
-      sha1 = "be03df8cc3e29de4d2c5df6501263f1fa4595e9a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."isstream"."~0.1.2" =
-    self.by-version."isstream"."0.1.2";
-  by-spec."jodid25519".">=1.0.0 <2.0.0" =
-    self.by-version."jodid25519"."1.0.2";
-  by-version."jodid25519"."1.0.2" = self.buildNodePackage {
-    name = "jodid25519-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
-      name = "jodid25519-1.0.2.tgz";
-      sha1 = "06d4912255093419477d425633606e0e90782967";
-    };
-    deps = {
-      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."joi"."^4.0.0" =
-    self.by-version."joi"."4.9.0";
-  by-version."joi"."4.9.0" = self.buildNodePackage {
-    name = "joi-4.9.0";
-    version = "4.9.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/joi/-/joi-4.9.0.tgz";
-      name = "joi-4.9.0.tgz";
-      sha1 = "2355023363089ca01bc1fd079e72949f977baada";
-    };
-    deps = {
-      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
-      "topo-1.1.0" = self.by-version."topo"."1.1.0";
-      "isemail-1.2.0" = self.by-version."isemail"."1.2.0";
-      "moment-2.12.0" = self.by-version."moment"."2.12.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."joi"."^4.7.0" =
-    self.by-version."joi"."4.9.0";
-  by-spec."joi-assert"."0.0.3" =
-    self.by-version."joi-assert"."0.0.3";
-  by-version."joi-assert"."0.0.3" = self.buildNodePackage {
-    name = "joi-assert-0.0.3";
-    version = "0.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/joi-assert/-/joi-assert-0.0.3.tgz";
-      name = "joi-assert-0.0.3.tgz";
-      sha1 = "77291376ac3f0b124f433f98db74b4f20f686fd6";
-    };
-    deps = {
-      "assertion-error-1.0.1" = self.by-version."assertion-error"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."js-yaml"."3.5.5" = self.buildNodePackage {
-    name = "js-yaml-3.5.5";
-    version = "3.5.5";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.5.5.tgz";
-      name = "js-yaml-3.5.5.tgz";
-      sha1 = "0377c38017cabc7322b0d1fbcd25a491641f2fbe";
-    };
-    deps = {
-      "argparse-1.0.7" = self.by-version."argparse"."1.0.7";
-      "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jsbn".">=0.1.0 <0.2.0" =
-    self.by-version."jsbn"."0.1.0";
-  by-version."jsbn"."0.1.0" = self.buildNodePackage {
-    name = "jsbn-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
-      name = "jsbn-0.1.0.tgz";
-      sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jsbn"."~0.1.0" =
-    self.by-version."jsbn"."0.1.0";
-  by-spec."jsesc"."^0.5.0" =
-    self.by-version."jsesc"."0.5.0";
-  by-version."jsesc"."0.5.0" = self.buildNodePackage {
-    name = "jsesc-0.5.0";
-    version = "0.5.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz";
-      name = "jsesc-0.5.0.tgz";
-      sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json-pointer"."^0.2.2" =
-    self.by-version."json-pointer"."0.2.2";
-  by-version."json-pointer"."0.2.2" = self.buildNodePackage {
-    name = "json-pointer-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/json-pointer/-/json-pointer-0.2.2.tgz";
-      name = "json-pointer-0.2.2.tgz";
-      sha1 = "1a78285d4650c50b10475f7f59919a99db8a164b";
-    };
-    deps = {
-      "foreach-2.0.5" = self.by-version."foreach"."2.0.5";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."json-stringify-safe"."~5.0.1" =
-    self.by-version."json-stringify-safe"."5.0.1";
-  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
-    name = "json-stringify-safe-5.0.1";
-    version = "5.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
-      name = "json-stringify-safe-5.0.1.tgz";
-      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jsonfile"."^2.1.0" =
-    self.by-version."jsonfile"."2.2.3";
-  by-version."jsonfile"."2.2.3" = self.buildNodePackage {
-    name = "jsonfile-2.2.3";
-    version = "2.2.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.2.3.tgz";
-      name = "jsonfile-2.2.3.tgz";
-      sha1 = "e252b99a6af901d3ec41f332589c90509a7bc605";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jsonpointer"."2.0.0" =
-    self.by-version."jsonpointer"."2.0.0";
-  by-version."jsonpointer"."2.0.0" = self.buildNodePackage {
-    name = "jsonpointer-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
-      name = "jsonpointer-2.0.0.tgz";
-      sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."jsprim"."^1.2.2" =
-    self.by-version."jsprim"."1.2.2";
-  by-version."jsprim"."1.2.2" = self.buildNodePackage {
-    name = "jsprim-1.2.2";
-    version = "1.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz";
-      name = "jsprim-1.2.2.tgz";
-      sha1 = "f20c906ac92abd58e3b79ac8bc70a48832512da1";
-    };
-    deps = {
-      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
-      "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
-      "verror-1.3.6" = self.by-version."verror"."1.3.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."klaw"."^1.0.0" =
-    self.by-version."klaw"."1.1.3";
-  by-version."klaw"."1.1.3" = self.buildNodePackage {
-    name = "klaw-1.1.3";
-    version = "1.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz";
-      name = "klaw-1.1.3.tgz";
-      sha1 = "7da33c6b42f9b3dc9cec00d17f13af017fcc2721";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."latest-version"."1.0.1" = self.buildNodePackage {
-    name = "latest-version-1.0.1";
-    version = "1.0.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz";
-      name = "latest-version-1.0.1.tgz";
-      sha1 = "72cfc46e3e8d1be651e1ebb54ea9f6ea96f374bb";
-    };
-    deps = {
-      "package-json-1.2.0" = self.by-version."package-json"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lazy.js"."~0.3.2" =
-    self.by-version."lazy.js"."0.3.2";
-  by-version."lazy.js"."0.3.2" = self.buildNodePackage {
-    name = "lazy.js-0.3.2";
-    version = "0.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lazy.js/-/lazy.js-0.3.2.tgz";
-      name = "lazy.js-0.3.2.tgz";
-      sha1 = "7cc1107e5f809ae70498f511dd180e1f80b4efa9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."load-json-file"."^1.0.0" =
-    self.by-version."load-json-file"."1.1.0";
-  by-version."load-json-file"."1.1.0" = self.buildNodePackage {
-    name = "load-json-file-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz";
-      name = "load-json-file-1.1.0.tgz";
-      sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0";
-    };
-    deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "parse-json-2.2.0" = self.by-version."parse-json"."2.2.0";
-      "pify-2.3.0" = self.by-version."pify"."2.3.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
-      "strip-bom-2.0.0" = self.by-version."strip-bom"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash".">= 4.0.0 < 5.0.0" =
-    self.by-version."lodash"."4.6.1";
-  by-version."lodash"."4.6.1" = self.buildNodePackage {
-    name = "lodash-4.6.1";
-    version = "4.6.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-4.6.1.tgz";
-      name = "lodash-4.6.1.tgz";
-      sha1 = "df00c1164ad236b183cfc3887a5e8d38cc63cbbc";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lodash"."~4.2.1" =
-    self.by-version."lodash"."4.2.1";
-  by-version."lodash"."4.2.1" = self.buildNodePackage {
-    name = "lodash-4.2.1";
-    version = "4.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lodash/-/lodash-4.2.1.tgz";
-      name = "lodash-4.2.1.tgz";
-      sha1 = "171fdcfbbc30d689c544cd18c0529f56de6c1aa9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "lodash" = self.by-version."lodash"."4.2.1";
-  by-spec."loud-rejection"."^1.0.0" =
-    self.by-version."loud-rejection"."1.3.0";
-  by-version."loud-rejection"."1.3.0" = self.buildNodePackage {
-    name = "loud-rejection-1.3.0";
-    version = "1.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/loud-rejection/-/loud-rejection-1.3.0.tgz";
-      name = "loud-rejection-1.3.0.tgz";
-      sha1 = "f289a392f17d2baacf194d0a673004394433b115";
-    };
-    deps = {
-      "array-find-index-1.0.1" = self.by-version."array-find-index"."1.0.1";
-      "signal-exit-2.1.2" = self.by-version."signal-exit"."2.1.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."lru-cache"."2.7.3" = self.buildNodePackage {
-    name = "lru-cache-2.7.3";
-    version = "2.7.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
-      name = "lru-cache-2.7.3.tgz";
-      sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."lru-cache"."^4.0.0" =
-    self.by-version."lru-cache"."4.0.1";
-  by-version."lru-cache"."4.0.1" = self.buildNodePackage {
-    name = "lru-cache-4.0.1";
-    version = "4.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz";
-      name = "lru-cache-4.0.1.tgz";
-      sha1 = "1343955edaf2e37d9b9e7ee7241e27c4b9fb72be";
-    };
-    deps = {
-      "pseudomap-1.0.2" = self.by-version."pseudomap"."1.0.2";
-      "yallist-2.0.0" = self.by-version."yallist"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."map-obj"."1.0.1" = self.buildNodePackage {
-    name = "map-obj-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz";
-      name = "map-obj-1.0.1.tgz";
-      sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."map-obj"."^1.0.1" =
-    self.by-version."map-obj"."1.0.1";
-  by-spec."map-stream"."~0.1.0" =
-    self.by-version."map-stream"."0.1.0";
-  by-version."map-stream"."0.1.0" = self.buildNodePackage {
-    name = "map-stream-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz";
-      name = "map-stream-0.1.0.tgz";
-      sha1 = "e56aa94c4c8055a16404a0674b78f215f7c8e194";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."meow"."3.7.0" = self.buildNodePackage {
-    name = "meow-3.7.0";
-    version = "3.7.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz";
-      name = "meow-3.7.0.tgz";
-      sha1 = "72cb668b425228290abbfa856892587308a801fb";
-    };
-    deps = {
-      "camelcase-keys-2.1.0" = self.by-version."camelcase-keys"."2.1.0";
-      "decamelize-1.2.0" = self.by-version."decamelize"."1.2.0";
-      "loud-rejection-1.3.0" = self.by-version."loud-rejection"."1.3.0";
-      "map-obj-1.0.1" = self.by-version."map-obj"."1.0.1";
-      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
-      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
-      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
-      "read-pkg-up-1.0.1" = self.by-version."read-pkg-up"."1.0.1";
-      "redent-1.0.0" = self.by-version."redent"."1.0.0";
-      "trim-newlines-1.0.0" = self.by-version."trim-newlines"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-db"."~1.22.0" =
-    self.by-version."mime-db"."1.22.0";
-  by-version."mime-db"."1.22.0" = self.buildNodePackage {
-    name = "mime-db-1.22.0";
-    version = "1.22.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz";
-      name = "mime-db-1.22.0.tgz";
-      sha1 = "ab23a6372dc9d86d3dc9121bd0ebd38105a1904a";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."^2.1.10" =
-    self.by-version."mime-types"."2.1.10";
-  by-version."mime-types"."2.1.10" = self.buildNodePackage {
-    name = "mime-types-2.1.10";
-    version = "2.1.10";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz";
-      name = "mime-types-2.1.10.tgz";
-      sha1 = "b93c7cb4362e16d41072a7e54538fb4d43070837";
-    };
-    deps = {
-      "mime-db-1.22.0" = self.by-version."mime-db"."1.22.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."mime-types"."~2.1.7" =
-    self.by-version."mime-types"."2.1.10";
-  by-spec."minichain"."~0.0.1" =
-    self.by-version."minichain"."0.0.1";
-  by-version."minichain"."0.0.1" = self.buildNodePackage {
-    name = "minichain-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minichain/-/minichain-0.0.1.tgz";
-      name = "minichain-0.0.1.tgz";
-      sha1 = "0bae49774170d8931401c271bb6ed6d3992a9f52";
-    };
-    deps = {
-      "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
-      "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."minimatch"."2 || 3" =
-    self.by-version."minimatch"."3.0.0";
-  by-version."minimatch"."3.0.0" = self.buildNodePackage {
-    name = "minimatch-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz";
-      name = "minimatch-3.0.0.tgz";
-      sha1 = "5236157a51e4f004c177fb3c527ff7dd78f0ef83";
-    };
-    deps = {
-      "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."minimatch"."2.0.10" = self.buildNodePackage {
-    name = "minimatch-2.0.10";
-    version = "2.0.10";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz";
-      name = "minimatch-2.0.10.tgz";
-      sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7";
-    };
-    deps = {
-      "brace-expansion-1.1.3" = self.by-version."brace-expansion"."1.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."minimist"."^0.1.0" =
-    self.by-version."minimist"."0.1.0";
-  by-version."minimist"."0.1.0" = self.buildNodePackage {
-    name = "minimist-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz";
-      name = "minimist-0.1.0.tgz";
-      sha1 = "99df657a52574c21c9057497df742790b2b4c0de";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."minimist"."1.2.0" = self.buildNodePackage {
-    name = "minimist-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
-      name = "minimist-1.2.0.tgz";
-      sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."minimist"."^1.1.3" =
-    self.by-version."minimist"."1.2.0";
-  by-spec."minimist"."^1.2.0" =
-    self.by-version."minimist"."1.2.0";
-  by-spec."ministyle".">=0.1.2 >=0.1.3 <0.2.0" =
-    self.by-version."ministyle"."0.1.4";
-  by-spec."ministyle"."~0.1.2" =
-    self.by-version."ministyle"."0.1.4";
-  by-spec."minitable"."0.0.4" =
-    self.by-version."minitable"."0.0.4";
-  by-version."minitable"."0.0.4" = self.buildNodePackage {
-    name = "minitable-0.0.4";
-    version = "0.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minitable/-/minitable-0.0.4.tgz";
-      name = "minitable-0.0.4.tgz";
-      sha1 = "8d61cb78fae6f371d8051ce77e8a7831ce3d5396";
-    };
-    deps = {
-      "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4";
-      "minichain-0.0.1" = self.by-version."minichain"."0.0.1";
-      "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."miniwrite"."~0.1.2" =
-    self.by-version."miniwrite"."0.1.4";
-  by-version."mkdirp"."0.5.1" = self.buildNodePackage {
-    name = "mkdirp-0.5.1";
-    version = "0.5.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz";
-      name = "mkdirp-0.5.1.tgz";
-      sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903";
-    };
-    deps = {
-      "minimist-0.0.8" = self.by-version."minimist"."0.0.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."moment"."2.x.x" =
-    self.by-version."moment"."2.12.0";
-  by-version."moment"."2.12.0" = self.buildNodePackage {
-    name = "moment-2.12.0";
-    version = "2.12.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.12.0.tgz";
-      name = "moment-2.12.0.tgz";
-      sha1 = "dc2560d19838d6c0731b1a6afa04675264d360d6";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ms"."0.7.1" =
-    self.by-version."ms"."0.7.1";
-  by-version."ms"."0.7.1" = self.buildNodePackage {
-    name = "ms-0.7.1";
-    version = "0.7.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
-      name = "ms-0.7.1.tgz";
-      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."nested-error-stacks"."1.0.2" = self.buildNodePackage {
-    name = "nested-error-stacks-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz";
-      name = "nested-error-stacks-1.0.2.tgz";
-      sha1 = "19f619591519f096769a5ba9a86e6eeec823c3cf";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."node-uuid"."1.x" =
-    self.by-version."node-uuid"."1.4.7";
-  by-version."node-uuid"."1.4.7" = self.buildNodePackage {
-    name = "node-uuid-1.4.7";
-    version = "1.4.7";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
-      name = "node-uuid-1.4.7.tgz";
-      sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."node-uuid"."~1.4.7" =
-    self.by-version."node-uuid"."1.4.7";
-  by-spec."normalize-package-data"."^2.3.2" =
-    self.by-version."normalize-package-data"."2.3.5";
-  by-version."normalize-package-data"."2.3.5" = self.buildNodePackage {
-    name = "normalize-package-data-2.3.5";
-    version = "2.3.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.5.tgz";
-      name = "normalize-package-data-2.3.5.tgz";
-      sha1 = "8d924f142960e1777e7ffe170543631cc7cb02df";
-    };
-    deps = {
-      "hosted-git-info-2.1.4" = self.by-version."hosted-git-info"."2.1.4";
-      "is-builtin-module-1.0.0" = self.by-version."is-builtin-module"."1.0.0";
-      "semver-5.1.0" = self.by-version."semver"."5.1.0";
-      "validate-npm-package-license-3.0.1" = self.by-version."validate-npm-package-license"."3.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."normalize-package-data"."^2.3.4" =
-    self.by-version."normalize-package-data"."2.3.5";
-  by-spec."number-is-nan"."^1.0.0" =
-    self.by-version."number-is-nan"."1.0.0";
-  by-version."number-is-nan"."1.0.0" = self.buildNodePackage {
-    name = "number-is-nan-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz";
-      name = "number-is-nan-1.0.0.tgz";
-      sha1 = "c020f529c5282adfdd233d91d4b181c3d686dc4b";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."oauth-sign"."~0.8.0" =
-    self.by-version."oauth-sign"."0.8.1";
-  by-version."oauth-sign"."0.8.1" = self.buildNodePackage {
-    name = "oauth-sign-0.8.1";
-    version = "0.8.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz";
-      name = "oauth-sign-0.8.1.tgz";
-      sha1 = "182439bdb91378bf7460e75c64ea43e6448def06";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."object-assign"."2.1.1" = self.buildNodePackage {
-    name = "object-assign-2.1.1";
-    version = "2.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz";
-      name = "object-assign-2.1.1.tgz";
-      sha1 = "43c36e5d569ff8e4816c4efa8be02d26967c18aa";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."object-assign"."^3.0.0" =
-    self.by-version."object-assign"."3.0.0";
-  by-version."object-assign"."3.0.0" = self.buildNodePackage {
-    name = "object-assign-3.0.0";
-    version = "3.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
-      name = "object-assign-3.0.0.tgz";
-      sha1 = "9bedd5ca0897949bca47e7ff408062d549f587f2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."object-assign"."^4.0.1" =
-    self.by-version."object-assign"."4.0.1";
-  by-version."object-assign"."4.0.1" = self.buildNodePackage {
-    name = "object-assign-4.0.1";
-    version = "4.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz";
-      name = "object-assign-4.0.1.tgz";
-      sha1 = "99504456c3598b5cad4fc59c26e8a9bb107fe0bd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."once"."1.3.3" = self.buildNodePackage {
-    name = "once-1.3.3";
-    version = "1.3.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.3.3.tgz";
-      name = "once-1.3.3.tgz";
-      sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
-    };
-    deps = {
-      "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."os-homedir"."^1.0.0" =
-    self.by-version."os-homedir"."1.0.1";
-  by-version."os-homedir"."1.0.1" = self.buildNodePackage {
-    name = "os-homedir-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.1.tgz";
-      name = "os-homedir-1.0.1.tgz";
-      sha1 = "0d62bdf44b916fd3bbdcf2cab191948fb094f007";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."os-tmpdir"."^1.0.0" =
-    self.by-version."os-tmpdir"."1.0.1";
-  by-version."os-tmpdir"."1.0.1" = self.buildNodePackage {
-    name = "os-tmpdir-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.1.tgz";
-      name = "os-tmpdir-1.0.1.tgz";
-      sha1 = "e9b423a1edaf479882562e92ed71d7743a071b6e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."osenv"."0.1.3" = self.buildNodePackage {
-    name = "osenv-0.1.3";
-    version = "0.1.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz";
-      name = "osenv-0.1.3.tgz";
-      sha1 = "83cf05c6d6458fc4d5ac6362ea325d92f2754217";
-    };
-    deps = {
-      "os-homedir-1.0.1" = self.by-version."os-homedir"."1.0.1";
-      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."package-json"."1.2.0" = self.buildNodePackage {
-    name = "package-json-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz";
-      name = "package-json-1.2.0.tgz";
-      sha1 = "c8ecac094227cdf76a316874ed05e27cc939a0e0";
-    };
-    deps = {
-      "got-3.3.1" = self.by-version."got"."3.3.1";
-      "registry-url-3.0.3" = self.by-version."registry-url"."3.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parse-json"."^2.2.0" =
-    self.by-version."parse-json"."2.2.0";
-  by-version."parse-json"."2.2.0" = self.buildNodePackage {
-    name = "parse-json-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz";
-      name = "parse-json-2.2.0.tgz";
-      sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9";
-    };
-    deps = {
-      "error-ex-1.3.0" = self.by-version."error-ex"."1.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."parsimmon"."^0.5.0" =
-    self.by-version."parsimmon"."0.5.1";
-  by-version."parsimmon"."0.5.1" = self.buildNodePackage {
-    name = "parsimmon-0.5.1";
-    version = "0.5.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/parsimmon/-/parsimmon-0.5.1.tgz";
-      name = "parsimmon-0.5.1.tgz";
-      sha1 = "247c970d7d5e99a51115b16a106de96f0eb9303b";
-    };
-    deps = {
-      "pjs-5.1.1" = self.by-version."pjs"."5.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."path-exists"."^2.0.0" =
-    self.by-version."path-exists"."2.1.0";
-  by-version."path-exists"."2.1.0" = self.buildNodePackage {
-    name = "path-exists-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz";
-      name = "path-exists-2.1.0.tgz";
-      sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b";
-    };
-    deps = {
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."path-type"."^1.0.0" =
-    self.by-version."path-type"."1.1.0";
-  by-version."path-type"."1.1.0" = self.buildNodePackage {
-    name = "path-type-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz";
-      name = "path-type-1.1.0.tgz";
-      sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441";
-    };
-    deps = {
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-      "pify-2.3.0" = self.by-version."pify"."2.3.0";
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pause-stream"."0.0.11" =
-    self.by-version."pause-stream"."0.0.11";
-  by-version."pause-stream"."0.0.11" = self.buildNodePackage {
-    name = "pause-stream-0.0.11";
-    version = "0.0.11";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz";
-      name = "pause-stream-0.0.11.tgz";
-      sha1 = "fe5a34b0cbce12b5aa6a2b403ee2e73b602f1445";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pify"."^2.0.0" =
-    self.by-version."pify"."2.3.0";
-  by-version."pify"."2.3.0" = self.buildNodePackage {
-    name = "pify-2.3.0";
-    version = "2.3.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz";
-      name = "pify-2.3.0.tgz";
-      sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pinkie"."^2.0.0" =
-    self.by-version."pinkie"."2.0.4";
-  by-version."pinkie"."2.0.4" = self.buildNodePackage {
-    name = "pinkie-2.0.4";
-    version = "2.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
-      name = "pinkie-2.0.4.tgz";
-      sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pinkie-promise"."^2.0.0" =
-    self.by-version."pinkie-promise"."2.0.0";
-  by-version."pinkie-promise"."2.0.0" = self.buildNodePackage {
-    name = "pinkie-promise-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz";
-      name = "pinkie-promise-2.0.0.tgz";
-      sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
-    };
-    deps = {
-      "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."pjs"."5.x" =
-    self.by-version."pjs"."5.1.1";
-  by-version."pjs"."5.1.1" = self.buildNodePackage {
-    name = "pjs-5.1.1";
-    version = "5.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pjs/-/pjs-5.1.1.tgz";
-      name = "pjs-5.1.1.tgz";
-      sha1 = "9dfc4673bb01deffd6915fb1dec75827aba42abf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."prepend-http"."1.0.3" = self.buildNodePackage {
-    name = "prepend-http-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/prepend-http/-/prepend-http-1.0.3.tgz";
-      name = "prepend-http-1.0.3.tgz";
-      sha1 = "4d0d2b6f9efcf1190c23931325b4f3a9dba84869";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."process-nextick-args"."~1.0.6" =
-    self.by-version."process-nextick-args"."1.0.6";
-  by-version."process-nextick-args"."1.0.6" = self.buildNodePackage {
-    name = "process-nextick-args-1.0.6";
-    version = "1.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz";
-      name = "process-nextick-args-1.0.6.tgz";
-      sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."promised-temp"."^0.1.0" =
-    self.by-version."promised-temp"."0.1.0";
-  by-version."promised-temp"."0.1.0" = self.buildNodePackage {
-    name = "promised-temp-0.1.0";
-    version = "0.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/promised-temp/-/promised-temp-0.1.0.tgz";
-      name = "promised-temp-0.1.0.tgz";
-      sha1 = "5f8a704ccdf5f2ac23996fcafe2b301bc2a8d0eb";
-    };
-    deps = {
-      "temp-0.8.3" = self.by-version."temp"."0.8.3";
-      "q-1.4.1" = self.by-version."q"."1.4.1";
-      "debug-2.2.0" = self.by-version."debug"."2.2.0";
-      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "promised-temp" = self.by-version."promised-temp"."0.1.0";
-  by-spec."pseudomap"."^1.0.1" =
-    self.by-version."pseudomap"."1.0.2";
-  by-version."pseudomap"."1.0.2" = self.buildNodePackage {
-    name = "pseudomap-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-      name = "pseudomap-1.0.2.tgz";
-      sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."q"."1.4.1" = self.buildNodePackage {
-    name = "q-1.4.1";
-    version = "1.4.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/q/-/q-1.4.1.tgz";
-      name = "q-1.4.1.tgz";
-      sha1 = "55705bcd93c5f3673530c2c2cbc0c2b3addc286e";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."qs"."~6.0.2" =
-    self.by-version."qs"."6.0.2";
-  by-version."qs"."6.0.2" = self.buildNodePackage {
-    name = "qs-6.0.2";
-    version = "6.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
-      name = "qs-6.0.2.tgz";
-      sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."rc"."1.1.6" = self.buildNodePackage {
-    name = "rc-1.1.6";
-    version = "1.1.6";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/rc/-/rc-1.1.6.tgz";
-      name = "rc-1.1.6.tgz";
-      sha1 = "43651b76b6ae53b5c802f1151fa3fc3b059969c9";
-    };
-    deps = {
-      "deep-extend-0.4.1" = self.by-version."deep-extend"."0.4.1";
-      "ini-1.3.4" = self.by-version."ini"."1.3.4";
-      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
-      "strip-json-comments-1.0.4" = self.by-version."strip-json-comments"."1.0.4";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."read-all-stream"."2.2.0" = self.buildNodePackage {
-    name = "read-all-stream-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-2.2.0.tgz";
-      name = "read-all-stream-2.2.0.tgz";
-      sha1 = "6b83370546c55ab6ade2bf75e83c66e45989bbf0";
-    };
-    deps = {
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."read-all-stream"."^3.0.0" =
-    self.by-version."read-all-stream"."3.1.0";
-  by-version."read-all-stream"."3.1.0" = self.buildNodePackage {
-    name = "read-all-stream-3.1.0";
-    version = "3.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-      name = "read-all-stream-3.1.0.tgz";
-      sha1 = "35c3e177f2078ef789ee4bfafa4373074eaef4fa";
-    };
-    deps = {
-      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
-      "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."read-pkg"."^1.0.0" =
-    self.by-version."read-pkg"."1.1.0";
-  by-version."read-pkg"."1.1.0" = self.buildNodePackage {
-    name = "read-pkg-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz";
-      name = "read-pkg-1.1.0.tgz";
-      sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28";
-    };
-    deps = {
-      "load-json-file-1.1.0" = self.by-version."load-json-file"."1.1.0";
-      "normalize-package-data-2.3.5" = self.by-version."normalize-package-data"."2.3.5";
-      "path-type-1.1.0" = self.by-version."path-type"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."read-pkg-up"."^1.0.1" =
-    self.by-version."read-pkg-up"."1.0.1";
-  by-version."read-pkg-up"."1.0.1" = self.buildNodePackage {
-    name = "read-pkg-up-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz";
-      name = "read-pkg-up-1.0.1.tgz";
-      sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02";
-    };
-    deps = {
-      "find-up-1.1.2" = self.by-version."find-up"."1.1.2";
-      "read-pkg-1.1.0" = self.by-version."read-pkg"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."readable-stream"."^2.0.0" =
-    self.by-version."readable-stream"."2.0.6";
-  by-version."readable-stream"."2.0.6" = self.buildNodePackage {
-    name = "readable-stream-2.0.6";
-    version = "2.0.6";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz";
-      name = "readable-stream-2.0.6.tgz";
-      sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e";
-    };
-    deps = {
-      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "isarray-1.0.0" = self.by-version."isarray"."1.0.0";
-      "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
-      "util-deprecate-1.0.2" = self.by-version."util-deprecate"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."readable-stream"."~2.0.5" =
-    self.by-version."readable-stream"."2.0.6";
-  by-spec."redent"."^1.0.0" =
-    self.by-version."redent"."1.0.0";
-  by-version."redent"."1.0.0" = self.buildNodePackage {
-    name = "redent-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/redent/-/redent-1.0.0.tgz";
-      name = "redent-1.0.0.tgz";
-      sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde";
-    };
-    deps = {
-      "indent-string-2.1.0" = self.by-version."indent-string"."2.1.0";
-      "strip-indent-1.0.1" = self.by-version."strip-indent"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."repeating"."^2.0.0" =
-    self.by-version."repeating"."2.0.0";
-  by-version."repeating"."2.0.0" = self.buildNodePackage {
-    name = "repeating-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/repeating/-/repeating-2.0.0.tgz";
-      name = "repeating-2.0.0.tgz";
-      sha1 = "fd27d6d264d18fbebfaa56553dd7b82535a5034e";
-    };
-    deps = {
-      "is-finite-1.0.1" = self.by-version."is-finite"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."request"."2.69.0" = self.buildNodePackage {
-    name = "request-2.69.0";
-    version = "2.69.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz";
-      name = "request-2.69.0.tgz";
-      sha1 = "cf91d2e000752b1217155c005241911991a2346a";
-    };
-    deps = {
-      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
-      "aws4-1.3.2" = self.by-version."aws4"."1.3.2";
-      "bl-1.0.3" = self.by-version."bl"."1.0.3";
-      "caseless-0.11.0" = self.by-version."caseless"."0.11.0";
-      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
-      "extend-3.0.0" = self.by-version."extend"."3.0.0";
-      "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
-      "form-data-1.0.0-rc4" = self.by-version."form-data"."1.0.0-rc4";
-      "har-validator-2.0.6" = self.by-version."har-validator"."2.0.6";
-      "hawk-3.1.3" = self.by-version."hawk"."3.1.3";
-      "http-signature-1.1.1" = self.by-version."http-signature"."1.1.1";
-      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
-      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
-      "mime-types-2.1.10" = self.by-version."mime-types"."2.1.10";
-      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
-      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
-      "qs-6.0.2" = self.by-version."qs"."6.0.2";
-      "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
-      "tough-cookie-2.2.2" = self.by-version."tough-cookie"."2.2.2";
-      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."request"."^2.45.0" =
-    self.by-version."request"."2.69.0";
-  by-version."rimraf"."2.5.2" = self.buildNodePackage {
-    name = "rimraf-2.5.2";
-    version = "2.5.2";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz";
-      name = "rimraf-2.5.2.tgz";
-      sha1 = "62ba947fa4c0b4363839aefecd4f0fbad6059726";
-    };
-    deps = {
-      "glob-7.0.3" = self.by-version."glob"."7.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."semver"."2 || 3 || 4 || 5" =
-    self.by-version."semver"."5.1.0";
-  by-version."semver"."5.1.0" = self.buildNodePackage {
-    name = "semver-5.1.0";
-    version = "5.1.0";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
-      name = "semver-5.1.0.tgz";
-      sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."semver".">=5.1.0 <6" =
-    self.by-version."semver"."5.1.0";
-  by-version."semver"."4.3.6" = self.buildNodePackage {
-    name = "semver-4.3.6";
-    version = "4.3.6";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
-      name = "semver-4.3.6.tgz";
-      sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."semver"."^5.0.3" =
-    self.by-version."semver"."5.1.0";
-  by-version."semver-diff"."2.1.0" = self.buildNodePackage {
-    name = "semver-diff-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-      name = "semver-diff-2.1.0.tgz";
-      sha1 = "4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36";
-    };
-    deps = {
-      "semver-5.1.0" = self.by-version."semver"."5.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."sigmund"."1.0.1" = self.buildNodePackage {
-    name = "sigmund-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz";
-      name = "sigmund-1.0.1.tgz";
-      sha1 = "3ff21f198cad2175f9f3b781853fd94d0d19b590";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."signal-exit"."^2.1.2" =
-    self.by-version."signal-exit"."2.1.2";
-  by-version."signal-exit"."2.1.2" = self.buildNodePackage {
-    name = "signal-exit-2.1.2";
-    version = "2.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/signal-exit/-/signal-exit-2.1.2.tgz";
-      name = "signal-exit-2.1.2.tgz";
-      sha1 = "375879b1f92ebc3b334480d038dc546a6d558564";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sort-keys"."^1.0.0" =
-    self.by-version."sort-keys"."1.1.1";
-  by-version."sort-keys"."1.1.1" = self.buildNodePackage {
-    name = "sort-keys-1.1.1";
-    version = "1.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sort-keys/-/sort-keys-1.1.1.tgz";
-      name = "sort-keys-1.1.1.tgz";
-      sha1 = "a791c26071df66c356bf5dcad9cfb57a7b2f826e";
-    };
-    deps = {
-      "is-plain-obj-1.1.0" = self.by-version."is-plain-obj"."1.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sort-keys-length"."^1.0.0" =
-    self.by-version."sort-keys-length"."1.0.1";
-  by-version."sort-keys-length"."1.0.1" = self.buildNodePackage {
-    name = "sort-keys-length-1.0.1";
-    version = "1.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sort-keys-length/-/sort-keys-length-1.0.1.tgz";
-      name = "sort-keys-length-1.0.1.tgz";
-      sha1 = "9cb6f4f4e9e48155a6aa0671edd336ff1479a188";
-    };
-    deps = {
-      "sort-keys-1.1.1" = self.by-version."sort-keys"."1.1.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."spdx-correct"."~1.0.0" =
-    self.by-version."spdx-correct"."1.0.2";
-  by-version."spdx-correct"."1.0.2" = self.buildNodePackage {
-    name = "spdx-correct-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz";
-      name = "spdx-correct-1.0.2.tgz";
-      sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
-    };
-    deps = {
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."spdx-exceptions"."^1.0.4" =
-    self.by-version."spdx-exceptions"."1.0.4";
-  by-version."spdx-exceptions"."1.0.4" = self.buildNodePackage {
-    name = "spdx-exceptions-1.0.4";
-    version = "1.0.4";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-1.0.4.tgz";
-      name = "spdx-exceptions-1.0.4.tgz";
-      sha1 = "220b84239119ae9045a892db81a83f4ce16f80fd";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."spdx-expression-parse"."~1.0.0" =
-    self.by-version."spdx-expression-parse"."1.0.2";
-  by-version."spdx-expression-parse"."1.0.2" = self.buildNodePackage {
-    name = "spdx-expression-parse-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.2.tgz";
-      name = "spdx-expression-parse-1.0.2.tgz";
-      sha1 = "d52b14b5e9670771440af225bcb563122ac452f6";
-    };
-    deps = {
-      "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4";
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."spdx-license-ids"."^1.0.0" =
-    self.by-version."spdx-license-ids"."1.2.0";
-  by-version."spdx-license-ids"."1.2.0" = self.buildNodePackage {
-    name = "spdx-license-ids-1.2.0";
-    version = "1.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz";
-      name = "spdx-license-ids-1.2.0.tgz";
-      sha1 = "b549dd0f63dcb745a17e2ea3a07402e0e332d1e2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."spdx-license-ids"."^1.0.2" =
-    self.by-version."spdx-license-ids"."1.2.0";
-  by-spec."split"."0.2" =
-    self.by-version."split"."0.2.10";
-  by-version."split"."0.2.10" = self.buildNodePackage {
-    name = "split-0.2.10";
-    version = "0.2.10";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/split/-/split-0.2.10.tgz";
-      name = "split-0.2.10.tgz";
-      sha1 = "67097c601d697ce1368f418f06cd201cf0521a57";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."sprintf-js"."1.0.3" = self.buildNodePackage {
-    name = "sprintf-js-1.0.3";
-    version = "1.0.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz";
-      name = "sprintf-js-1.0.3.tgz";
-      sha1 = "04e6926f662895354f3dd015203633b857297e2c";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."sshpk"."^1.7.0" =
-    self.by-version."sshpk"."1.7.4";
-  by-version."sshpk"."1.7.4" = self.buildNodePackage {
-    name = "sshpk-1.7.4";
-    version = "1.7.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz";
-      name = "sshpk-1.7.4.tgz";
-      sha1 = "ad7b47defca61c8415d964243b62b0ce60fbca38";
-    };
-    deps = {
-      "asn1-0.2.3" = self.by-version."asn1"."0.2.3";
-      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
-      "dashdash-1.13.0" = self.by-version."dashdash"."1.13.0";
-    };
-    optionalDependencies = {
-      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
-      "tweetnacl-0.14.1" = self.by-version."tweetnacl"."0.14.1";
-      "jodid25519-1.0.2" = self.by-version."jodid25519"."1.0.2";
-      "ecc-jsbn-0.1.1" = self.by-version."ecc-jsbn"."0.1.1";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."stringstream"."0.0.5" = self.buildNodePackage {
-    name = "stringstream-0.0.5";
-    version = "0.0.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
-      name = "stringstream-0.0.5.tgz";
-      sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."strip-ansi"."^3.0.0" =
-    self.by-version."strip-ansi"."3.0.1";
-  by-version."strip-ansi"."3.0.1" = self.buildNodePackage {
-    name = "strip-ansi-3.0.1";
-    version = "3.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz";
-      name = "strip-ansi-3.0.1.tgz";
-      sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf";
-    };
-    deps = {
-      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."strip-bom"."^2.0.0" =
-    self.by-version."strip-bom"."2.0.0";
-  by-version."strip-bom"."2.0.0" = self.buildNodePackage {
-    name = "strip-bom-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz";
-      name = "strip-bom-2.0.0.tgz";
-      sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e";
-    };
-    deps = {
-      "is-utf8-0.2.1" = self.by-version."is-utf8"."0.2.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."strip-indent"."^1.0.1" =
-    self.by-version."strip-indent"."1.0.1";
-  by-version."strip-indent"."1.0.1" = self.buildNodePackage {
-    name = "strip-indent-1.0.1";
-    version = "1.0.1";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz";
-      name = "strip-indent-1.0.1.tgz";
-      sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2";
-    };
-    deps = {
-      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."strip-json-comments"."~1.0.4" =
-    self.by-version."strip-json-comments"."1.0.4";
-  by-version."strip-json-comments"."1.0.4" = self.buildNodePackage {
-    name = "strip-json-comments-1.0.4";
-    version = "1.0.4";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-      name = "strip-json-comments-1.0.4.tgz";
-      sha1 = "1e15fbcac97d3ee99bf2d73b4c656b082bbafb91";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."supports-color"."^2.0.0" =
-    self.by-version."supports-color"."2.0.0";
-  by-version."supports-color"."2.0.0" = self.buildNodePackage {
-    name = "supports-color-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
-      name = "supports-color-2.0.0.tgz";
-      sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."temp"."0.8.3" =
-    self.by-version."temp"."0.8.3";
-  by-version."temp"."0.8.3" = self.buildNodePackage {
-    name = "temp-0.8.3";
-    version = "0.8.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/temp/-/temp-0.8.3.tgz";
-      name = "temp-0.8.3.tgz";
-      sha1 = "e0c6bc4d26b903124410e4fed81103014dfc1f59";
-    };
-    deps = {
-      "os-tmpdir-1.0.1" = self.by-version."os-tmpdir"."1.0.1";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."temp"."^0.8.1" =
-    self.by-version."temp"."0.8.3";
-  by-spec."through"."2" =
-    self.by-version."through"."2.3.8";
-  by-version."through"."2.3.8" = self.buildNodePackage {
-    name = "through-2.3.8";
-    version = "2.3.8";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/through/-/through-2.3.8.tgz";
-      name = "through-2.3.8.tgz";
-      sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."through"."~2.3" =
-    self.by-version."through"."2.3.8";
-  by-spec."through"."~2.3.1" =
-    self.by-version."through"."2.3.8";
-  by-spec."topo"."1.x.x" =
-    self.by-version."topo"."1.1.0";
-  by-version."topo"."1.1.0" = self.buildNodePackage {
-    name = "topo-1.1.0";
-    version = "1.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/topo/-/topo-1.1.0.tgz";
-      name = "topo-1.1.0.tgz";
-      sha1 = "e9d751615d1bb87dc865db182fa1ca0a5ef536d5";
-    };
-    deps = {
-      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tough-cookie"."~2.2.0" =
-    self.by-version."tough-cookie"."2.2.2";
-  by-version."tough-cookie"."2.2.2" = self.buildNodePackage {
-    name = "tough-cookie-2.2.2";
-    version = "2.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.2.tgz";
-      name = "tough-cookie-2.2.2.tgz";
-      sha1 = "c83a1830f4e5ef0b93ef2a3488e724f8de016ac7";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."trim-newlines"."^1.0.0" =
-    self.by-version."trim-newlines"."1.0.0";
-  by-version."trim-newlines"."1.0.0" = self.buildNodePackage {
-    name = "trim-newlines-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz";
-      name = "trim-newlines-1.0.0.tgz";
-      sha1 = "5887966bb582a4503a41eb524f7d35011815a613";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tsd"."~0.6.5" =
-    self.by-version."tsd"."0.6.5";
-  by-version."tsd"."0.6.5" = self.buildNodePackage {
-    name = "tsd-0.6.5";
-    version = "0.6.5";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tsd/-/tsd-0.6.5.tgz";
-      name = "tsd-0.6.5.tgz";
-      sha1 = "34a0b64c1db6a70b3860fe4f5571d9d1357421ad";
-    };
-    deps = {
-      "assertion-error-1.0.0" = self.by-version."assertion-error"."1.0.0";
-      "bl-0.9.5" = self.by-version."bl"."0.9.5";
-      "bluebird-1.2.4" = self.by-version."bluebird"."1.2.4";
-      "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
-      "colors-1.1.2" = self.by-version."colors"."1.1.2";
-      "deep-freeze-0.0.1" = self.by-version."deep-freeze"."0.0.1";
-      "definition-header-0.1.0" = self.by-version."definition-header"."0.1.0";
-      "detect-indent-0.2.0" = self.by-version."detect-indent"."0.2.0";
-      "diff-1.4.0" = self.by-version."diff"."1.4.0";
-      "event-stream-3.1.7" = self.by-version."event-stream"."3.1.7";
-      "exit-0.1.2" = self.by-version."exit"."0.1.2";
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
-      "joi-4.9.0" = self.by-version."joi"."4.9.0";
-      "joi-assert-0.0.3" = self.by-version."joi-assert"."0.0.3";
-      "jsesc-0.5.0" = self.by-version."jsesc"."0.5.0";
-      "json-pointer-0.2.2" = self.by-version."json-pointer"."0.2.2";
-      "lazy.js-0.3.2" = self.by-version."lazy.js"."0.3.2";
-      "lru-cache-2.5.2" = self.by-version."lru-cache"."2.5.2";
-      "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0";
-      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
-      "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4";
-      "minitable-0.0.4" = self.by-version."minitable"."0.0.4";
-      "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4";
-      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "open-0.0.5" = self.by-version."open"."0.0.5";
-      "request-2.69.0" = self.by-version."request"."2.69.0";
-      "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8";
-      "semver-4.3.6" = self.by-version."semver"."4.3.6";
-      "type-detect-0.1.2" = self.by-version."type-detect"."0.1.2";
-      "universal-analytics-0.3.11" = self.by-version."universal-analytics"."0.3.11";
-      "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2";
-      "uri-templates-0.1.9" = self.by-version."uri-templates"."0.1.9";
-      "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
-      "verror-1.4.0" = self.by-version."verror"."1.4.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "tsd" = self.by-version."tsd"."0.6.5";
-  by-spec."tunnel-agent"."~0.4.1" =
-    self.by-version."tunnel-agent"."0.4.2";
-  by-version."tunnel-agent"."0.4.2" = self.buildNodePackage {
-    name = "tunnel-agent-0.4.2";
-    version = "0.4.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz";
-      name = "tunnel-agent-0.4.2.tgz";
-      sha1 = "1104e3f36ac87125c287270067d582d18133bfee";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."tweetnacl".">=0.13.0 <1.0.0" =
-    self.by-version."tweetnacl"."0.14.1";
-  by-version."tweetnacl"."0.14.1" = self.buildNodePackage {
-    name = "tweetnacl-0.14.1";
-    version = "0.14.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.1.tgz";
-      name = "tweetnacl-0.14.1.tgz";
-      sha1 = "37c6a1fb5cd4b63b7acee450d8419d9c0024cc03";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."type-detect"."~0.1.2" =
-    self.by-version."type-detect"."0.1.2";
-  by-version."type-detect"."0.1.2" = self.buildNodePackage {
-    name = "type-detect-0.1.2";
-    version = "0.1.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz";
-      name = "type-detect-0.1.2.tgz";
-      sha1 = "c88e853e54e5abd88f1bf3194b477c853c94f854";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."universal-analytics"."~0.3.4" =
-    self.by-version."universal-analytics"."0.3.11";
-  by-version."universal-analytics"."0.3.11" = self.buildNodePackage {
-    name = "universal-analytics-0.3.11";
-    version = "0.3.11";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/universal-analytics/-/universal-analytics-0.3.11.tgz";
-      name = "universal-analytics-0.3.11.tgz";
-      sha1 = "512879193a12a66dcbd9185121389bab913cd4b6";
-    };
-    deps = {
-      "request-2.69.0" = self.by-version."request"."2.69.0";
-      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-      "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
-      "async-0.2.10" = self.by-version."async"."0.2.10";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."update-notifier"."^0.2.2" =
-    self.by-version."update-notifier"."0.2.2";
-  by-version."update-notifier"."0.2.2" = self.buildNodePackage {
-    name = "update-notifier-0.2.2";
-    version = "0.2.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz";
-      name = "update-notifier-0.2.2.tgz";
-      sha1 = "e69b3a784b4e686a2acd98f5e66944591996e187";
-    };
-    deps = {
-      "chalk-0.5.1" = self.by-version."chalk"."0.5.1";
-      "configstore-0.3.2" = self.by-version."configstore"."0.3.2";
-      "is-npm-1.0.0" = self.by-version."is-npm"."1.0.0";
-      "latest-version-1.0.1" = self.by-version."latest-version"."1.0.1";
-      "semver-diff-2.1.0" = self.by-version."semver-diff"."2.1.0";
-      "string-length-1.0.1" = self.by-version."string-length"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."uri-templates"."~0.1.5" =
-    self.by-version."uri-templates"."0.1.9";
-  by-version."uri-templates"."0.1.9" = self.buildNodePackage {
-    name = "uri-templates-0.1.9";
-    version = "0.1.9";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/uri-templates/-/uri-templates-0.1.9.tgz";
-      name = "uri-templates-0.1.9.tgz";
-      sha1 = "c56f7a5731b3a310226695f6e5639180fd1aa249";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."util-deprecate"."~1.0.1" =
-    self.by-version."util-deprecate"."1.0.2";
-  by-version."util-deprecate"."1.0.2" = self.buildNodePackage {
-    name = "util-deprecate-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
-      name = "util-deprecate-1.0.2.tgz";
-      sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."validate-npm-package-license"."^3.0.1" =
-    self.by-version."validate-npm-package-license"."3.0.1";
-  by-version."validate-npm-package-license"."3.0.1" = self.buildNodePackage {
-    name = "validate-npm-package-license-3.0.1";
-    version = "3.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz";
-      name = "validate-npm-package-license-3.0.1.tgz";
-      sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc";
-    };
-    deps = {
-      "spdx-correct-1.0.2" = self.by-version."spdx-correct"."1.0.2";
-      "spdx-expression-parse-1.0.2" = self.by-version."spdx-expression-parse"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."verror"."~1.4.0" =
-    self.by-version."verror"."1.4.0";
-  by-version."verror"."1.4.0" = self.buildNodePackage {
-    name = "verror-1.4.0";
-    version = "1.4.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/verror/-/verror-1.4.0.tgz";
-      name = "verror-1.4.0.tgz";
-      sha1 = "5d8fdf5875141c3183b7c6bc23a0aa3e3e6ca4e2";
-    };
-    deps = {
-      "extsprintf-1.0.3" = self.by-version."extsprintf"."1.0.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-version."xtend"."4.0.1" = self.buildNodePackage {
-    name = "xtend-4.0.1";
-    version = "4.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
-      name = "xtend-4.0.1.tgz";
-      sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."yallist"."^2.0.0" =
-    self.by-version."yallist"."2.0.0";
-  by-version."yallist"."2.0.0" = self.buildNodePackage {
-    name = "yallist-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/yallist/-/yallist-2.0.0.tgz";
-      name = "yallist-2.0.0.tgz";
-      sha1 = "306c543835f09ee1a4cb23b7bce9ab341c91cdd4";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
 }
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 600ea00b93e6d..55637a06d059d 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -35,6 +35,7 @@
 , "ansi-remover"
 , "mkdirp"
 , "jshint"
+, "eslint"
 , "bcrypt"
 , "nconf"
 , "winston"
@@ -53,7 +54,6 @@
 , "forever"
 , "forever-monitor"
 , "kue"
-, "supertest"
 , "should"
 , "nodemon"
 , "timezone"
@@ -71,6 +71,7 @@
 , { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
 , "grunt-cli"
 , "grunt-contrib-jshint"
+, "grunt-contrib-eslint"
 , "grunt-contrib-requirejs"
 , "grunt-contrib-less"
 , "grunt-contrib-cssmin"
@@ -109,7 +110,7 @@
 , "deepmerge"
 , "slasp"
 , "react"
-, { "pure-css": "git://github.com/yui/pure.git#v0.5.0-rc-1" }
+, "pure"
 , "marked"
 , "browserify"
 , "uglify-js"
@@ -126,7 +127,6 @@
 , "node-stringprep"
 , "ltx"
 , "node-xmpp"
-, "node-xmpp-core"
 , "node-xmpp-client"
 , "node-xmpp-component"
 , "node-xmpp-server"
@@ -137,11 +137,8 @@
 , "sloc"
 , "peerflix"
 , "peerflix-server"
-, "trash"
-, "empty-trash"
 , "castnow"
 , "parsoid"
-, { "kibana-authentication-proxy": "git://github.com/fangli/kibana-authentication-proxy.git" }
 , "react-tools"
 , "json"
 , "bipio"
@@ -172,7 +169,6 @@
 , "bip-pod-instagram"
 , "bip-pod-witai"
 , "bip-pod-zoho"
-, "bip-pod-bitly"
 , "bip-pod-circonus"
 , "bip-pod-google"
 , "bip-pod-mailchimp"

From 00cc0cab13abe2e66da3b3f172fc4bc2b0c5f4c0 Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Tue, 5 Apr 2016 16:32:56 +0200
Subject: [PATCH 736/857] Sort node packages in node-packages.json
 alphabetically

---
 pkgs/top-level/node-packages.json | 304 +++++++++++++++---------------
 1 file changed, 152 insertions(+), 152 deletions(-)

diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 55637a06d059d..1b05c05c56331 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -1,187 +1,187 @@
 [
   "async"
+, "almond"
+, "amdefine"
+, "ansi-remover"
 , "assert"
-, "mocha"
-, "jayschema"
-, "underscore"
-, "extend"
-, "express"
-, "express-form"
-, "s3http"
 , "aws-sdk"
-, "nijs"
-, "amdefine"
-, "smartdc"
-, "optparse"
-, "jsontool"
-, { "swig": "0.14.x" }
-, "coffee-script"
-, "escape-html"
-, "buffertools"
-, "wu"
-, "source-map"
-, "knox"
-, "node-expat"
-, "optimist"
-, "temp"
-, "faye-websocket"
-, "node-uuid"
-, "sockjs"
 , "backbone"
-, "browserchannel"
-, "node-gyp"
-, "semver"
-, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
-, "ansi-remover"
-, "mkdirp"
-, "jshint"
-, "eslint"
 , "bcrypt"
-, "nconf"
-, "winston"
-, "jade"
-, "view-helpers"
-, "redis"
-, { "mongoose": "3.6.x" }
-, "mongoose-schema-extend"
-, "connect-mongo"
+, "bip-pod-alchemy"
+, "bip-pod-chain"
+, "bip-pod-circonus"
+, "bip-pod-coindesk"
+, "bip-pod-craigslist"
+, "bip-pod-crypto"
+, "bip-pod-dropbox"
+, "bip-pod-embedly"
+, "bip-pod-evernote"
+, "bip-pod-facebook"
+, "bip-pod-flickr"
+, "bip-pod-github"
+, "bip-pod-github"
+, "bip-pod-github"
+, "bip-pod-gmail"
+, "bip-pod-google"
+, "bip-pod-google-drive"
+, "bip-pod-imgur"
+, "bip-pod-instagram"
+, "bip-pod-kato"
+, "bip-pod-keenio"
+, "bip-pod-mailchimp"
+, "bip-pod-mailgun"
+, "bip-pod-mixcloud"
+, "bip-pod-mongodb"
+, "bip-pod-numerous"
+, "bip-pod-pushbullet"
+, "bip-pod-pusher"
+, "bip-pod-soundcloud"
+, "bip-pod-statuscake"
+, "bip-pod-todoist"
+, "bip-pod-trello"
+, "bip-pod-trello"
+, "bip-pod-twilio"
+, "bip-pod-twitter"
+, "bip-pod-witai"
+, "bip-pod-wordpress"
+, "bip-pod-zoho"
+, "bipio"
+, "bower"
+, "bower2nix"
+, "browserchannel"
+, "browserify"
+, "buffertools"
+, "castnow"
+, "chai"
+, "coffee-script"
 , "connect-flash"
-, "passport"
-, "passport-local"
-, "passport-http"
-, "gzippo"
-, "walk"
+, "connect-jade-static"
+, "connect-mongo"
+, "cordova"
+, "coveralls"
+, "deepmerge"
+, "docker-registry-server"
+, "escape-html"
+, "eslint"
+, "express"
+, "express-form"
+, "extend"
+, "faye-websocket"
+, "flatiron"
 , "forever"
 , "forever-monitor"
-, "kue"
-, "should"
-, "nodemon"
-, "timezone"
-, "i18next"
-, "stylus"
-, "nib"
-, "npm"
-, "gridfs-stream"
-, "tar"
-, "flatiron"
-, "ironhorse"
 , "fs-walk"
-, "ungit"
-, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
-, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
+, "git-run"
+, "gridfs-stream"
 , "grunt-cli"
-, "grunt-contrib-jshint"
+, "grunt-contrib-cssmin"
 , "grunt-contrib-eslint"
-, "grunt-contrib-requirejs"
+, "grunt-contrib-jshint"
 , "grunt-contrib-less"
-, "grunt-contrib-cssmin"
+, "grunt-contrib-requirejs"
 , "grunt-contrib-uglify"
 , "grunt-karma"
 , "grunt-sed"
 , "gulp"
-, "webpack"
+, "gzippo"
+, "hipache"
+, "i18next"
+, "ironhorse"
+, "istanbul"
+, "jade"
+, "jayschema"
+, "jfs"
+, "js-yaml"
+, "jshint"
+, "json"
+, "jsontool"
 , "karma"
-, "karma-mocha"
+, "karma-chrome-launcher"
 , "karma-coverage"
+, "karma-junit-reporter"
+, "karma-mocha"
 , "karma-requirejs"
 , "karma-sauce-launcher"
-, "karma-chrome-launcher"
-, "karma-junit-reporter"
-, "almond"
+, "knox"
+, "kue"
 , "lcov-result-merger"
-, "coveralls"
-, "js-yaml"
-, "node-inspector"
-, "istanbul"
-, "mocha-unfunk-reporter"
-, "chai"
-, "selenium-webdriver"
-, "webdrvr"
-, "connect-jade-static"
-, "plist-native"
-, "x509"
-, "owl-deepcopy"
-, "meat"
-, "hipache"
-, "posix"
-, "node-protobuf"
-, "rethinkdb"
-, "titanium"
-, "deepmerge"
-, "slasp"
-, "react"
-, "pure"
-, "marked"
-, "browserify"
-, "uglify-js"
 , "less"
+, "ltx"
+, "marked"
+, "meat"
+, "mkdirp"
+, "mocha"
 , "mocha-phantomjs"
-, "phantomjs"
-, "sinon"
-, "shelljs"
-, "typescript"
-, "git-run"
-, "bower"
-, "bower2nix"
-, "npm-check-updates"
+, "mocha-unfunk-reporter"
+, "mongoose-schema-extend"
+, "nconf"
+, "nib"
+, "nijs"
+, "node-expat"
+, "node-gyp"
+, "node-inspector"
+, "node-protobuf"
+, "node-red"
 , "node-stringprep"
-, "ltx"
+, "node-uuid"
 , "node-xmpp"
 , "node-xmpp-client"
 , "node-xmpp-component"
+, "node-xmpp-joap"
 , "node-xmpp-server"
 , "node-xmpp-serviceadmin"
-, "node-xmpp-joap"
-, "jfs"
-, "cordova"
-, "sloc"
+, "nodemon"
+, "npm"
+, "npm-check-updates"
+, "optimist"
+, "optparse"
+, "owl-deepcopy"
+, "parsoid"
+, "passport"
+, "passport-http"
+, "passport-local"
 , "peerflix"
 , "peerflix-server"
-, "castnow"
-, "parsoid"
+, "phantomjs"
+, "plist-native"
+, "posix"
+, "pure"
+, "react"
 , "react-tools"
-, "json"
-, "bipio"
-, "bip-pod-flickr"
-, "bip-pod-imgur"
-, "bip-pod-github"
-, "bip-pod-twilio"
-, "bip-pod-coindesk"
-, "bip-pod-twitter"
-, "bip-pod-crypto"
-, "bip-pod-embedly"
-, "bip-pod-mailgun"
-, "bip-pod-chain"
-, "bip-pod-trello"
-, "bip-pod-pusher"
-, "bip-pod-keenio"
-, "bip-pod-numerous"
-, "bip-pod-statuscake"
-, "bip-pod-mongodb"
-, "bip-pod-facebook"
-, "bip-pod-trello"
-, "bip-pod-wordpress"
-, "bip-pod-alchemy"
-, "bip-pod-dropbox"
-, "bip-pod-craigslist"
-, "bip-pod-soundcloud"
-, "bip-pod-mixcloud"
-, "bip-pod-instagram"
-, "bip-pod-witai"
-, "bip-pod-zoho"
-, "bip-pod-circonus"
-, "bip-pod-google"
-, "bip-pod-mailchimp"
-, "bip-pod-pushbullet"
-, "bip-pod-todoist"
-, "bip-pod-kato"
-, "bip-pod-evernote"
-, "bip-pod-gmail"
-, "bip-pod-github"
-, "bip-pod-google-drive"
-, "bip-pod-github"
-, "sleep"
-, "node-red"
+, "redis"
+, "rethinkdb"
+, "s3http"
+, "selenium-webdriver"
+, "semver"
+, "shelljs"
+, "should"
+, "sinon"
 , "sinopia"
-, "docker-registry-server"
+, "slasp"
+, "sleep"
+, "sloc"
+, "smartdc"
+, "sockjs"
+, "source-map"
+, "stylus"
+, "tar"
+, "temp"
+, "timezone"
+, "titanium"
+, "typescript"
+, "uglify-js"
+, "underscore"
+, "ungit"
+, "view-helpers"
+, "walk"
+, "webdrvr"
+, "webpack"
+, "winston"
+, "wu"
+, "x509"
+, { "guifi-earth": "https://github.com/jmendeth/guifi-earth/tarball/f3ee96835fd4fb0e3e12fadbd2cb782770d64854 " }
+, { "mongoose": "3.6.x" }
+, { "node-uptime": "https://github.com/fzaninotto/uptime/tarball/1c65756575f90f563a752e2a22892ba2981c79b7" }
+, { "npm2nix": "git://github.com/NixOS/npm2nix.git#5.12.0" }
+, { "swig": "0.14.x" }
 ]

From 54d93ab15a46dd82aa8aa5ca7ec3e37088ba63d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Tue, 5 Apr 2016 09:36:56 -0400
Subject: [PATCH 737/857] liquibase: init at 3.4.2

---
 .../tools/database/liquibase/default.nix      | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/tools/database/liquibase/default.nix

diff --git a/pkgs/development/tools/database/liquibase/default.nix b/pkgs/development/tools/database/liquibase/default.nix
new file mode 100644
index 0000000000000..7d89555085d79
--- /dev/null
+++ b/pkgs/development/tools/database/liquibase/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  pname = "liquibase";
+  version = "3.4.2";
+
+  src = fetchurl {
+    url = "https://github.com/liquibase/liquibase/releases/download/${pname}-parent-${version}/${name}-bin.tar.gz";
+    sha256 = "1kvxqjz8jmqpmb1clhp2asxmgfk6ynqjir8fldc321v9a5wnqby5";
+  };
+
+  buildInputs = [ jre makeWrapper ];
+
+  unpackPhase = ''
+    tar xfz ${src}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/{bin,lib,sdk}
+    mv ./* $out/
+    wrapProgram $out/liquibase --prefix PATH ":" ${jre}/bin --set LIQUIBASE_HOME $out;
+    ln -s $out/liquibase $out/bin/liquibase
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Version Control for your database";
+    homepage = "http://www.liquibase.org/";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ nequissimus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7b336c9f1a879..3891c41048c3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4464,6 +4464,8 @@ in
 
   lessc = callPackage ../development/compilers/lessc { };
 
+  liquibase = callPackage ../development/tools/database/liquibase { };
+
   llvm = llvmPackages.llvm;
 
   llvm_38 = llvmPackages_38.llvm;

From 822665f06697d6d73c5d1cce4788518453e99f17 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Mar 2016 19:03:25 +0300
Subject: [PATCH 738/857] paprefs: propagate GConf dbus service

---
 pkgs/applications/audio/paprefs/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix             | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/paprefs/default.nix b/pkgs/applications/audio/paprefs/default.nix
index b026d8b9e6a60..3ce52806a4e0f 100644
--- a/pkgs/applications/audio/paprefs/default.nix
+++ b/pkgs/applications/audio/paprefs/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, libpulseaudio, gtkmm, libglademm
-, dbus_glib, gconfmm, intltool }:
+, dbus_glib, GConf, gconfmm, intltool }:
 
 stdenv.mkDerivation rec {
   name = "paprefs-0.9.10";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool ];
 
+  propagatedUserEnvPkgs = [ GConf ];
+
   configureFlags = [ "--disable-lynx" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5170ae246acc5..af60b1478308a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13329,7 +13329,7 @@ in
   panotools = callPackage ../applications/graphics/panotools { };
 
   paprefs = callPackage ../applications/audio/paprefs {
-    inherit (gnome) libglademm gconfmm;
+    inherit (gnome) libglademm gconfmm GConf;
   };
 
   pavucontrol = callPackage ../applications/audio/pavucontrol { };

From d06dfe861d18aa63301cb32dbf64b94bbab7ac33 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 5 Apr 2016 16:44:54 +0000
Subject: [PATCH 739/857] ocaml-text: 0.7.1 -> 0.8

---
 .../ocaml-modules/ocaml-text/default.nix            | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix
index 9c84045de60d0..64e0bb5ba010e 100644
--- a/pkgs/development/ocaml-modules/ocaml-text/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix
@@ -1,11 +1,12 @@
-{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}:
+{ stdenv, fetchzip, libiconv, ocaml, findlib, ncurses }:
 
-stdenv.mkDerivation {
-  name = "ocaml-text-0.7.1";
+stdenv.mkDerivation rec {
+  name = "ocaml-text-${version}";
+  version = "0.8";
 
-  src = fetchurl {
-    url = "https://github.com/vbmithr/ocaml-text/archive/0.7.1.tar.gz";
-    sha256 = "0dn096q9gjfj7ibj237mb7lq0742a760zawka6i064qns727qwrg";
+  src = fetchzip {
+    url = "https://github.com/vbmithr/ocaml-text/archive/${version}.tar.gz";
+    sha256 = "11jamdfn5s19a0yvl012q1xvdk1grkp4rkrn819imqrvdplqkn1y";
   };
 
   buildInputs = [ocaml findlib ncurses libiconv];

From 56d45e9b998659d5adb28ba86de4053e9c9ef001 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 5 Apr 2016 20:07:22 +0200
Subject: [PATCH 740/857] eclipse-plugin-scala: 4.3.0.201512011535 ->
 4.4.0.201604010956

---
 pkgs/applications/editors/eclipse/plugins.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 0e0c75fcfc880..87603f20b89a7 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -359,11 +359,11 @@ rec {
 
   scala = buildEclipseUpdateSite rec {
     name = "scala-${version}";
-    version = "4.3.0.201512011535";
+    version = "4.4.0.201604010956";
 
     src = fetchzip {
       url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
-      sha256 = "1j0qw4frkvvmyl64wdbznglgjjr9sfg8wb9npar0x7qv1hj4hw3x";
+      sha256 = "1yypzcf2iwlcj43vd6h9n4y2ka1gxjf5vm3yx87bgfbzbchzckz7";
     };
 
     meta = with stdenv.lib; {

From 9c2a49e76aef9aee9b25a6a48e1ba36954d560a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Apr 2016 23:22:46 +0200
Subject: [PATCH 741/857] mpv: 0.15.0 -> 0.16.0

---
 pkgs/applications/video/mpv/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index a38ab6e9b3df6..7fb62a5e1acce 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -58,12 +58,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-
-  name = "mpv-${meta.version}";
+  name = "mpv-${version}";
+  version = "0.16.0";
 
   src = fetchurl {
-    url = "https://github.com/mpv-player/mpv/archive/v${meta.version}.tar.gz";
-    sha256 = "1p0b83048g66icpz5n66v3k4ldr1z0rmg5d2rr7kcbspm1xj2cbx";
+    url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
+    sha256 = "1fiqxx85s418qynq2fp0v7cpzrz8j285hwmc4fqgn5ny1vg1jdpw";
   };
 
   patchPhase = ''
@@ -129,7 +129,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    version = "0.15.0";
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = http://mpv.io;
     license = licenses.gpl2Plus;

From 2dd01bdeb1c814d61c11e044624271efc691ba5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 5 Apr 2016 23:31:24 +0200
Subject: [PATCH 742/857] liferea: maintenance update 1.10.18 -> 1.10.19

---
 pkgs/applications/networking/newsreaders/liferea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index ff2b16b8a5802..6c061940b26d2 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.18";
+    version = "1.10.19";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0xyy0qm3h22b69if2hmg36jzvvljxb1w0zy2m2a28kdqfzpa6m8g";
+    sha256 = "1h6x8xd4ldrgw9mbf2gwf7wxi6z34h0d0rnwy9kyskdcgkymvi80";
   };
 
   buildInputs = with gst_all_1; [

From fd80407db30598ba0334c5019c0b4ce71a769530 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Mon, 4 Apr 2016 04:27:55 +0000
Subject: [PATCH 743/857] libsodium: 1.0.8 -> 1.0.10

---
 pkgs/development/libraries/libsodium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index 660ea28091230..1490e15c361f3 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.8";
+  name = "libsodium-1.0.10";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "09hr604k9gdss2r321x5dv3wn11fdl87nswr18g68lkqab993wf0";
+    sha256 = "1gn45g956lyz8l6iq187yc6l627vyivyp8qc5dkr6dnhdnlqddvi";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";

From 3e8f0201d0706da6e09e889fb71082ca263e9f80 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 5 Apr 2016 00:01:20 +0200
Subject: [PATCH 744/857] japa: init at 0.8.4

---
 pkgs/applications/audio/japa/default.nix | 30 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/applications/audio/japa/default.nix

diff --git a/pkgs/applications/audio/japa/default.nix b/pkgs/applications/audio/japa/default.nix
new file mode 100644
index 0000000000000..4efdaa86084a7
--- /dev/null
+++ b/pkgs/applications/audio/japa/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl,   alsaLib, libjack2, fftwFloat, libclthreads, libclxclient, libX11,  libXft, zita-alsa-pcmi, }:
+
+stdenv.mkDerivation rec {
+  version = "0.8.4";
+  name = "japa-${version}";
+
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "1jhj7s4vqk5c4lchdall0kslvj5sh91902hhfjvs6r3a5nrhwcp0";
+  };
+
+  buildInputs = [ alsaLib libjack2 fftwFloat libclthreads libclxclient libX11 libXft zita-alsa-pcmi ];
+
+  preConfigure = ''
+    cd ./source/
+  '';
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "SUFFIX=''"
+  ];
+
+  meta = {
+    description = "A 'perceptual' or 'psychoacoustic' audio spectrum analyser for JACK and ALSA";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/index.html;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 304a698df67df..fb0ff8f3d0152 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12772,6 +12772,8 @@ in
 
   jamin = callPackage ../applications/audio/jamin { };
 
+  japa = callPackage ../applications/audio/japa { };
+
   jedit = callPackage ../applications/editors/jedit { };
 
   jigdo = callPackage ../applications/misc/jigdo { };

From a81190237015922c0a930d2e839aa3dcd46ed688 Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Tue, 5 Apr 2016 19:11:36 -0700
Subject: [PATCH 745/857] anki: 2.0.33 -> 2.0.35

---
 pkgs/games/anki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index f4fff289fec86..a298b379c0f82 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-    version = "2.0.33";
+    version = "2.0.35";
 in
 stdenv.mkDerivation rec {
     name = "anki-${version}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
         "http://ankisrs.net/download/mirror/${name}.tgz"
         "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "1d5rf5gcw98m38wam6wh3hyh7qd78ws7zipm67xg744flqsjrzmr";
+      sha256 = "1d7k38xzw1nbg83d1aqxf2f76fv3hn2fry99k3vf4lgmhndj52mv";
     };
 
     pythonPath = [ pyqt4 pysqlite sqlalchemy pyaudio beautifulsoup httplib2 ]

From ea4fb2c887516552419fa431c988951eed21199a Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Tue, 5 Apr 2016 22:28:19 -0400
Subject: [PATCH 746/857] inspectrum: 20160103 -> 20160403

---
 pkgs/applications/misc/inspectrum/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/inspectrum/default.nix b/pkgs/applications/misc/inspectrum/default.nix
index 1736581a30f13..536582e4ee714 100644
--- a/pkgs/applications/misc/inspectrum/default.nix
+++ b/pkgs/applications/misc/inspectrum/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, fftwFloat, qt5 }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, boost, fftwFloat, qt5, gnuradio }:
 
 stdenv.mkDerivation rec {
   name = "inspectrum-${version}";
-  version = "20160103";
+  version = "20160403";
 
   src = fetchFromGitHub {
     owner = "miek";
     repo = "inspectrum";
-    rev = "a60d711b46130d37b7c05074285558cd67a28820";
-    sha256 = "1q7izpyi7c9qszygiaq0zs3swihxlss3n52q7wx2jq97hdi2hmzy";
+    rev = "27381dbb30f59267a429c04d17d792d3953a6b99";
+    sha256 = "0y4j62khq6fcv2qqlqi0kn2ix821m5gcqzg72nhc2zzfb3cdm9nm";
   };
 
-  buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat ];
+  buildInputs = [ pkgconfig cmake qt5.qtbase fftwFloat boost gnuradio ];
   
   meta = with stdenv.lib; {
     description = "Tool for analysing captured signals from sdr receivers";

From 64205427ce0dabd7c81db17fec3462d9fa0a5137 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Tue, 5 Apr 2016 22:40:00 -0400
Subject: [PATCH 747/857] platformio: 2.8.3 -> 2.8.6

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f55d60a21ba54..0e854f0b459da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15595,13 +15595,13 @@ in modules // {
 
   platformio =  buildPythonPackage rec {
     name = "platformio-${version}";
-    version="2.8.3";
+    version="2.8.6";
 
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/platformio/platformio-${version}.tar.gz";
-      sha256 = "1lz5f7xc53bk8ri4806xfpisvhyqdxdniwk0ywifinnhzx47jgp7";
+      sha256 = "1l8jcwf8flmx8xcsvly2my8al8nzjr67h3mg5c9wvdr7a42q7dil";
      };
 
      propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama];

From b3732a77c6a73a6de7e12d20afdfd5b7134d87a7 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Tue, 5 Apr 2016 23:02:13 -0400
Subject: [PATCH 748/857] sopel: 6.3.0 -> 6.3.1

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f55d60a21ba54..807b3474969e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19957,11 +19957,11 @@ in modules // {
   };
 
   sopel = buildPythonPackage rec {
-    name = "sopel-6.3.0";
+    name = "sopel-6.3.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz";
-      sha256 = "10g3p603qiz4whacknnslmkza5y1f7a8blq1q07dfrny4442c6nb";
+      sha256 = "1swvw7xw8n5anb8ah8jilk4vk1y30y62fkibfd9vm9fbk45d1q48";
     };
 
     buildInputs = with self; [ pytest ];

From 3e9b101522c164dd7c5fa4a17a21d6d834b7cf25 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 6 Apr 2016 02:39:17 -0300
Subject: [PATCH 749/857] libast: init at 0.7

---
 pkgs/development/libraries/libast/default.nix | 22 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/libast/default.nix

diff --git a/pkgs/development/libraries/libast/default.nix b/pkgs/development/libraries/libast/default.nix
new file mode 100644
index 0000000000000..d392f9a38e1d2
--- /dev/null
+++ b/pkgs/development/libraries/libast/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl
+, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "libast-${version}";
+  version = "0.7";
+  
+  src = fetchurl {
+    url = "http://www.eterm.org/download/${name}.tar.gz";
+    sha256 = "1w7bs46r4lykfd83kc3bg9i1rxzzlb4ydk23ikf8mx8avz05q1aj";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "Library of Assorted Spiffy Things";
+    homepage = "http://www.eterm.org";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 58cb5d5af7467..6d65344de93e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7259,6 +7259,8 @@ in
 
   libass = callPackage ../development/libraries/libass { };
 
+  libast = callPackage ../development/libraries/libast { };
+
   libassuan = callPackage ../development/libraries/libassuan { };
 
   libasyncns = callPackage ../development/libraries/libasyncns { };

From bd7ce5ac7f34c4230762903e414a990f212f2d59 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 6 Apr 2016 02:40:17 -0300
Subject: [PATCH 750/857] Eterm: init at 0.9.6

---
 pkgs/applications/misc/eterm/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/misc/eterm/default.nix

diff --git a/pkgs/applications/misc/eterm/default.nix b/pkgs/applications/misc/eterm/default.nix
new file mode 100644
index 0000000000000..b622cf46cc82d
--- /dev/null
+++ b/pkgs/applications/misc/eterm/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl
+, libX11, libXext, libXaw
+, pkgconfig, imlib2, libast }:
+
+stdenv.mkDerivation rec {
+  name = "eterm-${version}";
+  version = "0.9.6";
+  srcName = "Eterm-${version}";
+
+  src = fetchurl {
+    url = "http://www.eterm.org/download/${srcName}.tar.gz";
+    sha256 = "0g71szjklkiczxwzbjjfm59y6v9w4hp8mg7cy99z1g7qcjm0gfbj";
+  };
+
+  buildInputs = [ libX11 libXext libXaw pkgconfig imlib2 ];
+  propagatedBuildInputs = [ libast ];
+
+  meta = with stdenv.lib; {
+    description = "Terminal emulator";
+    homepage = "http://www.eterm.org";
+    license = licenses.bsd2;
+    maintainers = [ maintainers.AndersonTorres ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d65344de93e2..40984e5ea022a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12210,6 +12210,8 @@ in
 
   esniper = callPackage ../applications/networking/esniper { };
 
+  eterm = callPackage ../applications/misc/eterm { };
+
   etherape = callPackage ../applications/networking/sniffers/etherape {
     inherit (gnome) gnomedocutils libgnome libglade libgnomeui scrollkeeper;
   };

From e1ab998776a5b9bf20a7abf8b996d70d190f9cae Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 6 Apr 2016 08:53:10 +0200
Subject: [PATCH 751/857] pharo-spur: 2016.02.15 -> 2016.04.04

---
 pkgs/development/pharo/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 0628e8545e73b..9e6ae40b67d5e 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -16,12 +16,12 @@ rec {
   };
 
   pharo-spur = pharo-vm-build rec {
-    version = "2016.02.15";
+    version = "2016.04.04";
     name = "pharo-vm-spur-i386-${version}";
     binary-basename = "pharo-spur-vm";
     src = fetchurl {
       url = "${base-url}/pharo-vm-spur-${version}.tar.bz2";
-      sha256 = "1lyz6wkxg9cmhgbg32a27kyj1syvk3p3015ga83z98353xlz91rx";
+      sha256 = "1kmf782vdk9xbzi2yn1vpzksv8m04ry8n2ih16jhcihibxzcmz23";
     };
   };
 }

From 21cb5fcf785c3359f9780f0cd21473115180d7a0 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 6 Apr 2016 08:53:53 +0200
Subject: [PATCH 752/857] pharo-no-spur: 2015.08.06 -> 2016.02.18

---
 pkgs/development/pharo/vm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 9e6ae40b67d5e..2dc3cbc3ff99e 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -6,12 +6,12 @@ rec {
   base-url = http://files.pharo.org/vm/src/vm-unix-sources/blessed;
 
   pharo-no-spur = pharo-vm-build rec {
-    version = "2015.08.06";
+    version = "2016.02.18";
     name = "pharo-vm-i386-${version}";
     binary-basename = "pharo-vm";
     src = fetchurl {
       url = "${base-url}/pharo-vm-${version}.tar.bz2";
-      sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
+      sha256 = "16n2zg7v2s1ml0vvpbhkw6khmgn637sr0d7n2b28qm5yc8pfhcj4";
     };
   };
 

From cfad82119ba1911d74721ffc8aeca790ee04842f Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Wed, 6 Apr 2016 09:43:25 +0200
Subject: [PATCH 753/857] telegram-cli: 2015-07-30 -> 2016-03-23

---
 .../instant-messengers/telegram/telegram-cli/default.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
index b5bd22f887719..527d618328616 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-cli/default.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "telegram-cli-2015-07-30";
+  name = "telegram-cli-2016-03-23";
 
   src = fetchgit {
     url = "https://github.com/vysheng/tg.git";
-    sha256 = "0phn9nl0sf2fylzfwi427xq60cfrnpsvhh8bp55y1wcjkmp0fxsn";
-    rev = "2052f4b381337d75e783facdbfad56b04dec1a9c";
+    sha256 = "07x6172nyipbz4bk7n417a2ydj5r7y1ch2zl3hp79nckfw11fix7";
+    rev = "6547c0b21b977b327b3c5e8142963f4bc246187a";
   };
 
   buildInputs = [

From 3d412dd84e9bfba82633b76b5c97f52416f11a2b Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Wed, 6 Apr 2016 09:45:35 +0200
Subject: [PATCH 754/857] nodejs: 5.10.0 -> 5.10.1

---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index a96e50008292f..5cb87ecc0764c 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -6,7 +6,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.10.0";
+  version = "5.10.1";
 
   deps = {
     inherit openssl zlib libuv;
@@ -30,7 +30,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0avn25j04q172ri8mksrryyg4g95k7x2pqzsbmp1nr6ybfpvkblg";
+    sha256 = "1kdaahq3h89c7mz2qbqx43qdigsswl1i8ll5vw6j8g5m2av7iqn6";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From b95a1c4f774e37ee605c3c196e1b0d3143d268cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 25 Mar 2016 09:50:08 +0000
Subject: [PATCH 755/857] kernel: fix build of 3.10 and 3.12 on i686
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 23730413fef4be7fe365f452fcaef16c5f4e4b1b)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 .../linux/kernel/gcc5-link-apm.patch          | 29 ++++++++++++
 .../linux/kernel/gcc5-link-lguest.patch       | 46 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/patches.nix     | 10 ++++
 pkgs/top-level/all-packages.nix               |  4 +-
 4 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/kernel/gcc5-link-apm.patch
 create mode 100644 pkgs/os-specific/linux/kernel/gcc5-link-lguest.patch

diff --git a/pkgs/os-specific/linux/kernel/gcc5-link-apm.patch b/pkgs/os-specific/linux/kernel/gcc5-link-apm.patch
new file mode 100644
index 0000000000000..e415c2d9f2b40
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/gcc5-link-apm.patch
@@ -0,0 +1,29 @@
+From 54c2f3fdb941204cad136024c7b854b7ad112ab6 Mon Sep 17 00:00:00 2001
+From: Andi Kleen <ak@linux.intel.com>
+Date: Mon, 5 Aug 2013 15:02:45 -0700
+Subject: x86, asmlinkage, apm: Make APM data structure used from assembler
+ visible
+
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+Link: http://lkml.kernel.org/r/1375740170-7446-12-git-send-email-andi@firstfloor.org
+Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
+---
+ arch/x86/kernel/apm_32.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
+index 53a4e27..3ab0343 100644
+--- a/arch/x86/kernel/apm_32.c
++++ b/arch/x86/kernel/apm_32.c
+@@ -392,7 +392,7 @@ static struct cpuidle_device apm_cpuidle_device;
+ /*
+  * Local variables
+  */
+-static struct {
++__visible struct {
+ 	unsigned long	offset;
+ 	unsigned short	segment;
+ } apm_bios_entry;
+-- 
+cgit v0.12
+
diff --git a/pkgs/os-specific/linux/kernel/gcc5-link-lguest.patch b/pkgs/os-specific/linux/kernel/gcc5-link-lguest.patch
new file mode 100644
index 0000000000000..b2474f572ae13
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/gcc5-link-lguest.patch
@@ -0,0 +1,46 @@
+From cdd77e87eae52b7251acc5990207a1c4500a84ce Mon Sep 17 00:00:00 2001
+From: Andi Kleen <ak@linux.intel.com>
+Date: Tue, 5 Nov 2013 21:22:28 +1030
+Subject: x86, asmlinkage, lguest: Pass in globals into assembler statement
+
+Tell the compiler that the inline assembler statement
+references lguest_entry.
+
+This fixes compile problems with LTO where the variable
+and the assembler code may end up in different files.
+
+Cc: x86@kernel.org
+Cc: rusty@rustcorp.com.au
+Signed-off-by: Andi Kleen <ak@linux.intel.com>
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+ drivers/lguest/x86/core.c | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/lguest/x86/core.c b/drivers/lguest/x86/core.c
+index 5169239..922a1ac 100644
+--- a/drivers/lguest/x86/core.c
++++ b/drivers/lguest/x86/core.c
+@@ -157,7 +157,7 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages)
+ 	 * stack, then the address of this call.  This stack layout happens to
+ 	 * exactly match the stack layout created by an interrupt...
+ 	 */
+-	asm volatile("pushf; lcall *lguest_entry"
++	asm volatile("pushf; lcall *%4"
+ 		     /*
+ 		      * This is how we tell GCC that %eax ("a") and %ebx ("b")
+ 		      * are changed by this routine.  The "=" means output.
+@@ -169,7 +169,9 @@ static void run_guest_once(struct lg_cpu *cpu, struct lguest_pages *pages)
+ 		      * physical address of the Guest's top-level page
+ 		      * directory.
+ 		      */
+-		     : "0"(pages), "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir))
++		     : "0"(pages), 
++		       "1"(__pa(cpu->lg->pgdirs[cpu->cpu_pgd].pgdir)),
++		       "m"(lguest_entry)
+ 		     /*
+ 		      * We tell gcc that all these registers could change,
+ 		      * which means we don't have to save and restore them in
+-- 
+cgit v0.12
+
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 67f6ad9c94a14..a8fb1598af7e9 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -35,6 +35,16 @@ in
 
 rec {
 
+  link_lguest =
+    { name = "gcc5-link-lguest";
+      patch = ./gcc5-link-lguest.patch;
+    };
+
+  link_apm =
+    { name = "gcc5-link-apm";
+      patch = ./gcc5-link-apm.patch;
+    };
+
   bridge_stp_helper =
     { name = "bridge-stp-helper";
       patch = ./bridge-stp-helper.patch;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40984e5ea022a..f8a5bdb8605fe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10378,7 +10378,7 @@ in
   };
 
   linux_3_10 = callPackage ../os-specific/linux/kernel/linux-3.10.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+    kernelPatches = with kernelPatches; [ bridge_stp_helper link_lguest link_apm ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill
@@ -10387,7 +10387,7 @@ in
   };
 
   linux_3_12 = callPackage ../os-specific/linux/kernel/linux-3.12.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper kernelPatches.crc_regression ]
+    kernelPatches = with kernelPatches; [ bridge_stp_helper crc_regression link_lguest ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
       [ kernelPatches.mips_fpureg_emu
         kernelPatches.mips_fpu_sigill

From b77df197f5d91eee6951fc594c17e9b225fc41ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 6 Apr 2016 12:29:45 +0100
Subject: [PATCH 756/857] phantomjs2: 2.0.0 -> 2.1.1 (fix build)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 94036474c2b424ac19c4e8e30b5b026210649789)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/development/tools/phantomjs2/default.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/phantomjs2/default.nix b/pkgs/development/tools/phantomjs2/default.nix
index a0f919b404f37..e5af795fa4b79 100644
--- a/pkgs/development/tools/phantomjs2/default.nix
+++ b/pkgs/development/tools/phantomjs2/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl,
+{ stdenv, fetchgit,
   bison2, flex, fontconfig, freetype, gperf, icu, openssl, libjpeg, libpng, perl, python, ruby, sqlite,
   darwin, writeScriptBin, cups
 }:
@@ -33,11 +33,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "phantomjs-${version}";
-  version = "2.0.0-20150528";
+  version = "2.1.1";
 
-  src = fetchurl {
-    url = "https://github.com/bprodoehl/phantomjs/archive/v2.0.0-20150528.tar.gz";
-    sha256 = "18h37bxxg25lacry9k3vb5yim057bqcxmsifw97jrjp7gzfx56v5";
+  # needs git submodules, so can't use fetchFromGitHub
+  src = fetchgit {
+    rev = "refs/tags/${version}";
+    url = "https://github.com/ariya/phantomjs.git";
+    sha256 = "16x104cw5f1dyhf7fg12vlpcywvc9c43r9afhl0dvssgxklrn0q7";
   };
 
   buildInputs = [ bison2 flex fontconfig freetype gperf icu openssl libjpeg libpng perl python ruby sqlite ]
@@ -49,7 +51,8 @@ in stdenv.mkDerivation rec {
 
   patchPhase = ''
     patchShebangs .
-    sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure 
+    sed -i -e 's|/bin/pwd|pwd|' src/qt/qtbase/configure
+    touch src/qt/{qtbase,qtwebkit,3rdparty}/.git
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's,-licucore,/usr/lib/libicucore.dylib,' src/qt/qtwebkit/Source/WTF/WTF.pri
     substituteInPlace src/qt/qtwebkit/Tools/qmake/mkspecs/features/features.pri \
@@ -78,7 +81,9 @@ in stdenv.mkDerivation rec {
 
   __impureHostDeps = stdenv.lib.optional stdenv.isDarwin "/usr/lib/libicucore.dylib";
 
-  buildPhase = "./build.sh --confirm";
+  buildPhase = "./build.py --confirm -j$NIX_BUILD_CORES";
+
+  enableParallelBuilding = true;
 
   installPhase = ''
     mkdir -p $out/share/doc/phantomjs

From e9842ea8d797b7e6cd93b2d5a74a0f9c49fa4934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 6 Apr 2016 12:42:35 +0100
Subject: [PATCH 757/857] kernelHeaders: fix build with libmpc

---
 pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index e4ce19457058f..06261f59d9d93 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, perl }:
+{ stdenv, kernel, perl, libmpc }:
 
 let
   baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ];
@@ -7,7 +7,7 @@ in stdenv.mkDerivation {
 
   inherit (kernel) src patches;
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl libmpc ];
 
   buildFlags = [ "ARCH=${stdenv.platform.kernelArch}" ] ++ baseBuildFlags;
 

From c8502034872878c85dcd1d8294eb1b5aa8073536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 6 Apr 2016 12:42:45 +0100
Subject: [PATCH 758/857] linuxHeaders: add platforms

---
 pkgs/os-specific/linux/kernel-headers/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index 06261f59d9d93..de30938f33a63 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -22,4 +22,6 @@ in stdenv.mkDerivation {
 
   # Headers shouldn't reference anything else
   allowedReferences = [];
+
+  meta.platforms = stdenv.lib.platforms.linux;
 }

From c6e6c68b5de67627a7715bf8335ca1f4121b841c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Apr 2016 00:41:33 +0200
Subject: [PATCH 759/857] pythonPackages.fusepy: 2.0.2 -> 2.0.4

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30bcb9801adad..b88bbd51a4b38 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9538,11 +9538,11 @@ in modules // {
   });
 
   fusepy = buildPythonPackage rec {
-    name = "fusepy-2.0.2";
+    name = "fusepy-2.0.4";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/f/fusepy/${name}.tar.gz";
-      sha256 = "1z0va3z1hzjw167skl21k9dsklbmr46k66j80qadibjc8vajjnda";
+      sha256 = "0v5grm4zyf58hsplwsxfbihddw95lz9w8cy3rpzbyha287swgx8h";
     };
 
     propagatedBuildInputs = [ pkgs.fuse ];

From 5d142bd94ce16db18675db6e74a32d0b47965bf0 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Wed, 6 Apr 2016 15:41:27 +0200
Subject: [PATCH 760/857] uncertainties: 2.4.6.1 -> 2.4.8.1

---
 pkgs/top-level/python-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index da81848ecc8f7..9ef8a6883c987 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24559,11 +24559,12 @@ in modules // {
 
 
   uncertainties = buildPythonPackage rec {
-    name = "uncertainties-2.4.6.1";
+    name = "uncertainties-${version}";
+    version = "2.4.8.1";
 
     src = pkgs.fetchurl {
-       url = "https://github.com/lebigot/uncertainties/archive/2.4.6.1.tar.gz";
-       sha256 = "993ad1a380185ff9548510401ed89fe96cf1f18ca48b44657356c8dcd3ad5032";
+       url = "https://github.com/lebigot/uncertainties/archive/${version}.tar.gz";
+       sha256 = "1j5z0h5l3plsywsmwjpaggkr6rn5cjxw0lhkwgl6a8a25f8bz4pz";
     };
 
     buildInputs = with self; [ nose numpy ];

From 59ef7d25c3944f2b46461181f6bc99f183389644 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 6 Apr 2016 15:50:01 +0200
Subject: [PATCH 761/857] nvidia-x11: 358.16 -> 361.42

This fixes the segfault reported in #13942 caused by missing
libEGL.so.0 and libEGL_nvidia.so.0 symlinks.
---
 pkgs/os-specific/linux/nvidia-x11/builder.sh  | 21 ++++++++++---------
 pkgs/os-specific/linux/nvidia-x11/default.nix |  6 +++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index c1f165c45dd54..1f4671a761573 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -34,6 +34,8 @@ installPhase() {
     cp -prd *.so.* tls "$out/lib/"
     rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately
 
+    rm $out/lib/libGL.so.1.* # GLVND
+
     if test -z "$libsOnly"; then
         # Install the X drivers.
         mkdir -p $out/lib/xorg/modules
@@ -60,16 +62,18 @@ installPhase() {
 
       libname_short=`echo -n "$libname" | sed 's/so\..*/so/'`
 
-      # nvidia's EGL stack seems to expect libGLESv2.so.2 to be available
-      if [ $(basename "$libname_short") == "libGLESv2.so" ]; then
-          ln -srnf "$libname" "$libname_short.2"
-      fi
-
       if [[ "$libname" != "$libname_short" ]]; then
         ln -srnf "$libname" "$libname_short"
       fi
-      if [[ "$libname" != "$libname_short.1" ]]; then
-        ln -srnf "$libname" "$libname_short.1"
+
+      if [[ $libname_short =~ libEGL.so || $libname_short =~ libEGL_nvidia.so ]]; then
+          major=0
+      else
+          major=1
+      fi
+
+      if [[ "$libname" != "$libname_short.$major" ]]; then
+        ln -srnf "$libname" "$libname_short.$major"
       fi
     done
 
@@ -119,9 +123,6 @@ installPhase() {
     # For simplicity and dependency reduction, don't support the gtk3 interface.
     rm $out/lib/libnvidia-gtk3.*
 
-    # We distribute these separately in `libvdpau`
-    rm "$out"/lib/libvdpau{.*,_trace.*}
-
     # Move VDPAU libraries to their place
     mkdir "$out"/lib/vdpau
     mv "$out"/lib/libvdpau* "$out"/lib/vdpau
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index fff1135d31186..e67df53c9ed0a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "358.16";
+  versionNumber = "361.42";
 
   # Policy: use the highest stable version as the default (on our master).
   inherit (stdenv.lib) makeLibraryPath;
@@ -28,12 +28,12 @@ stdenv.mkDerivation {
     if stdenv.system == "i686-linux" then
       fetchurl {
         url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1cc0zsri92nz2mznabfd6pqckm9mlbszmysqqqh3w5mipwn898nk";
+        sha256 = "10jfdrmjcddgp7kg9l3dwxjh4b7sdrg86nwaf6zalfnsc9zh8bg3";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "1xr16faam2zsx8ajwm9g9302m6qjzyjh1zd56g8jhc8jxg8h43sg";
+        sha256 = "04yyrzk4xzq1i386mdxfwg4dqiclvj1fm195qsqy0r79zmpc3kq4";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 

From b95274cc90b566daf98cf0bb0645438b7ffeb163 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 6 Apr 2016 16:34:02 +0300
Subject: [PATCH 762/857] kernel: Don't patchELF manually

AFAICT this is done by stdenv nowadays:

https://github.com/NixOS/nixpkgs/blob/bde82098b88861a27faadc8a69b597510e56d846/pkgs/development/tools/misc/patchelf/setup-hook.sh#L5
https://github.com/NixOS/nixpkgs/blob/bde82098b88861a27faadc8a69b597510e56d846/pkgs/stdenv/generic/setup.sh#L737

Might help /be somehow related to these mysterious errors that seem to
occur sometimes (?):

http://hydra.nixos.org/build/34131589/nixlog/1/raw
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 238b7ecd242c6..67342d4ab8ae3 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -190,15 +190,6 @@ let
           $installFlags "''${installFlagsArray[@]}"
       '');
 
-      # !!! This leaves references to gcc in $dev
-      # that we might be able to avoid
-      postFixup = if isModular then ''
-        # !!! Should this be part of stdenv? Also patchELF should take an argument...
-        prefix=$dev
-        patchELF
-        prefix=$out
-      '' else null;
-
       meta = {
         description =
           "The Linux kernel" +

From a4e7cc58bb7829c52907c6047ee48720b0a9c544 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Wed, 6 Apr 2016 15:31:04 +0100
Subject: [PATCH 763/857] pythonPackages.cgkit: init at 2.0.0

---
 .../python-modules/cgkit/scons-env.patch      | 22 ++++++++++++++++
 pkgs/top-level/python-packages.nix            | 25 +++++++++++++++++++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/cgkit/scons-env.patch

diff --git a/pkgs/development/python-modules/cgkit/scons-env.patch b/pkgs/development/python-modules/cgkit/scons-env.patch
new file mode 100644
index 0000000000000..65e9d58a0ae49
--- /dev/null
+++ b/pkgs/development/python-modules/cgkit/scons-env.patch
@@ -0,0 +1,22 @@
+diff --git a/supportlib/SConstruct b/supportlib/SConstruct
+index 7f797b9..07907e9 100644
+--- a/supportlib/SConstruct
++++ b/supportlib/SConstruct
+@@ -5,7 +5,7 @@
+ # library.
+ ######################################################################
+ 
+-import sys, glob, os.path
++import sys, glob, os.path, os
+ 
+ # Read the options
+ vars = Variables("cpp_config.cfg")
+@@ -16,7 +16,7 @@ vars.Add("CPPPATH", "The include directories", [])
+ vars.Add("MSVS_VERSION", "The preferred version of MS Visual Studio")
+ 
+ # Create the construction environment
+-env = Environment(variables = vars)
++env = Environment(variables = vars, ENV = os.environ)
+ 
+ # Build the files in "obj"
+ env.VariantDir("obj", "src", duplicate=0)
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5608f75b15c44..4570586420df2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2946,6 +2946,31 @@ in modules // {
     };
   };
 
+  cgkit = buildPythonPackage rec {
+    version = "2.0.0";
+    name = "cgkit-${version}";
+    disabled = isPy3k;
+
+    src = pkgs.fetchurl {
+      url = "http://downloads.sourceforge.net/project/cgkit/cgkit/cgkit-${version}/cgkit-${version}-py2k.tar.gz";
+      sha256 = "0vvllc42mdyma3c7yqhahs4bfxymm2kvmc4va7dxqr5x0rzh6rd6";
+    };
+
+    patches = [ ../development/python-modules/cgkit/scons-env.patch ];
+
+    buildInputs = with pkgs; [ scons boost mesa ];
+
+    preBuild = ''
+      cd supportlib
+      scons
+      cd -
+    '';
+
+    meta = {
+      homepage = http://cgkit.sourceforge.net;
+      description = "Python Computer Graphics Kit";
+    };
+  };
 
   cheetah = buildPythonPackage rec {
     version = "2.4.4";

From 33530b5bd125de65a4ef9d5963886c1a0b87f356 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Apr 2016 16:12:36 +0200
Subject: [PATCH 764/857] wcslib: 5.14 -> 5.15

---
 pkgs/development/libraries/wcslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index b6ca281f05308..08258f677a400 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "5.14";
+  version = "5.15";
   name = "wcslib-${version}";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
-    sha256 ="0zz3747m6gjzglgsqrrslwk2qkb6swsx8gmaxa459dvbcg914gsd";
+    sha256 ="1s2nig327g4bimd9xshlk11ww09a7mrjmsbpdcd8smsmn2kl1glb";
   };
 
   enableParallelBuilding = true;

From 8be8b6c713c97d3014eb01aa5a6f85d76f094acd Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 6 Apr 2016 23:37:50 +0900
Subject: [PATCH 765/857] thunderbird-bin: 38.7.1 -> 38.7.2

---
 .../mailreaders/thunderbird-bin/sources.nix   | 234 +++++++++---------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index e3ffa283ad9e5..781e2d27e55ab 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "38.7.1";
+  version = "38.7.2";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha256 = "186ba5f03adc7cb94c69351f5edcf241abdba1a3602f9b140a46682cb94b053c"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "7c6308024524c8ba458bb43cace95bdf92dfa7d797c7ff936598257c018e4807"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "61de0fc548ff70367334c82bec580caa895f3db63c6b045c5a717bfa282e69db"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "34c935a0b162e182a341699782143cad1e225ea63bf314c158d25f629889c5e1"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "4442d37c8bb411c5c151bd98d06a375dc8ffcf72fee4d03bed6ac8691ccd8e2c"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "e7226b6b42e7cfe4d36c430eca755f5deae8899fd64ea1877ad576f96fe29b8c"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "eaf46e571b55800dfaf63a807236e8bf5fa8e8ba77bc996830ab0dfcdce23300"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "62edb0cee78dd88a871355c996107901456f1fb70793d21209e75875c33d91a3"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "76e3222d9b7bc4f5948c56be6248deb23c1777550f497f115487e323c16b2f95"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "b7ad9dd397abb89b844f8a1adbd34d0dfdea6bb85b3f8ad5d5f297e7f8b1b081"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "b10c7e572ba88f79acb2d57988308c5af6fde268f64434956c4312f8a7c3ed42"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "174f671aa90307e4dd6756d60f37a0b628d7d1cee8c7bb623a1a32c55b26a967"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "b966f3381a30567db88890dd3885c56f9cf367d9c92e192d0c6c79066e482c91"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "e5d96ddd9ed6b685b872d90e95bded23124e21575e9e0bcb7aeaa77ef0226009"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "fdbe97bc87656569b20d8154619cd7b3b5c3b03cbbcd7ff2f1e07a3af547bb41"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "b24ea0ae2977d9380cadfd130f83971e798677ce956152d794523e90a54222e6"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "ba39bd39698ad0486e22806ff468b9a763712f35e943b93e6021365dc061c2ce"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "f51e4dcaeac1aeb53d858d029c34c366e948616f7ca3f35eb22b165fd2839376"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "511441bfe56749643f59e10c9219b8c3192d64c50008ee3d8a2dc342993c0133"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "9f60a1c06da4e61a415359eeaed831d61a8c8ad377952948c1475ee6a2bc0cd3"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "d48939ad0dab7c4829cd41cd6afe9239d12ab2a2337296203b660613cbba2698"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "6b1398161ab1271caa14b20c4ad0b3e4372fca743b4ae2e3d5bd1d77d8038c15"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "c30f3fea47cca28fcc928d813e8c631db43a665d8f347f174b23ef3c1fdd7550"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "592b18fa8ff3749c7a68b5f5406f5ae42f9f97e47cc8c2f9c18b242c8f192b8d"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "1ccdde8b11337e75feabbd1e40f1316c287862769d0b9c37934f22108c74bf1a"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "acb837b0120f00f6cb39e447e86cb140c0cabbe599bff70d85429126df377d85"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "ba4c223c22fda306f4b66daa6ed0d157c5c24489ec7627e1124c9f79b5aca989"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "f4bb5a60493f3fbf519a55dc7ff2fa7bb455ad344d27b133addb2864f9d9d100"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "205729f0ce14666ef98b7e23dad0882d450a508b568fc1d2c99cdfffd2cc9547"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "7c7cb801ea902f93e57f944209e1358bcbe73f8ee312112e94ade2a2ef4b1194"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "8bbb39afd31656bc7cdab60b179e0a5bb9d9d9fed62e1ad398dfc5c0f40a35ab"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0d86ebebfd2ba294b0f27b5eb84b083a7c8cecc8fea944705525831cf3c161b8"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "76673ffb93fb3b902366c5939619dfa11ecd724dc5ff37fe769d598dc937c353"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "6e7098cf9eb6f1b55d7504b341b709133fb5d4d20cb761984647422749b71615"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "3de2c84af3c7111a306e35f1f7304bf7a77a0e50c8d2c9bfbc896a11a6a23e5d"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "a2bb5c2b6e174a65cf825293f57cc1628930686f6a674d2cb7fcee6aaf755afc"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "f0ec8c9613ee04c7f7c1b55cb81386036220a715b58edc302e2099882e2c642d"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "3ed3c4431fc604fbc05b6f17c9c6e74057278e9ef85480d60ea638843eab1394"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "e4dac93472bc5f41a75daf9ca18265de527b5fc621812bde2c634f1fa5a4692c"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "8a30c0c7a586f598e6065f20b2a0dc1e105f59d3e4adac8167da462e8e0193d2"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "adfe8aca07faf08ba780ca0f84d638d461f4a0f00b92d5a9cebe8102a94bce79"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "19ccb4a2ec44b1c8edce204627af3d0e84f214591d3b7a4f6e67e297dd9db0f9"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "88f763080b2bbfb8957ed6b52189f2195b3317a1bfb851a6e686765e8a12181a"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "5955d594802281794ef25e9fda196206464ac0594ce12e957b5c40c589c89ad0"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7fb849565e25b1bba853b434d7f0207bfc9b3f39251f08edf65a8a38ccd0dd96"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "b56cd8b5fc665ad24061fdf2ac3196aff9f953395e894007b133bc83f676be33"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "860dca420cd8c6c18bc703ab4934948e038b4e7e91a1d80d3f632980f0799424"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "4e8723dacd9a4961f02fece36066166c044880fbc0c7aab4e0f1289a36bd22c6"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "fd071bf547ba0baaf13141e30f34c15108fb6e44432b02d55508cf3dfca91cdb"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b999261eb53e28c5b43fa5d3ffcb2f9c12cca45a38c6e8fc56a342b1a5dda78a"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "2c2e7d7a459dd85f88fb3839002e2eb602d47ce5df4d0572928d8a35a0df4773"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "0c540f0ffb1224c8d3b18423690f319d25ff5e0c004d18cc8bc6b7d69ecbc48a"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "5d7e14f94f53c7623dc4fce69aa991a67792e0d2405a6c7044558d5023ea0cc0"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "6355145ae642332d1798f8ce169cb85cc930af6add6c8cda142e8183666fdb71"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "897eca9ffdbf28f3d3f720dd44f68f67a289e4d2aff91005c180688b34358b08"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "43d2cf464be8be57a5d2bdba1683e6179641448e351d9a8bee9889febe1ebefd"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "5e6b806364d7e97384bf3f30e4f398c8041cd8acc000b21edcf218ca24e1903a"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "5b96ea401ec1af9473cc57e4f09f6f264598e52196dd9da38cebe3e802649fc9"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3fbd40d914f9347f09848ffb3486d1cec9734f9ae3cc969bc71a8d9c61aea92b"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "9f60903ccb571eebdf7fab4c62e1f0675d4c7f5bcbca7589e669c931b355b55a"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "bd0e53bb5d792c9caf2aedc67cf1df2281d234905b96748766446e842448e39e"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "f7bc98632e15fb73c61c5fd54c3e349e93f3f07b61ee92d704b105b05386949d"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "6361b21f9a57468cb8e6273805437d4a40f90c0b461d447b17543f84f9cae8c2"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "df4d4ef5a25a8aa2f9cbbfef2425056c19b568030e2b217f9bb535fcd81cc017"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "def27fdc02da10e148b3312199826157b981165a98ea9a3f5135866092e07ad3"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "3c55c72d8b9936dc0b0ecf2e88024d4e128f4cbdb32ec5770d4caa930e12d696"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "7f1e39da21362857afd57151b0bb606c7a8b52f0ea1362cbb5bf9c4eb9b18db8"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "3b70e990616d999c572a9e95f92dc62b004f5449891778a6530ee81dc1f42703"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "7023635ab8fde872b41b08f523128721863091d7bd7e76646ea2f2929a667719"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "370075633a30d3f4afbe69c617ecc4df33e51aa95704ef9fff599a13e9cb3ab2"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "f143791c658916ee2ddac2199293ded234cfd8201cd6399775ccb996cb784e18"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "5d48abb53a5b71be190dc4c127c5718704fbc12590c2c5fbcf3b4046f9840415"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "319df90e458817537f7323e97c3d7fdeb2fd965a215b1173f87378b3c94e3ac7"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "2f93a35135f387c8cb2e4ca4b0c800f846596d0f93350f3be0983797a0571359"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "8e3d9003a67a0d38821dae7a070eebe32698ae6a89272394d4f7faea91595360"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "bf2bb1676c5966b6fdcf34c93eb3444ed0f3dd6ed03c8e2a39f6757811bf0e7f"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "e938fcf2e84bc19d766c89312f8ca8e055ffeaf7fe20ba8d616aeb0b862cd064"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "ab0b01922e883a34874de33f6eae08a8e4e40d23dd7ddcdf42254386218728e6"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "fd3fd9fe5280365a27ef4e81f7965da2e85ad149e4e026f6a8714a73d976eeb2"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "6a68c72828036a256a8d04b1678be58c786671ef97f106b23812ebcf149f1d15"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "26bb8ca3617c70d1126ef4111787ab267bc6dcd28b2b995e07b7296bdf24723b"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "de6ac16163aab662ba4fef2130dd822ec9cfecc0f4beec54f2017785fec8eb0a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "82c459a487d2a7b156f92db36e85c815c714d59474ed9bd8cde46b08c69f1d57"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "1f4caae64ced0c69fe6ba6330921fce0d220b616a0eb8b1e696da85cdcf5ec01"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "830b649a394cd844bb1b159a76d265455f6ace76dec6697491367b2f6eff1588"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "e89e906cd896c8e04754a9658dc72617954e0a097e6e3b648e5ce827c8cec7d7"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "260fc959ce74945d827c230124a451cec75b6347b78d7d8bbeb65a2bd91f5bd8"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "aa416170d0d04d0e2e570d0b0874b6c585d706f8b670de3c24bc5a9ce9819d8d"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "a24ec33c8812921ad0f15dd4306218a2443f7018be5141bcc8e87e0ce3f52929"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "5c8bb4872206cacd17cfb77ed3cf58024cdc81be181908213f80659c4d36594b"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "06bde08af3d4b73db3f0a8b87f4f5f3bbc95fd92d717a9ac83efddb7ebc0f12b"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "6adf1e6992b05b6c93152bb19a79fe39f319b5a5a62d2491191544eaaabbcc1b"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "3f757064e857d8c4d025c0de8325b3bfd81648ac2b77ee11ca847e8ea85d35a5"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "01147194ad382e4cc61c22c6a2672a01740ced6fdb3d4c2a9394ca9d62503c24"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "ffd8e8bbadb7be4672555f1ec8e4134af5c0898041cc197e1d0081b636d07642"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "d1e9df7d081afa272e94534ee3d6310c3498629cd7bba0fd7ab86675ea885714"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "2835ea496c48c171efa0d79924cd3183c12f6de49ce05af72214f6ad4a407c85"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "e585b0839c2b31ef12f562c4303b46b392493c6619b7e1b0c92e21c3afdb7461"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "592ece3de096b4135c24e9079f20b85b8c394d488caa6b7907b75d49f51fb30d"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "048bcb92d0915b909e2174c990948dd5c50345452369e067bf8c5770bc7b40c4"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "b24e02beeb02d44ba64884864cdfb6605e7b3454b6e953767ceeaf4817f41d95"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "caad067689a49308c2e51385750f3d2319e3a06757cf56060ce3c5ecb74a9ed6"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "a2dc5de82a1736dd3aa157da305f5db478625508444df244a3492dfaff8278f3"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "d2c4ab30e6e5d17716d7981d0039f043a41107edb917a838be66659d60653074"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "58773ebf8d949541a2c19924935eb09f0d996aa4059ad3c17a71c664357c2bcc"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "bb5c4d1d81373c1d25c1df4d896fbd1ba52acfed4e890a81650e34e5b9bd2ef0"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "c95f531aaa3d36788cf6511d51afa1242657890bdc10628218aef60d6d80b106"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "bf04a4f7b629e20f8389aad530b89b592686bd1a8340090311882934f9bea391"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "2c0c6d3a2d4228b7838864835665ff7d46cf8564d59db817ee1d8f9665828410"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "c51477c9aaa96765205c163df83acb003c2db837243225d5d1e8753b1de5b71b"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "3c92aef738962dab12fa0e118d64d29bb0d110f9ef2050630b3649d574036476"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "4854536b65fb7afb8925315ff4192c369db53f55b3ccec698cb561af1bc03f68"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "3aa69342828a99d075e0b70938d1360dcb9016ad322638c57fba9288e37b9b3e"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "9d590c31e369d8e1287c915cb91061f14359329c89e5038e3491052ff3df894a"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "f133efa32b74f0203186abfeb5b191bf50711f04bf29762e2569b78e0feb66e3"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "15d71526ef072de2b9adacb300e0eb158170839be82a7def9efa6ac55adcda37"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "63cdb91df96bc132e0b9b6c702cdc82b9583a58be11863c76c0a1a04b689b1ed"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "d1dc64cc1ca886b81da71e132b31644d89b8f61b4fab5f886c00b3b8defcd49a"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "b71ee84b0e56d7dd9b4cb40032055c8c1f8b4c18e9d679d84b71c226c928a189"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "dbb80209a669529b17553d152d5b3ccffbabd5c44b1e6a7e63a2d011e5425a2c"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "358cf7d9b9b13cbd5614daa4f140a412e777f2dffe0dfa2673b33582f59e02f9"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "bd4ac7afafcc4b4a65e34f207f7c07b24be36c06c8e067fb75f4a22ce759fb4b"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "853629b5625f9dd9a81d5f18d862f0f527043435a7c4624f6f78fa68541a5bba"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "8d094f3d934d2ca42c38b985145bec7f72b4ddb9af7c31e30413721eaecc934d"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d569e6211c4c011955553f3480fd8530ba6dd853b227859f95b0d8af4d9e8c6e"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "5ed4e24f7725864b47dcbb0602463bc95bb33c8e4413483854e0bf3f33ad9376"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "683716f591654dfc843a32198d5bbf6199bccb1a035d391293c4877f0ec47b1c"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "965d58b4ea4280f20d197e28e0e9eb87b29fc955e4f6e15b6582027000d0da6f"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "eadc1248c9352574dcfcdcb3264a662d3a29f85a2f112f77a843f76d8778cba2"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "cdd631c4a32d529a85f04bee01bbc7f50396b183a0f154808e801d29f0f11aab"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "093f01ad325ba33f3f33f2efd72fb5cf3a87dd81162b094dc544744af78f3705"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "f74b39dfd0d9f2241ea65d55a6e9459296796adf228def80c57dd66c3f05921d"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "f84113f32952ae91a35d2aa166f16c4683e03fa43ce6fbd911d0f7f237b22ee8"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e53fd624a5c968e60cd485ea7c7b80a68c164c2f165287ec68a180066c560cb"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "ff1f79558185d2a29487d15f95140716603f5978e8fcd891206ea0c5697342a0"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "522c53748cc7ab0faab84e124e45f3bcdb865f4b5312ff129fc50700ebc4d8ef"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "3e83bca492c325438f48880d76a259c3fbfa65eac71569a79e1fdff858268621"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "020655df7c19750f86a7e1778846ed53e2fe350d44a76f4ac0acaeb82c9d4100"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "3409d2988bb31b2dfc490e03976471e2d09139660a4c08daab518f3095b45170"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "f5d084e8efe87488fed491432d93fb74c7e14b1fbcbc2abf21af6c669110b5bf"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "514a3262c1d0e146b3dbfc24d54b73ce0a5e27e02f26692e25ba6e36897da125"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "924b0e1514cddbad893446bb6561ca9422d46f6f5303fa7f847550f2f92a988f"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "1cff7f847a1ca8a52cfc9a733b7e223a8468a82f5ea9c7d8e1c074868a9baf27"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "5e803270db14ba348ab7b8697d488d172b774a8d782c22f079db0e8ccda793bf"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "95428cacb129137747da7cab4c793f102f87a5224ad2a5adc6f52939df746432"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "828317d27c4336aebf7122e2e5268697d8d0cdcde9bf874b63798f7fc6f84fd1"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "7ec8555eeb01f126671b89fd8dcc46f219bc938cf15ca8b7f67b13a1df38a101"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "082c9ace7d6775aff0e0b379206fa5109ce5bac08686ab937b7441edd6e17d6f"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "722e87bb5dbde3a7aa6ce5a913622a050a3fd1da822656a787cac6a18881737f"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "4420c5d0b773e76bdfa4e4ac842b86f3875ad81dc5b4d0666497a30d77267720"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "a3128b1315428ec2906ff44bef49f8f448d7116bae80be7bd68bf78138cf5192"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "299284d934129a15b70ca9f2d26fb05773d555972b14afe9f65826aaeda7bbf6"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "197ba5387010a6d95fff049d780829526d1676de43f1eaa16be2ae1f04f1601a"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "fc8386c294d107994463311d3778ad507a8848af3be8a533fd2c5be7394b9222"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "db764598fb0cec2fdd0e585b3396e53fa873af303c4f9a027061a0179e445705"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "ea87a217ec9934fae484a32f4dcc655cac04116c9b0c73e458eaee7e595f2b77"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "e27563fdfcfceb5ed4b2643d63d5c26834ca9afed1d887151671fd13086fd66a"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "0ee8fdb3d0a1e50afa5f232fba57d84b97c428c41176e73a712a2438bc3e8796"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "a5a785c9ebfb40a7962e29603792de280c57ff5d77f7836c5048074d5c9d4178"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c5bbbb471fc2af310d768e7b01ff1336f78791a42a60b4473cdab00c0bd6e980"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9c18f2677315f8613203dc69a7877b83e787f6c0b96fb150ab7e4ba3ac712e54"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "ccfcca939876bcca2e3b9fd81aee747d1c94f0df02f5258c9ae43564f61c7c23"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "60031f3767779568e49ea477fd2677adf0f437d5663a53b7d96203e2cbc85f1e"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "1090d5993cfffa923be8a8bb3acb197bd7968c994a1558a1024d81283e9341b2"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "5a67627f06ae51553730e9185a11208f6ba15c421ebc5fa3ba358a341830efae"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "2f7d114cfd69859f1cecd479ad00735744efe19b8a3db1be391fcd7dfe6ca757"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "f6cd331db9669ec8d910210061e95f2c87e64afe6343f5faaf75a321a5b99471"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "f665b75ad6ad846c57007e747931b89d773984beedb825c87fcb07a86ab52f9b"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "69b5baa57f47ce77373aa9505b2ccba0baf90911f2c3ebaef28b043b601ad34b"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "7bd6d9e36e87cf2e3aadb4fc7dec2dea371004466bc9a84ead3f60a59af38ae8"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "72cd9a12387bc5dc02783bb6f6a1d55ab8444557e4d2c46c35b93ce0ab0cf394"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "27b60e8cee363317070e74702d9ba97e5d68318caba0e17fc37aad6bf0fbb362"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "b0b8219da55e81f3feb0872333eadd0f490b251fae09244d31287f2e40339861"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "fb1b52b27253280f98e01b11e6f46e01d854998831b337a52922b925570ca330"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "8474bc4a1fd0f8b27131ed3ba999402e1a56b7e04be157e571b95c470f43e779"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "e68036c3057ce7c369b43335397c8248e5aac83a6db6e729c8e1116ed57a20a1"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "23ea1fb9c64baf835be0a87f7633ee5b87cc05db90a652ca05f17d6b2cb1904c"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "52584ff6ec72359f44891e630b099fc9114e1266a11cd0d063db5ff6034ed02e"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "3e018dd9407823747dce9d32571a390a8fdff11339826bcd68c6879b8edb9c1b"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "f86a8cd6be21403749607690c467baa126be38e547d1b0e3f50d40477b346fde"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "82afb08b29d44aa09da71c454c42d31fbf7ee2756c6f1ddca5c456179e5a7f89"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "d449b869faf6438697bb7e3f692c9bca6c1a116441b08dbd84e775de62564470"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "02bcacb390dd85bf2e7809751d840fa7c87bb8eac467d9bc2cb50a77559060f9"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "8ee832167990dc9546775a1c32518e4524b0f92147ce11e149b0b447932f7ecc"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "374b797f6d662e3deb5a05f6939f650a0ec272f7788cc7dc1a02fc0262e5c903"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "e0308132773119f13443ab475d66e651182adf508b7ca04b0efb65fd84013916"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "dce54478d896490141be7f10ef780196ce446e3312cf5623315baedc4354f992"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "e4b478609faa58ab0e8de7e2f542290f9ecf268d68f32828182208337523d3f5"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "14b2df6e331ae651d1d913c2d7116466df63e9fd24aad02db7a7f3dd010820c4"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "779f48e75546babae4ee153ce7d16f93af9daabf70f855dd702281e948a75cba"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "faa6893cff053c090428035964fe67af8ecf9f5b71225678754e96d38d498311"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "8a3ddebc51e182175afc272f16bdb7a584d78dd7af8849844f4e02892a439efd"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "3298284a9b326eccc05343ec5795034fa46dbfe75458e19d39d23564391840ac"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "e1f2da61eaf58f723e0c0021eb728e2a78a8cf36db60353e58d0233c2de60f73"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4cb1c3b16b8d70f19e14a185bfbbc505d66795ddc4d55e1575193dd018c950d6"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "72b2c72ee5da9c4b353868efc0431b78feaeb0be8c18eecab6df4cfa0c5c7a3c"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "48e7d195e4b6b9144e32f4a254a40f10c59a167a05ce0f38a013f4b914511d55"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "ac6b2064b76b2a5f3cfad6089897126bca7cbf64922b61474eb01b0d65638221"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "57aee02d52b638d393df6a824021a1355df83711dc50663cc67a71366004a017"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "451de8f95bc2eaf67d1abb7ec604f566e5cb2f6b9a8ae2f2495f10a7157a12eb"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "98391cba2a9cfd194cb427243738e588f6de9c112762a6c1e099ba7a4fe621a0"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "92eeb485a7da11f1d600371d596c31fff778415784b54ec2fc5ba74199f49ec5"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "f4e3073d31b221dc2fb37162011d6ab9c0980137cd81f0d9bf70384cfda91e4a"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "4694fd61f7fe2a1066e08f85f041112076d63cf0fcb99db79c5833d714684388"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "088c29a337c926dcbe11ef19c072624014ae7b59cf0ba2a0b8f25a5a725ec796"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "0cb7c16955538ce7089e3aa8e5bc5c3325c4867aadf56837e7e3a05e86c4f482"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "b420443eec07c56afed8435c02c305d355935cb0131b672814878cc9fb0143e6"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5964971c7261ba0619d34ce70d1fcf00aa105f159e2e47853d67fe03579dcbb7"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "ffb21e8a7a02ec8ef445735bc519671f3f3bf90f994db750a4d29385d574fd24"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "1177e20ff9b866c4c7e49a929c1f54c47174f80a8541ad0c98d5e472c4f20d26"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "1309eaf342d7bd7a31c1022183e13e1b02275b01228fbfbd0d5e8b3ef235cceb"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "adf736651eab43de2a927cd7ad471042f35eada0a5df4a09c0bbccf75dd17b44"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "102c828dd42872ca9472d94ff842f412bd907be1f4cec8605805fea9f75250e2"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ebb608409f3c4ab44a6818020a826be7c3402977c18b08200df6b332e0a7fd3c"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "ff984951130343fdba5377f91e325e7cd21b7c4e25a524b4a1bc98978842e45c"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "15ca7d36207f8e7a80744d0d15966015c8dc395464cf7f70c98b643059f19fcb"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "6c93f80d249ab5558543cc7b13cf72c2abba1da0616a817661f790e5c17c24cd"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "3c6c64fbc264d4a3c98ae69c92ea778a87bd84ea23ded7f63117b4c77f93b4d5"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "3a82d99b249d9a99d207fc0b1d5a1bd8523833dc61ec09dd917ff427659ec338"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0bf0e9ff45b3d25ef1b31f28b91e30280e8bdb25f864a31ccac795f66e27bb68"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "d346b57092959dbc880c9dc5a8b832dc7967c171ac361aa9b7e77b5589bd4c9e"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "6d86d75981ba1850980c3fa498c804dc64b4328c90d12d3a5c13af2f1e47af6d"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "179a67fbb2420615e179d1c69cc5dccf1b135a7c61aea26bda658c724655931f"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "bc95ac4b30ae806658218df21f5d9aa6c26b8b8c5fc8a58090de92e347735c58"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "8b49fbe88dcc328b94a99f3b30af9f783910dbcdea1fc5b160526409d56994f7"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "2ab49ec5742c07c44028d8aa980a6bd96623c554699037fd64d28cf4744789ce"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "6eecd8d5fa6d6a826fec7a09ba11092348a0fa74c7c7a8c1239f41392d2e2055"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "fdb2a25480eee0659803432fea02794f73aa18e9fe5a4b1c1c70ac5aceb09b4f"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "64358161ecc5064ee9fd26e301136a58f32b387466d6127604772b59b44f32c5"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "f9f54927e4ee378f56879b6ffc121d02ad300f6982d7751e730564ed9a9d8c80"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "78a6721da743bec597c9dd1e6bededffa43d675784f3585b0d1f03989007f295"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "fc3460aae0c3395220644ec0ce8c139512726e62d591ef51f4900ac3c9a9e461"; }
   ];
 }

From 80db147f0ceabb6fbcd2d5a6bd9faec3d4555eb6 Mon Sep 17 00:00:00 2001
From: wedens <kirill.wedens@gmail.com>
Date: Wed, 6 Apr 2016 22:12:16 +0600
Subject: [PATCH 766/857] rtv: 1.8.0 -> 1.9.0

---
 pkgs/applications/misc/rtv/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 68097c2e2544c..194535c7314cd 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "1.8.0";
+  version = "1.9.0";
   name = "rtv-${version}";
 
   src = fetchFromGitHub {
     owner = "michael-lazar";
     repo = "rtv";
     rev = "v${version}";
-    sha256 = "0vp9yapm6bm4zdhd1ibbirc23ck7smrbsrask7xkrnz7qysxgsd3";
+    sha256 = "18r3i2zlcprj6d4nzhhbd6sm1fs2x28924xsm6lcxa1643gkyb7i";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -24,6 +24,6 @@ pythonPackages.buildPythonApplication rec {
     homepage = https://github.com/michael-lazar/rtv;
     description = "Browse Reddit from your Terminal";
     license = licenses.mit;
-    maintainers = with maintainers; [ matthiasbeyer jgeerds ];
+    maintainers = with maintainers; [ matthiasbeyer jgeerds wedens ];
   };
 }

From 9435e5364840e6001253db06177c02fd79ca969d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Apr 2016 19:39:29 +0200
Subject: [PATCH 767/857] sane-backends-git -> 2016-04-06

---
 pkgs/applications/graphics/sane/backends/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/sane/backends/git.nix b/pkgs/applications/graphics/sane/backends/git.nix
index b285edd71e032..47532972893f9 100644
--- a/pkgs/applications/graphics/sane/backends/git.nix
+++ b/pkgs/applications/graphics/sane/backends/git.nix
@@ -1,10 +1,10 @@
 { callPackage, fetchgit, ... } @ args:
 
 callPackage ./generic.nix (args // {
-  version = "2016-03-24";
+  version = "2016-04-06";
   src = fetchgit {
-    sha256 = "593672ccfef6e3e0f3cb8ae4bbc67db9b2f1a821df4914343e4cf32f75cea865";
-    rev = "41a416e4afcf6cada69193dc408ef184d0e5f678";
+    sha256 = "af0b5943787bfe86169cd9bbf34284152e18b6df1f692773369545047e54a288";
+    rev = "e6b6ad9d4847e86aed8be0837a19bfada881f52d";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From eec040009d08560e1ccd6bb72c694610b9990d27 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Apr 2016 19:49:19 +0200
Subject: [PATCH 768/857] tldr: 1.1.0 -> 1.2.0

---
 pkgs/tools/misc/tldr/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index f223a97520b0e..39a7dc25c0949 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "tldr-${version}";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
-    sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz";
+    sha256 = "1dyvmxdxm92bfs5i6cngk8isa65qp6xlpim4yizs5rnm0rynf9kr";
     rev = "v${version}";
     repo = "tldr-cpp-client";
     owner = "tldr-pages";
@@ -14,13 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ curl clang libzip ];
   nativeBuildInputs = [ pkgconfig ];
 
-  preConfigure = ''
-    cd src
-  '';
-
-  installPhase = ''
-    install -Dm755 {.,$out/bin}/tldr
-  '';
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     description = "Simplified and community-driven man pages";

From 0661a9891b131d7af80027ea536e0fd0154331fd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Apr 2016 20:06:26 +0200
Subject: [PATCH 769/857] libpsl: list 2016-03-30 -> 2016-04-05

---
 pkgs/development/libraries/libpsl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index 8a83462119417..a620826576cc1 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,10 +3,10 @@
 
 let
 
-  listVersion = "2016-03-30";
+  listVersion = "2016-04-05";
   listSources = fetchFromGitHub {
-    sha256 = "0433ck6ykcq6pc48mvgif9f785q0ndprk77jsk58gb5289b87yns";
-    rev = "6ec573d549e25fc89d930bb64939d947bae38f68";
+    sha256 = "08ai0yyym0mvsn92fasfn5b5rdrjbavxxl1hhp60g1m0iamfzpa4";
+    rev = "1e0c6b000874f98f28663870909e32ee6323fe1d";
     repo = "list";
     owner = "publicsuffix";
   };

From 6cd2eccdc7e3366307665b63b306eb250c4ff9f6 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Wed, 6 Apr 2016 21:08:23 +0200
Subject: [PATCH 770/857] neovim: Fix build by via order of `buildInputs`

See #14442 for details and further real fixes.
---
 pkgs/applications/editors/neovim/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index e291cfcdc2bfc..7d23ae5bbbdde 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -75,8 +75,10 @@ let
       glib
       libtermkey
       libuv
-      luajit
+      # For some reason, `luajit` has to be listed after `lua`. See
+      # https://github.com/NixOS/nixpkgs/issues/14442
       lua
+      luajit
       lpeg
       luaMessagePack
       luabitop

From d2d3ef953e191bf0f3465dd422f6e4433822b12b Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Wed, 6 Apr 2016 17:11:19 -0400
Subject: [PATCH 771/857] gforth: fix build on darwin

---
 pkgs/development/compilers/gforth/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix
index c6165bb558691..6ea21207f19f8 100644
--- a/pkgs/development/compilers/gforth/default.nix
+++ b/pkgs/development/compilers/gforth/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ m4 ];
 
+  configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64-apple-darwin" ];
+
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp
     cp gforth.el $out/share/emacs/site-lisp/

From 8c2e8ec13ce717ff83eeb7992068f30dab7ff685 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 6 Apr 2016 22:05:55 +0100
Subject: [PATCH 772/857] haskellPackages.dnssd: override the dns_sd dependency
 to point to avahi built with the right flags.

Fixes #14502
---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index ba48becf5747c..8f3c2ad1a6f81 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -960,4 +960,10 @@ self: super: {
     hint = self.hint_0_4_3;
   };
 
+  # Looks like Avahi provides the missing library
+  dnssd = super.dnssd.override {
+    dns_sd = pkgs.avahi.override {
+      withLibdnssdCompat = true;
+    };
+  };
 }

From 47e5145d0b5c2d9af6cd43d70bf3ba6aea634c33 Mon Sep 17 00:00:00 2001
From: makefu <makefu@syntax-fehler.de>
Date: Wed, 6 Apr 2016 23:38:10 +0200
Subject: [PATCH 773/857] taskserver: integrate pki scripts

In the patchPhase all scripts related to generating a CA for taskwarrior are
written into share/taskd and patched to actually work within nixos environment
---
 pkgs/servers/misc/taskserver/default.nix | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/misc/taskserver/default.nix b/pkgs/servers/misc/taskserver/default.nix
index 3d34bb8e11f2e..a1502b4d6c44c 100644
--- a/pkgs/servers/misc/taskserver/default.nix
+++ b/pkgs/servers/misc/taskserver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+{ stdenv, fetchurl, cmake, libuuid, gnutls, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "taskserver-${version}";
@@ -11,6 +11,26 @@ stdenv.mkDerivation rec {
     sha256 = "1d110q9vw8g5syzihxymik7hd27z1592wkpz55kya6lphzk8i13v";
   };
 
+  patchPhase = ''
+    pkipath=$out/share/taskd/pki
+    mkdir -p $pkipath
+    cp -r pki/* $pkipath
+    echo "patching paths in pki/generate"
+    sed -i "s#^\.#$pkipath#" $pkipath/generate
+    for f in $pkipath/generate* ;do
+      i=$(basename $f)
+      echo patching $i
+      sed -i \
+          -e 's/which/type -p/g' \
+          -e 's#^\. ./vars#if test -e ./vars;then . ./vars; else echo "cannot find ./vars - copy the template from '$pkipath'/vars into the working directory";exit 1; fi#' $f
+
+      echo wrapping $i
+      makeWrapper  $pkipath/$i $out/bin/taskd-pki-$i \
+        --prefix PATH : ${gnutls}/bin/
+    done
+  '';
+
+  buildInputs = [ makeWrapper ];
   nativeBuildInputs = [ cmake libuuid gnutls ];
 
   meta = {
@@ -18,6 +38,6 @@ stdenv.mkDerivation rec {
     homepage = http://taskwarrior.org;
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer ];
+    maintainers = with stdenv.lib.maintainers; [ matthiasbeyer makefu ];
   };
 }

From d8f99973df26d1c7c74ba02369a1b297e5b86215 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 4 Apr 2016 15:37:56 +0200
Subject: [PATCH 774/857] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20160406 using the following inputs:

  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/2266fbc644819a4de2aeeea7ba811d41fa453ab1
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/7a74143acf6bc16cbcf2ba3b33045a9f3fb92641
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/5e435cbedbaecd86319dddbca1690c64fc2ccfb5
---
 .../haskell-modules/configuration-lts-0.0.nix |   15 +
 .../haskell-modules/configuration-lts-0.1.nix |   15 +
 .../haskell-modules/configuration-lts-0.2.nix |   15 +
 .../haskell-modules/configuration-lts-0.3.nix |   15 +
 .../haskell-modules/configuration-lts-0.4.nix |   15 +
 .../haskell-modules/configuration-lts-0.5.nix |   15 +
 .../haskell-modules/configuration-lts-0.6.nix |   15 +
 .../haskell-modules/configuration-lts-0.7.nix |   15 +
 .../haskell-modules/configuration-lts-1.0.nix |   15 +
 .../haskell-modules/configuration-lts-1.1.nix |   15 +
 .../configuration-lts-1.10.nix                |   15 +
 .../configuration-lts-1.11.nix                |   15 +
 .../configuration-lts-1.12.nix                |   15 +
 .../configuration-lts-1.13.nix                |   15 +
 .../configuration-lts-1.14.nix                |   15 +
 .../configuration-lts-1.15.nix                |   15 +
 .../haskell-modules/configuration-lts-1.2.nix |   15 +
 .../haskell-modules/configuration-lts-1.4.nix |   15 +
 .../haskell-modules/configuration-lts-1.5.nix |   15 +
 .../haskell-modules/configuration-lts-1.7.nix |   15 +
 .../haskell-modules/configuration-lts-1.8.nix |   15 +
 .../haskell-modules/configuration-lts-1.9.nix |   15 +
 .../haskell-modules/configuration-lts-2.0.nix |   15 +
 .../haskell-modules/configuration-lts-2.1.nix |   15 +
 .../configuration-lts-2.10.nix                |   15 +
 .../configuration-lts-2.11.nix                |   15 +
 .../configuration-lts-2.12.nix                |   15 +
 .../configuration-lts-2.13.nix                |   15 +
 .../configuration-lts-2.14.nix                |   15 +
 .../configuration-lts-2.15.nix                |   15 +
 .../configuration-lts-2.16.nix                |   15 +
 .../configuration-lts-2.17.nix                |   15 +
 .../configuration-lts-2.18.nix                |   15 +
 .../configuration-lts-2.19.nix                |   15 +
 .../haskell-modules/configuration-lts-2.2.nix |   15 +
 .../configuration-lts-2.20.nix                |   15 +
 .../configuration-lts-2.21.nix                |   15 +
 .../configuration-lts-2.22.nix                |   15 +
 .../haskell-modules/configuration-lts-2.3.nix |   15 +
 .../haskell-modules/configuration-lts-2.4.nix |   15 +
 .../haskell-modules/configuration-lts-2.5.nix |   15 +
 .../haskell-modules/configuration-lts-2.6.nix |   15 +
 .../haskell-modules/configuration-lts-2.7.nix |   15 +
 .../haskell-modules/configuration-lts-2.8.nix |   15 +
 .../haskell-modules/configuration-lts-2.9.nix |   15 +
 .../haskell-modules/configuration-lts-3.0.nix |   17 +
 .../haskell-modules/configuration-lts-3.1.nix |   18 +
 .../configuration-lts-3.10.nix                |   18 +
 .../configuration-lts-3.11.nix                |   18 +
 .../configuration-lts-3.12.nix                |   18 +
 .../configuration-lts-3.13.nix                |   18 +
 .../configuration-lts-3.14.nix                |   18 +
 .../configuration-lts-3.15.nix                |   18 +
 .../configuration-lts-3.16.nix                |   18 +
 .../configuration-lts-3.17.nix                |   18 +
 .../configuration-lts-3.18.nix                |   18 +
 .../configuration-lts-3.19.nix                |   18 +
 .../haskell-modules/configuration-lts-3.2.nix |   18 +
 .../configuration-lts-3.20.nix                |   18 +
 .../configuration-lts-3.21.nix                |   18 +
 .../configuration-lts-3.22.nix                |   18 +
 .../haskell-modules/configuration-lts-3.3.nix |   18 +
 .../haskell-modules/configuration-lts-3.4.nix |   18 +
 .../haskell-modules/configuration-lts-3.5.nix |   18 +
 .../haskell-modules/configuration-lts-3.6.nix |   18 +
 .../haskell-modules/configuration-lts-3.7.nix |   18 +
 .../haskell-modules/configuration-lts-3.8.nix |   18 +
 .../haskell-modules/configuration-lts-3.9.nix |   18 +
 .../haskell-modules/configuration-lts-4.0.nix |   18 +
 .../haskell-modules/configuration-lts-4.1.nix |   18 +
 .../haskell-modules/configuration-lts-4.2.nix |   18 +
 .../haskell-modules/configuration-lts-5.0.nix |   20 +
 .../haskell-modules/configuration-lts-5.1.nix |   21 +
 .../configuration-lts-5.10.nix                |   27 +
 .../configuration-lts-5.11.nix                |   27 +
 .../haskell-modules/configuration-lts-5.2.nix |   21 +
 .../haskell-modules/configuration-lts-5.3.nix |   21 +
 .../haskell-modules/configuration-lts-5.4.nix |   21 +
 .../haskell-modules/configuration-lts-5.5.nix |   22 +
 .../haskell-modules/configuration-lts-5.6.nix |   24 +
 .../haskell-modules/configuration-lts-5.7.nix |   24 +
 .../haskell-modules/configuration-lts-5.8.nix |   24 +
 .../haskell-modules/configuration-lts-5.9.nix |   26 +
 .../haskell-modules/hackage-packages.nix      | 1369 ++++++++++++-----
 84 files changed, 2431 insertions(+), 358 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index c9f34e1b44e09..76ae38156f3fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -965,6 +965,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1341,6 +1342,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3027,6 +3029,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4064,6 +4067,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4830,6 +4834,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5137,12 +5142,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5229,6 +5237,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5562,6 +5571,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5690,6 +5700,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6981,7 +6992,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7148,6 +7161,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = doDistribute super."regular_0_3_4_3";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8552,6 +8566,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 23e86decbbc64..af27bea6a66cb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -965,6 +965,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1341,6 +1342,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3027,6 +3029,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4064,6 +4067,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4830,6 +4834,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5137,12 +5142,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5229,6 +5237,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5562,6 +5571,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5690,6 +5700,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6981,7 +6992,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7148,6 +7161,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = doDistribute super."regular_0_3_4_3";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8552,6 +8566,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index fa44bb2ff7db5..e91ec4ef1efd7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -965,6 +965,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1341,6 +1342,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3027,6 +3029,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4064,6 +4067,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4830,6 +4834,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5137,12 +5142,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5229,6 +5237,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5562,6 +5571,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5690,6 +5700,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6981,7 +6992,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7148,6 +7161,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = doDistribute super."regular_0_3_4_3";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8552,6 +8566,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 04a693eb708df..4ba0dc18bc6eb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -965,6 +965,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1341,6 +1342,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3027,6 +3029,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4064,6 +4067,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4830,6 +4834,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5137,12 +5142,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5229,6 +5237,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5562,6 +5571,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5690,6 +5700,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6981,7 +6992,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7148,6 +7161,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = doDistribute super."regular_0_3_4_3";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8552,6 +8566,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 72c9814bbfd0d..b4e24ace05cfc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -965,6 +965,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1341,6 +1342,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3026,6 +3028,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4061,6 +4064,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4827,6 +4831,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5134,12 +5139,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5226,6 +5234,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5559,6 +5568,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5687,6 +5697,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6978,7 +6989,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7145,6 +7158,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = doDistribute super."regular_0_3_4_3";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8548,6 +8562,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 7a4a99d0f76ad..3a57c2b731b80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -965,6 +965,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1341,6 +1342,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3026,6 +3028,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4061,6 +4064,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4827,6 +4831,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5134,12 +5139,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5226,6 +5234,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5559,6 +5568,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5687,6 +5697,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6978,7 +6989,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7145,6 +7158,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = doDistribute super."regular_0_3_4_3";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8548,6 +8562,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index ff3fa0160c87e..1bb176c3c12ed 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -964,6 +964,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1340,6 +1341,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3025,6 +3027,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4060,6 +4063,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4825,6 +4829,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5132,12 +5137,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5224,6 +5232,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5557,6 +5566,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5685,6 +5695,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6976,7 +6987,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7143,6 +7156,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8545,6 +8559,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 81919a2c579b4..10bf8a3834df3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -964,6 +964,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1340,6 +1341,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3025,6 +3027,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4060,6 +4063,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4825,6 +4829,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5132,12 +5137,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5224,6 +5232,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5557,6 +5566,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5685,6 +5695,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6976,7 +6987,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7143,6 +7156,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8545,6 +8559,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = dontDistribute super."type-list";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 2fe027de4db70..6612f19fdf5e2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -961,6 +961,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1337,6 +1338,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3016,6 +3018,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4052,6 +4055,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4816,6 +4820,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5123,12 +5128,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5215,6 +5223,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5548,6 +5557,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5676,6 +5686,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6967,7 +6978,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7134,6 +7147,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8534,6 +8548,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index d9e3fbfd0d1b2..a0e29bada3d89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -961,6 +961,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1337,6 +1338,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3013,6 +3015,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4048,6 +4051,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4810,6 +4814,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5117,12 +5122,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5209,6 +5217,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5542,6 +5551,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5670,6 +5680,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6960,7 +6971,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7127,6 +7140,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8522,6 +8536,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 0caa96182cf6b..da5284cd71b3f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4038,6 +4041,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4799,6 +4803,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5101,12 +5106,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5193,6 +5201,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5525,6 +5534,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5653,6 +5663,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6940,7 +6951,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7106,6 +7119,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8495,6 +8509,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 823ad98d5a45c..fce3ad89e8142 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4037,6 +4040,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4798,6 +4802,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5098,12 +5103,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5190,6 +5198,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5521,6 +5530,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5649,6 +5659,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6936,7 +6947,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7102,6 +7115,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8491,6 +8505,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index fb53e677c0df2..1514facb15d9d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4037,6 +4040,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4797,6 +4801,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5097,12 +5102,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5189,6 +5197,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5520,6 +5529,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5648,6 +5658,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6935,7 +6946,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7101,6 +7114,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8490,6 +8504,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 3aeeafdfe7060..a96b87bc33cc7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4036,6 +4039,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4796,6 +4800,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5096,12 +5101,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5188,6 +5196,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5519,6 +5528,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5647,6 +5657,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6934,7 +6945,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7100,6 +7113,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8488,6 +8502,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 223f1b85355be..b2c6af6a0abd7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -959,6 +959,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1335,6 +1336,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3006,6 +3008,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4033,6 +4036,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4793,6 +4797,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5093,12 +5098,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5185,6 +5193,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5516,6 +5525,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5644,6 +5654,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6929,7 +6940,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7095,6 +7108,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8483,6 +8497,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index f9e492cad0325..277d0afdb9c6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -958,6 +958,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1334,6 +1335,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3002,6 +3004,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4029,6 +4032,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4789,6 +4793,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5089,12 +5094,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5181,6 +5189,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5512,6 +5521,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5640,6 +5650,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6922,7 +6933,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7088,6 +7101,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8474,6 +8488,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index f579b92feee19..704d124cfe29e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -961,6 +961,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1337,6 +1338,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3011,6 +3013,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4045,6 +4048,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4807,6 +4811,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5114,12 +5119,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5206,6 +5214,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5539,6 +5548,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5667,6 +5677,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6956,7 +6967,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7122,6 +7135,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8516,6 +8530,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 51e84ca38738e..65b5d6c624e34 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3010,6 +3012,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4043,6 +4046,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4804,6 +4808,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5111,12 +5116,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5203,6 +5211,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5536,6 +5545,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5664,6 +5674,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6952,7 +6963,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7118,6 +7131,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8511,6 +8525,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index ec297f09670ea..04d8f345d9470 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4042,6 +4045,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4803,6 +4807,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5110,12 +5115,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5202,6 +5210,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5535,6 +5544,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5663,6 +5673,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6951,7 +6962,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7117,6 +7130,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8509,6 +8523,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index c91d1e3d33f7d..acb8e4c739857 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4042,6 +4045,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4803,6 +4807,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5105,12 +5110,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5197,6 +5205,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5530,6 +5539,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5658,6 +5668,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6946,7 +6957,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7112,6 +7125,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8504,6 +8518,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index a6ba689d7510b..b68f0ea1bb228 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4039,6 +4042,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4800,6 +4804,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5102,12 +5107,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5194,6 +5202,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5526,6 +5535,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5654,6 +5664,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6942,7 +6953,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7108,6 +7121,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8499,6 +8513,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index dac67df3b5af4..bd38b54e1732d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -960,6 +960,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1336,6 +1337,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -3009,6 +3011,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4038,6 +4041,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4799,6 +4803,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5101,12 +5106,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5193,6 +5201,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5525,6 +5534,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5653,6 +5663,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6941,7 +6952,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7107,6 +7120,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8498,6 +8512,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 35052e2ee2b61..30ba247b98fc7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -952,6 +952,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1328,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2990,6 +2992,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4012,6 +4015,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4769,6 +4773,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5064,12 +5069,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5154,6 +5162,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5480,6 +5489,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5607,6 +5617,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6877,7 +6888,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7043,6 +7056,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8421,6 +8435,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 44fac410f440b..7b1e884ee5831 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -952,6 +952,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1328,6 +1329,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2989,6 +2991,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4011,6 +4014,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4768,6 +4772,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5063,12 +5068,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5153,6 +5161,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5479,6 +5488,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5606,6 +5616,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6876,7 +6887,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7042,6 +7055,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8420,6 +8434,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index c65458eba36d7..2b4bcfffd6e89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1323,6 +1324,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2975,6 +2977,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3992,6 +3995,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4747,6 +4751,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5041,12 +5046,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5129,6 +5137,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5454,6 +5463,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5581,6 +5591,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6844,7 +6855,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7010,6 +7023,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8376,6 +8390,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index f68e86a6cd5e6..25c4b95bba16d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2974,6 +2976,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3990,6 +3993,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4744,6 +4748,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5038,12 +5043,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5125,6 +5133,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5450,6 +5459,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5577,6 +5587,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6838,7 +6849,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7004,6 +7017,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8367,6 +8381,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 732219ccf6ee5..15edd3cf4aa9a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2974,6 +2976,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3990,6 +3993,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4744,6 +4748,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5038,12 +5043,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5125,6 +5133,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5450,6 +5459,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5577,6 +5587,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6838,7 +6849,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7004,6 +7017,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8366,6 +8380,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index e2c60ce548f93..f7f3d0135900e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2974,6 +2976,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3989,6 +3992,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4743,6 +4747,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5036,12 +5041,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5123,6 +5131,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5448,6 +5457,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5575,6 +5585,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6836,7 +6847,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7002,6 +7015,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8364,6 +8378,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 955d6f57c9b5e..2db86ffa7af97 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2974,6 +2976,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3988,6 +3991,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4741,6 +4745,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5034,12 +5039,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5121,6 +5129,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5446,6 +5455,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5573,6 +5583,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6834,7 +6845,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7000,6 +7013,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8361,6 +8375,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 0437a69aa2409..b80dfba74b5fd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2973,6 +2975,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3987,6 +3990,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4740,6 +4744,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5033,12 +5038,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5120,6 +5128,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5445,6 +5454,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5572,6 +5582,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6832,7 +6843,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6998,6 +7011,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8358,6 +8372,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 3a4182ab419b5..ce6662633818c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2970,6 +2972,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3983,6 +3986,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4736,6 +4740,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5029,12 +5034,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5116,6 +5124,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5440,6 +5449,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5567,6 +5577,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6827,7 +6838,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6993,6 +7006,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8353,6 +8367,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 7fb1662007cfd..1e8a2763fbb5a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2968,6 +2970,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3979,6 +3982,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4732,6 +4736,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5025,12 +5030,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5112,6 +5120,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5436,6 +5445,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5563,6 +5573,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6822,7 +6833,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6988,6 +7001,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8348,6 +8362,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index cc0104ece73d0..d6519d66eb0b3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2966,6 +2968,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3977,6 +3980,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4730,6 +4734,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5023,12 +5028,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5110,6 +5118,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5434,6 +5443,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5561,6 +5571,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6819,7 +6830,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6985,6 +6998,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8344,6 +8358,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 5773930cf3e43..43ec086efd64c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2966,6 +2968,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3976,6 +3979,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4729,6 +4733,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5022,12 +5027,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5109,6 +5117,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5433,6 +5442,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5560,6 +5570,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6817,7 +6828,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6983,6 +6996,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8341,6 +8355,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 1bbf520af396e..301d968c8ce2a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -951,6 +951,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1327,6 +1328,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2986,6 +2988,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4008,6 +4011,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4765,6 +4769,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5060,12 +5065,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5150,6 +5158,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5476,6 +5485,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5603,6 +5613,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6873,7 +6884,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7039,6 +7052,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8417,6 +8431,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index c0352e149a957..fb9c2c7c2d3cb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2965,6 +2967,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3975,6 +3978,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4728,6 +4732,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5021,12 +5026,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5108,6 +5116,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5432,6 +5441,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5559,6 +5569,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6815,7 +6826,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6981,6 +6994,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8338,6 +8352,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 095d670ff4490..81d1eaa0e0081 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2965,6 +2967,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3975,6 +3978,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4728,6 +4732,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5021,12 +5026,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5108,6 +5116,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5432,6 +5441,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5559,6 +5569,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6814,7 +6825,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6980,6 +6993,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8337,6 +8351,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 32692917f7430..607837e207e2b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1322,6 +1323,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2965,6 +2967,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3975,6 +3978,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4727,6 +4731,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5020,12 +5025,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5107,6 +5115,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5431,6 +5440,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5558,6 +5568,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6813,7 +6824,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6979,6 +6992,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8336,6 +8350,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index e0656f801a000..547776053b2c4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -951,6 +951,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1327,6 +1328,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2986,6 +2988,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4007,6 +4010,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4764,6 +4768,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5058,12 +5063,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5148,6 +5156,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5474,6 +5483,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5601,6 +5611,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6871,7 +6882,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7037,6 +7050,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8415,6 +8429,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 37cee09e9df8d..f3b120df6abec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -951,6 +951,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1327,6 +1328,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2985,6 +2987,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4006,6 +4009,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4763,6 +4767,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5057,12 +5062,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5147,6 +5155,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5473,6 +5482,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5600,6 +5610,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6869,7 +6880,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7035,6 +7048,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8412,6 +8426,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 2513667b84fcb..86c810c0506c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -951,6 +951,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1327,6 +1328,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2984,6 +2986,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4005,6 +4008,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4762,6 +4766,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5056,12 +5061,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5146,6 +5154,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5472,6 +5481,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5599,6 +5609,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6868,7 +6879,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7034,6 +7047,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8411,6 +8425,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index ca9274f22032a..ff9dfccadcfba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -951,6 +951,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1325,6 +1326,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2981,6 +2983,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -4000,6 +4003,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4757,6 +4761,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5051,12 +5056,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5141,6 +5149,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5467,6 +5476,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5594,6 +5604,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6862,7 +6873,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7028,6 +7041,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8403,6 +8417,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 3b897d0c05d44..127045918a711 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -950,6 +950,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1324,6 +1325,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2980,6 +2982,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3999,6 +4002,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4756,6 +4760,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5050,12 +5055,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5140,6 +5148,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5466,6 +5475,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5593,6 +5603,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6862,7 +6873,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7028,6 +7041,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8403,6 +8417,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index cf8d90016cd6e..9e24f7278cc9e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1323,6 +1324,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2979,6 +2981,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3997,6 +4000,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4754,6 +4758,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5048,12 +5053,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5138,6 +5146,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5464,6 +5473,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5591,6 +5601,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6860,7 +6871,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7026,6 +7039,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8397,6 +8411,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 66d9d8e55843a..321b21984d4a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -949,6 +949,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1323,6 +1324,7 @@ self: super: {
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "angel" = dontDistribute super."angel";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = dontDistribute super."annotated-wl-pprint";
   "anonymous-sums" = dontDistribute super."anonymous-sums";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
@@ -2976,6 +2978,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3993,6 +3996,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4748,6 +4752,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_1_3";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -5042,12 +5047,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -5132,6 +5140,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5457,6 +5466,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = dontDistribute super."list-fusion-probe";
@@ -5584,6 +5594,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines" = doDistribute super."machines_0_4_1";
@@ -6851,7 +6862,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -7017,6 +7030,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular-extras" = dontDistribute super."regular-extras";
   "regular-web" = dontDistribute super."regular-web";
@@ -8384,6 +8398,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_0_0_1";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 4cfcd2d3702fd..35a05fd87d4ba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -558,6 +558,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -930,6 +931,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1298,6 +1300,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2891,6 +2894,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3011,6 +3015,7 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
   "fast-logger" = doDistribute super."fast-logger_2_4_0";
   "fast-math" = dontDistribute super."fast-math";
@@ -3883,6 +3888,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4626,6 +4632,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4905,12 +4912,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4991,6 +5001,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5296,6 +5307,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_3";
@@ -5422,6 +5434,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6642,7 +6655,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6805,6 +6820,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8136,6 +8152,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index e713814ec7d8c..7af46a481351f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -558,6 +558,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -930,6 +931,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1297,6 +1299,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2890,6 +2893,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3010,7 +3014,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3880,6 +3886,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4623,6 +4630,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4902,12 +4910,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4988,6 +4999,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5293,6 +5305,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_3";
@@ -5418,6 +5431,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6636,7 +6650,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6799,6 +6815,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8129,6 +8146,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 8a9e724f6bd5e..fe0690ee942f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -927,6 +928,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1294,6 +1296,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2872,6 +2875,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2992,7 +2996,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3856,6 +3862,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4595,6 +4602,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4872,12 +4880,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4958,6 +4969,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5258,6 +5270,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5383,6 +5396,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6588,7 +6602,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6750,6 +6766,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8070,6 +8087,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 62e2926a48053..67205eb5067e2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -927,6 +928,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1294,6 +1296,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2871,6 +2874,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2990,7 +2994,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3854,6 +3860,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4593,6 +4600,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4870,12 +4878,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4956,6 +4967,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5256,6 +5268,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5381,6 +5394,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6585,7 +6599,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6747,6 +6763,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8067,6 +8084,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 94b60c2c96dba..a81c742f03300 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -927,6 +928,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1294,6 +1296,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2870,6 +2873,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2989,7 +2993,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3852,6 +3858,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4591,6 +4598,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4868,12 +4876,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4954,6 +4965,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5254,6 +5266,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5379,6 +5392,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6582,7 +6596,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6744,6 +6760,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8062,6 +8079,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index cf466c69874d0..79610166c8d6d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -927,6 +928,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1294,6 +1296,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2870,6 +2873,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2989,7 +2993,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3852,6 +3858,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4590,6 +4597,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4867,12 +4875,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4953,6 +4964,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5252,6 +5264,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5377,6 +5390,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6579,7 +6593,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6741,6 +6757,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8059,6 +8076,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 32219a6d0e01c..68aacafb13f56 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -927,6 +928,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1292,6 +1294,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2864,6 +2867,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2983,7 +2987,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3846,6 +3852,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4583,6 +4590,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4860,12 +4868,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4946,6 +4957,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5245,6 +5257,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5370,6 +5383,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6572,7 +6586,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6734,6 +6750,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8052,6 +8069,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index a2b9591f31720..b3c63a710abe7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -927,6 +928,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1292,6 +1294,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2864,6 +2867,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2983,7 +2987,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3846,6 +3852,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4581,6 +4588,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4857,12 +4865,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4943,6 +4954,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5242,6 +5254,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5367,6 +5380,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6569,7 +6583,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6731,6 +6747,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8048,6 +8065,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 37e610e5cf0ae..067bc308136d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -926,6 +927,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1291,6 +1293,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2863,6 +2866,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2981,7 +2985,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3843,6 +3849,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4578,6 +4585,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4854,12 +4862,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4940,6 +4951,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5238,6 +5250,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5363,6 +5376,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6563,7 +6577,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6724,6 +6740,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8038,6 +8055,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 0e567b86b4982..0592f86bdc3b4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -926,6 +927,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1291,6 +1293,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2862,6 +2865,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2980,7 +2984,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3841,6 +3847,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4576,6 +4583,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4851,12 +4859,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4937,6 +4948,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5235,6 +5247,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5359,6 +5372,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6558,7 +6572,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6719,6 +6735,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8033,6 +8050,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 1269e8c9d0190..00df06ee5f840 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -926,6 +927,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1291,6 +1293,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2861,6 +2864,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2979,7 +2983,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3837,6 +3843,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4570,6 +4577,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4845,12 +4853,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4931,6 +4942,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5229,6 +5241,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5353,6 +5366,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6551,7 +6565,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6712,6 +6728,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8025,6 +8042,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index dd886829bd08e..bdbe5483706e6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -555,6 +555,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -925,6 +926,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1290,6 +1292,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2855,6 +2858,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2973,7 +2977,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3831,6 +3837,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4562,6 +4569,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4837,12 +4845,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4922,6 +4933,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5220,6 +5232,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5343,6 +5356,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6540,7 +6554,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6701,6 +6717,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8013,6 +8030,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index b527ff2ed2dab..d7de4a3461985 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -557,6 +557,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -929,6 +930,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1296,6 +1298,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2887,6 +2890,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3007,7 +3011,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3876,6 +3882,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4619,6 +4626,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4898,12 +4906,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4984,6 +4995,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5287,6 +5299,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_3";
@@ -5412,6 +5425,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6629,7 +6643,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6792,6 +6808,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8121,6 +8138,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 64e281547fdbe..23db250f1fd5c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -554,6 +554,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -924,6 +925,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1289,6 +1291,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2854,6 +2857,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2972,7 +2976,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3830,6 +3836,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4561,6 +4568,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4836,12 +4844,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4921,6 +4932,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5219,6 +5231,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5342,6 +5355,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6539,7 +6553,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6699,6 +6715,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8010,6 +8027,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index b75347e108068..0a083cff7063e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -554,6 +554,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -924,6 +925,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1289,6 +1291,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2853,6 +2856,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2971,7 +2975,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3827,6 +3833,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4558,6 +4565,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4831,12 +4839,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4916,6 +4927,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5214,6 +5226,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5337,6 +5350,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6531,7 +6545,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6691,6 +6707,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -7996,6 +8013,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index c231b3071c8cf..0a0b6e975bef2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -554,6 +554,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -924,6 +925,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1289,6 +1291,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2853,6 +2856,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2970,7 +2974,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3825,6 +3831,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4555,6 +4562,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4825,12 +4833,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4910,6 +4921,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5208,6 +5220,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5331,6 +5344,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6525,7 +6539,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6685,6 +6701,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -7990,6 +8007,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index cc3ae037832d1..01397df180471 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -557,6 +557,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -929,6 +930,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1296,6 +1298,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2887,6 +2890,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3007,7 +3011,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3875,6 +3881,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4617,6 +4624,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4896,12 +4904,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4982,6 +4993,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5285,6 +5297,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_3";
@@ -5410,6 +5423,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6627,7 +6641,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6789,6 +6805,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8117,6 +8134,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 48d2c2bda5b5f..f9755359a77ed 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -557,6 +557,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -929,6 +930,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1296,6 +1298,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2887,6 +2890,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3007,7 +3011,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3875,6 +3881,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4617,6 +4624,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4896,12 +4904,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4982,6 +4993,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5285,6 +5297,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_3";
@@ -5410,6 +5423,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6627,7 +6641,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6789,6 +6805,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8116,6 +8133,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index e6cc581f80b21..7c785b05d0c9c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -557,6 +557,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -929,6 +930,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1296,6 +1298,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2886,6 +2889,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3006,7 +3010,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3873,6 +3879,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4613,6 +4620,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4890,12 +4898,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4976,6 +4987,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5279,6 +5291,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5404,6 +5417,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6618,7 +6632,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6780,6 +6796,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8104,6 +8121,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index fdc0007038411..88eaeed0f5b29 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -557,6 +557,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -929,6 +930,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1296,6 +1298,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2886,6 +2889,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3006,7 +3010,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3870,6 +3876,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4610,6 +4617,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4887,12 +4895,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4973,6 +4984,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5273,6 +5285,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5398,6 +5411,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6611,7 +6625,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6773,6 +6789,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8096,6 +8113,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 335ca51351206..fec2f0d3bd69f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -557,6 +557,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -929,6 +930,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1296,6 +1298,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2883,6 +2886,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -3003,7 +3007,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3867,6 +3873,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4606,6 +4613,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4883,12 +4891,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4969,6 +4980,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5269,6 +5281,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5394,6 +5407,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6605,7 +6619,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6767,6 +6783,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8089,6 +8106,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 2263664981862..e21c56a396859 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -557,6 +557,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -929,6 +930,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1296,6 +1298,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2877,6 +2880,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2997,7 +3001,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3861,6 +3867,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4600,6 +4607,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4877,12 +4885,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4963,6 +4974,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5263,6 +5275,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5388,6 +5401,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6597,7 +6611,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6759,6 +6775,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8080,6 +8097,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 20661911f6f0c..e93acae28fa8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -556,6 +556,7 @@ self: super: {
   "INblobs" = dontDistribute super."INblobs";
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -927,6 +928,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1294,6 +1296,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "annotated-wl-pprint" = doDistribute super."annotated-wl-pprint_0_6_0";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
@@ -2873,6 +2876,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2993,7 +2997,9 @@ self: super: {
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
   "farmhash" = dontDistribute super."farmhash";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3857,6 +3863,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4596,6 +4603,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-reverse-proxy" = doDistribute super."http-reverse-proxy_0_4_2";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
@@ -4873,12 +4881,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ix-shapable" = dontDistribute super."ix-shapable";
@@ -4959,6 +4970,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5259,6 +5271,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-fusion-probe" = doDistribute super."list-fusion-probe_0_1_0_4";
@@ -5384,6 +5397,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6592,7 +6606,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6754,6 +6770,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -8075,6 +8092,7 @@ self: super: {
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-list" = doDistribute super."type-list_0_2_0_0";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 2a93a5170821a..98b396a99cbd3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -543,6 +543,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -906,6 +907,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1265,6 +1267,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2783,6 +2786,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2899,7 +2903,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3732,6 +3738,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4433,6 +4440,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4691,12 +4699,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4772,6 +4783,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5070,6 +5082,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5190,6 +5203,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6337,7 +6351,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6488,6 +6504,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -7743,6 +7760,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index c5bc923e67676..407d5b7d404a6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -543,6 +543,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -906,6 +907,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1263,6 +1265,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2779,6 +2782,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2894,7 +2898,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3726,6 +3732,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4426,6 +4433,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4679,12 +4687,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4760,6 +4771,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5055,6 +5067,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5175,6 +5188,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6320,7 +6334,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6471,6 +6487,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -7726,6 +7743,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index b3bce20007a4c..992f86ff7a42f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -541,6 +541,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -902,6 +903,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1259,6 +1261,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2768,6 +2771,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "envy" = dontDistribute super."envy";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
@@ -2881,7 +2885,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3707,6 +3713,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4402,6 +4409,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4651,12 +4659,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4732,6 +4743,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -5027,6 +5039,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5147,6 +5160,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6286,7 +6300,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6436,6 +6452,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -7680,6 +7697,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index b51729bf2818f..a01d5d3618d71 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -535,6 +535,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -891,6 +892,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1247,6 +1249,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2726,6 +2729,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2789,6 +2793,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2836,7 +2841,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3650,6 +3657,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4344,6 +4352,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4590,12 +4599,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4671,6 +4683,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4962,6 +4975,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5082,6 +5096,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -6203,7 +6218,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6350,6 +6367,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6824,6 +6842,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7575,6 +7594,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 76a7d5bbc9ca2..4a1271e520645 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -534,6 +534,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -890,6 +891,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1245,6 +1247,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2720,6 +2723,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2783,6 +2787,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2830,7 +2835,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3644,6 +3651,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4338,6 +4346,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4583,12 +4592,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4664,6 +4676,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4955,6 +4968,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5075,6 +5089,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5268,6 +5283,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -6194,7 +6210,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6340,6 +6358,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6813,6 +6832,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7563,6 +7583,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.10.nix b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
index 2cbd8c771e508..4afe0e0a0b8b6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.10.nix
@@ -527,6 +527,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -882,6 +883,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1233,6 +1235,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2659,6 +2662,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2719,6 +2723,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2765,7 +2770,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3103,6 +3110,7 @@ self: super: {
   "ghci-lib" = dontDistribute super."ghci-lib";
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3564,6 +3572,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -3766,6 +3775,7 @@ self: super: {
   "hedis-tags" = dontDistribute super."hedis-tags";
   "hedn" = dontDistribute super."hedn";
   "hein" = dontDistribute super."hein";
+  "heist" = doDistribute super."heist_0_14_1_2";
   "heist-aeson" = dontDistribute super."heist-aeson";
   "heist-async" = dontDistribute super."heist-async";
   "helics" = dontDistribute super."helics";
@@ -4200,6 +4210,7 @@ self: super: {
   "hsx-xhtml" = dontDistribute super."hsx-xhtml";
   "hsyscall" = dontDistribute super."hsyscall";
   "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = doDistribute super."htaglib_1_0_2";
   "htags" = dontDistribute super."htags";
   "htar" = dontDistribute super."htar";
   "htiled" = dontDistribute super."htiled";
@@ -4238,6 +4249,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4478,12 +4490,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4520,6 +4535,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_2";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4557,6 +4573,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4844,6 +4861,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -4960,6 +4978,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5141,6 +5160,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6036,7 +6056,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6179,6 +6201,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6486,6 +6509,7 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6638,6 +6662,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7371,6 +7396,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
@@ -7790,6 +7816,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.11.nix b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
index f76cfb80c2a57..34f5701d36c55 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.11.nix
@@ -526,6 +526,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -881,6 +882,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1231,6 +1233,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2651,6 +2654,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2710,6 +2714,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2756,7 +2761,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3093,6 +3100,7 @@ self: super: {
   "ghci-lib" = dontDistribute super."ghci-lib";
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3554,6 +3562,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -3756,6 +3765,7 @@ self: super: {
   "hedis-tags" = dontDistribute super."hedis-tags";
   "hedn" = dontDistribute super."hedn";
   "hein" = dontDistribute super."hein";
+  "heist" = doDistribute super."heist_0_14_1_2";
   "heist-aeson" = dontDistribute super."heist-aeson";
   "heist-async" = dontDistribute super."heist-async";
   "helics" = dontDistribute super."helics";
@@ -4186,6 +4196,7 @@ self: super: {
   "hsx-xhtml" = dontDistribute super."hsx-xhtml";
   "hsyscall" = dontDistribute super."hsyscall";
   "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = doDistribute super."htaglib_1_0_2";
   "htags" = dontDistribute super."htags";
   "htar" = dontDistribute super."htar";
   "htiled" = dontDistribute super."htiled";
@@ -4224,6 +4235,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4463,12 +4475,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4505,6 +4520,7 @@ self: super: {
   "jose" = dontDistribute super."jose";
   "jpeg" = dontDistribute super."jpeg";
   "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_2";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4542,6 +4558,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4829,6 +4846,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -4945,6 +4963,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5124,6 +5143,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6018,7 +6038,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6161,6 +6183,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6468,6 +6491,7 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6620,6 +6644,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7348,6 +7373,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
@@ -7762,6 +7788,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index bd84d493760a4..6bf2ccc526e0d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -534,6 +534,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -889,6 +890,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1244,6 +1246,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2718,6 +2721,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2779,6 +2783,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2826,7 +2831,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3637,6 +3644,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4330,6 +4338,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4574,12 +4583,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4655,6 +4667,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4946,6 +4959,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5066,6 +5080,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5257,6 +5272,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6173,7 +6189,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6319,6 +6337,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6791,6 +6810,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7540,6 +7560,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index c7cdcc3de5289..7c359ae979b21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -531,6 +531,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -886,6 +887,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1241,6 +1243,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2702,6 +2705,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2762,6 +2766,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2808,7 +2813,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3616,6 +3623,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4309,6 +4317,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4552,12 +4561,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4633,6 +4645,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4924,6 +4937,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5043,6 +5057,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5231,6 +5246,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6144,7 +6160,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6288,6 +6306,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6758,6 +6777,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7503,6 +7523,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index 269cd7e281022..1eb6d9d934e74 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -530,6 +530,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -885,6 +886,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1239,6 +1241,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2691,6 +2694,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2751,6 +2755,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2797,7 +2802,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3603,6 +3610,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4292,6 +4300,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4535,12 +4544,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4616,6 +4628,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4907,6 +4920,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5024,6 +5038,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5209,6 +5224,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6115,7 +6131,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6258,6 +6276,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6728,6 +6747,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7471,6 +7491,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
index 32a7dfff632be..170b4b23c8e48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -530,6 +530,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -885,6 +886,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1239,6 +1241,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2687,6 +2690,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2747,6 +2751,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2793,7 +2798,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3598,6 +3605,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4286,6 +4294,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4529,12 +4538,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4610,6 +4622,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4901,6 +4914,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -5018,6 +5032,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5203,6 +5218,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6109,7 +6125,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6252,6 +6270,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6722,6 +6741,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7465,6 +7485,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
@@ -7890,6 +7911,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.6.nix b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
index 40258206fbd60..054cffa604250 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.6.nix
@@ -529,6 +529,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -884,6 +885,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1238,6 +1240,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2677,6 +2680,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2737,6 +2741,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2783,7 +2788,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3121,6 +3128,7 @@ self: super: {
   "ghci-lib" = dontDistribute super."ghci-lib";
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3584,6 +3592,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4231,6 +4240,7 @@ self: super: {
   "hsx-xhtml" = dontDistribute super."hsx-xhtml";
   "hsyscall" = dontDistribute super."hsyscall";
   "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = doDistribute super."htaglib_1_0_2";
   "htags" = dontDistribute super."htags";
   "htar" = dontDistribute super."htar";
   "htiled" = dontDistribute super."htiled";
@@ -4269,6 +4279,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4512,12 +4523,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4593,6 +4607,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4883,6 +4898,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -4999,6 +5015,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5184,6 +5201,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6087,7 +6105,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6230,6 +6250,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6699,6 +6720,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7440,6 +7462,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
@@ -7863,6 +7886,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.7.nix b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
index 93309958e178a..573e6d4d2a184 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.7.nix
@@ -529,6 +529,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -884,6 +885,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1238,6 +1240,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2673,6 +2676,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2733,6 +2737,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2779,7 +2784,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3117,6 +3124,7 @@ self: super: {
   "ghci-lib" = dontDistribute super."ghci-lib";
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3580,6 +3588,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4225,6 +4234,7 @@ self: super: {
   "hsx-xhtml" = dontDistribute super."hsx-xhtml";
   "hsyscall" = dontDistribute super."hsyscall";
   "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = doDistribute super."htaglib_1_0_2";
   "htags" = dontDistribute super."htags";
   "htar" = dontDistribute super."htar";
   "htiled" = dontDistribute super."htiled";
@@ -4263,6 +4273,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4506,12 +4517,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4587,6 +4601,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4877,6 +4892,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -4993,6 +5009,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5177,6 +5194,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6077,7 +6095,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6220,6 +6240,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6688,6 +6709,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7426,6 +7448,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
@@ -7849,6 +7872,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.8.nix b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
index c947c1178774f..33846a1f09417 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.8.nix
@@ -529,6 +529,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -884,6 +885,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1238,6 +1240,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2672,6 +2675,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2732,6 +2736,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2778,7 +2783,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3116,6 +3123,7 @@ self: super: {
   "ghci-lib" = dontDistribute super."ghci-lib";
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3579,6 +3587,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -4224,6 +4233,7 @@ self: super: {
   "hsx-xhtml" = dontDistribute super."hsx-xhtml";
   "hsyscall" = dontDistribute super."hsyscall";
   "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = doDistribute super."htaglib_1_0_2";
   "htags" = dontDistribute super."htags";
   "htar" = dontDistribute super."htar";
   "htiled" = dontDistribute super."htiled";
@@ -4262,6 +4272,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4505,12 +4516,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4586,6 +4600,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4876,6 +4891,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -4992,6 +5008,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5176,6 +5193,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6076,7 +6094,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6219,6 +6239,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6687,6 +6708,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7425,6 +7447,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
@@ -7846,6 +7869,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.9.nix b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
index dda42848b6e4f..f62ae9defa253 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.9.nix
@@ -529,6 +529,7 @@ self: super: {
   "IOR" = dontDistribute super."IOR";
   "IORefCAS" = dontDistribute super."IORefCAS";
   "IOSpec" = dontDistribute super."IOSpec";
+  "IPv6Addr" = doDistribute super."IPv6Addr_0_6_0_2";
   "IcoGrid" = dontDistribute super."IcoGrid";
   "Imlib" = dontDistribute super."Imlib";
   "ImperativeHaskell" = dontDistribute super."ImperativeHaskell";
@@ -884,6 +885,7 @@ self: super: {
   "TableAlgebra" = dontDistribute super."TableAlgebra";
   "Tables" = dontDistribute super."Tables";
   "Tablify" = dontDistribute super."Tablify";
+  "Tahin" = dontDistribute super."Tahin";
   "Tainted" = dontDistribute super."Tainted";
   "Takusen" = dontDistribute super."Takusen";
   "Tape" = dontDistribute super."Tape";
@@ -1237,6 +1239,7 @@ self: super: {
   "android" = dontDistribute super."android";
   "android-lint-summary" = dontDistribute super."android-lint-summary";
   "animalcase" = dontDistribute super."animalcase";
+  "annihilator" = dontDistribute super."annihilator";
   "anonymous-sums-tests" = dontDistribute super."anonymous-sums-tests";
   "ansi-pretty" = dontDistribute super."ansi-pretty";
   "ansigraph" = dontDistribute super."ansigraph";
@@ -2666,6 +2669,7 @@ self: super: {
   "enummapset-th" = dontDistribute super."enummapset-th";
   "enumset" = dontDistribute super."enumset";
   "env-parser" = dontDistribute super."env-parser";
+  "envelope" = dontDistribute super."envelope";
   "envparse" = dontDistribute super."envparse";
   "epanet-haskell" = dontDistribute super."epanet-haskell";
   "epass" = dontDistribute super."epass";
@@ -2726,6 +2730,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_3";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
   "exinst" = dontDistribute super."exinst";
@@ -2772,7 +2777,9 @@ self: super: {
   "falling-turnip" = dontDistribute super."falling-turnip";
   "fallingblocks" = dontDistribute super."fallingblocks";
   "family-tree" = dontDistribute super."family-tree";
+  "fast-builder" = doDistribute super."fast-builder_0_0_0_2";
   "fast-digits" = dontDistribute super."fast-digits";
+  "fast-logger" = doDistribute super."fast-logger_2_4_1";
   "fast-math" = dontDistribute super."fast-math";
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
@@ -3110,6 +3117,7 @@ self: super: {
   "ghci-lib" = dontDistribute super."ghci-lib";
   "ghci-ng" = dontDistribute super."ghci-ng";
   "ghci-pretty" = dontDistribute super."ghci-pretty";
+  "ghcid" = doDistribute super."ghcid_0_5_1";
   "ghcjs-codemirror" = dontDistribute super."ghcjs-codemirror";
   "ghcjs-dom" = dontDistribute super."ghcjs-dom";
   "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
@@ -3572,6 +3580,7 @@ self: super: {
   "happybara" = dontDistribute super."happybara";
   "happybara-webkit" = dontDistribute super."happybara-webkit";
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
+  "hapstone" = dontDistribute super."hapstone";
   "har" = dontDistribute super."har";
   "harchive" = dontDistribute super."harchive";
   "hardware-edsl" = dontDistribute super."hardware-edsl";
@@ -3774,6 +3783,7 @@ self: super: {
   "hedis-tags" = dontDistribute super."hedis-tags";
   "hedn" = dontDistribute super."hedn";
   "hein" = dontDistribute super."hein";
+  "heist" = doDistribute super."heist_0_14_1_2";
   "heist-aeson" = dontDistribute super."heist-aeson";
   "heist-async" = dontDistribute super."heist-async";
   "helics" = dontDistribute super."helics";
@@ -4212,6 +4222,7 @@ self: super: {
   "hsx-xhtml" = dontDistribute super."hsx-xhtml";
   "hsyscall" = dontDistribute super."hsyscall";
   "hszephyr" = dontDistribute super."hszephyr";
+  "htaglib" = doDistribute super."htaglib_1_0_2";
   "htags" = dontDistribute super."htags";
   "htar" = dontDistribute super."htar";
   "htiled" = dontDistribute super."htiled";
@@ -4250,6 +4261,7 @@ self: super: {
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
+  "http-response-decoder" = dontDistribute super."http-response-decoder";
   "http-server" = dontDistribute super."http-server";
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
@@ -4490,12 +4502,15 @@ self: super: {
   "ivar-simple" = dontDistribute super."ivar-simple";
   "ivor" = dontDistribute super."ivor";
   "ivory" = dontDistribute super."ivory";
+  "ivory-artifact" = dontDistribute super."ivory-artifact";
   "ivory-backend-c" = dontDistribute super."ivory-backend-c";
   "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "ivory-eval" = dontDistribute super."ivory-eval";
   "ivory-examples" = dontDistribute super."ivory-examples";
   "ivory-hw" = dontDistribute super."ivory-hw";
   "ivory-opts" = dontDistribute super."ivory-opts";
   "ivory-quickcheck" = dontDistribute super."ivory-quickcheck";
+  "ivory-serialize" = dontDistribute super."ivory-serialize";
   "ivory-stdlib" = dontDistribute super."ivory-stdlib";
   "ivy-web" = dontDistribute super."ivy-web";
   "ixdopp" = dontDistribute super."ixdopp";
@@ -4570,6 +4585,7 @@ self: super: {
   "jsonsql" = dontDistribute super."jsonsql";
   "jsontsv" = dontDistribute super."jsontsv";
   "jspath" = dontDistribute super."jspath";
+  "juandelacosa" = dontDistribute super."juandelacosa";
   "judy" = dontDistribute super."judy";
   "jukebox" = dontDistribute super."jukebox";
   "jump" = dontDistribute super."jump";
@@ -4860,6 +4876,7 @@ self: super: {
   "lipsum-gen" = dontDistribute super."lipsum-gen";
   "liquid-fixpoint" = dontDistribute super."liquid-fixpoint";
   "liquidhaskell" = dontDistribute super."liquidhaskell";
+  "liquidhaskell-cabal" = dontDistribute super."liquidhaskell-cabal";
   "lispparser" = dontDistribute super."lispparser";
   "list-extras" = dontDistribute super."list-extras";
   "list-grouping" = dontDistribute super."list-grouping";
@@ -4976,6 +4993,7 @@ self: super: {
   "lzma-streams" = dontDistribute super."lzma-streams";
   "maam" = dontDistribute super."maam";
   "mac" = dontDistribute super."mac";
+  "macbeth-lib" = dontDistribute super."macbeth-lib";
   "maccatcher" = dontDistribute super."maccatcher";
   "machinecell" = dontDistribute super."machinecell";
   "machines-binary" = dontDistribute super."machines-binary";
@@ -5160,6 +5178,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-connect" = dontDistribute super."monad-connect";
+  "monad-control" = doDistribute super."monad-control_1_0_0_5";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -6056,7 +6075,9 @@ self: super: {
   "quiver-cell" = dontDistribute super."quiver-cell";
   "quiver-csv" = dontDistribute super."quiver-csv";
   "quiver-enumerator" = dontDistribute super."quiver-enumerator";
+  "quiver-groups" = dontDistribute super."quiver-groups";
   "quiver-http" = dontDistribute super."quiver-http";
+  "quiver-interleave" = dontDistribute super."quiver-interleave";
   "quoridor-hs" = dontDistribute super."quoridor-hs";
   "qux" = dontDistribute super."qux";
   "rabocsv2qif" = dontDistribute super."rabocsv2qif";
@@ -6199,6 +6220,7 @@ self: super: {
   "regions-monadsfd" = dontDistribute super."regions-monadsfd";
   "regions-monadstf" = dontDistribute super."regions-monadstf";
   "regions-mtl" = dontDistribute super."regions-mtl";
+  "register-machine-typelevel" = dontDistribute super."register-machine-typelevel";
   "regress" = dontDistribute super."regress";
   "regular" = dontDistribute super."regular";
   "regular-extras" = dontDistribute super."regular-extras";
@@ -6506,6 +6528,7 @@ self: super: {
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
   "serv-wai" = dontDistribute super."serv-wai";
+  "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_3_0_1";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6659,6 +6682,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_2";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -7393,6 +7417,7 @@ self: super: {
   "type-level-sets" = dontDistribute super."type-level-sets";
   "type-level-tf" = dontDistribute super."type-level-tf";
   "type-natural" = dontDistribute super."type-natural";
+  "type-operators" = dontDistribute super."type-operators";
   "type-ord" = dontDistribute super."type-ord";
   "type-ord-spine-cereal" = dontDistribute super."type-ord-spine-cereal";
   "type-prelude" = dontDistribute super."type-prelude";
@@ -7813,6 +7838,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_1";
   "xlsx-tabular" = dontDistribute super."xlsx-tabular";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 6c308fbd74920..8503807b26478 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4732,6 +4732,7 @@ self: {
        jailbreak = true;
        description = "A client library for the DigitalOcean API";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DimensionalHash" = callPackage
@@ -5201,24 +5202,6 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, ListLike, tasty, tasty-hunit
-     , tasty-quickcheck, unordered-containers
-     }:
-     mkDerivation {
-       pname = "Earley";
-       version = "0.11.0.0";
-       sha256 = "a8ad11ac5a263752180fb25a9d1accd21855f61423086bdbf223bd3fb2192126";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ListLike ];
-       executableHaskellDepends = [ base unordered-containers ];
-       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
-       doCheck = false;
-       description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Earley_0_11_0_1" = callPackage
     ({ mkDerivation, base, ListLike, tasty, tasty-hunit
      , tasty-quickcheck, unordered-containers
      }:
@@ -5233,7 +5216,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -10898,6 +10880,7 @@ self: {
        jailbreak = true;
        homepage = "https://github.com/jaiyalas/Hish";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Histogram" = callPackage
@@ -11482,7 +11465,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "IPv6Addr" = callPackage
+  "IPv6Addr_0_6_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, HUnit, iproute, network
      , network-info, random, test-framework, test-framework-hunit, text
      }:
@@ -11499,6 +11482,26 @@ self: {
        homepage = "https://github.com/MichelBoucey/IPv6Addr";
        description = "Library to deal with IPv6 address text representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "IPv6Addr" = callPackage
+    ({ mkDerivation, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "0.6.1.0";
+       sha256 = "dea0eb0a534e1df647487f120428ac7cfc54ab9c8ca75f63fe47a4020d4888c6";
+       libraryHaskellDepends = [
+         attoparsec base iproute network network-info random text
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/MichelBoucey/IPv6Addr";
+       description = "Library to deal with IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "IcoGrid" = callPackage
@@ -12201,8 +12204,8 @@ self: {
        pname = "JuicyPixels-scale-dct";
        version = "0.1.1.0";
        sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9";
-       revision = "1";
-       editedCabalFile = "5b187d4f46adbd5ff68ddda4f2f0221370dc3f4f47d7a95f652d147a7bd9f36a";
+       revision = "2";
+       editedCabalFile = "d80ead4c776cec3babb37a69c099560b421e5eb929b9ebe8e433a8fa4ef243ea";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -12715,8 +12718,8 @@ self: {
      }:
      mkDerivation {
        pname = "Lambdaya";
-       version = "0.2.0.0.1";
-       sha256 = "ecb9d7490da6f3b11aaa118f271121fa3f3a940a7914e7551b8b078650ea4dcf";
+       version = "0.3.0.0.0";
+       sha256 = "9a54212c2fe90cad44bf64c2c6f696e71905e3b1e3fdff98fe0749a3b335fc52";
        libraryHaskellDepends = [
          base binary mtl network pipes pipes-binary pipes-network
          pipes-parse
@@ -13133,8 +13136,8 @@ self: {
      }:
      mkDerivation {
        pname = "LogicGrowsOnTrees-network";
-       version = "1.0.0.3";
-       sha256 = "b6893ed0a39edcb3b35e7d25d7e4d99cfac41212bfcf40dcdcaf5e57c6bac664";
+       version = "1.0.0.4";
+       sha256 = "7a01eb40f87b5810bfccfb23d49e4a04f7bb630f201425caaa0eeb0a82d9b973";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -13149,7 +13152,6 @@ self: {
          base hslogger hslogger-template HUnit LogicGrowsOnTrees network
          random stm test-framework test-framework-hunit transformers
        ];
-       jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13758,6 +13760,7 @@ self: {
        homepage = "https://github.com/audreyt/MoeDict.hs";
        description = "Utilities working with MoeDict.tw JSON dataset";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadCatchIO-mtl" = callPackage
@@ -16035,20 +16038,6 @@ self: {
      }) {};
 
   "PortMidi" = callPackage
-    ({ mkDerivation, alsaLib, base }:
-     mkDerivation {
-       pname = "PortMidi";
-       version = "0.1.5.2";
-       sha256 = "b855a9f3c0b9796e9e8fe00bbfad47fd233e648b31c3443881f4dfa544800276";
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ alsaLib ];
-       homepage = "http://haskell.org/haskellwiki/PortMidi";
-       description = "A binding for PortMedia/PortMidi";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {inherit (pkgs) alsaLib;};
-
-  "PortMidi_0_1_6_0" = callPackage
     ({ mkDerivation, alsaLib, base }:
      mkDerivation {
        pname = "PortMidi";
@@ -16059,7 +16048,7 @@ self: {
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -19341,6 +19330,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Tahin" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, containers
+     , cryptohash, haskeline, mtl, optparse-applicative, text
+     }:
+     mkDerivation {
+       pname = "Tahin";
+       version = "0.1.2";
+       sha256 = "c89b2b2bc837985fb697eec2f9f39ad6acb1a8d45beafb9b41cc6bcb1a231923";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base base64-bytestring bytestring text ];
+       executableHaskellDepends = [
+         base base64-bytestring bytestring containers cryptohash haskeline
+         mtl optparse-applicative text
+       ];
+       homepage = "http://github.com/mtesseract/Tahin#readme";
+       description = "Tahin Password Generator";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Tainted" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -23879,6 +23888,7 @@ self: {
        homepage = "https://github.com/Fuuzetsu/aeson-schema";
        description = "Haskell JSON schema validator and parser generator";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-serialize" = callPackage
@@ -24919,6 +24929,7 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -30397,6 +30408,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "annihilator" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "annihilator";
+       version = "0.1.0.0";
+       sha256 = "d70391510f1edc498e8b746737500d378dd5cebd75fc953ee7bb75279cbfc001";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/Shou/annihilator#readme";
+       description = "Semigroups with annihilators and utility functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "annotated-wl-pprint_0_6_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -30458,8 +30481,8 @@ self: {
        pname = "ansi-pretty";
        version = "0.1.2.0";
        sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424";
-       revision = "1";
-       editedCabalFile = "3f1fc699687e8f3b474da3666fc4c7e26626bba2329455a87655cc91ea62ee78";
+       revision = "2";
+       editedCabalFile = "76329a4d951e443e7d43bc570d6420d03b9a6a0aa337f22efbb5f4ff7006bf22";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -30586,8 +30609,8 @@ self: {
      }:
      mkDerivation {
        pname = "antagonist";
-       version = "0.1.0.29";
-       sha256 = "e91e99d72c990663a2e58ebdf9f397bb9963a6a58dbb0470abb31072809579b6";
+       version = "0.1.0.30";
+       sha256 = "e601f6619590b3027113c596115abdc8d46bdb43ad177b0b78cd83010255faad";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30703,8 +30726,8 @@ self: {
      }:
      mkDerivation {
        pname = "antisplice";
-       version = "0.17.1.0";
-       sha256 = "de325d8b473db1eec25c630f07266fbd6262cb6452252f0bed02065e9f3888b8";
+       version = "0.17.1.1";
+       sha256 = "a2e6407db5c32760f9ede11b610f452f235827ae7bf80c0142aa18e3b2f365fa";
        libraryHaskellDepends = [
          base chatty chatty-utils haskeline mtl template-haskell text time
          transformers
@@ -33590,7 +33613,7 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -37457,8 +37480,8 @@ self: {
      }:
      mkDerivation {
        pname = "bert";
-       version = "1.2.2.4";
-       sha256 = "e4e907e3353a9967196c973a363bc8742670587f42e9de0ac639a4c836f58bed";
+       version = "1.2.2.5";
+       sha256 = "72b99fa9df51890bac1b725ccd4a4821f2540cfc71afb55d2f903ca75012716a";
        libraryHaskellDepends = [
          base binary binary-conduit bytestring conduit conduit-extra
          containers mtl network parsec time unix void
@@ -37635,6 +37658,7 @@ self: {
        homepage = "https://github.com/cacay/bibdb";
        description = "A database based bibliography manager for BibTeX";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bibtex" = callPackage
@@ -37780,18 +37804,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bifunctors_5_2_1" = callPackage
-    ({ mkDerivation, base, comonad, containers, hspec, QuickCheck
-     , semigroups, tagged, template-haskell, transformers
+  "bifunctors_5_3" = callPackage
+    ({ mkDerivation, base, base-orphans, comonad, containers, hspec
+     , QuickCheck, semigroups, tagged, template-haskell, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "bifunctors";
-       version = "5.2.1";
-       sha256 = "cbb459178a8c72cbb695361b518ae17ed3664e3ad207a34276f4d2990107e9cb";
+       version = "5.3";
+       sha256 = "66d2faa673752b4e47018a9ebfd84075c450b41556bb9551cf04d359dbcce8bf";
        libraryHaskellDepends = [
-         base comonad containers semigroups tagged template-haskell
-         transformers transformers-compat
+         base base-orphans comonad containers semigroups tagged
+         template-haskell transformers transformers-compat
        ];
        testHaskellDepends = [
          base hspec QuickCheck transformers transformers-compat
@@ -39553,6 +39577,7 @@ self: {
        homepage = "http://github.com/aktowns/bindings-wlc#readme";
        description = "Bindings against the wlc library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) wlc;};
 
   "bindings-yices" = callPackage
@@ -42832,16 +42857,17 @@ self: {
      }) {};
 
   "buildbox" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, mtl
-     , old-locale, pretty, process, random, stm, text, time
+    ({ mkDerivation, base, bytestring, containers, directory
+     , exceptions, mtl, old-locale, pretty, process, stm, temporary
+     , text, time
      }:
      mkDerivation {
        pname = "buildbox";
-       version = "2.1.7.1";
-       sha256 = "5193d8b22d0b576e972f85f032627a4ebbd6f2d6033aa4a789b312574baf8f58";
+       version = "2.1.8.1";
+       sha256 = "086a39b3424e4e86a0f5338877ad06847de42e5b868c67446e80dea1540dd445";
        libraryHaskellDepends = [
-         base bytestring containers directory mtl old-locale pretty process
-         random stm text time
+         base bytestring containers directory exceptions mtl old-locale
+         pretty process stm temporary text time
        ];
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Rehackable components for writing buildbots and test harnesses";
@@ -45837,20 +45863,20 @@ self: {
      }) {};
 
   "cacophony" = callPackage
-    ({ mkDerivation, async, base, bytestring, cryptonite, directory
-     , doctest, filepath, free, hlint, lens, memory, mtl, QuickCheck
-     , tasty, tasty-quickcheck
+    ({ mkDerivation, async, base, bytestring, cryptonite, deepseq, free
+     , hlint, lens, memory, mtl, QuickCheck, tasty, tasty-quickcheck
      }:
      mkDerivation {
        pname = "cacophony";
-       version = "0.5.0";
-       sha256 = "942167185eebb4290e576f2c25816d0ccd52d68b47641dbdf5b5d8fffcd8f750";
+       version = "0.6.0";
+       sha256 = "2a1b2cf962fbf2743efb36439428b89882add585a4877436533b9fc755d98a9c";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring cryptonite free lens memory mtl
+         base bytestring cryptonite deepseq free lens memory mtl
        ];
        testHaskellDepends = [
-         async base bytestring directory doctest filepath hlint mtl
-         QuickCheck tasty tasty-quickcheck
+         async base bytestring hlint mtl QuickCheck tasty tasty-quickcheck
        ];
        doCheck = false;
        homepage = "https://github.com/centromere/cacophony";
@@ -48466,13 +48492,12 @@ self: {
      }:
      mkDerivation {
        pname = "chatty";
-       version = "0.6.4.1";
-       sha256 = "9f3ecc2335277144a86e9299f9775d2c655862e028b49e1070623cc8dbcaea09";
+       version = "0.7.0.0";
+       sha256 = "87e2025fab3187c029ffdf221c8280b25dffb4f59fcf57212dcf0235ddba167b";
        libraryHaskellDepends = [
          ansi-terminal base chatty-utils directory mtl process random setenv
          template-haskell text time transformers unix
        ];
-       jailbreak = true;
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Some monad transformers and typeclasses for abstraction of global dependencies";
        license = stdenv.lib.licenses.agpl3;
@@ -48482,8 +48507,8 @@ self: {
     ({ mkDerivation, base, chatty, transformers }:
      mkDerivation {
        pname = "chatty-text";
-       version = "0.6.2.0";
-       sha256 = "830a7503347bdcba3c6778ab8e4d7843d574c3a8d64f387e6b4349d92efecf3d";
+       version = "0.6.2.1";
+       sha256 = "820f5d1f6b7cc52430ee835ce0f7779b41987a6b492bee2466b957c03780c301";
        libraryHaskellDepends = [ base chatty transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Provides some classes and types for dealing with text, using the fundaments of Chatty";
@@ -48494,8 +48519,8 @@ self: {
     ({ mkDerivation, base, mtl, text, transformers }:
      mkDerivation {
        pname = "chatty-utils";
-       version = "0.7.3.2";
-       sha256 = "12c9510397cdbf45fd90aac93ebf353df8aac0ad3e24b353ca3549fc934f22b5";
+       version = "0.7.3.3";
+       sha256 = "e966e3c04e31cba118a4dd5a3a695976b4e5aa03cafa8031c7305c1587ebf8ad";
        libraryHaskellDepends = [ base mtl text transformers ];
        homepage = "http://doomanddarkness.eu/pub/chatty";
        description = "Some utilities every serious chatty-based application may need";
@@ -52126,6 +52151,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clock_0_7_1_1" = callPackage
+    ({ mkDerivation, base, tasty, tasty-quickcheck }:
+     mkDerivation {
+       pname = "clock";
+       version = "0.7.1.1";
+       sha256 = "6be612a15ede79fcc6c4f8272555e3890247e75ba211c88b1b02d856f3e0150d";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       homepage = "https://github.com/corsis/clock";
+       description = "High-resolution clock functions: monotonic, realtime, cputime";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clocked" = callPackage
     ({ mkDerivation, base, clock, containers, MonadCatchIO-transformers
      , QtCore, transformers
@@ -58643,6 +58682,7 @@ self: {
        homepage = "https://github.com/etcinit/craze#readme";
        description = "HTTP Racing Library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crc" = callPackage
@@ -59918,6 +59958,7 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite-openssl";
        description = "Crypto stuff using OpenSSL cryptographic library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "cryptsy-api" = callPackage
@@ -60301,13 +60342,16 @@ self: {
      }) {};
 
   "ctpl" = callPackage
-    ({ mkDerivation, base, chatty-text, chatty-utils }:
+    ({ mkDerivation, array, base, chatty-text, chatty-utils }:
      mkDerivation {
        pname = "ctpl";
-       version = "0.1.0.1";
-       sha256 = "3b6bb011e0cc647fcc1254c52b182a5928a730a26cb55cfbcc19d9f2e27a78d5";
-       libraryHaskellDepends = [ base chatty-text chatty-utils ];
-       jailbreak = true;
+       version = "0.1.0.4";
+       sha256 = "29eef56cbc972a03b9da43bd00a61bd8f9eab81d23dbcbf0e5e171b270f16c0f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ array base chatty-text chatty-utils ];
+       executableHaskellDepends = [ array base chatty-text chatty-utils ];
+       homepage = "http://doomanddarkness.eu/pub/ctpl";
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -60490,8 +60534,8 @@ self: {
     ({ mkDerivation, base, c2hs, cuda }:
      mkDerivation {
        pname = "cufft";
-       version = "0.1.2.1";
-       sha256 = "d29c4de93e2ccf1d9124cff6466b1e0a04108c8cfc284164713b5ec79bb879e2";
+       version = "0.1.2.2";
+       sha256 = "7ce52f10a05bd5064466dde644e0663abbc9eb3cfe0026531cfc04c1c8302bec";
        libraryHaskellDepends = [ base cuda ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/robeverest/cufft";
@@ -63612,6 +63656,7 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler test driver and buildbot";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddci-core" = callPackage
@@ -67700,8 +67745,8 @@ self: {
      }:
      mkDerivation {
        pname = "digit";
-       version = "0.2.5";
-       sha256 = "685bf3e11e88ccc17c3895f10eac5508e186fcb5fbcd9a59040612e683c227e8";
+       version = "0.2.6";
+       sha256 = "778670a01298e208ee0913e61749be40d99bc3559541b5f85bc698de1ce5eb1f";
        libraryHaskellDepends = [
          base lens parsec parsers semigroups template-haskell
        ];
@@ -68243,6 +68288,7 @@ self: {
        homepage = "http://github.com/accraze/discogs-haskell";
        description = "Client for Discogs REST API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "discordian-calendar" = callPackage
@@ -70899,6 +70945,7 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -74197,6 +74244,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "envelope" = callPackage
+    ({ mkDerivation, aeson, base, doctest, Glob, mtl, text }:
+     mkDerivation {
+       pname = "envelope";
+       version = "0.1.0.0";
+       sha256 = "9116ceda5b6e103219361bcd5cdaa699a1365a43df06e5752c61dfb6419b316e";
+       libraryHaskellDepends = [ aeson base mtl text ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/cdepillabout/envelope#readme";
+       description = "Defines generic 'Envelope' type to wrap reponses from a JSON API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "envparse" = callPackage
     ({ mkDerivation, base, containers, hspec }:
      mkDerivation {
@@ -75910,7 +75970,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "exception-transformers" = callPackage
+  "exception-transformers_0_4_0_3" = callPackage
     ({ mkDerivation, base, HUnit, stm, test-framework
      , test-framework-hunit, transformers, transformers-compat
      }:
@@ -75927,6 +75987,26 @@ self: {
        ];
        description = "Type classes and monads for unchecked extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "exception-transformers" = callPackage
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "exception-transformers";
+       version = "0.4.0.4";
+       sha256 = "d9b3a527acaeb1c03746db4704d8f64453d02ab4b89d16bd90fb4dbe7b9e7696";
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit transformers
+         transformers-compat
+       ];
+       description = "Type classes and monads for unchecked extensible exceptions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "exceptional" = callPackage
@@ -77082,7 +77162,7 @@ self: {
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
-  "fast-builder" = callPackage
+  "fast-builder_0_0_0_2" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
      , stm
      }:
@@ -77095,6 +77175,22 @@ self: {
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fast-builder" = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, process, QuickCheck
+     , stm
+     }:
+     mkDerivation {
+       pname = "fast-builder";
+       version = "0.0.0.3";
+       sha256 = "74f45c8059eb428cfb75d7ff72d49b775af53d3e155329537e15fde1b068feed";
+       libraryHaskellDepends = [ base bytestring ghc-prim ];
+       testHaskellDepends = [ base bytestring process QuickCheck stm ];
+       homepage = "http://github.com/takano-akio/fast-builder";
+       description = "Fast ByteString Builder";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "fast-digits" = callPackage
@@ -77177,7 +77273,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fast-logger" = callPackage
+  "fast-logger_2_4_1" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring
      , bytestring-builder, directory, filepath, hspec, text
      }:
@@ -77194,6 +77290,24 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec ];
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fast-logger" = callPackage
+    ({ mkDerivation, array, auto-update, base, bytestring
+     , bytestring-builder, directory, filepath, hspec, text
+     }:
+     mkDerivation {
+       pname = "fast-logger";
+       version = "2.4.2";
+       sha256 = "2a9b8cba58c21c95c0209f94e0656a77aa79abe85401a91d9e5b242b05fff5e7";
+       libraryHaskellDepends = [
+         array auto-update base bytestring bytestring-builder directory
+         filepath text
+       ];
+       testHaskellDepends = [ base bytestring directory hspec ];
+       description = "A fast logging system";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fast-math" = callPackage
@@ -80383,20 +80497,21 @@ self: {
      }) {};
 
   "flat-mcmc" = callPackage
-    ({ mkDerivation, base, monad-par, monad-par-extras, mtl, mwc-random
-     , primitive, vector
+    ({ mkDerivation, base, mcmc-types, monad-par, monad-par-extras
+     , mwc-probability, pipes, primitive, transformers, vector
      }:
      mkDerivation {
        pname = "flat-mcmc";
-       version = "0.1.0.0";
-       sha256 = "e50ffd58d41a2f2fd4a82a7397b2330eff63f5269578d8cf91734d81d493e5ba";
+       version = "1.0.1";
+       sha256 = "a2852f0b020b086fa9e28e63b502a7bbdcbc4151080ce01baa366d53362de774";
        libraryHaskellDepends = [
-         base monad-par monad-par-extras mtl mwc-random primitive vector
+         base mcmc-types monad-par monad-par-extras mwc-probability pipes
+         primitive transformers vector
        ];
-       jailbreak = true;
+       testHaskellDepends = [ base vector ];
        homepage = "http://jtobin.github.com/flat-mcmc";
        description = "Painless general-purpose sampling";
-       license = stdenv.lib.licenses.bsd3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "flat-tex" = callPackage
@@ -82787,8 +82902,8 @@ self: {
      }:
      mkDerivation {
        pname = "freer";
-       version = "0.2.2.4";
-       sha256 = "1af6b91d290eb3eea3e6c3a888e7b32a0a7a864de0ef33ddb7d3b7a169a1777d";
+       version = "0.2.2.5";
+       sha256 = "4ba63b5e1c0860458fe59f8d7370d25ddcf7a6a8442409b850108881a6644ef7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -82796,7 +82911,7 @@ self: {
        testHaskellDepends = [
          base QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
-       homepage = "https://gitlab.com/cpp.cabrera/freer";
+       homepage = "https://gitlab.com/queertypes/freer";
        description = "Implementation of the Freer Monad";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -83863,7 +83978,7 @@ self: {
        homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fwgl-javascript" = callPackage
@@ -85687,20 +85802,20 @@ self: {
     ({ mkDerivation, base, bytestring, Cabal, containers, directory
      , exceptions, filepath, ghc, ghc-mod, ghc-paths, ghc-syb-utils
      , haddock-api, hspec, hspec-discover, monad-journal, mtl
-     , optparse-applicative, parsec, process, process-streaming, safe
-     , syb, transformers
+     , optparse-applicative, parsec, pipes-transduce, process
+     , process-streaming, safe, syb, transformers
      }:
      mkDerivation {
        pname = "ghc-imported-from";
-       version = "0.3.0.2";
-       sha256 = "7be48f1328fa0faa7a99effd04cdd17ef4058a7f6f716cb09d381055b30e59eb";
+       version = "0.3.0.4";
+       sha256 = "ed2517109076ae499c2de8d999577a32b666063d99b48364adbf7de68f947341";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring Cabal containers directory exceptions filepath ghc
          ghc-mod ghc-paths ghc-syb-utils haddock-api hspec hspec-discover
-         monad-journal mtl optparse-applicative parsec process
-         process-streaming safe syb transformers
+         monad-journal mtl optparse-applicative parsec pipes-transduce
+         process process-streaming safe syb transformers
        ];
        executableHaskellDepends = [
          base bytestring Cabal containers directory exceptions filepath ghc
@@ -85714,7 +85829,7 @@ self: {
          monad-journal mtl optparse-applicative parsec process
          process-streaming safe syb transformers
        ];
-       jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
@@ -86532,7 +86647,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghcid" = callPackage
+  "ghcid_0_5_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers
      , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
      , terminal-size, time
@@ -86558,6 +86673,36 @@ self: {
        homepage = "https://github.com/ndmitchell/ghcid#readme";
        description = "GHCi based bare bones IDE";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghcid" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+     , terminal-size, time, unix
+     }:
+     mkDerivation {
+       pname = "ghcid";
+       version = "0.6.1";
+       sha256 = "f3a69db6c66670aefa9c38ec8f30cec1e5a5ac3405b661fcc320a613518b4a4c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cmdargs directory extra filepath process terminal-size time
+         unix
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process terminal-size time unix
+       ];
+       testHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process tasty tasty-hunit terminal-size time unix
+       ];
+       doCheck = false;
+       homepage = "https://github.com/ndmitchell/ghcid#readme";
+       description = "GHCi based bare bones IDE";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ghcjs-codemirror" = callPackage
@@ -86851,6 +86996,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gst bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gstreamer;};
 
   "gi-gstaudio" = callPackage
@@ -86870,6 +87016,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GstAudio bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst_plugins_base;};
 
   "gi-gstbase" = callPackage
@@ -86888,6 +87035,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GstBase bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst_plugins_base;};
 
   "gi-gstvideo" = callPackage
@@ -86907,6 +87055,7 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "GstVideo bindings";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst_plugins_base;};
 
   "gi-gtk" = callPackage
@@ -87128,8 +87277,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.1.8.0";
-       sha256 = "b09eeb70e68c50637ade30c385b7ec99a97baf378a76d802e3f550b3b59d3409";
+       version = "0.2.0.0";
+       sha256 = "e88221b67e7d262da943bd3b16f5de061130201425e889ca949422bb7e301ff3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -87382,21 +87531,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "giphy-api_0_3_0_0" = callPackage
+  "giphy-api_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, basic-prelude, bytestring, containers
      , directory, hspec, http-api-data, http-client, http-client-tls
      , lens, microlens, microlens-th, mtl, network-uri, servant
-     , servant-client, text
+     , servant-client, text, transformers
      }:
      mkDerivation {
        pname = "giphy-api";
-       version = "0.3.0.0";
-       sha256 = "55fbe10b9fd72dba376710e2a6a98e9f53983e0601c6a995006433dd140627a7";
+       version = "0.4.0.0";
+       sha256 = "bb2952f54232cead3e66350b514ca31aac511bf172be45115b98dd8777859876";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers http-api-data http-client http-client-tls
          microlens microlens-th mtl network-uri servant servant-client text
+         transformers
        ];
        executableHaskellDepends = [ base network-uri text ];
        testHaskellDepends = [
@@ -89206,12 +89356,11 @@ self: {
      }:
      mkDerivation {
        pname = "gloss";
-       version = "1.9.4.1";
-       sha256 = "b16094797ba377372bb492cb04dc50e60a77687bd7300bf57e9fab2ad366afe5";
+       version = "1.10.1.1";
+       sha256 = "a6c4e0391668688c0965e2e5eddff4abaebbcca62606a7b260942a863de34630";
        libraryHaskellDepends = [
          base bmp bytestring containers ghc-prim gloss-rendering GLUT OpenGL
        ];
-       jailbreak = true;
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
@@ -89227,17 +89376,18 @@ self: {
        revision = "1";
        editedCabalFile = "cddab61d37317ec1a15ad7da65d909b8668b284dcf182a7a348d234bff7d30ff";
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
+       jailbreak = true;
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-algorithms" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, gloss }:
      mkDerivation {
        pname = "gloss-algorithms";
-       version = "1.9.4.1";
-       sha256 = "40cbf7b28182e17ae86091aa108489848aff8d5ae4e2c5719e112493cc011649";
+       version = "1.10.1.1";
+       sha256 = "da385e6fa2cdca7ab3b6ce2397d24fac0055896609376c9a8c3acf193e908b0e";
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
@@ -89280,8 +89430,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-examples";
-       version = "1.9.4.1";
-       sha256 = "9e16dbd092cfc6586a13639550f2701e2727e850734856d118a4a19757ef1a0b";
+       version = "1.10.1.1";
+       sha256 = "a08f297c5a38e9d975ac4390c960d5095b58c77033285de744028f3855048c96";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -89306,7 +89456,7 @@ self: {
        homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-juicy" = callPackage
@@ -89327,7 +89477,7 @@ self: {
        homepage = "http://github.com/alpmestan/gloss-juicy";
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-raster" = callPackage
@@ -89336,8 +89486,8 @@ self: {
      }:
      mkDerivation {
        pname = "gloss-raster";
-       version = "1.9.4.1";
-       sha256 = "697325d17ff549f8092ccb08fa6d8b51fc2ae6b704e7a150f7a2bf11ebc3d560";
+       version = "1.10.1.1";
+       sha256 = "01e68842a6ef911be37556b92ae82786e298a70e86177b3b86472222ad1b01f2";
        libraryHaskellDepends = [
          base containers ghc-prim gloss gloss-rendering repa
        ];
@@ -89358,6 +89508,7 @@ self: {
        libraryHaskellDepends = [
          accelerate accelerate-cuda base gloss gloss-accelerate
        ];
+       jailbreak = true;
        description = "Parallel rendering of raster images using Accelerate";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -89367,12 +89518,11 @@ self: {
     ({ mkDerivation, base, bmp, bytestring, containers, GLUT, OpenGL }:
      mkDerivation {
        pname = "gloss-rendering";
-       version = "1.9.3.1";
-       sha256 = "fefbab161f3aa797416f63cd3ae029883470c7be6ab4f67803beefc95dea49db";
+       version = "1.10.1.1";
+       sha256 = "279ad168dc44e8432a6e7fb58b97c4514a2d0806806b3e7b71a159b87ace8c5c";
        libraryHaskellDepends = [
          base bmp bytestring containers GLUT OpenGL
        ];
-       jailbreak = true;
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -98390,6 +98540,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hapstone" = callPackage
+    ({ mkDerivation, base, c2hs, capstone, hspec, QuickCheck
+     , quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "hapstone";
+       version = "0.1.0.1";
+       sha256 = "408ca259ec062af5bb9b6b871d07bd846ee590449efca9ab24db497aa56d2c23";
+       libraryHaskellDepends = [ base ];
+       librarySystemDepends = [ capstone ];
+       libraryToolDepends = [ c2hs ];
+       testHaskellDepends = [
+         base hspec QuickCheck quickcheck-instances
+       ];
+       homepage = "http://github.com/ibabushkin/hapstone";
+       description = "Capstone bindings for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) capstone;};
+
   "har" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, filepath, text
      }:
@@ -100077,6 +100246,7 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-packages";
        description = "Haskell suite library for package management and integration with Cabal";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-pdf-presenter" = callPackage
@@ -102245,12 +102415,11 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-optparse-applicative";
-       version = "0.1";
-       sha256 = "42f0b2acdfd1e213f8c30f65abeb063cb62534cb8d8a2f7950201409b00b7ac5";
+       version = "0.1.1";
+       sha256 = "8d0e6601a5353d4cd5bd6fd7f713d79ecf8bfbe3458163c0b0e0f10a90ed80fd";
        libraryHaskellDepends = [
          base-prelude hasql hasql-pool optparse-applicative
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
@@ -102260,10 +102429,9 @@ self: {
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
-       version = "0.4";
-       sha256 = "6bb18b7f41a471e0260a60ecd0a4495ccef111e3151d0b3e55ae5e3865c3850e";
+       version = "0.4.1";
+       sha256 = "cc6fdd5a088999609b63c46ca888ddfaa73f28fb36bf007c73379e6b9779c60d";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -102613,12 +102781,11 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-th";
-       version = "0.2";
-       sha256 = "c08dab84a62bb5adff1e8f0aa2e0a626d1a8347597ca287deebb12b46602a4e4";
+       version = "0.2.1";
+       sha256 = "af86c90705ad5590c4a6d0e86bf8082904f739e862993b3233a0fede2fadd651";
        libraryHaskellDepends = [
          base-prelude bytestring template-haskell text
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-th";
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -102631,14 +102798,13 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-transaction";
-       version = "0.4.3";
-       sha256 = "9b6a623cdfb83c648c18ac70d7ce548742115d0a9ce25d41a8ab2ff73f67f95e";
+       version = "0.4.4";
+       sha256 = "b6a14cc3f4cbfdef648ccd8ad5ef1b5a1c58ba0fa7655aac62f54a6c36ad532f";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras either hasql mtl postgresql-error-codes
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-transaction";
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -104707,7 +104873,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "heist" = callPackage
+  "heist_0_14_1_2" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
      , bytestring, containers, directory, directory-tree, dlist, either
      , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl
@@ -104727,6 +104893,29 @@ self: {
        homepage = "http://snapframework.com/";
        description = "An Haskell template system supporting both HTML5 and XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "heist" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, blaze-html
+     , bytestring, containers, directory, directory-tree, dlist, either
+     , filepath, hashable, map-syntax, MonadCatchIO-transformers, mtl
+     , process, random, text, time, transformers, unordered-containers
+     , vector, xmlhtml
+     }:
+     mkDerivation {
+       pname = "heist";
+       version = "0.14.1.3";
+       sha256 = "295b53f7e3dac7df3aaa92a7fc989a41efb508561df9ce8fb067d5dc230e4deb";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder blaze-html bytestring
+         containers directory directory-tree dlist either filepath hashable
+         map-syntax MonadCatchIO-transformers mtl process random text time
+         transformers unordered-containers vector xmlhtml
+       ];
+       homepage = "http://snapframework.com/";
+       description = "An Haskell template system supporting both HTML5 and XML";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "heist-aeson" = callPackage
@@ -106148,6 +106337,7 @@ self: {
        homepage = "https://github.com/LukeHoersten/hgrev";
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgrib" = callPackage
@@ -111938,6 +112128,7 @@ self: {
        homepage = "https://bitbucket.org/tdammers/hpaco";
        description = "Modular template compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpaco-lib" = callPackage
@@ -111957,6 +112148,7 @@ self: {
        homepage = "https://bitbucket.org/tdammers/hpaco";
        description = "Modular template compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpage" = callPackage
@@ -117422,7 +117614,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) taglib;};
 
-  "htaglib" = callPackage
+  "htaglib_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HUnit
      , taglib, test-framework, test-framework-hunit, text
      }:
@@ -117438,6 +117630,25 @@ self: {
        homepage = "https://github.com/mrkkrp/htaglib";
        description = "Bindings to TagLib, audio meta-data library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) taglib;};
+
+  "htaglib" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath, HUnit
+     , taglib, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "htaglib";
+       version = "1.0.3";
+       sha256 = "b6e1a3d8e93c01fc626dea3a020b5ad4418eb8dede2210491eee43a85a99ea9b";
+       libraryHaskellDepends = [ base bytestring text ];
+       librarySystemDepends = [ taglib ];
+       testHaskellDepends = [
+         base directory filepath HUnit test-framework test-framework-hunit
+       ];
+       homepage = "https://github.com/mrkkrp/htaglib";
+       description = "Bindings to TagLib, audio meta-data library";
+       license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) taglib;};
 
   "htags" = callPackage
@@ -117627,15 +117838,14 @@ self: {
      }:
      mkDerivation {
        pname = "html-entities";
-       version = "1.1.0.0";
-       sha256 = "1641957d9a76e85c5bf060e3fe3fd1ecc0b2ddcff96638562d9797837cd1a07e";
+       version = "1.1.1.1";
+       sha256 = "d837f8628acaa3ac7ffa7ef19128715aad1f516842144ace4e25599ab8a7c94b";
        libraryHaskellDepends = [
          attoparsec base-prelude text unordered-containers
        ];
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
@@ -119477,6 +119687,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http-response-decoder" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder
+     , case-insensitive, http-client, http-types, matcher, profunctors
+     , text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "http-response-decoder";
+       version = "0.2.1.1";
+       sha256 = "0c208150b72e1b1f40651cffaac0e239140cb89f86da5e9cb986945866f9fa0d";
+       libraryHaskellDepends = [
+         base-prelude bytestring bytestring-tree-builder case-insensitive
+         http-client http-types matcher profunctors text transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/sannsyn/http-response-decoder";
+       description = "Declarative DSL for parsing an HTTP response";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "http-reverse-proxy_0_4_1_2" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
@@ -119906,6 +120135,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http2_1_6_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, case-insensitive, containers, directory
+     , doctest, filepath, Glob, hex, hspec, psqueues, stm, text
+     , unordered-containers, vector, word8
+     }:
+     mkDerivation {
+       pname = "http2";
+       version = "1.6.0";
+       sha256 = "2d33647a74f9945fa0e3a0982832eeb2c57cb46d3ddbacf5ba049ee59a60da97";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder case-insensitive
+         containers psqueues stm
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         case-insensitive containers directory filepath hex text
+         unordered-containers vector word8
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty array base bytestring bytestring-builder
+         case-insensitive containers directory doctest filepath Glob hex
+         hspec psqueues stm text unordered-containers vector word8
+       ];
+       description = "HTTP/2.0 library including frames and HPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "httpd-shed" = callPackage
     ({ mkDerivation, base, network, network-uri }:
      mkDerivation {
@@ -120535,14 +120795,14 @@ self: {
 
   "hw-succinct" = callPackage
     ({ mkDerivation, array, attoparsec, base, bytestring, conduit
-     , deepseq, ghc-prim, hspec, lens, mmap, mono-traversable, parsec
-     , QuickCheck, random, resourcet, safe, text, transformers, vector
-     , word8
+     , criterion, deepseq, ghc-prim, hspec, lens, mmap, mono-traversable
+     , parsec, QuickCheck, random, resourcet, safe, text, transformers
+     , vector, word8
      }:
      mkDerivation {
        pname = "hw-succinct";
-       version = "0.0.0.1";
-       sha256 = "22faed7c70d7675a2f7ca2d594a5b26de6e43e8f659ca3124feaa36457d60aae";
+       version = "0.0.0.4";
+       sha256 = "cbcec5f49f002108655ec5a75ef17d2d7361e24e778b9484d019a9433edbc3e8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120550,7 +120810,9 @@ self: {
          mono-traversable parsec QuickCheck random resourcet safe text
          vector word8
        ];
-       executableHaskellDepends = [ attoparsec base conduit resourcet ];
+       executableHaskellDepends = [
+         base bytestring conduit criterion mmap resourcet vector
+       ];
        testHaskellDepends = [
          attoparsec base bytestring conduit hspec mmap parsec QuickCheck
          resourcet transformers vector
@@ -121595,18 +121857,19 @@ self: {
      }) {};
 
   "hylogen" = callPackage
-    ({ mkDerivation, base, filepath, hinotify, process, random, text
-     , websockets
+    ({ mkDerivation, base, bytestring, filepath, hinotify, network
+     , process, random, text, websockets
      }:
      mkDerivation {
        pname = "hylogen";
-       version = "0.1.0.2";
-       sha256 = "4efda349a9758123ea147198c7c50ae296d5c8a77763fa82abdc02c1a29078c0";
+       version = "0.1.0.5";
+       sha256 = "59be04f1b9d6b6c84c77f16ebeb2d2a69624d76df1f270057c464c4cf40c6c93";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [
-         base filepath hinotify process random text websockets
+         base bytestring filepath hinotify network process random text
+         websockets
        ];
        homepage = "https://github.com/sleexyz/hylogen";
        description = "a tiny EDSL for live-coding fragment shaders";
@@ -123974,7 +124237,7 @@ self: {
        homepage = "https://github.com/emilaxelsson/imperative-edsl";
        description = "Deep embedding of imperative programs with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imperative-edsl-vhdl" = callPackage
@@ -124605,8 +124868,8 @@ self: {
      }:
      mkDerivation {
        pname = "informative";
-       version = "0.1.0.20";
-       sha256 = "f6503d7b794fd938a29c8e9ae5fafe349697d835fce0ab15ce872d9239bef4f5";
+       version = "0.1.0.27";
+       sha256 = "d03ffde1e85025fa10866db27b7c222a509fc18bfe1004016a49563a104a0616";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124619,7 +124882,6 @@ self: {
          pandoc persistent persistent-postgresql shakespeare text time
          time-locale-compat yesod yesod-auth yesod-core yesod-form
        ];
-       jailbreak = true;
        homepage = "http://doomanddarkness.eu/pub/informative";
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
@@ -124967,6 +125229,7 @@ self: {
        homepage = "https://github.com/k0001/instant-aeson";
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "instant-bytes" = callPackage
@@ -125389,8 +125652,8 @@ self: {
     ({ mkDerivation, base-prelude, transformers }:
      mkDerivation {
        pname = "interspersed";
-       version = "0.1.0.1";
-       sha256 = "f4a6ec7009696f80e7e6b778c15090949bfd90b5a7b6bf1f95738b1370500558";
+       version = "0.1.1.2";
+       sha256 = "43ce7ce1fdb26f53aeb30c0377226dd9c495da89490ef6312c15df563a4fa783";
        libraryHaskellDepends = [ base-prelude transformers ];
        homepage = "https://github.com/nikita-volkov/interspersed";
        description = "An abstraction over interspersing monadic actions";
@@ -126550,8 +126813,8 @@ self: {
      }:
      mkDerivation {
        pname = "ironforge";
-       version = "0.1.0.35";
-       sha256 = "f490eba48cfbbaa2fb997d20c8a453cbe74aea0ea4ef26735a1b51eab6a4a0b7";
+       version = "0.1.0.36";
+       sha256 = "86aee52c1b9752a32a750cdc28c23e6d6a520872ed178000ad6cb04308bcda85";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -126952,38 +127215,56 @@ self: {
      }) {};
 
   "ivory" = callPackage
-    ({ mkDerivation, base, containers, monadLib, parsec, pretty
-     , template-haskell, th-lift
+    ({ mkDerivation, alex, array, base, base-compat, containers, dlist
+     , filepath, happy, monadLib, pretty, template-haskell, text
+     , th-lift
      }:
      mkDerivation {
        pname = "ivory";
-       version = "0.1.0.0";
-       sha256 = "4c1739e32f72d694b3ad45d1b4771e1ed436edef377e32972d1344a6f354c1e6";
+       version = "0.1.0.3";
+       sha256 = "e842ec8c195c2f148c393d09471c96bcae09c1fd5260f102df6b26b591da91e6";
        libraryHaskellDepends = [
-         base containers monadLib parsec pretty template-haskell th-lift
+         array base base-compat containers dlist filepath monadLib pretty
+         template-haskell text th-lift
        ];
-       jailbreak = true;
+       libraryToolDepends = [ alex happy ];
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ivory-artifact" = callPackage
+    ({ mkDerivation, base, directory, filepath, HStringTemplate, text
+     , utf8-string
+     }:
+     mkDerivation {
+       pname = "ivory-artifact";
+       version = "0.1.0.3";
+       sha256 = "375a287288e9886bc9055c128e0d2d4cddab985baf8e52a82176c323b98f401e";
+       libraryHaskellDepends = [
+         base directory filepath HStringTemplate text utf8-string
+       ];
+       homepage = "http://ivorylang.org";
+       description = "Manage additional data files during Ivory compilation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ivory-backend-c" = callPackage
-    ({ mkDerivation, base, bytestring, cmdlib, containers, directory
-     , filepath, ivory, ivory-opts, language-c-quote, mainland-pretty
-     , monadLib, process, srcloc, template-haskell
+    ({ mkDerivation, base, base-compat, bytestring, containers
+     , directory, filepath, ivory, ivory-artifact, ivory-opts
+     , language-c-quote, mainland-pretty, monadLib, process, srcloc
+     , template-haskell
      }:
      mkDerivation {
        pname = "ivory-backend-c";
-       version = "0.1.0.1";
-       sha256 = "244630c41baf5c96a69b4333727eb05f8124dd9ded855e80b2dc20daad522c8b";
+       version = "0.1.0.3";
+       sha256 = "44e43e14e1951c4703c99bf116d6951eff575124d92f58dd7450f19ec14aa33e";
        libraryHaskellDepends = [
-         base bytestring cmdlib containers directory filepath ivory
-         ivory-opts language-c-quote mainland-pretty monadLib process srcloc
-         template-haskell
+         base base-compat bytestring containers directory filepath ivory
+         ivory-artifact ivory-opts language-c-quote mainland-pretty monadLib
+         process srcloc template-haskell
        ];
-       jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
@@ -127011,23 +127292,40 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ivory-eval" = callPackage
+    ({ mkDerivation, base, base-compat, containers, ivory, monadLib
+     , tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "ivory-eval";
+       version = "0.1.0.3";
+       sha256 = "94acbed559f5567d291f95fb3ce70e9487cbf31bfc4721030017bbc5f078b958";
+       libraryHaskellDepends = [
+         base base-compat containers ivory monadLib
+       ];
+       testHaskellDepends = [
+         base base-compat containers ivory monadLib tasty tasty-hunit
+       ];
+       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       description = "Simple concrete evaluator for Ivory programs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ivory-examples" = callPackage
-    ({ mkDerivation, base, ivory, ivory-backend-c, ivory-opts
-     , ivory-quickcheck, ivory-stdlib, mainland-pretty, monadLib, pretty
-     , QuickCheck, template-haskell, wl-pprint
+    ({ mkDerivation, base, base-compat, ivory, ivory-backend-c
+     , ivory-opts, ivory-stdlib, monadLib, pretty, QuickCheck
+     , template-haskell
      }:
      mkDerivation {
        pname = "ivory-examples";
-       version = "0.1.0.2";
-       sha256 = "35d7f04e613887e691d0ad3ac10cd899eb700d28df2124c843de04a3c5c94c4a";
+       version = "0.1.0.3.1";
+       sha256 = "f73720e850410a0d3ab4acfc6fe478c2d475f9e2e12c6782ec9f8a1236690f82";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base ivory ivory-backend-c ivory-opts ivory-quickcheck ivory-stdlib
-         mainland-pretty monadLib pretty QuickCheck template-haskell
-         wl-pprint
+         base base-compat ivory ivory-backend-c ivory-opts ivory-stdlib
+         monadLib pretty QuickCheck template-haskell
        ];
-       jailbreak = true;
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
@@ -127035,63 +127333,85 @@ self: {
      }) {};
 
   "ivory-hw" = callPackage
-    ({ mkDerivation, base, filepath, ivory, ivory-backend-c
-     , ivory-bitdata
+    ({ mkDerivation, base, filepath, ivory, ivory-artifact
+     , ivory-backend-c
      }:
      mkDerivation {
        pname = "ivory-hw";
-       version = "0.1.0.0";
-       sha256 = "5eafbcb226d11e65127c55b32e324bfe628cc24dc59a32e2c1e5d953bd5740e9";
+       version = "0.1.0.3";
+       sha256 = "0dec96122661a8f281daf7e52f8e7dcc80481090518115a8c6e0859d919f64b2";
        libraryHaskellDepends = [
-         base filepath ivory ivory-backend-c ivory-bitdata
+         base filepath ivory ivory-artifact ivory-backend-c
        ];
-       jailbreak = true;
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       homepage = "http://ivorylang.org";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
-    ({ mkDerivation, base, containers, dlist, fgl, filepath, ivory
-     , monadLib
+    ({ mkDerivation, base, base-compat, containers, data-reify, dlist
+     , fgl, filepath, ivory, monadLib, pretty
      }:
      mkDerivation {
        pname = "ivory-opts";
-       version = "0.1.0.1";
-       sha256 = "bf68324fbd65da2221c942c313d523498b03cd50269732a069b49dd12697dc23";
+       version = "0.1.0.3";
+       sha256 = "caaf34f5b38ec88fe422cc367f28ab8b98b1a3b131dadaffcd8000b438562eb3";
        libraryHaskellDepends = [
-         base containers dlist fgl filepath ivory monadLib
+         base base-compat containers data-reify dlist fgl filepath ivory
+         monadLib pretty
        ];
-       jailbreak = true;
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       homepage = "http://ivorylang.org";
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-quickcheck" = callPackage
-    ({ mkDerivation, base, ivory, monadLib, QuickCheck, random }:
+    ({ mkDerivation, base, base-compat, directory, filepath, ivory
+     , ivory-backend-c, ivory-eval, ivory-stdlib, monadLib, process
+     , QuickCheck, random, tasty, tasty-hunit
+     }:
      mkDerivation {
        pname = "ivory-quickcheck";
-       version = "0.1.0.0";
-       sha256 = "4d6a0b49f276091617a9a4949cc59e68c3dfd825a4d2f25e82004ff4abbe6e49";
-       libraryHaskellDepends = [ base ivory monadLib QuickCheck random ];
-       jailbreak = true;
-       homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
+       version = "0.2.0.3";
+       sha256 = "ca005a77265d6140cabe7796062d145ae8be185123db1095c957aee76aec56f4";
+       libraryHaskellDepends = [
+         base base-compat ivory ivory-backend-c ivory-eval monadLib
+         QuickCheck random
+       ];
+       testHaskellDepends = [
+         base base-compat directory filepath ivory ivory-backend-c
+         ivory-stdlib monadLib process QuickCheck tasty tasty-hunit
+       ];
+       homepage = "http://ivorylang.org";
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ivory-serialize" = callPackage
+    ({ mkDerivation, base, base-compat, filepath, ivory, ivory-artifact
+     , monadLib
+     }:
+     mkDerivation {
+       pname = "ivory-serialize";
+       version = "0.1.0.3";
+       sha256 = "bb07a4218c8e6d314ee5aa0bdf75891a9f9b7a106020f4bb439bfe26053610eb";
+       libraryHaskellDepends = [
+         base base-compat filepath ivory ivory-artifact monadLib
+       ];
+       description = "Serialization library for Ivory";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "ivory-stdlib" = callPackage
-    ({ mkDerivation, base, filepath, ivory }:
+    ({ mkDerivation, base, filepath, ivory, ivory-artifact }:
      mkDerivation {
        pname = "ivory-stdlib";
-       version = "0.1.0.0";
-       sha256 = "b88b962382e82e9e768ec8e61950ebddbc8e428a339dc84ab63fbf6c424a6da8";
-       libraryHaskellDepends = [ base filepath ivory ];
-       jailbreak = true;
+       version = "0.1.0.3";
+       sha256 = "0ff865b14e046a9caffd1ac79e256568bd3bf60aa648e673582d7009bdcc635c";
+       libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
@@ -128113,7 +128433,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery" = callPackage
+  "js-jquery_1_12_2" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -128125,6 +128445,21 @@ self: {
        homepage = "https://github.com/ndmitchell/js-jquery#readme";
        description = "Obtain minified jQuery code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "js-jquery" = callPackage
+    ({ mkDerivation, base, HTTP }:
+     mkDerivation {
+       pname = "js-jquery";
+       version = "1.12.3";
+       sha256 = "9661095b1138db61a051dd5ea94e86e37428b57c0453d43fac7e447b91f9b09a";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base HTTP ];
+       doCheck = false;
+       homepage = "https://github.com/ndmitchell/js-jquery#readme";
+       description = "Obtain minified jQuery code";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "jsaddle" = callPackage
@@ -128702,10 +129037,9 @@ self: {
     ({ mkDerivation, attoparsec, base-prelude, text }:
      mkDerivation {
        pname = "json-pointer";
-       version = "0.1.1";
-       sha256 = "443221a71faa40a5eddf8865a3219b5f48086a4c62efcdea9d468ae934410ee3";
+       version = "0.1.2";
+       sha256 = "772a765387d39ffda21f437aa8372289b1eb726aa983ff16863aa5b1cd1f88ba";
        libraryHaskellDepends = [ attoparsec base-prelude text ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/json-pointer";
        description = "JSON Pointer parsing and interpretation utilities";
        license = stdenv.lib.licenses.mit;
@@ -128717,13 +129051,12 @@ self: {
      }:
      mkDerivation {
        pname = "json-pointer-hasql";
-       version = "0.1";
-       sha256 = "5ed9ae42aadc1fde554480f055df77f751e5eb1c5386d0ed71883dfe9d534a8a";
+       version = "0.1.1";
+       sha256 = "f0626791ea35094e72eaabc2f5b9ea40ae8ace274129f16da8b36e26ce1016b9";
        libraryHaskellDepends = [ base-prelude hasql json-pointer text ];
        testHaskellDepends = [
          aeson either hasql json-pointer rebase transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/json-pointer-hasql";
        description = "JSON Pointer extensions for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -129313,6 +129646,7 @@ self: {
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonsql" = callPackage
@@ -129375,6 +129709,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "juandelacosa" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring
+     , case-insensitive, docopt, entropy, http-types, mysql
+     , mysql-simple, network, raw-strings-qq, resource-pool, unix, wai
+     , warp
+     }:
+     mkDerivation {
+       pname = "juandelacosa";
+       version = "0.0.1";
+       sha256 = "9c0d494b28384304cc9ba9bc8897c049d87e31a1f810c456ea759e31d6ab727f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base base64-bytestring bytestring case-insensitive docopt entropy
+         http-types mysql mysql-simple network raw-strings-qq resource-pool
+         unix wai warp
+       ];
+       description = "Manage users in MariaDB >= 10.1.1";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "judy" = callPackage
     ({ mkDerivation, base, bytestring, ghc-prim, hspec, Judy
      , QuickCheck
@@ -129995,15 +130350,14 @@ self: {
      }:
      mkDerivation {
        pname = "kdesrc-build-extra";
-       version = "0.1.0.2";
-       sha256 = "d9961b2e8d2668804d3e864c039ec2f82d56a19496af05edd98f1ba1669429d8";
+       version = "0.1.1";
+       sha256 = "c54e90038834f626e95b05ceb8faf6f2feee18c2017521611cb15ba84ee96c1d";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          ansi-terminal base bytestring cmdargs directory MissingH parsec
          process
        ];
-       jailbreak = true;
        description = "Build profiles for kdesrc-build";
        license = stdenv.lib.licenses.gpl3;
      }) {};
@@ -134404,6 +134758,7 @@ self: {
        executableHaskellDepends = [
          base gloss gnuplot not-gloss spatial-math
        ];
+       jailbreak = true;
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -137415,8 +137770,8 @@ self: {
      }:
      mkDerivation {
        pname = "liquid-fixpoint";
-       version = "0.5.0.0";
-       sha256 = "7be110035c09edfa492b369e504349538c76dd94e811d487352c5258e19cf40d";
+       version = "0.5.0.1";
+       sha256 = "7e14475ac33ed81983fb5b0fa2a1ad34ae0f449983f0a9cd432a7aa37875e53c";
        configureFlags = [ "-fbuild-external" ];
        isLibrary = true;
        isExecutable = true;
@@ -137440,48 +137795,56 @@ self: {
      }) {inherit (pkgs) ocaml; inherit (pkgs) z3;};
 
   "liquidhaskell" = callPackage
-    ({ mkDerivation, aeson, ansi-terminal, array, base, bifunctors
-     , bytestring, Cabal, cmdargs, containers, cpphs, data-default
-     , deepseq, Diff, directory, filemanip, filepath, fingertree, ghc
-     , ghc-paths, hashable, hpc, hscolour, intern, liquid-fixpoint, mtl
-     , optparse-applicative, parsec, pretty, process, stm, syb, tagged
-     , tasty, tasty-hunit, tasty-rerun, template-haskell, text, time
-     , transformers, unordered-containers, vector, z3
+    ({ mkDerivation, aeson, array, base, bifunctors, bytestring, Cabal
+     , cereal, cmdargs, containers, cpphs, daemons, data-default
+     , deepseq, Diff, directory, filepath, fingertree, ghc, ghc-paths
+     , hashable, hpc, hscolour, liquid-fixpoint, located-base, mtl
+     , network, optparse-applicative, parsec, pretty, process, stm, syb
+     , tagged, tasty, tasty-ant-xml, tasty-hunit, tasty-rerun
+     , template-haskell, temporary, text, time, transformers, unix
+     , unordered-containers, vector, z3
      }:
      mkDerivation {
        pname = "liquidhaskell";
-       version = "0.5.0.1";
-       sha256 = "27f31e7652cd9ef0b97d2e3936c8e9c759961ac153b324c3e84f11cb441ab89a";
-       revision = "2";
-       editedCabalFile = "54142d52274f85af299d405bd5daac25b574f9d3f16c8e42b7f5b999d9a34a1d";
+       version = "0.6.0.0";
+       sha256 = "4b5d6fc321c7b92b80b84bda67fc34e3f37f44d23dd60828ba9d9e3d7d645696";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-terminal array base bifunctors bytestring Cabal cmdargs
-         containers cpphs data-default deepseq Diff directory filemanip
-         filepath fingertree ghc ghc-paths hashable hpc hscolour intern
-         liquid-fixpoint mtl parsec pretty process syb template-haskell text
-         time unordered-containers vector
+         aeson array base bifunctors bytestring Cabal cereal cmdargs
+         containers cpphs data-default deepseq Diff directory filepath
+         fingertree ghc ghc-paths hashable hpc hscolour liquid-fixpoint
+         located-base mtl parsec pretty process syb template-haskell
+         temporary text time unordered-containers vector
        ];
        executableHaskellDepends = [
-         aeson ansi-terminal array base bifunctors bytestring cmdargs
-         containers cpphs data-default deepseq Diff directory filemanip
-         filepath fingertree ghc ghc-paths hashable hpc hscolour
-         liquid-fixpoint mtl parsec pretty process syb template-haskell text
-         time unordered-containers vector
+         base bytestring cereal cmdargs daemons data-default deepseq
+         directory ghc liquid-fixpoint located-base network pretty process
+         unix unordered-containers
        ];
        testHaskellDepends = [
          base containers directory filepath mtl optparse-applicative process
-         stm tagged tasty tasty-hunit tasty-rerun transformers
+         stm tagged tasty tasty-ant-xml tasty-hunit tasty-rerun transformers
        ];
        testSystemDepends = [ z3 ];
-       jailbreak = true;
        homepage = "http://goto.ucsd.edu/liquidhaskell";
        description = "Liquid Types for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) z3;};
 
+  "liquidhaskell-cabal" = callPackage
+    ({ mkDerivation, base, Cabal, filepath }:
+     mkDerivation {
+       pname = "liquidhaskell-cabal";
+       version = "0.1.0.0";
+       sha256 = "0c13322b6925738ea5bbbbda9ce472e9aa44dd6d8a59c7b1a5dca953d75b848a";
+       libraryHaskellDepends = [ base Cabal filepath ];
+       homepage = "https://github.com/spinda/liquidhaskell-cabal#readme";
+       description = "Liquid Haskell integration for Cabal and stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lispparser" = callPackage
     ({ mkDerivation, base, parsec }:
      mkDerivation {
@@ -140495,6 +140858,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "macbeth-lib" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit
+     , conduit-extra, containers, directory, either-unwrap, filepath
+     , FindBin, hspec, MissingH, mtl, network, old-locale, resourcet
+     , safe, sodium, split, stm, text, time, transformers, wx, wxcore
+     , yaml
+     }:
+     mkDerivation {
+       pname = "macbeth-lib";
+       version = "0.0.12";
+       sha256 = "06717de488f6f382c171528c52a7a28f01bde2d48411b3e309c46477a3055de6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit conduit-extra containers
+         directory either-unwrap filepath FindBin MissingH mtl network
+         old-locale resourcet safe sodium split stm text time transformers
+         wx wxcore yaml
+       ];
+       executableHaskellDepends = [ base stm wx wxcore ];
+       testHaskellDepends = [ attoparsec base bytestring hspec ];
+       homepage = "http://www.macbeth-ficsclient.com";
+       description = "Macbeth - A beautiful and minimalistic FICS client";
+       license = "GPL";
+     }) {};
+
   "maccatcher" = callPackage
     ({ mkDerivation, base, binary, parsec, process }:
      mkDerivation {
@@ -141938,7 +142327,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Sampling random points on general manifolds";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manifolds" = callPackage
@@ -141957,7 +142346,7 @@ self: {
        homepage = "https://github.com/leftaroundabout/manifolds";
        description = "Coordinate-free hypersurfaces";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-syntax" = callPackage
@@ -142429,15 +142818,15 @@ self: {
      }) {};
 
   "matcher" = callPackage
-    ({ mkDerivation, base-prelude, profunctors, success, text
+    ({ mkDerivation, base, base-prelude, profunctors, success, text
      , transformers
      }:
      mkDerivation {
        pname = "matcher";
-       version = "0.1.1.2";
-       sha256 = "d08f0499be5779a2d9ed1890fbce76ee369cc3e5a1d82f538bc7ea61456e48a8";
+       version = "0.1.1.3";
+       sha256 = "9c9ce11a2d142ef9aa8de080e2d28acd3ccb786109539cf637d988cd69e50ab7";
        libraryHaskellDepends = [
-         base-prelude profunctors success text transformers
+         base base-prelude profunctors success text transformers
        ];
        homepage = "https://github.com/sannsyn/matcher";
        description = "A composable abstraction for checking or converting a context value";
@@ -146131,7 +146520,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-control" = callPackage
+  "monad-control_1_0_0_5" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -146145,6 +146534,23 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monad-control" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control";
+       version = "1.0.1.0";
+       sha256 = "d4b0209c6cb7006fac618e4d8e3743d908f8b21579d6ff72e9f6e758e24301f4";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/basvandijk/monad-control";
+       description = "Lift control operations, like exception catching, through monad transformers";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monad-coroutine_0_8" = callPackage
@@ -147506,16 +147912,22 @@ self: {
 
   "mondo" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
-     , containers, http-client, http-client-tls, mtl, servant
-     , servant-client, text, transformers
+     , containers, hspec, http-client, http-client-tls, mtl, network
+     , servant, servant-client, servant-server, text, time, timerep
+     , transformers, unordered-containers, wai, warp
      }:
      mkDerivation {
        pname = "mondo";
-       version = "0.2.0.0";
-       sha256 = "15b796b677545c351a44517e3f1c4db92a8d4d1ce22ccbe300e40b042c8393cf";
+       version = "0.3.0.0";
+       sha256 = "e66cdefd358c5376b488c2c1aba86d39e77ead5e9e5b739374c2e504e409073b";
        libraryHaskellDepends = [
          aeson authenticate-oauth base bytestring containers http-client
-         http-client-tls mtl servant servant-client text transformers
+         http-client-tls mtl servant servant-client text time timerep
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base hspec network servant servant-client servant-server time
+         timerep transformers wai warp
        ];
        jailbreak = true;
        description = "Haskell bindings for the Mondo API";
@@ -149672,8 +150084,8 @@ self: {
      }:
      mkDerivation {
        pname = "murmur";
-       version = "0.0.0.1";
-       sha256 = "3c2f11a2d21346fa92e62fd878dccac1020a897759e39d8f0b2ed93a87fbdfc7";
+       version = "0.0.0.2";
+       sha256 = "3553df87f26aca79a10c008ca03fc29a35e5b707003af97ee1296f3e3bde8632";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149686,7 +150098,7 @@ self: {
        ];
        testHaskellDepends = [ base ];
        homepage = "http://github.com/tokiwoousaka/murmur#readme";
-       description = "Initial project template from stack";
+       description = "Simple CUI Twitter Client";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -155131,6 +155543,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "octane_0_4_16" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, autoexporter, base, binary
+     , binary-bits, bytestring, containers, data-binary-ieee754, deepseq
+     , newtype-generics, tasty, tasty-hspec, text
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.4.16";
+       sha256 = "5ee70deae5a19be4c82bf555f8bef20dc41d1328e58e35e13cf3006e6cb91267";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty autoexporter base binary binary-bits bytestring
+         containers data-binary-ieee754 deepseq newtype-generics text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base binary bytestring containers tasty tasty-hspec
+       ];
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -156557,6 +156994,7 @@ self: {
        homepage = "https://github.com/emilaxelsson/operational-alacarte";
        description = "A version of Operational suitable for extensible EDSLs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "operational-class" = callPackage
@@ -163865,8 +164303,8 @@ self: {
      }:
      mkDerivation {
        pname = "picologic";
-       version = "0.1.2";
-       sha256 = "449f6ead23c54d1751d66437a06950a5b2a478348c53e6b927ec9a2bb9e9e40f";
+       version = "0.2.0";
+       sha256 = "eb831c0e385a43966849d75194418ac2823d2fad54cefc0eb29771e04d6c4e03";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164520,10 +164958,8 @@ self: {
     ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }:
      mkDerivation {
        pname = "pipes-cacophony";
-       version = "0.2.0";
-       sha256 = "1e6e6469df152cd540c4cee20cb5e82975f6c069a35931a0ebfc4bd3b5fb53be";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.1";
+       sha256 = "c112376b75e744e15006b81ecd9b60bee10be6a54cca6c2fd6b7f5f7e8d99041";
        libraryHaskellDepends = [ base bytestring cacophony pipes ];
        testHaskellDepends = [ base hlint ];
        homepage = "https://github.com/centromere/pipes-cacophony";
@@ -164928,8 +165364,8 @@ self: {
     ({ mkDerivation, base, containers, pipes }:
      mkDerivation {
        pname = "pipes-interleave";
-       version = "0.2.1";
-       sha256 = "79a85c313d44cf5ce698ce796b2aefeba0d5c856834aa52ae3566292fb4244f7";
+       version = "0.2.2";
+       sha256 = "31427ee2c164449fa3119dfc08bd6912f0287bcac74c9c811755a9c716c21d4a";
        libraryHaskellDepends = [ base containers pipes ];
        homepage = "http://github.com/bgamari/pipes-interleave";
        description = "Interleave and merge streams of elements";
@@ -165242,6 +165678,28 @@ self: {
      }) {};
 
   "pipes-transduce" = callPackage
+    ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
+     , foldl, free, lens-family-core, pipes, pipes-bytestring
+     , pipes-concurrency, pipes-group, pipes-parse, pipes-safe
+     , pipes-text, tasty, tasty-hunit, text, transformers, void
+     }:
+     mkDerivation {
+       pname = "pipes-transduce";
+       version = "0.3.3.0";
+       sha256 = "af40b285eb0e55f8ba17223890b09b4b9cc9b9774d55c7539d878e1d3d68c49b";
+       libraryHaskellDepends = [
+         base bifunctors bytestring conceit foldl free lens-family-core
+         pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse
+         pipes-safe pipes-text text transformers void
+       ];
+       testHaskellDepends = [
+         base doctest foldl free pipes tasty tasty-hunit text
+       ];
+       description = "Interfacing pipes with foldl folds";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pipes-transduce_0_3_4_0" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
      , foldl, free, pipes, pipes-bytestring, pipes-concurrency
      , pipes-group, pipes-parse, pipes-safe, pipes-text, tasty
@@ -165261,6 +165719,7 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-vector" = callPackage
@@ -165354,15 +165813,20 @@ self: {
      }) {};
 
   "pipes-zlib" = callPackage
-    ({ mkDerivation, base, bytestring, pipes, transformers, zlib
-     , zlib-bindings
+    ({ mkDerivation, base, bytestring, HUnit, pipes, QuickCheck
+     , quickcheck-instances, streaming-commons, tasty, tasty-hunit
+     , tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "pipes-zlib";
-       version = "0.4.3";
-       sha256 = "ac6a4a6b3f9e5b7962d5913f438478a04ae31cc4fca0eb7d25b4db1a32e03112";
+       version = "0.4.4";
+       sha256 = "39de93960e739e386990044737de0734a1f4d9c925ca7f085a74dbfb127ebd64";
        libraryHaskellDepends = [
-         base bytestring pipes transformers zlib zlib-bindings
+         base bytestring pipes streaming-commons transformers
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit pipes QuickCheck quickcheck-instances tasty
+         tasty-hunit tasty-quickcheck
        ];
        homepage = "https://github.com/k0001/pipes-zlib";
        description = "Zlib and GZip compression and decompression for Pipes streams";
@@ -166826,14 +167290,13 @@ self: {
      }:
      mkDerivation {
        pname = "poppler";
-       version = "0.13.1";
-       sha256 = "525c9fb4748b561e807d07e0b21afef5dd44ded3628aae8c1d28f6336b32f3d6";
+       version = "0.14";
+       sha256 = "7197ab38013b978f544721fa3cbb3a6851935f04a328934904f3369bd63753ba";
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
        libraryPkgconfigDepends = [ gdk2 gdk_pixbuf pango poppler ];
        libraryToolDepends = [ gtk2hs-buildtools ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/gtk2hs";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
@@ -167121,6 +167584,7 @@ self: {
        homepage = "https://github.com/mattyhall/haskell-postcodes";
        description = "A library that gets postcode information from the uk-postcodes.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-binary_0_5_0" = callPackage
@@ -169294,6 +169758,7 @@ self: {
          semigroups tasty tasty-hunit text transformers transformers-compat
          void
        ];
+       doCheck = false;
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169875,8 +170340,8 @@ self: {
      }:
      mkDerivation {
        pname = "prometheus";
-       version = "0.3.1";
-       sha256 = "8883bfea72ed5fc34b0ea8820b4a0aa3ad8b033fd646bc08e24d686b96148a49";
+       version = "0.3.2.1";
+       sha256 = "91b3a501a73ac11020184c39eb885bf0f373231b65393fe350f00b2bdb58c417";
        libraryHaskellDepends = [
          atomic-primops base bytestring containers http-types text
          transformers wai warp
@@ -169977,26 +170442,26 @@ self: {
      }) {};
 
   "propellor" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions, filepath
-     , hslogger, IfElse, MissingH, mtl, network, process, stm, text
-     , time, transformers, unix, unix-compat
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , directory, exceptions, filepath, hslogger, IfElse, MissingH, mtl
+     , network, process, stm, text, time, transformers, unix
+     , unix-compat
      }:
      mkDerivation {
        pname = "propellor";
-       version = "3.0.0";
-       sha256 = "bd53ac4d53bb9136c249238ad4b633fb00dd300017afd9093096db12b8cd011f";
+       version = "3.0.1";
+       sha256 = "6a0e12e90f1c962f477e210f3f99216c1d1a7b1ac2459a7122d04ab1e4fc5263";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions filepath hslogger IfElse MissingH mtl network
-         process stm text time transformers unix unix-compat
+         ansi-terminal async base bytestring containers directory exceptions
+         filepath hslogger IfElse MissingH mtl network process stm text time
+         transformers unix unix-compat
        ];
        executableHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions filepath hslogger IfElse MissingH mtl network
-         process stm text time transformers unix unix-compat
+         ansi-terminal async base bytestring containers directory exceptions
+         filepath hslogger IfElse MissingH mtl network process stm text time
+         transformers unix unix-compat
        ];
        homepage = "https://propellor.branchable.com/";
        description = "property-based host configuration management in haskell";
@@ -171424,6 +171889,51 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "purescript_0_8_4_0" = callPackage
+    ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
+     , base-compat, bower-json, boxes, bytestring, containers, directory
+     , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec
+     , hspec-discover, http-types, HUnit, language-javascript
+     , lifted-base, monad-control, monad-logger, mtl, network
+     , optparse-applicative, parallel, parsec, pattern-arrows, pipes
+     , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap
+     , split, stm, syb, text, time, transformers, transformers-base
+     , transformers-compat, unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "purescript";
+       version = "0.8.4.0";
+       sha256 = "cb0f75b7c4a9f926b6e183fe825153abdde6170f5da9c2b0ccef27575e3e264e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base base-compat bower-json boxes
+         bytestring containers directory dlist edit-distance filepath
+         fsnotify Glob http-types language-javascript lifted-base
+         monad-control monad-logger mtl parallel parsec pattern-arrows pipes
+         pipes-http process regex-tdfa safe semigroups sourcemap split stm
+         syb text time transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base base-compat boxes bytestring containers
+         directory filepath Glob haskeline monad-logger mtl network
+         optparse-applicative parsec process split stm text time
+         transformers transformers-compat utf8-string
+       ];
+       testHaskellDepends = [
+         aeson aeson-better-errors base base-compat boxes bytestring
+         containers directory filepath Glob haskeline hspec hspec-discover
+         HUnit mtl optparse-applicative parsec process stm text time
+         transformers transformers-compat utf8-string vector
+       ];
+       jailbreak = true;
+       homepage = "http://www.purescript.org/";
+       description = "PureScript Programming Language Compiler";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "purescript-bridge" = callPackage
     ({ mkDerivation, base, containers, directory, filepath
      , generic-deriving, text
@@ -172709,6 +173219,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quiver-groups" = callPackage
+    ({ mkDerivation, base, dlist, hspec, QuickCheck, quiver }:
+     mkDerivation {
+       pname = "quiver-groups";
+       version = "0.1.0.0";
+       sha256 = "a2edef17cf3e860afda832181de10055cbc953f3f3bfe3f30227341497fe9104";
+       libraryHaskellDepends = [ base dlist quiver ];
+       testHaskellDepends = [ base hspec QuickCheck quiver ];
+       description = "Group and chunk values within a Quiver";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quiver-http" = callPackage
     ({ mkDerivation, base, bytestring, http-client, http-client-tls
      , quiver
@@ -172727,6 +173249,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "quiver-interleave" = callPackage
+    ({ mkDerivation, base, hspec, QuickCheck, quiver }:
+     mkDerivation {
+       pname = "quiver-interleave";
+       version = "0.1.0.0";
+       sha256 = "68d5387600de2525002fa4470586c7621372acfea95f3446562c179975334439";
+       libraryHaskellDepends = [ base quiver ];
+       testHaskellDepends = [ base hspec QuickCheck quiver ];
+       description = "Interleave values from multiple Quivers";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "quoridor-hs" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , directory, dlist, exceptions, filepath, hex, HUnit, mtl, network
@@ -175445,6 +175979,7 @@ self: {
        libraryHaskellDepends = [
          base dependent-sum gloss mtl reflex transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -176229,6 +176764,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "register-machine-typelevel" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "register-machine-typelevel";
+       version = "0.1.0.0";
+       sha256 = "5232f3539da39675ac7bf0de7848748ee9503558cf7afe017449573db1be5b7f";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/kcsongor/register-machine-type";
+       description = "A computationally universal register machine implementation at the type-level";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "regress" = callPackage
     ({ mkDerivation, ad, base, vector }:
      mkDerivation {
@@ -183243,17 +183790,17 @@ self: {
      }) {};
 
   "scotty-params-parser" = callPackage
-    ({ mkDerivation, base-prelude, scotty, success, text, transformers
-     , unordered-containers
+    ({ mkDerivation, base-prelude, matcher, scotty, success, text
+     , transformers, unordered-containers
      }:
      mkDerivation {
        pname = "scotty-params-parser";
-       version = "0.4";
-       sha256 = "e334daaa407a407e4ececb0cd6d79b4037949abbc912d0d96641f007f041b631";
+       version = "0.5.1";
+       sha256 = "ee6a0c5691f93c6acab2e094755299ba2c4e967edf4d911a7f526e293547d2ae";
        libraryHaskellDepends = [
-         base-prelude scotty success text transformers unordered-containers
+         base-prelude matcher scotty success text transformers
+         unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/scotty-params-parser";
        description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
        license = stdenv.lib.licenses.mit;
@@ -185353,7 +185900,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-JuicyPixels" = callPackage
+  "servant-JuicyPixels_0_3_0_1" = callPackage
     ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
      , servant-server, wai, warp
      }:
@@ -185372,6 +185919,28 @@ self: {
        homepage = "https://github.com/tvh/servant-JuicyPixels";
        description = "Servant support for JuicyPixels";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-JuicyPixels" = callPackage
+    ({ mkDerivation, base, bytestring, http-media, JuicyPixels, servant
+     , servant-server, wai, warp
+     }:
+     mkDerivation {
+       pname = "servant-JuicyPixels";
+       version = "0.3.0.2";
+       sha256 = "34ed22ef256d7ff3af3fff56484261448928f140b1b4287965619fe6b10b3ebd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring http-media JuicyPixels servant
+       ];
+       executableHaskellDepends = [
+         base JuicyPixels servant servant-server wai warp
+       ];
+       homepage = "https://github.com/tvh/servant-JuicyPixels";
+       description = "Servant support for JuicyPixels";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "servant-blaze_0_4_4_6" = callPackage
@@ -186742,8 +187311,8 @@ self: {
        pname = "servant-yaml";
        version = "0.1.0.0";
        sha256 = "c917d9b046b06a9c4386f743a78142c27cf7f0ec1ad8562770ab9828f2ee3204";
-       revision = "4";
-       editedCabalFile = "7384ce42808b7df6200f48299a55524e1793072a33529b433eef0113319fd742";
+       revision = "5";
+       editedCabalFile = "49eac863eece8a51ed250931103972dae2bf1551a4d6cb5d55c5d4ae65cb24b3";
        libraryHaskellDepends = [
          base bytestring http-media servant yaml
        ];
@@ -189951,6 +190520,7 @@ self: {
          base bytestring connection containers network old-locale time
        ];
        testHaskellDepends = [ base bytestring hspec HUnit knob ];
+       doCheck = false;
        homepage = "http://github.com/dom96/SimpleIRC";
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
@@ -190593,6 +191163,7 @@ self: {
        homepage = "http://github.com/geekyfox/skulk";
        description = "Eclectic collection of utility functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skype4hs" = callPackage
@@ -190938,7 +191509,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slug" = callPackage
+  "slug_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent
      , QuickCheck, test-framework, test-framework-quickcheck2, text
      }:
@@ -190956,6 +191527,27 @@ self: {
        homepage = "https://github.com/mrkkrp/slug";
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "slug" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "slug";
+       version = "0.1.3";
+       sha256 = "4258c62509ae22823411d22e598cb56ca39236ed28a0a403cf7f8de47c66bce0";
+       libraryHaskellDepends = [
+         aeson base exceptions path-pieces persistent text
+       ];
+       testHaskellDepends = [
+         base exceptions path-pieces QuickCheck test-framework
+         test-framework-quickcheck2 text
+       ];
+       homepage = "https://github.com/mrkkrp/slug";
+       description = "Type-safe slugs for Yesod ecosystem";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "smallarray" = callPackage
@@ -193657,20 +194249,18 @@ self: {
      }:
      mkDerivation {
        pname = "solr";
-       version = "0.2.1.5";
-       sha256 = "cafd40f77391330d1dd3746aec44e0be92a24fa9d860924d1016eda4cadb63a1";
+       version = "0.3";
+       sha256 = "7cc47e9998197624cb78adb5bec4dabec4febf11cda876cecac56dd0a4d5ef66";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder case-insensitive
          contravariant http-client http-response-decoder json-encoder
          json-incremental-decoder matcher profunctors semigroups text
          transformers uri-encode
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/solr";
        description = "A minimal Solr client library";
        license = stdenv.lib.licenses.mit;
-       broken = true;
-     }) {http-response-decoder = null;};
+     }) {};
 
   "sonic-visualiser" = callPackage
     ({ mkDerivation, array, base, bytestring, bzlib, containers, mtl
@@ -194936,8 +195526,8 @@ self: {
      }:
      mkDerivation {
        pname = "sqlite";
-       version = "0.5.2.2";
-       sha256 = "372f9824627bebf2adfbd61314a0ff4b737b1cae0b3b14be66b4094cb8d89ec2";
+       version = "0.5.3";
+       sha256 = "fe07fb757e8d579e6f9fbfe76659dbb4249ffec234e306848f54a1781df187c2";
        libraryHaskellDepends = [
          base bytestring directory pretty time utf8-string
        ];
@@ -197592,8 +198182,8 @@ self: {
      }:
      mkDerivation {
        pname = "stitch";
-       version = "0.3.2.0";
-       sha256 = "672de129731e55e56893ef5f0149f12778ad4fd3db3c2717f9fb578e7c3e16c1";
+       version = "0.3.3.0";
+       sha256 = "1f27e9ff43da60dd67fe33c7ea927df09c9bfa7968aac0b06f07417eb8cf858e";
        libraryHaskellDepends = [ base containers text transformers ];
        testHaskellDepends = [ base Cabal hspec text ];
        description = "lightweight CSS DSL";
@@ -200535,8 +201125,8 @@ self: {
      }:
      mkDerivation {
        pname = "supplemented";
-       version = "0.5.0.2";
-       sha256 = "cd0f5577da83984a63a950950bb820abcbcbbbd678e89b24a075ae1b29eae4ec";
+       version = "0.5.0.3";
+       sha256 = "6375f692152040e0c9a30af9313bd0332653965b56c75f7de7d2978b9be99a5f";
        libraryHaskellDepends = [ base-prelude transformers ];
        testHaskellDepends = [
          QuickCheck quickcheck-instances rebase tasty tasty-hunit
@@ -201164,6 +201754,7 @@ self: {
        homepage = "https://github.com/akc/sym";
        description = "Permutations, patterns, and statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sym-plot" = callPackage
@@ -207452,6 +208043,8 @@ self: {
        pname = "these";
        version = "0.6.2.1";
        sha256 = "41dd6403ec489deef66632fcae4cd058f636badb162aedff7c8b4930affb99bb";
+       revision = "1";
+       editedCabalFile = "d4a7e4b298af27e72431b3f361841ce3063dc451500d319f754fd39117fd6907";
        libraryHaskellDepends = [
          base bifunctors containers data-default-class hashable mtl
          profunctors semigroupoids semigroups transformers
@@ -207911,27 +208504,6 @@ self: {
      }) {};
 
   "tidal" = callPackage
-    ({ mkDerivation, base, binary, bytestring, colour, containers
-     , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec
-     , PortMidi, process, serialport, text, time, transformers
-     , websockets
-     }:
-     mkDerivation {
-       pname = "tidal";
-       version = "0.7";
-       sha256 = "740fed95c4eacdf2abea0965d81f2d6e747a303868adf0d9472b7413952a5aa1";
-       libraryHaskellDepends = [
-         base binary bytestring colour containers hashable hmt hosc
-         mersenne-random-pure64 mtl parsec PortMidi process serialport text
-         time transformers websockets
-       ];
-       homepage = "http://tidal.lurk.org/";
-       description = "Pattern language for improvised music";
-       license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
-     }) {};
-
-  "tidal_0_7_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, colour, containers
      , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec
      , PortMidi, process, serialport, text, time, transformers
@@ -207946,11 +208518,10 @@ self: {
          mersenne-random-pure64 mtl parsec PortMidi process serialport text
          time transformers websockets
        ];
-       jailbreak = true;
        homepage = "http://tidal.lurk.org/";
        description = "Pattern language for improvised music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tidal-midi" = callPackage
@@ -208320,8 +208891,8 @@ self: {
        pname = "time-parsers";
        version = "0.1.0.0";
        sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8";
-       revision = "1";
-       editedCabalFile = "57e4187d557fd911e5578d0daf7ccc5734bb968820e211c1a3c64c291b423132";
+       revision = "2";
+       editedCabalFile = "700250081f7f2faaeefc228fe3972df380e5bb774edc33529cdfa839ab8e65d4";
        libraryHaskellDepends = [ base parsers template-haskell time ];
        testHaskellDepends = [
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -208504,6 +209075,7 @@ self: {
        homepage = "http://hub.darcs.net/esz/timelike-clock";
        description = "Timelike interface for the clock library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timelike-time" = callPackage
@@ -208842,8 +209414,8 @@ self: {
      }:
      mkDerivation {
        pname = "tinylog";
-       version = "0.13.0";
-       sha256 = "9acfff4bb36595c91ad9bdb7b9105fd46b2cb123b3b359c9825c9ea8dbcad637";
+       version = "0.14.0";
+       sha256 = "322f56178011707436a8e5234a879c5254a468f789ad8db635c98adf752a73ea";
        libraryHaskellDepends = [
          base bytestring containers double-conversion fast-logger text
          transformers unix-time
@@ -212591,6 +213163,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-operators" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "type-operators";
+       version = "0.1.0.0";
+       sha256 = "1ed1669c0185a6411eeea83034b6b46f366d57341813006992273b3724c5c2a4";
+       libraryHaskellDepends = [ base ghc-prim ];
+       homepage = "https://github.com/Shou/type-operators#readme";
+       description = "Various type-level operators";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "type-ord" = callPackage
     ({ mkDerivation, base, template-haskell, type-digits, type-spine }:
      mkDerivation {
@@ -212811,6 +213395,7 @@ self: {
        homepage = "http://github.com/typed-wire/hs-typed-wire-utils#readme";
        description = "Haskell utility library required for code generated by typed-wire compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typedquery" = callPackage
@@ -216759,6 +217344,7 @@ self: {
        homepage = "https://github.com/schell/varying";
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault_0_3_0_3" = callPackage
@@ -218051,6 +218637,7 @@ self: {
        homepage = "http://github.com/andrew/vinyl-plus";
        description = "Vinyl records utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-utils" = callPackage
@@ -218755,8 +219342,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-app-file-cgi";
-       version = "3.1.0";
-       sha256 = "fef1e40473f5d2a3355f8160c88f1626c0c90ca04e0bc5d57a06747384ab5a92";
+       version = "3.1.1";
+       sha256 = "a8f5389330063d55a7c08ef779a603a70ec4455271d8e3a8dcf2a35f19efe91d";
        libraryHaskellDepends = [
          array attoparsec attoparsec-conduit base blaze-builder blaze-html
          bytestring case-insensitive conduit conduit-extra containers
@@ -218769,6 +219356,7 @@ self: {
          base bytestring conduit conduit-extra directory doctest filepath
          hspec HTTP http-types unix wai warp
        ];
+       jailbreak = true;
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "File/CGI/Rev Proxy App of WAI";
        license = stdenv.lib.licenses.bsd3;
@@ -222688,6 +223276,39 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_6" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
+     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.6";
+       sha256 = "4ac0ce7613a5a9c70d2100d8553c790567a4cd2147b994c5f838c2862e6dd810";
+       libraryHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers ghc-prim hashable
+         http-date http-types http2 iproute network simple-sendfile stm
+         streaming-commons text unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network process QuickCheck silently
+         simple-sendfile stm streaming-commons text time transformers unix
+         unix-compat vault wai word8
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -224542,8 +225163,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.5.1.0";
-       sha256 = "54698d8333958d20dc19ae2c7f50a09e89776056a6574eee1bde24d9cc7bed0b";
+       version = "0.5.2.0";
+       sha256 = "2bf5465e38c31694c24c1d985e514c89b6c503638ecccc9a45b74dae6aac0e57";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -227154,7 +227775,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xlsx" = callPackage
+  "xlsx_0_2_1" = callPackage
     ({ mkDerivation, base, binary-search, bytestring, conduit
      , containers, data-default, digest, HUnit, lens, mtl, old-locale
      , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time
@@ -227184,6 +227805,39 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "xlsx" = callPackage
+    ({ mkDerivation, base, binary-search, bytestring, conduit
+     , containers, data-default, digest, HUnit, lens, mtl, old-locale
+     , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time
+     , transformers, utf8-string, vector, xml-conduit, xml-types
+     , zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.2.1.1";
+       sha256 = "0208caa841b4e971ea3ce21f0fbe04d7de8201ca7823144f17a194d864476cb2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens mtl old-locale text time transformers utf8-string
+         vector xml-conduit xml-types zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens old-locale text time transformers utf8-string vector
+         xml-conduit xml-types zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit lens smallcheck tasty tasty-hunit
+         tasty-smallcheck time vector xml-conduit
+       ];
+       homepage = "https://github.com/qrilka/xlsx";
+       description = "Simple and incomplete Excel file parser/writer";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "xlsx-tabular" = callPackage
@@ -227877,10 +228531,9 @@ self: {
     ({ mkDerivation, base-prelude, free, text }:
      mkDerivation {
        pname = "xml-query";
-       version = "0.9.0.2";
-       sha256 = "008d596529cffde397c55026c10c8a20951272959e2a6e35cfdfef499719ec7b";
+       version = "0.9.1";
+       sha256 = "985b84f838f91c9e8b8e8027e747e32a4d5c8d97fed58c42b7e832f4f7fd9a9b";
        libraryHaskellDepends = [ base-prelude free text ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/xml-query";
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
@@ -227892,13 +228545,12 @@ self: {
      }:
      mkDerivation {
        pname = "xml-query-xml-conduit";
-       version = "0.3";
-       sha256 = "daa66b0b16961b090d47278e4ad92b1b776080e1c675e414c65640db13118ecb";
+       version = "0.3.1";
+       sha256 = "78a66a96b043c6ed71e3e01ec474dc868b2b433b826149044f088d8210b0f39e";
        libraryHaskellDepends = [
          base-prelude text xml-conduit xml-query xml-query-xml-types
          xml-types
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/xml-query-xml-conduit";
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
@@ -227913,8 +228565,8 @@ self: {
      }:
      mkDerivation {
        pname = "xml-query-xml-types";
-       version = "0.4";
-       sha256 = "28291319efbb60d4a2889cf1319d3fd5aa63b71ec9f29562ec1fdfa243ce7b81";
+       version = "0.4.1";
+       sha256 = "090632a66a898114c237776afe84dd02b3f1a1cb2950ea7c0413f95421ba3963";
        libraryHaskellDepends = [
          base-prelude free html-entities success text transformers xml-query
          xml-types
@@ -227924,7 +228576,6 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text xml-conduit xml-query xml-types
        ];
-       jailbreak = true;
        homepage = "https://github.com/sannsyn/xml-query-xml-types";
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
@@ -236297,6 +236948,8 @@ self: {
        pname = "zip";
        version = "0.1.1";
        sha256 = "642a84ab891b4dee722d0c60d46703b6812298fcf56fe11ce803dbeaa3d156dd";
+       revision = "1";
+       editedCabalFile = "96d5a60a37b746603f6744020811ab38a35ae6be28b75a3fbe8f998c55d7dfd6";
        libraryHaskellDepends = [
          base bytestring bzlib-conduit case-insensitive cereal conduit
          conduit-extra containers digest exceptions filepath mtl path

From e6e5d984aba2ff0d2c1f0442686e056625c9a37f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Apr 2016 12:26:22 +0200
Subject: [PATCH 775/857] configuration-hackage2nix.yaml: update list of broken
 packages

---
 .../configuration-hackage2nix.yaml            | 46 +++++++++++++++----
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 3d87f86f4ab25..1c0536b67e670 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -191,6 +191,7 @@ dont-distribute-packages:
   AERN-RnToRm:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   aeson-bson:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   aeson-native:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
+  aeson-schema:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   aeson-smart:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   AesonBson:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   afv:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -206,6 +207,7 @@ dont-distribute-packages:
   al:                                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   alea:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   alga:                                         [ i686-linux ]
+  algebra-sql:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   algebraic:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   AlignmentAlgorithms:                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   Allure:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -289,7 +291,7 @@ dont-distribute-packages:
   atlassian-connect-core:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   atlassian-connect-descriptor:                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   atom-msp430:                                  [ x86_64-darwin, x86_64-linux ]
-  atomic-primops-foreign:                       [ x86_64-darwin ]
+  atomic-primops-foreign:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   atomic-primops-vector:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   atomo:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   AttoJson:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -362,6 +364,7 @@ dont-distribute-packages:
   berp:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   bff:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   bgzf:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
+  bibdb:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   bidirectionalization-combined:                [ i686-linux, x86_64-darwin, x86_64-linux ]
   bidispec:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   BigPixel:                                     [ x86_64-darwin ]
@@ -417,6 +420,7 @@ dont-distribute-packages:
   bindings-sc3:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   bindings-sipc:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   bindings-svm:                                 [ x86_64-darwin ]
+  bindings-wlc:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   binembed-example:                             [ x86_64-darwin ]
   bio:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   Biobase:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -766,6 +770,7 @@ dont-distribute-packages:
   craftwerk-cairo:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   craftwerk-gtk:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   craftwerk:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  craze:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   crc16:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   crf-chain1-constrained:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   crf-chain1:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -778,6 +783,7 @@ dont-distribute-packages:
   crunghc:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   crypto-enigma:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  cryptonite-openssl:                           [ i686-linux, x86_64-darwin, x86_64-linux ]
   cryptsy-api:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   crystalfontz:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -854,6 +860,7 @@ dont-distribute-packages:
   ddc-driver:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   ddc-source-tetra:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   ddc-tools:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  ddc-war:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   ddci-core:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   dead-simple-json:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   decepticons:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -913,6 +920,7 @@ dont-distribute-packages:
   DifferenceLogic:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   DifferentialEvolution:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  DigitalOcean:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   DimensionalHash:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   dingo-core:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   dingo-example:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -925,6 +933,7 @@ dont-distribute-packages:
   direct-plugins:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   directed-cubical:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   dirfiles:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  discogs-haskell:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   discount:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   disjoint-set:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   DisTract:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -977,6 +986,7 @@ dont-distribute-packages:
   dropbox-sdk:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   dropsolve:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   ds-kanren:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  dsh-sql:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   dsmc-tools:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   dsmc:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   DSTM:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1237,7 +1247,7 @@ dont-distribute-packages:
   funsat:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   future:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   fuzzytime:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
-  fwgl-glfw:                                    [ i686-linux, x86_64-darwin ]
+  fwgl-glfw:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   fwgl:                                         [ i686-linux ]
   g-npm:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   gact:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1303,6 +1313,10 @@ dont-distribute-packages:
   gi-girepository:                              [ i686-linux, x86_64-darwin ]
   gi-glib:                                      [ i686-linux ]
   gi-gobject:                                   [ i686-linux ]
+  gi-gst:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gi-gstaudio:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gi-gstbase:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gi-gstvideo:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   gi-gtk:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   gi-javascriptcore:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   gi-notify:                                    [ i686-linux, x86_64-darwin ]
@@ -1344,13 +1358,13 @@ dont-distribute-packages:
   glome-hs:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   GlomeTrace:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   GlomeView:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
-  gloss-accelerate:                             [ x86_64-darwin ]
+  gloss-accelerate:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   gloss-algorithms:                             [ x86_64-darwin ]
   gloss-banana:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   gloss-devil:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   gloss-examples:                               [ x86_64-darwin ]
-  gloss-game:                                   [ x86_64-darwin ]
-  gloss-juicy:                                  [ x86_64-darwin ]
+  gloss-game:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  gloss-juicy:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   gloss-raster:                                 [ x86_64-darwin ]
   gloss-rendering:                              [ x86_64-darwin ]
   gloss-sodium:                                 [ x86_64-darwin ]
@@ -1602,6 +1616,7 @@ dont-distribute-packages:
   haskell-mpi:                                  [ x86_64-darwin ]
   haskell-names:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-openflow:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
+  haskell-packages:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-pdf-presenter:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-platform-test:                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   haskell-plot:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1776,6 +1791,7 @@ dont-distribute-packages:
   hgithub:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   hgom:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   HGraphStorage:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  hgrev:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hgrib:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hharp:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   HHDL:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1806,6 +1822,7 @@ dont-distribute-packages:
   HipmunkPlayground:                            [ x86_64-darwin ]
   hircules:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   hirt:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
+  Hish:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   hissmetrics:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   hist-pl-fusion:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   hist-pl-lmf:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -1903,6 +1920,8 @@ dont-distribute-packages:
   hp2any-core:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   hp2any-graph:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   hp2any-manager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpaco-lib:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
+  hpaco:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hpage:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hpapi:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   hpaste:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2125,7 +2144,7 @@ dont-distribute-packages:
   imm:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   imparse:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   imperative-edsl-vhdl:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
-  imperative-edsl:                              [ i686-linux, x86_64-darwin ]
+  imperative-edsl:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   ImperativeHaskell:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   improve:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   INblobs:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2148,6 +2167,7 @@ dont-distribute-packages:
   inilist:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   inline-c-cpp:                                 [ x86_64-darwin ]
   inline-r:                                     [ i686-linux, x86_64-darwin ]
+  instant-aeson:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   instant-zipper:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   integer-pure:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   intel-aes:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2230,6 +2250,7 @@ dont-distribute-packages:
   JSONb:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   JsonGrammar:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   jsonresume:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  jsonschema-gen:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   jspath:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   judy:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   jukebox:                                      [ x86_64-darwin ]
@@ -2512,8 +2533,8 @@ dont-distribute-packages:
   manatee-welcome:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   manatee:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   mandulia:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
-  manifold-random:                              [ x86_64-darwin ]
-  manifolds:                                    [ x86_64-darwin ]
+  manifold-random:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
+  manifolds:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   mappy:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   marionetta:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   markdown-kate:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2595,6 +2616,7 @@ dont-distribute-packages:
   modular-prelude:                              [ i686-linux, x86_64-darwin, x86_64-linux ]
   module-management:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
   Moe:                                          [ x86_64-darwin ]
+  MoeDict:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   mohws:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   monad-abort-fd:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   monad-atom-simple:                            [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2822,6 +2844,7 @@ dont-distribute-packages:
   OpenVG:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   OpenVGRaw:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   Operads:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
+  operational-alacarte:                         [ i686-linux, x86_64-darwin, x86_64-linux ]
   optimal-blocks:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   optimusprime:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   orchestrate:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -2978,6 +3001,7 @@ dont-distribute-packages:
   posix-realtime:                               [ x86_64-darwin ]
   posix-timer:                                  [ x86_64-darwin ]
   posix-waitpid:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
+  postcodes:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   postgresql-simple-typed:                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   postgresql-typed:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   PostgreSQL:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3411,6 +3435,7 @@ dont-distribute-packages:
   sirkel:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   sized:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   skeleton:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  skulk:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   skype4hs:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   slack:                                        [ i686-linux, x86_64-darwin, x86_64-linux ]
   slidemews:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3574,6 +3599,7 @@ dont-distribute-packages:
   syb-extras:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   sylvia:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   sym-plot:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  sym:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
   symengine-hs:                                 [ i686-linux, x86_64-darwin, x86_64-linux ]
   sync-mht:                                     [ i686-linux ]
   sync:                                         [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3692,6 +3718,7 @@ dont-distribute-packages:
   time-series:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   time-w3c:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   timecalc:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
+  timelike-clock:                               [ i686-linux, x86_64-darwin, x86_64-linux ]
   timemap:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   timeout:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   timeparsers:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3780,6 +3807,7 @@ dont-distribute-packages:
   typeable-th:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   TypeClass:                                    [ i686-linux, x86_64-darwin, x86_64-linux ]
   typed-spreadsheet:                            [ x86_64-darwin ]
+  typed-wire-utils:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   typed-wire:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   typedquery:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   typehash:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
@@ -3846,6 +3874,7 @@ dont-distribute-packages:
   vacuum:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]
   vampire:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   var:                                          [ i686-linux, x86_64-darwin, x86_64-linux ]
+  varying:                                      [ i686-linux, x86_64-darwin, x86_64-linux ]
   vaultaire-common:                             [ i686-linux, x86_64-darwin, x86_64-linux ]
   vcache-trie:                                  [ x86_64-darwin ]
   vcache:                                       [ x86_64-darwin ]
@@ -3870,6 +3899,7 @@ dont-distribute-packages:
   vintage-basic:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   vinyl-gl:                                     [ i686-linux, x86_64-darwin, x86_64-linux ]
   vinyl-json:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
+  vinyl-plus:                                   [ i686-linux, x86_64-darwin, x86_64-linux ]
   vinyl-vectors:                                [ i686-linux, x86_64-darwin, x86_64-linux ]
   virthualenv:                                  [ i686-linux, x86_64-darwin, x86_64-linux ]
   vision:                                       [ i686-linux, x86_64-darwin, x86_64-linux ]

From 2daf67bf87db9cb9964d91c0b4c2ffc24887cf37 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Tue, 5 Apr 2016 07:14:48 -0400
Subject: [PATCH 776/857] haskell-pipes-transduce: fix build

---
 pkgs/development/haskell-modules/configuration-common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 8f3c2ad1a6f81..f40b1281e6bf8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -965,5 +965,10 @@ self: super: {
     dns_sd = pkgs.avahi.override {
       withLibdnssdCompat = true;
     };
+
+  # https://github.com/danidiaz/pipes-transduce/issues/2
+  pipes-transduce = super.pipes-transduce.override {
+    foldl = self.foldl_1_1_6;
   };
+
 }

From bec10ed1b83f6bd1988d050346b58930b7128d98 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Fri, 11 Mar 2016 05:41:35 -0500
Subject: [PATCH 777/857] haskell-present: remove obsolete patch

---
 .../development/haskell-modules/configuration-ghc-7.10.x.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index 6485229145917..ac829daa485fb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -125,11 +125,6 @@ self: super: {
   # https://github.com/kazu-yamamoto/unix-time/issues/30
   unix-time = dontCheck super.unix-time;
 
-  present = appendPatch super.present (pkgs.fetchpatch {
-    url = "https://github.com/chrisdone/present/commit/6a61f099bf01e2127d0c68f1abe438cd3eaa15f7.patch";
-    sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8";
-  });
-
   ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
     pname = "ghcjs-prim";
     version = "0.1.0.0";

From 3110ba445f64c7d2b352acdb0be41473fc194add Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Apr 2016 11:33:55 +0200
Subject: [PATCH 778/857] cabal2nix: update to version 20160406

---
 pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix        | 4 ++--
 .../tools/haskell/cabal2nix/distribution-nixpkgs.nix          | 4 ++--
 pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
index 87dc173dd8784..724942c57c83c 100644
--- a/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/cabal2nix.nix
@@ -6,12 +6,12 @@
 
 mkDerivation rec {
   pname = "cabal2nix";
-  version = "20160308";
+  version = "20160406";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52";
+    sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;
diff --git a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
index 5aa4370b26f90..870f3d40961e6 100644
--- a/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/distribution-nixpkgs.nix
@@ -11,8 +11,8 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
-    rev = "v20160308";
-    sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52";
+    rev = "v20160406";
+    sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
   };
   postUnpack = "sourceRoot+=/${pname}";
   libraryHaskellDepends = [
diff --git a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
index ce1d9303cdcd0..461cf464f4540 100644
--- a/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
+++ b/pkgs/development/tools/haskell/cabal2nix/hackage2nix.nix
@@ -7,12 +7,12 @@
 
 mkDerivation rec {
   pname = "hackage2nix";
-  version = "20160308";
+  version = "20160406";
   src = fetchFromGitHub {
     owner = "nixos";
     repo = "cabal2nix";
     rev = "v${version}";
-    sha256 = "02lj3x0rgpxvaimwbbjjgwm4ka0wkk4x5h35jjygz6bkr5lv3m52";
+    sha256 = "02dn2zllanf3rl16ny17j80h7p6gcdqkhadh3ypkr38gd9w16pc6";
   };
   postUnpack = "sourceRoot+=/${pname}";
   isLibrary = false;

From 7f976c7729caed4e37e105848cbde4eda0d08ca8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Apr 2016 12:21:38 +0200
Subject: [PATCH 779/857] haskell-fail: fix build with ghc-8.0.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index e39002b8dec44..4c6c59c6ea745 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -52,4 +52,7 @@ self: super: {
   # https://github.com/sol/doctest/issues/125
   doctest = self.doctest_0_11_0;
 
+  # No modules defined for this compiler.
+  fail = dontHaddock super.fail;
+
 }

From 7694bb18c87cdaf1bd720a91a4ae8c3d344bccf8 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Apr 2016 12:21:58 +0200
Subject: [PATCH 780/857] haskell-comonad: fix build with ghc-8.0.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 4c6c59c6ea745..0753e64c1e88e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -55,4 +55,8 @@ self: super: {
   # No modules defined for this compiler.
   fail = dontHaddock super.fail;
 
+  # Version 4.x doesn't compile with transformers 0.5 or later.
+  comonad_5 = dontCheck super.comonad_5;  # https://github.com/ekmett/comonad/issues/33
+  comonad = self.comonad_5;
+
 }

From 07f26f3df1a9548970d87eaedf10575be610a1de Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 6 Apr 2016 12:22:21 +0200
Subject: [PATCH 781/857] configuration-ghc-8.0.x.nix: clean up overrides

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 0753e64c1e88e..2e013ee940a24 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -47,7 +47,7 @@ self: super: {
   hspec-core = dontCheck super.hspec-core;
 
   # Deviate from Stackage here to fix lots of builds.
-  transformers-compat = super.transformers-compat_0_5_1_4;
+  transformers-compat = self.transformers-compat_0_5_1_4;
 
   # https://github.com/sol/doctest/issues/125
   doctest = self.doctest_0_11_0;

From c0a5872c2c771f9e88ca198ea625c1f1be840da2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 7 Apr 2016 07:58:32 +0200
Subject: [PATCH 782/857] configuration-common.nix: fix syntax error (and
 cosmetic)

---
 .../haskell-modules/configuration-common.nix        | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index f40b1281e6bf8..1833ce3ffced4 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -956,19 +956,12 @@ self: super: {
   jsaddle = dontCheck super.jsaddle;
 
   # https://github.com/gwern/mueval/issues/14
-  mueval = super.mueval.override {
-    hint = self.hint_0_4_3;
-  };
+  mueval = super.mueval.override { hint = self.hint_0_4_3; };
 
   # Looks like Avahi provides the missing library
-  dnssd = super.dnssd.override {
-    dns_sd = pkgs.avahi.override {
-      withLibdnssdCompat = true;
-    };
+  dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };
 
   # https://github.com/danidiaz/pipes-transduce/issues/2
-  pipes-transduce = super.pipes-transduce.override {
-    foldl = self.foldl_1_1_6;
-  };
+  pipes-transduce = super.pipes-transduce.override { foldl = self.foldl_1_1_6; };
 
 }

From 961d1e847c2ec76446863542abd164522c5d745d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ragnar=20Dahl=C3=A9n?= <r.dahlen@gmail.com>
Date: Wed, 6 Apr 2016 14:25:14 +0100
Subject: [PATCH 783/857] linux: kernel config for extended BPF support

- Enable BPF_SYSCALL and BPF_EVENTS
- Build modules for NET_CLS_BPF and NET_ACT_BPF

With these config options we can leverage the full potential of BPF for
tracing and instrumenting Linux systems, for example using
libraries/tools like those provided by the bcc project.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index f3dd32386bc95..58af04fbb8abc 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -118,6 +118,10 @@ with stdenv.lib;
   ${optionalString (stdenv.system == "x86_64-linux") ''
     BPF_JIT y
   ''}
+  ${optionalString (versionAtLeast version "4.4") ''
+    NET_CLS_BPF m
+    NET_ACT_BPF m
+  ''}
 
   # Wireless networking.
   CFG80211_WEXT? y # Without it, ipw2200 drivers don't build
@@ -398,6 +402,10 @@ with stdenv.lib;
   ${optionalString (versionAtLeast version "3.10") ''
     UPROBE_EVENT y
   ''}
+  ${optionalString (versionAtLeast version "4.4") ''
+    BPF_SYSCALL y
+    BPF_EVENTS y
+  ''}
   FUNCTION_PROFILER y
   RING_BUFFER_BENCHMARK n
 

From 551296a1cec0b9751ab96c420a7481e322ea127d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 7 Apr 2016 09:34:59 +0200
Subject: [PATCH 784/857] mendeley: 1.16 -> 1.16.1

---
 pkgs/applications/office/mendeley/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 4f641d1ee50b0..529c41ec8992e 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -12,14 +12,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.16-stable";
+  shortVersion = "1.16.1-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "da56abe0e0e86d868d305119f06cf6d14273d2f65e5c135fc2d190ca599b3cb6"
-    else "e9c2f026fd267db34396ff5f24bce9c6a4beba530bd8b40265a792d417282fba";
+    then "0lsmaw8zzyfvndsz1awz3vl5cdvsik9wc3ck8983y20awh7r9f4m"
+    else "12p6rgxiqajnfgd8nmknyb8icdkln727sshba8x1xlxakxg5c4q4";
 
   deps = [
     gcc.cc

From 136c35bccb5de99a3053e44d4e70d0e4e322dc1b Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 7 Apr 2016 11:31:10 +0200
Subject: [PATCH 785/857] exim: 4.86.2 -> 4.87

---
 pkgs/servers/mail/exim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index d8d1f0dc3a7cc..0918e308d263a 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,11 +1,11 @@
 { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.86.2";
+  name = "exim-4.87";
 
   src = fetchurl {
     url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2";
-    sha256 = "1cvfcc1hi60lydv8h3a2rxlfc0v2nflwpvzjj7h7cdsqs2pxwmkp";
+    sha256 = "1jbxn13shq90kpn0s73qpjnx5xm8jrpwhcwwgqw5s6sdzw6iwsbl";
   };
 
   buildInputs = [ coreutils db openssl pcre perl pkgconfig ];

From e1bcc27f1aaba77d4b8263250f5a95199fa36453 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 7 Apr 2016 11:37:19 +0200
Subject: [PATCH 786/857] Making trac/ldap handle httpd 2.4.

The option authzldapauthoritative had been removed in 2.4

I pushed this into 16.03 instead of master first. My fault.
(cherry picked from commit 516f47efefc44a5465266fe4d72f9136147d2caf)
---
 .../services/web-servers/apache-httpd/trac.nix        | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index 8fe8b90d823c0..c5c11029010e3 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -5,14 +5,19 @@ with lib;
 let
 
   # Build a Subversion instance with Apache modules and Swig/Python bindings.
-  subversion = pkgs.subversion.override (origArgs: {
+  subversion = pkgs.subversion.override {
     bdbSupport = true;
     httpServer = true;
     pythonBindings = true;
-  });
+    apacheHttpd = httpd;
+  };
 
   pythonLib = p: "${p}/";
 
+  httpd = serverInfo.serverConfig.package;
+
+  versionPre24 = versionOlder httpd.version "2.4";
+
 in
 
 {
@@ -82,7 +87,7 @@ in
         AuthName "${config.ldapAuthentication.name}"
         AuthBasicProvider "ldap"
         AuthLDAPURL "${config.ldapAuthentication.url}"
-        authzldapauthoritative Off
+        ${if versionPre24 then "authzldapauthoritative Off" else ""}
         require valid-user
       </LocationMatch>
     '' else ""}

From 28c8f37eef965b5c87cf676b03472f25f64aaa46 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Thu, 7 Apr 2016 10:58:10 +0100
Subject: [PATCH 787/857] rethinkdb: 2.2.4 -> 2.3.0

The removed patch is included in this upstream release.
---
 pkgs/servers/nosql/rethinkdb/default.nix      |   6 +-
 pkgs/servers/nosql/rethinkdb/glibc-2.23.patch | 111 ------------------
 2 files changed, 2 insertions(+), 115 deletions(-)
 delete mode 100644 pkgs/servers/nosql/rethinkdb/glibc-2.23.patch

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index f1b57546c7d7e..e61a94e7f07b0 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -4,15 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "rethinkdb-${version}";
-  version = "2.2.4";
+  version = "2.3.0";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "0zs07g7arrrvm85mqbkffyzgd255qawn64r6iqdws25lj1kq2qim";
+    sha256 = "0b787ibnrmziypiw86yx4gpmlj4ima6j6g9hzshbpilxy7lrq1cb";
   };
 
-  patches = [ ./glibc-2.23.patch ];
-
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
 
diff --git a/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch b/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch
deleted file mode 100644
index 818ea12456483..0000000000000
--- a/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 84be09f314c4cbf88b4ac8fe9dbff1d36f0f5781 Mon Sep 17 00:00:00 2001
-From: Daniel Mewes <daniel@rethinkdb.com>
-Date: Fri, 5 Feb 2016 18:45:28 -0800
-Subject: [PATCH] Alpinelinux compilation fixes
-
-by @clandmeter
----
- src/containers/buffer_group.hpp                            |  1 +
- src/containers/printf_buffer.hpp                           |  1 +
- src/errors.cc                                              |  2 +-
- src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc |  4 ++--
- src/rdb_protocol/geo/s2/util/math/mathlimits.h             | 12 ++++++------
- src/threading.hpp                                          |  2 ++
- 6 files changed, 13 insertions(+), 9 deletions(-)
-
-diff --git a/src/containers/buffer_group.hpp b/src/containers/buffer_group.hpp
-index 865c5cb..0403db6 100644
---- a/src/containers/buffer_group.hpp
-+++ b/src/containers/buffer_group.hpp
-@@ -3,6 +3,7 @@
- #define CONTAINERS_BUFFER_GROUP_HPP_
- 
- #include <stdlib.h>
-+#include <sys/types.h>
- #include <unistd.h>
- #include <vector>
- 
-diff --git a/src/containers/printf_buffer.hpp b/src/containers/printf_buffer.hpp
-index b7a5154..76959f3 100644
---- a/src/containers/printf_buffer.hpp
-+++ b/src/containers/printf_buffer.hpp
-@@ -5,6 +5,7 @@
- #include <stdarg.h>
- #include <stdio.h>
- #include <string.h>
-+#include <sys/types.h>
- 
- // Cannot include utils.hpp, we are included by utils.hpp.
- #include "errors.hpp"
-diff --git a/src/errors.cc b/src/errors.cc
-index d40c04f..39efc9f 100644
---- a/src/errors.cc
-+++ b/src/errors.cc
-@@ -89,7 +89,7 @@ void report_fatal_error(const char *file, int line, const char *msg, ...) {
- }
- 
- const char *errno_string_maybe_using_buffer(int errsv, char *buf, size_t buflen) {
--#ifdef _GNU_SOURCE
-+#ifdef __GLIBC__
-     return strerror_r(errsv, buf, buflen);
- #elif defined(_WIN32)
-     UNUSED errno_t res = strerror_s(buf, buflen, errsv);
-diff --git a/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc b/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
-index 3b07392..aa1a1d3 100644
---- a/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
-+++ b/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
-@@ -110,9 +110,9 @@ static int BN_ext_count_low_zero_bits(const BIGNUM* bn) {
- ExactFloat::ExactFloat(double v) {
-   BN_init(&bn_);
-   sign_ = signbit(v) ? -1 : 1;
--  if (isnan(v)) {
-+  if (std::isnan(v)) {
-     set_nan();
--  } else if (isinf(v)) {
-+  } else if (std::isinf(v)) {
-     set_inf(sign_);
-   } else {
-     // The following code is much simpler than messing about with bit masks,
-diff --git a/src/rdb_protocol/geo/s2/util/math/mathlimits.h b/src/rdb_protocol/geo/s2/util/math/mathlimits.h
-index 5148422..86af72d 100644
---- a/src/rdb_protocol/geo/s2/util/math/mathlimits.h
-+++ b/src/rdb_protocol/geo/s2/util/math/mathlimits.h
-@@ -14,7 +14,7 @@
- #define UTIL_MATH_MATHLIMITS_H__
- 
- #include <string.h>
--#include <math.h>
-+#include <cmath>
- #include <cfloat>
- 
- #include "rdb_protocol/geo/s2/base/basictypes.h"
-@@ -195,11 +195,11 @@ DECL_UNSIGNED_INT_LIMITS(unsigned long long int)
-   static bool IsNegInf(const Type x) { return _fpclass(x) == _FPCLASS_NINF; }
- #else
- #define DECL_FP_LIMIT_FUNCS \
--  static bool IsFinite(const Type x) { return !isinf(x)  &&  !isnan(x); } \
--  static bool IsNaN(const Type x) { return isnan(x); } \
--  static bool IsInf(const Type x) { return isinf(x); } \
--  static bool IsPosInf(const Type x) { return isinf(x)  &&  x > 0; } \
--  static bool IsNegInf(const Type x) { return isinf(x)  &&  x < 0; }
-+  static bool IsFinite(const Type x) { return !std::isinf(x)  &&  !std::isnan(x); } \
-+  static bool IsNaN(const Type x) { return std::isnan(x); } \
-+  static bool IsInf(const Type x) { return std::isinf(x); } \
-+  static bool IsPosInf(const Type x) { return std::isinf(x)  &&  x > 0; } \
-+  static bool IsNegInf(const Type x) { return std::isinf(x)  &&  x < 0; }
- #endif
- 
- // We can't put floating-point constant values in the header here because
-diff --git a/src/threading.hpp b/src/threading.hpp
-index 14fc6a8..9bf033f 100644
---- a/src/threading.hpp
-+++ b/src/threading.hpp
-@@ -1,6 +1,8 @@
- #ifndef THREADING_HPP_
- #define THREADING_HPP_
- 
-+#include <sys/types.h>
-+#include <unistd.h>
- #include <functional>
- #include <vector>
- 

From 2be0505b8df56a65e5b19910e3133fd41d5666b7 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Thu, 7 Apr 2016 11:19:08 +0100
Subject: [PATCH 788/857] pythonPackages.cgkit: Add maintenance information

Add @expipiplus as a maintainer.
---
 lib/maintainers.nix                | 1 +
 pkgs/top-level/python-packages.nix | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 09f928be20a8f..28b009471e2fe 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -114,6 +114,7 @@
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   exi = "Reno Reckling <nixos@reckling.org>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
+  expipiplus1 = "Joe Hermaszewski <nix@monoid.al>";
   fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4570586420df2..d46f59b56e072 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2946,6 +2946,7 @@ in modules // {
     };
   };
 
+  # This package is no longer actively maintained and can be removed if it becomes broken.
   cgkit = buildPythonPackage rec {
     version = "2.0.0";
     name = "cgkit-${version}";
@@ -2969,6 +2970,7 @@ in modules // {
     meta = {
       homepage = http://cgkit.sourceforge.net;
       description = "Python Computer Graphics Kit";
+      maintainers = with maintainers; [ expipiplus1 ];
     };
   };
 

From 5f028082cc974e6e322e697d21562b731fcfc328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 7 Apr 2016 11:34:15 +0100
Subject: [PATCH 789/857] Revert "kernelHeaders: fix build with libmpc"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit b0adde8f8a5f22cf45f32df64bba149f326dec85.

Doesn't fix the issue for grsec kernels.

(cherry picked from commit 22bd9c12fec43bf914cdbec4c3a11cd0d964912a)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/os-specific/linux/kernel-headers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/default.nix b/pkgs/os-specific/linux/kernel-headers/default.nix
index de30938f33a63..a33d24fc847ba 100644
--- a/pkgs/os-specific/linux/kernel-headers/default.nix
+++ b/pkgs/os-specific/linux/kernel-headers/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, kernel, perl, libmpc }:
+{ stdenv, kernel, perl }:
 
 let
   baseBuildFlags = [ "INSTALL_HDR_PATH=$(out)" "headers_install" ];
@@ -7,7 +7,7 @@ in stdenv.mkDerivation {
 
   inherit (kernel) src patches;
 
-  nativeBuildInputs = [ perl libmpc ];
+  nativeBuildInputs = [ perl ];
 
   buildFlags = [ "ARCH=${stdenv.platform.kernelArch}" ] ++ baseBuildFlags;
 

From 679dc0e70784c7c26cc8a17b5a26e194720cc77c Mon Sep 17 00:00:00 2001
From: georgewhewell <georgerw@gmail.com>
Date: Thu, 7 Apr 2016 11:38:42 +0000
Subject: [PATCH 790/857] putty: 0.66 -> 0.67

---
 pkgs/applications/networking/remote/putty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/remote/putty/default.nix b/pkgs/applications/networking/remote/putty/default.nix
index 241cfbd5bca74..ccabb5c77a81c 100644
--- a/pkgs/applications/networking/remote/putty/default.nix
+++ b/pkgs/applications/networking/remote/putty/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses, gtk, pkgconfig, autoconf, automake, perl, halibut, libtool }:
 
 stdenv.mkDerivation rec {
-  version = "0.66";
+  version = "0.67";
   name = "putty-${version}";
 
   src = fetchurl {
     url = "http://the.earth.li/~sgtatham/putty/latest/${name}.tar.gz";
-    sha256 = "14r9yfqjs61l82q09m8zifgcxrzvs6dvgx32ndl5i1jldkv14wzy";
+    sha256 = "0isak6dy5vmfzf9ckcq6jvhgrn3xfmfcmziaa7g2jqm4x1c286c0";
   };
 
   preConfigure = ''

From 009a9ceb88f2b1d6b03551244cdea9f70a5aba77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 7 Apr 2016 12:48:39 +0100
Subject: [PATCH 791/857] snabbswitch: 2015.12 -> 2016.04, rename to snabb

---
 .../{snabbswitch => snabb}/default.nix         | 18 +++++++++++-------
 pkgs/top-level/all-packages.nix                |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)
 rename pkgs/tools/networking/{snabbswitch => snabb}/default.nix (61%)

diff --git a/pkgs/tools/networking/snabbswitch/default.nix b/pkgs/tools/networking/snabb/default.nix
similarity index 61%
rename from pkgs/tools/networking/snabbswitch/default.nix
rename to pkgs/tools/networking/snabb/default.nix
index f7cd1a4300ac0..8ba9cfa6dad83 100644
--- a/pkgs/tools/networking/snabbswitch/default.nix
+++ b/pkgs/tools/networking/snabb/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, lib, fetchurl, bash, makeWrapper, git, mariadb, diffutils }:
+{ stdenv, lib, fetchFromGitHub, bash, makeWrapper, git, mariadb, diffutils, which, coreutils, procps, nettools }:
 
 stdenv.mkDerivation rec {
   name = "snabb-${version}";
-  version = "2015.12";
+  version = "2016.04";
 
-  src = fetchurl {
-    url = "https://github.com/SnabbCo/snabbswitch/archive/v${version}.tar.gz";
-    sha256 = "1949a6d3hqdr2hdfmrr1na9gvjdwdahadbhmvz2pg7azmpq6ssmr";
+  src = fetchFromGitHub {
+    owner = "snabbco";
+    repo = "snabb";
+    rev = "v${version}";
+    sha256 = "1b5g477zy6cr5d9171xf8zrhhq6wxshg4cn78i5bki572q86kwlx";
   };
 
   buildInputs = [ makeWrapper ];
@@ -18,13 +20,15 @@ stdenv.mkDerivation rec {
     for f in $(find src/program/snabbnfv/ -type f); do
       substituteInPlace $f --replace "/bin/bash" "${bash}/bin/bash"
     done
+
+    # We need a way to pass $PATH to the scripts
+    sed -i '2iexport PATH=${git}/bin:${mariadb}/bin:${which}/bin:${procps}/bin:${coreutils}/bin' src/program/snabbnfv/neutron_sync_master/neutron_sync_master.sh.inc
+    sed -i '2iexport PATH=${git}/bin:${coreutils}/bin:${diffutils}/bin:${nettools}/bin' src/program/snabbnfv/neutron_sync_agent/neutron_sync_agent.sh.inc
   '';
 
   installPhase = ''
     mkdir -p $out/bin
     cp src/snabb $out/bin
-
-    wrapProgram $out/bin/snabb --prefix PATH : "${ lib.makeBinPath [ git mariadb diffutils ]}"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8a5bdb8605fe..e82b388eb7391 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3202,7 +3202,7 @@ in
 
   smbnetfs = callPackage ../tools/filesystems/smbnetfs {};
 
-  snabbswitch = callPackage ../tools/networking/snabbswitch { } ;
+  snabb = callPackage ../tools/networking/snabb { } ;
 
   sng = callPackage ../tools/graphics/sng {
     libpng = libpng12;

From 0d8b694a104234deae7d4e50e42f3541da2f1247 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim.steinbach@exinda.com>
Date: Thu, 7 Apr 2016 08:33:17 -0400
Subject: [PATCH 792/857] oh-my-zsh: 2016-03-31 -> 2016-04-06

---
 pkgs/shells/oh-my-zsh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/shells/oh-my-zsh/default.nix b/pkgs/shells/oh-my-zsh/default.nix
index 4b2a4d4e763ea..796521b52334f 100644
--- a/pkgs/shells/oh-my-zsh/default.nix
+++ b/pkgs/shells/oh-my-zsh/default.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation rec {
   name = "oh-my-zsh-git-${version}";
-  version = "2016-03-31";
+  version = "2016-04-06";
 
   src = fetchgit {
     url = "https://github.com/robbyrussell/oh-my-zsh";
-    rev = "286c3e5e28b651c3f629e6aaba589a1cf56da4d8";
-    sha256 = "1jgbpfk6plj1gkwrv7xl1nsxjnrhyh7k3rjkindxx5s9lbq52f7z";
+    rev = "d310fac7f65d31f7494532201e02ebf67c9d9555";
+    sha256 = "0kx552b0jf5j8qkk1kixdr1z49ly79cvzhdh27848rj3kwb0z8vq";
   };
 
   phases = "installPhase";

From 4ac323d9247924415b60f4c74d59fa43299fdee0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 7 Apr 2016 07:44:26 -0500
Subject: [PATCH 793/857] kde5: enable libmtp udev rules

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 9891da2169ea5..71361bae82dc2 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -183,7 +183,10 @@ in
     services.upower.enable = config.powerManagement.enable;
 
     # Extra UDEV rules used by Solid
-    services.udev.packages = [ pkgs.media-player-info ];
+    services.udev.packages = [
+      pkgs.libmtp
+      pkgs.media-player-info
+    ];
 
     services.xserver.displayManager.sddm = {
       theme = "breeze";

From a6a7dcd6809675ea7058c87557add008bb3e23b3 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Thu, 7 Apr 2016 14:14:05 +0100
Subject: [PATCH 794/857] wego: init at 81d72ff

ingo: init at fab41e4
---
 pkgs/top-level/all-packages.nix |  2 ++
 pkgs/top-level/go-packages.nix  | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e82b388eb7391..4e4bc839d0865 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3557,6 +3557,8 @@ in
 
   weather = callPackage ../applications/misc/weather { };
 
+  wego = goPackages.wego.bin // { outputs = [ "bin" ]; };
+
   wal_e = callPackage ../tools/backup/wal-e { };
 
   watchman = callPackage ../development/tools/watchman { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2639cc4ac7acf..1da324e5879eb 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3979,4 +3979,22 @@ let
     sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw";
     propagatedBuildInputs = [ dbus ];
   };
+
+  ingo = buildFromGitHub rec {
+    rev     = "fab41e4e62cbef5d92998746ec25f7e195100f38";
+    version = "2016-04-07";
+    owner   = "schachmat";
+    repo    = "ingo";
+    sha256  = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb";
+    propagatedBuildInputs = [ ];
+  };
+
+  wego = buildFromGitHub rec {
+    rev     = "81d72ffd761f032fbd73dba4f94bd94c8c2d53d5";
+    version = "2016-04-07";
+    owner   = "schachmat";
+    repo    = "wego";
+    sha256  = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck";
+    propagatedBuildInputs = [ go-colorable mattn.go-runewidth ingo ];
+  };
 }; in self

From 3342f717da7f660b4695f09034abc175a14fda24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 14 Mar 2016 11:56:03 +0100
Subject: [PATCH 795/857] stdenv: set meta.outputsToInstall unless overridden

---
 pkgs/stdenv/generic/default.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 8395394f5a873..90cacd036c2a3 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -220,12 +220,22 @@ let
         # The meta attribute is passed in the resulting attribute set,
         # but it's not part of the actual derivation, i.e., it's not
         # passed to the builder and is not a dependency.  But since we
-        # include it in the result, it *is* available to nix-env for
-        # queries.  We also a meta.position attribute here to
-        # identify the source location of the package.
-        meta = meta // (if pos' != null then {
-          position = pos'.file + ":" + toString pos'.line;
-        } else {});
+        # include it in the result, it *is* available to nix-env for queries.
+        meta = { }
+            # If the packager hasn't specified `outputsToInstall`, choose a default,
+            # namely `p.bin or p.out or p`;
+            # if he has specified it, it will be overridden below in `// meta`.
+          // { outputsToInstall =
+            let
+              outs = outputs'; # the value passed to derivation primitive
+              hasOutput = out: builtins.elem out outs;
+            in [( lib.findFirst hasOutput null (["bin" "out"] ++ outs) )];
+          }
+          // meta
+            # Fill `meta.position` to identify the source location of the package.
+          // lib.optionalAttrs (pos' != null)
+            { position = pos'.file + ":" + toString pos'.line; }
+          ;
         inherit passthru;
       } //
       # Pass through extra attributes that are not inputs, but

From 2995439003a6473fc6531d09900e183b0d5de425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 14 Mar 2016 12:15:58 +0100
Subject: [PATCH 796/857] buildEnv: respect meta.outputsToInstall

As a result `systemPackages` now also respect it.
Only nix-env remains and that has a PR filed:
    https://github.com/NixOS/nix/pull/815
---
 nixos/modules/config/system-path.nix    | 6 +-----
 pkgs/build-support/buildenv/default.nix | 7 ++++++-
 pkgs/stdenv/generic/default.nix         | 3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index eb5eba7a042fe..69830683d9c5e 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -122,11 +122,7 @@ in
 
     system.path = pkgs.buildEnv {
       name = "system-path";
-      paths =
-        # The default output probably shouldn't be globally configurable.
-        # Services and users should specify them explicitly unless they want this default.
-        map (p: if p.outputUnspecified or false then p.bin or p.out or p else p)
-          config.environment.systemPackages;
+      paths = config.environment.systemPackages;
       inherit (config.environment) pathsToLink extraOutputsToLink;
       ignoreCollisions = true;
       # !!! Hacky, should modularise.
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 8b8c3e3cbc205..10f7c69c3aa1a 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -48,7 +48,12 @@ runCommand name
             meta pathsToLink extraPrefix postBuild buildInputs;
     pkgs = builtins.toJSON (map (drv: {
       paths =
-        [ drv ]
+        # First add the usual output(s): respect if user has chosen explicitly,
+        # and otherwise use `meta.outputsToInstall` (guaranteed to exist by stdenv).
+        (if (drv.outputUnspecified or false)
+          then map (outName: drv.${outName}) drv.meta.outputsToInstall
+          else [ drv ])
+        # Add any extra outputs specified by the caller of `buildEnv`.
         ++ lib.filter (p: p!=null)
           (builtins.map (outName: drv.${outName} or null) extraOutputsToLink);
       priority = drv.meta.priority or 5;
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 90cacd036c2a3..547541d28246e 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -225,6 +225,9 @@ let
             # If the packager hasn't specified `outputsToInstall`, choose a default,
             # namely `p.bin or p.out or p`;
             # if he has specified it, it will be overridden below in `// meta`.
+            #   Note: This default probably shouldn't be globally configurable.
+            #   Services and users should specify outputs explicitly,
+            #   unless they are comfortable with this default.
           // { outputsToInstall =
             let
               outs = outputs'; # the value passed to derivation primitive

From 9a824f2f1dd01450e6f7270246f77210d4c9c2a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 14 Mar 2016 12:19:37 +0100
Subject: [PATCH 797/857] treewide: rename extraOutputs{ToLink,ToInstall}

This is to get more consistent with `meta.outputsToInstall`.
---
 nixos/modules/config/debug-info.nix     | 2 +-
 nixos/modules/config/system-path.nix    | 4 ++--
 nixos/modules/programs/man.nix          | 2 +-
 pkgs/build-support/buildenv/default.nix | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/config/debug-info.nix b/nixos/modules/config/debug-info.nix
index 777ae71eebfb6..17cb862d29162 100644
--- a/nixos/modules/config/debug-info.nix
+++ b/nixos/modules/config/debug-info.nix
@@ -38,7 +38,7 @@ with lib;
     # environment.pathsToLink, and we can't have both.
     #environment.pathsToLink = [ "/lib/debug/.build-id" ];
 
-    environment.extraOutputsToLink =
+    environment.extraOutputsToInstall =
       optional config.environment.enableDebugInfo "debug";
 
   };
diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index 69830683d9c5e..d7815324c4c4d 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -73,7 +73,7 @@ in
         description = "List of directories to be symlinked in <filename>/run/current-system/sw</filename>.";
       };
 
-      extraOutputsToLink = mkOption {
+      extraOutputsToInstall = mkOption {
         type = types.listOf types.str;
         default = [ ];
         example = [ "doc" "info" "docdev" ];
@@ -123,7 +123,7 @@ in
     system.path = pkgs.buildEnv {
       name = "system-path";
       paths = config.environment.systemPackages;
-      inherit (config.environment) pathsToLink extraOutputsToLink;
+      inherit (config.environment) pathsToLink extraOutputsToInstall;
       ignoreCollisions = true;
       # !!! Hacky, should modularise.
       # outputs TODO: note that the tools will often not be linked by default
diff --git a/nixos/modules/programs/man.nix b/nixos/modules/programs/man.nix
index 94d026fdaef0a..201144ccb451b 100644
--- a/nixos/modules/programs/man.nix
+++ b/nixos/modules/programs/man.nix
@@ -23,7 +23,7 @@ with lib;
 
     environment.pathsToLink = [ "/share/man" ];
 
-    environment.extraOutputsToLink = [ "man" ];
+    environment.extraOutputsToInstall = [ "man" ];
 
   };
 
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 10f7c69c3aa1a..8b2167a8e74f6 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -27,7 +27,7 @@
 
 , # The package outputs to include. By default, only the default
   # output is included.
-  extraOutputsToLink ? []
+  extraOutputsToInstall ? []
 
 , # Root the result in directory "$out${extraPrefix}", e.g. "/share".
   extraPrefix ? ""
@@ -55,7 +55,7 @@ runCommand name
           else [ drv ])
         # Add any extra outputs specified by the caller of `buildEnv`.
         ++ lib.filter (p: p!=null)
-          (builtins.map (outName: drv.${outName} or null) extraOutputsToLink);
+          (builtins.map (outName: drv.${outName} or null) extraOutputsToInstall);
       priority = drv.meta.priority or 5;
     }) paths);
     preferLocalBuild = true;

From c73191f11e928d08ce0a154bc8d8f0823ad67a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 3 Apr 2016 19:17:26 +0200
Subject: [PATCH 798/857] nixpkgs manual: add multiple-output chapter

---
 doc/manual.xml          |  1 +
 doc/multiple-output.xml | 91 +++++++++++++++++++++++++++++++++++++++++
 doc/stdenv.xml          |  2 +-
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 doc/multiple-output.xml

diff --git a/doc/manual.xml b/doc/manual.xml
index 2b4f47aff1c8b..de663fcd5b647 100644
--- a/doc/manual.xml
+++ b/doc/manual.xml
@@ -12,6 +12,7 @@
   <xi:include href="introduction.xml" />
   <xi:include href="quick-start.xml" />
   <xi:include href="stdenv.xml" />
+  <xi:include href="multiple-output.xml" />
   <xi:include href="configuration.xml" />
   <xi:include href="functions.xml" />
   <xi:include href="meta.xml" />
diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
new file mode 100644
index 0000000000000..00b6614775a07
--- /dev/null
+++ b/doc/multiple-output.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter [
+  <!ENTITY ndash "&#x2013;"> <!-- @vcunat likes to use this one ;-) -->
+]>
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="chap-multiple-output">
+
+<title>Multiple-output packages</title>
+
+<section><title>Introduction</title>
+  <para>The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems.  The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution.  The exception is that building from source always produces all the outputs.</para>
+  <para>The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced.  Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime.  As a result, closure sizes of many packages can get reduced to a half or even much less.</para>
+  <note><para>Similarly to other packaging systems, the reduction effects could be instead achieved by building the parts in completely separate derivations.  That would often additionally reduce build-time closures, but it would be much harder to write such derivations, due to build systems assuming all parts are being built at once.</para></note>
+</section>
+
+<section><title>Installing a split package</title>
+  <para>When installing a package via <varname>systemPackages</varname> or <command>nix-env</command> you have several options:</para>
+  <warning><para>Currently <command>nix-env</command> almost always installs all outputs until https://github.com/NixOS/nix/pull/815 gets merged.</para></warning>
+  <itemizedlist>
+    <listitem><para>You can install particular outputs explicitly, as each is available in the Nix language as an attribute of the package.  The <varname>outputs</varname> attribute contains a list of output names.</para></listitem>
+    <listitem><para>You can let it use the default outputs.  These are handled by <varname>meta.outputsToInstall</varname> attribute that contains a list of output names.</para>
+      <para>TODO: more about tweaking the attribute, etc.</para></listitem>
+    <listitem><para>NixOS provides configuration option <varname>environment.extraOutputsToInstall</varname> that allows adding extra outputs of <varname>environment.systemPackages</varname> atop the default ones.  It's mainly meant for documentation and debug symbols, and it's also modified by specific options.</para>
+      <note><para>At this moment there is no similar configurability for packages installed by <command>nix-env</command>.  You can still use approach from <xref linkend="sec-modify-via-packageOverrides" /> to override <varname>meta.outputsToInstall</varname> attributes, but that's a rather inconvenient way.</para></note>
+    </listitem>
+  </itemizedlist>
+</section>
+
+<section><title>Using a split package</title>
+  <para>In the Nix language the individual outputs can be reached explicitly as attributes, e.g. <varname>coreutils.info</varname>, but the typical case is just using packages as build inputs.</para>
+  <para>When a multiple-output derivation gets into a build input of another derivation, the first output is added (<varname>.dev</varname> by convention) and also <varname>propagatedBuildOutputs</varname> of that package which by default contain <varname>$outputBin</varname> and <varname>$outputLib</varname>. (See <xref linkend="multiple-output-file-type-groups" />.)</para>
+</section>
+
+
+<section><title>Writing a split derivation</title>
+  <para>Here you find how to write a derivation that produces multiple outputs.</para>
+  <para>In nixpkgs there is a framework supporting multiple-output derivations. It tries to cover most cases by default behavior.  You can find the source separated in &lt;<filename>nixpkgs/pkgs/build-support/setup-hooks/multiple-outputs.sh</filename>&gt;; it's relatively well-readable.  The whole machinery is triggered by defining the <varname>outputs</varname> attribute to contain the list of desired output names (strings).</para>
+  <programlisting>outputs = [ "dev" "out" "bin" "doc" ];</programlisting>
+  <para>Often such a single line is enough.  For each output an equally named environment variable is passed to the builder and contains the path in nix store for that output.  By convention, the first output should usually be <varname>dev</varname>; typically you also want to have the main <varname>out</varname> output, as it catches any files that didn't get elsewhere.</para>
+
+  <note><para>There is a special handling of the <varname>debug</varname> output, described at <xref linkend="stdenv-separateDebugInfo" />.</para></note>
+
+  <section xml:id="multiple-output-file-type-groups">
+    <title>File type groups</title>
+    <para>The support code currently recognizes some particular kinds of outputs and either instructs the build system of the package to put files into their desired outputs or it moves the files during the fixup phase.  Each group of file types has an <varname>outputFoo</varname> variable specifying the output name where they should go.  If that variable isn't defined by the derivation writer, it is guessed &ndash; a default output name is defined, falling back to other possibilities if the output isn't defined.</para>
+    <variablelist>
+      <varlistentry><term><varname>
+         $outputDev</varname></term><listitem><para>
+         is for development-only files. These include C(++) headers, pkg-config, cmake and aclocal files.  They go to <varname>dev</varname> or <varname>out</varname> by default.
+        </para></listitem></varlistentry>
+      <varlistentry><term><varname>
+        $outputBin</varname></term><listitem><para>
+        is meant for user-facing binaries, typically residing in bin/.  They go to <varname>bin</varname> or <varname>out</varname> by default.
+        </para></listitem></varlistentry>
+      <varlistentry><term><varname>
+        $outputLib</varname></term><listitem><para>
+        is meant for libraries, typically residing in <filename>lib/</filename> and <filename>libexec/</filename>.  They go to <varname>lib</varname> or <varname>out</varname> by default.
+        </para></listitem></varlistentry>
+      <varlistentry><term><varname>
+        $outputDoc</varname></term><listitem><para>
+        is for user documentation, typically residing in <filename>share/doc/</filename>.  It goes to <varname>doc</varname> or <varname>out</varname> by default.
+        </para></listitem></varlistentry>
+      <varlistentry><term><varname>
+        $outputDocdev</varname></term><listitem><para>
+        is for <emphasis>developer</emphasis> documentation.  Currently we count gtk-doc and man3 pages in there.  It goes to <varname>docdev</varname> or is removed (!) by default.  This is because e.g. gtk-doc tends to be rather large and completely unused by nixpkgs users.
+        </para></listitem></varlistentry>
+      <varlistentry><term><varname>
+        $outputMan</varname></term><listitem><para>
+        is for man pages (except for section 3). They go to <varname>man</varname> or <varname>doc</varname> or <varname>$outputBin</varname> by default.
+        </para></listitem></varlistentry>
+      <varlistentry><term><varname>
+        $outputInfo</varname></term><listitem><para>
+        is for info pages. They go to <varname>info</varname> or <varname>doc</varname> or <varname>$outputMan</varname> by default.
+        </para></listitem></varlistentry>
+    </variablelist>
+  </section>
+
+  <section><title>Common caveats</title>
+    <itemizedlist>
+      <listitem><para>Some configure scripts don't like some of the parameters passed by default by the framework, e.g. <literal>--docdir=/foo/bar</literal>.  You can disable this by setting <literal>setOutputFlags = false;</literal>.</para></listitem>
+      <listitem><para>The outputs of a single derivation can retain references to each other, but note that circular references are not allowed.  (And each strongly-connected component would act as a single output anyway.)</para></listitem>
+      <listitem><para>Most of split packages contain their core functionality in libraries.  These libraries tend to refer to various kind of data that typically gets into <varname>out</varname>, e.g. locale strings, so there is often no advantage in separating the libraries into <varname>lib</varname>, as keeping them in <varname>out</varname> is easier.</para></listitem>
+      <listitem><para>Some packages have hidden assumptions on install paths, which complicates splitting.</para></listitem>
+    </itemizedlist>
+  </section>
+
+</section><!--Writing a split derivation-->
+
+</chapter>
+
diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index f8d9acb2fb0c7..136e83ee0cda8 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -956,7 +956,7 @@ following:
     phase.</para></listitem>
   </varlistentry>
 
-  <varlistentry>
+  <varlistentry xml:id="stdenv-separateDebugInfo">
     <term><varname>separateDebugInfo</varname></term>
     <listitem><para>If set to <literal>true</literal>, the standard
     environment will enable debug information in C/C++ builds. After

From 133e6e1ea649f835a7527a961ca2fef3edf4e5f7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 7 Apr 2016 17:52:48 +0200
Subject: [PATCH 799/857] httpd.service: Support reload

This is useful when ACME has generated a new TLS certificate.
---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 60ec49c9e66ee..fdbd61c85e653 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -685,6 +685,7 @@ in
 
         serviceConfig.ExecStart = "@${httpd}/bin/httpd httpd -f ${httpdConf}";
         serviceConfig.ExecStop = "${httpd}/bin/httpd -f ${httpdConf} -k graceful-stop";
+        serviceConfig.ExecReload = "${httpd}/bin/httpd -f ${httpdConf} -k graceful";
         serviceConfig.Type = "forking";
         serviceConfig.PIDFile = "${mainCfg.stateDir}/httpd.pid";
         serviceConfig.Restart = "always";

From 48d8f051857b1afd75d44fadfd1069d86c61b696 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 6 Apr 2016 20:17:16 +0200
Subject: [PATCH 800/857] pythonPackages.click: 6.4 -> 6.6

---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 655592315dc2b..5a02c0246e6c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3109,11 +3109,11 @@ in modules // {
   };
 
   click = buildPythonPackage rec {
-    name = "click-6.3";
+    name = "click-6.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "076cr1xbhfyfrzkvflz1i0950jgjn2161hp3f5xji4z1mgxdj85p";
+      sha256 = "1sggipyz52crrybwbr9xvwxd4aqigvplf53k9w3ygxmzivd1jsnc";
     };
 
     buildInputs = with self; [ pytest ];

From 16b12fbd87929e0604365cbffffb3273b8d74b6d Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Thu, 7 Apr 2016 11:57:12 -0500
Subject: [PATCH 801/857] apt-cacher-ng: disable on OSX

fmemopen() doesn't exist on OSX. This causes the builds to fail.
---
 pkgs/servers/http/apt-cacher-ng/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/http/apt-cacher-ng/default.nix b/pkgs/servers/http/apt-cacher-ng/default.nix
index 9e485946a18da..8958b51e873ad 100644
--- a/pkgs/servers/http/apt-cacher-ng/default.nix
+++ b/pkgs/servers/http/apt-cacher-ng/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     description = "A caching proxy specialized for linux distribution files";
     homepage = https://www.unix-ag.uni-kl.de/~bloch/acng/;
     license = licenses.gpl2;
+    platforms = platforms.linux;
     maintainers = [ maintainers.makefu ];
   };
 }

From 2968a8ce0ad1b5b3386c6b8c22c64a82b4d59bc9 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Wed, 6 Apr 2016 22:12:08 -0700
Subject: [PATCH 802/857] wkhtmltopdf: 0.12.2.4 -> 0.12.3.2

---
 pkgs/tools/graphics/wkhtmltopdf/default.nix | 116 +++++++++++++-------
 1 file changed, 79 insertions(+), 37 deletions(-)

diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index 89ea0e9444402..bcb7803785b0c 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -1,72 +1,114 @@
-{ stdenv, fetchgit, qt4, fontconfig, freetype, libpng, zlib, libjpeg
+{ stdenv, fetchFromGitHub, qt4, fontconfig, freetype, libpng, zlib, libjpeg
 , openssl, libX11, libXext, libXrender, overrideDerivation }:
 
 stdenv.mkDerivation rec {
-  version = "0.12.2.4";
+  version = "0.12.3.2";
   name = "wkhtmltopdf-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/wkhtmltopdf/wkhtmltopdf.git";
-    rev = "refs/tags/${version}";
-    sha256 = "0g96vgi3s633j4myjfzakkyiml1zspvdvbc0q1vhw8fp5n1xdknm";
-    fetchSubmodules = false;
+  src = fetchFromGitHub {
+    owner  = "wkhtmltopdf";
+    repo   = "wkhtmltopdf";
+    rev    = "${version}";
+    sha256 = "1yyqjhxv4dvpkad79scs7xdx4iz8jpyidr9ya86k3zpfyvh4gq3s";
   };
 
   wkQt = overrideDerivation qt4 (deriv: {
-    name = "qt-mod-4.8.6";
+    name = "qt-mod-4.8.7";
     enableParallelBuilding = true;
-    src = fetchgit {
-      url = "https://github.com/wkhtmltopdf/qt.git";
-      rev = "48e71c19c7fc67517fb3dca6d42eacb57341c9ba"; # From git submodule spec in wkhtml repo.
-      sha256 = "1ygr7g3k900zjf54ji6kkfppqnxaqwbh8npr53g2krdw3bmny6fx";
+    src = fetchFromGitHub {
+      owner  = "wkhtmltopdf";
+      repo   = "qt";
+      rev    = "fe194f9dac0b515757392a18f7fc9527c91d45ab"; # From git submodule spec in wkhtml repo.
+      sha256 = "1j2ld2bfacnn3vm2l1870v55sj82bq4y8zkawmlx2y5j63d8vr23";
     };
     configureFlags =
       ''
-        -v -no-separate-debug-info -release -confirm-license -opensource
-        -qdbus -glib -dbus-linked -openssl-linked
+        -dbus-linked
+        -glib
+        -no-separate-debug-info
+        -openssl-linked
+        -qdbus
+        -v
       ''
       + # This is taken from the wkhtml build script that we don't run
       ''
-        -fast
-        -static
+        -confirm-license
         -exceptions
-        -xmlpatterns
-        -webkit
-        -system-zlib
-        -system-libpng
-        -system-libjpeg
+        -fast
+        -graphicssystem raster
+        -iconv
+        -largefile
+        -no-3dnow
+        -no-accessibility
+        -no-audio-backend
+        -no-avx
+        -no-cups
+        -no-dbus
+        -no-declarative
+        -no-glib
+        -no-gstreamer
+        -no-gtkstyle
+        -no-icu
+        -no-javascript-jit
         -no-libmng
         -no-libtiff
-        -no-accessibility
-        -no-stl
-        -no-qt3support
+        -nomake demos
+        -nomake docs
+        -nomake examples
+        -nomake tests
+        -nomake tools
+        -nomake translations
+        -no-mitshm
+        -no-mmx
+        -no-multimedia
+        -no-nas-sound
+        -no-neon
+        -no-nis
+        -no-opengl
+        -no-openvg
+        -no-pch
         -no-phonon
         -no-phonon-backend
-        -no-opengl
-        -no-declarative
+        -no-qt3support
+        -no-rpath
+        -no-scripttools
+        -no-sm
         -no-sql-ibase
         -no-sql-mysql
         -no-sql-odbc
         -no-sql-psql
         -no-sql-sqlite
         -no-sql-sqlite2
-        -no-mmx
-        -no-3dnow
         -no-sse
         -no-sse2
-        -no-multimedia
-        -nomake demos
-        -nomake docs
-        -nomake examples
-        -nomake tools
-        -nomake tests
-        -nomake translations
+        -no-sse3
+        -no-sse4.1
+        -no-sse4.2
+        -no-ssse3
+        -no-stl
+        -no-xcursor
+        -no-xfixes
+        -no-xinerama
+        -no-xinput
+        -no-xkb
+        -no-xrandr
+        -no-xshape
+        -no-xsync
+        -opensource
+        -openssl
+        -release
+        -static
+        -system-libjpeg
+        -system-libpng
+        -system-zlib
+        -webkit
+        -xmlpatterns
       '';
   });
 
   buildInputs = [ wkQt fontconfig freetype libpng zlib libjpeg openssl
-    libX11 libXext libXrender
-    ];
+                  libX11 libXext libXrender
+                ];
 
   configurePhase = "qmake wkhtmltopdf.pro INSTALLBASE=$out";
 

From 2d0e18f64f4075feca6118d5b782aab42432ad4e Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Thu, 7 Apr 2016 14:31:45 -0700
Subject: [PATCH 803/857] aria2: 1.20.0 -> 1.21.0

---
 pkgs/tools/networking/aria2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 8cb6172d87b60..189be8be9e265 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz";
-    sha256 = "1l4gzz3yr0cl6a9xdy7843c5sb7afyq0i80wi2hasfpfdx5k95mz";
+    sha256 = "1035rzx9y7qv4p7cv04f461343dxha7ikprch059x2fci8n5yp12";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From feca1695f6b28560b734b94b8231be5414c75475 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 7 Apr 2016 23:52:35 +0200
Subject: [PATCH 804/857] zpaq: 7.08 -> 7.09

Fixes bug in extracting streaming archive with empty first file name.
---
 pkgs/tools/archivers/zpaq/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix
index ed0cd80863419..8a0a3ef4ccaf8 100644
--- a/pkgs/tools/archivers/zpaq/default.nix
+++ b/pkgs/tools/archivers/zpaq/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="708";
+    version="709";
     name="${baseName}-${version}";
-    hash="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
-    url="http://mattmahoney.net/dc/zpaq708.zip";
-    sha256="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
+    hash="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh";
+    url="http://mattmahoney.net/dc/zpaq709.zip";
+    sha256="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh";
   };
 in
 stdenv.mkDerivation {

From 50e16a29be61f2e664c2ada43bf8a14cd2941eea Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 7 Apr 2016 18:15:10 -0400
Subject: [PATCH 805/857] pcl: buildable without GUI components

One can build pcl with vtk, qt4, and libXt set to null iff libpng is
explicitly listed as a dependency.

pcl's build system is happy to proceed without those GUI-related
packages as long as libpng is available.
---
 pkgs/development/libraries/pcl/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix
index 46e2da18aa1e8..908d1ea856f5d 100644
--- a/pkgs/development/libraries/pcl/default.nix
+++ b/pkgs/development/libraries/pcl/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchzip, cmake, qhull, flann, boost, vtk, eigen, pkgconfig, qt4
-, libusb1, libpcap, libXt
+, libusb1, libpcap, libXt, libpng
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake qhull flann boost vtk eigen pkgconfig qt4 libusb1 libpcap libXt ];
+  buildInputs = [ cmake qhull flann boost eigen pkgconfig libusb1 libpcap
+                  libpng vtk qt4 libXt ];
 
   meta = {
     homepage = http://pointclouds.org/;

From 9b0890cfa536ffbe5978a94ec7f6cb7e23947732 Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 7 Apr 2016 18:19:01 -0400
Subject: [PATCH 806/857] graphviz: build with pango even without xorg

The pango dependency enables outputting PDF files, and is somewhat
independent of the larger xorg dependencies.
---
 pkgs/tools/graphics/graphviz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 5635e3a69ff7f..66f36a6f63c9b 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
     ];
 
   buildInputs =
-    [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex
-    ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ]
+    [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
+    ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender libXaw ]
     ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
 
   CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")

From c4bbfdb478fdda41d9e8aa2747440025c29f37a3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 8 Apr 2016 03:11:40 +0300
Subject: [PATCH 807/857] steam: add xdg_utils to chrootenv

---
 pkgs/games/steam/chrootenv.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 4bb81d30027e0..7a4fd611b1b4a 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -24,6 +24,8 @@ let
       which
       # Needed by gdialog, including in the steam-runtime
       perl
+      # Open URLs
+      xdg_utils
     ] ++ lib.optional withJava jdk
       ++ lib.optional withPrimus (primus.override {
            stdenv = overrideInStdenv stdenv [ useOldCXXAbi ];

From f9099deb8ed18935b993b90c769af3f55bfcbb00 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 7 Apr 2016 21:24:49 -0500
Subject: [PATCH 808/857] mercurial: 3.7.1 -> 3.7.3 for multiple CVEs

CVE-2016-3068

    Blake Burkhart discovered that Mercurial allows URLs for Git
    subrepositories that could result in arbitrary code execution on
    clone.

CVE-2016-3069

    Blake Burkhart discovered that Mercurial allows arbitrary code
    execution when converting Git repositories with specially
    crafted names.

CVE-2016-3630

    It was discovered that Mercurial does not properly perform bounds-
    checking in its binary delta decoder, which may be exploitable for
    remote code execution via clone, push or pull.
---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index b99727b2c9b61..f44baad4715b0 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,7 +3,7 @@
 , ApplicationServices, cf-private }:
 
 let
-  version = "3.7.1";
+  version = "3.7.3";
   name = "mercurial-${version}";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1vfgqlb8z2k1vcx2nvcianxmml79cqqqncchw6aj40sa8hgpvlwn";
+    sha256 = "0c2vkad9piqkggyk8y310rf619qgdfcwswnk3nv21mg2fhnw96f0";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From 21c78411da491931d600c1848b4e91805fba5c44 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Fri, 8 Apr 2016 05:59:05 +0100
Subject: [PATCH 809/857] qutebrowser: 0.5.1 -> 0.6.0

---
 pkgs/applications/networking/browsers/qutebrowser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 1be28829e3512..bd7ca88638977 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -2,7 +2,7 @@
 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
 , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
 
-let version = "0.5.1"; in
+let version = "0.6.0"; in
 
 buildPythonApplication rec {
   name = "qutebrowser-${version}";
@@ -10,7 +10,7 @@ buildPythonApplication rec {
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "1pxgap04rv94kgcp9a05xx2kwg3j6jv8f6d3ww7hqs2xnkj8wzqb";
+    sha256 = "1vf9gh1f12wza72y3yqj568h2wsm7wfvjjs6qsh6apw5mgjysz91";
   };
 
   # Needs tox

From eda65083e866c2fc2f2371836fe3620fd24aba26 Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Thu, 7 Apr 2016 23:42:12 -0700
Subject: [PATCH 810/857] optipng: 0.7.5 -> 0.7.6 (CVE-2016-2191)

---
 pkgs/tools/graphics/optipng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/optipng/default.nix b/pkgs/tools/graphics/optipng/default.nix
index 08f99469d255b..767ea0e542540 100644
--- a/pkgs/tools/graphics/optipng/default.nix
+++ b/pkgs/tools/graphics/optipng/default.nix
@@ -5,11 +5,11 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "optipng-0.7.5";
+  name = "optipng-0.7.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/optipng/${name}.tar.gz";
-    sha256 = "17b197437z5wn29llpwklk7ihgx8bhc913gvjf4zyb81idwlprbl";
+    sha256 = "105yk5qykvhiahzag67gm36s2kplxf6qn5hay02md0nkrcgn6w28";
   };
 
   buildInputs = [ libpng ];

From 800d088c8587350c0a1c60adfe2868445fcdb133 Mon Sep 17 00:00:00 2001
From: Micxjo Funkcio <micxjo@fastmail.com>
Date: Fri, 8 Apr 2016 01:23:22 -0700
Subject: [PATCH 811/857] gambit: 4.7.3 -> 4.8.5

---
 pkgs/development/compilers/gambit/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix
index cc8c80653ba2a..99a4d6fc4d1fb 100644
--- a/pkgs/development/compilers/gambit/default.nix
+++ b/pkgs/development/compilers/gambit/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name    = "gambit-${version}";
-  version = "4.7.3";
-  devver  = "4_7_3";
+  version = "4.8.5";
+  devver  = "4_8_5";
 
   src = fetchurl {
-    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.7/source/gambc-v${devver}-devel.tgz";
-    sha256 = "12jbr6bc0zmc7vw07a9pliadbvqgwkpmw6cj8awz73clv1j7pxha";
+    url    = "http://www.iro.umontreal.ca/~gambit/download/gambit/v4.8/source/gambit-v${devver}-devel.tgz";
+    sha256 = "02b5bm06k2qr0lvdwwsl0ygxs7n8410rrkq95picn4s02kxszqnq";
   };
 
   configureFlags = [ "--enable-shared" "--enable-single-host" ];

From 0f5dff43b7e939d1eadb3db4ff458b113fe03bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 8 Apr 2016 13:49:26 +0200
Subject: [PATCH 812/857] doxygen: fix finding libiconv after #13856

The changed the build system to cmake, and it somehow won't find the
includes. I'm lazy to investigate details ATM.
---
 pkgs/development/tools/documentation/doxygen/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 0b16723866bfa..7373d8584c234 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -3,14 +3,14 @@
 stdenv.mkDerivation rec {
 
   name = "doxygen-1.8.11";
-  
+
   src = fetchurl {
     url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
     sha256 = "0ja02pm3fpfhc5dkry00kq8mn141cqvdqqpmms373ncbwi38pl35";
   };
 
   nativeBuildInputs = [ cmake ];
-  
+
   buildInputs =
     [ perl python flex bison ]
     ++ stdenv.lib.optional (qt4 != null) qt4
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices libiconv ];
 
   cmakeFlags =
+    [ "-DICONV_INCLUDE_DIR=${libiconv}/include" ] ++
     stdenv.lib.optional (qt4 != null) "-Dbuild_wizard=YES";
 
   NIX_CFLAGS_COMPILE =

From f1f79505fc854a4eda421ab4d97d713bc6a2329b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Apr 2016 14:00:47 +0200
Subject: [PATCH 813/857] find-tarballs.nix: Handle stdenv bootstrap fetchurl

---
 maintainers/scripts/find-tarballs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix
index 0065945966026..ad79af90901e8 100644
--- a/maintainers/scripts/find-tarballs.nix
+++ b/maintainers/scripts/find-tarballs.nix
@@ -14,12 +14,12 @@ let
     operator = const [ ];
   });
 
-  urls = map (drv: { url = head drv.urls; hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies;
+  urls = map (drv: { url = head (drv.urls or [ drv.url ]); hash = drv.outputHash; type = drv.outputHashAlgo; }) fetchurlDependencies;
 
   fetchurlDependencies =
     filter
       (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat"
-          && drv.postFetch or "" == "" && drv ? urls)
+          && drv.postFetch or "" == "" && (drv ? url || drv ? urls))
       dependencies;
 
   dependencies = map (x: x.value) (genericClosure {

From 03e74fb117a7651e2ea835f0251b9ce05952b184 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 8 Apr 2016 22:11:29 +0900
Subject: [PATCH 814/857] flashplayer: 11.2.202.577 -> 11.2.202.616

---
 .../mozilla-plugins/flashplayer-11/default.nix   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 2b6b0d5b41236..129a71126096b 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -49,7 +49,7 @@ let
   suffix =
     if      stdenv.system == "x86_64-linux" then
       if    debug then throw "no x86_64 debugging version available"
-      else             "-release.x86_64"
+      else             "_linux.x86_64"
     else if stdenv.system == "i686-linux"   then
       if    debug then "_linux_debug.i386"
       else             "_linux.i386"
@@ -59,28 +59,30 @@ let
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
-  version = "11.2.202.577";
+  version = "11.2.202.616";
 
   src = fetchurl {
     url = "https://fpdownload.macromedia.com/pub/flashplayer/installers/archive/fp_${version}_archive.zip";
-    sha256 = "1k02d6c9y8z9lxyqyq04zsc5735cvm30mkwli71mh87fr1va2q4j";
+    sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l";
   };
 
   buildInputs = [ unzip ];
 
   postUnpack = ''
     pushd $sourceRoot
-    tar -xvzf *${arch}/*${suffix}.tar.gz
+    tar -xvzf *${suffix}.tar.gz
 
     ${ lib.optionalString is-i686 ''
-       tar -xvzf */*_sa.*.tar.gz
-       tar -xvzf */*_sa_debug.*.tar.gz
+       tar -xvzf *_sa.*.tar.gz
+       tar -xvzf *_sa_debug.*.tar.gz
     ''}
 
     popd
   '';
 
-  sourceRoot = "fp_${version}_archive";
+  setSourceRoot = ''
+    sourceRoot=$(ls -d *${arch})
+  '';
 
   dontStrip = true;
   dontPatchELF = true;

From af8fd3c2fe2de9185dd19c12ea4409dfa9bf7627 Mon Sep 17 00:00:00 2001
From: Nicolas Petton <nicolas@petton.fr>
Date: Fri, 8 Apr 2016 15:24:04 +0200
Subject: [PATCH 815/857] Add nodePackages.tern

This also removes "node-xmpp" which has a broken dependency.
---
 pkgs/top-level/node-packages-generated.nix | 1032 ++++++++------------
 pkgs/top-level/node-packages.json          |    3 +-
 2 files changed, 418 insertions(+), 617 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index b8f0e66dd5329..229461b82f7cb 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -565,8 +565,6 @@
   };
   by-spec."adm-zip"."~0.4.3" =
     self.by-version."adm-zip"."0.4.7";
-  by-spec."adm-zip"."~0.4.7" =
-    self.by-version."adm-zip"."0.4.7";
   by-spec."after"."0.8.1" =
     self.by-version."after"."0.8.1";
   by-version."after"."0.8.1" = self.buildNodePackage {
@@ -2003,15 +2001,15 @@
     cpu = [ ];
   };
   by-spec."async"."*" =
-    self.by-version."async"."2.0.0-rc.2";
-  by-version."async"."2.0.0-rc.2" = self.buildNodePackage {
-    name = "async-2.0.0-rc.2";
-    version = "2.0.0-rc.2";
+    self.by-version."async"."2.0.0-rc.3";
+  by-version."async"."2.0.0-rc.3" = self.buildNodePackage {
+    name = "async-2.0.0-rc.3";
+    version = "2.0.0-rc.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.2.tgz";
-      name = "async-2.0.0-rc.2.tgz";
-      sha1 = "6fc56eec72574ebfe43ad30aefef6206f1ad2494";
+      url = "https://registry.npmjs.org/async/-/async-2.0.0-rc.3.tgz";
+      name = "async-2.0.0-rc.3.tgz";
+      sha1 = "1fae1160594dd47dbe5431d4726d66b10f374d89";
     };
     deps = {
       "lodash-4.8.2" = self.by-version."lodash"."4.8.2";
@@ -2022,7 +2020,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "async" = self.by-version."async"."2.0.0-rc.2";
+  "async" = self.by-version."async"."2.0.0-rc.3";
   by-spec."async"."0.1.18" =
     self.by-version."async"."0.1.18";
   by-version."async"."0.1.18" = self.buildNodePackage {
@@ -2310,15 +2308,15 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."*" =
-    self.by-version."aws-sdk"."2.3.0";
-  by-version."aws-sdk"."2.3.0" = self.buildNodePackage {
-    name = "aws-sdk-2.3.0";
-    version = "2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
+  by-version."aws-sdk"."2.3.2" = self.buildNodePackage {
+    name = "aws-sdk-2.3.2";
+    version = "2.3.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.0.tgz";
-      name = "aws-sdk-2.3.0.tgz";
-      sha1 = "96c653063863e2b7df34f6ab160f89f9c90b6a7b";
+      url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.3.2.tgz";
+      name = "aws-sdk-2.3.2.tgz";
+      sha1 = "2025fb6cfd40b077befb783b8de57d0c09a92575";
     };
     deps = {
       "sax-1.1.5" = self.by-version."sax"."1.1.5";
@@ -2332,7 +2330,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "aws-sdk" = self.by-version."aws-sdk"."2.3.0";
+  "aws-sdk" = self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk"."2.0.5" =
     self.by-version."aws-sdk"."2.0.5";
   by-version."aws-sdk"."2.0.5" = self.buildNodePackage {
@@ -2356,7 +2354,7 @@
     cpu = [ ];
   };
   by-spec."aws-sdk"."2.x" =
-    self.by-version."aws-sdk"."2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk".">=1.2.0 <2" =
     self.by-version."aws-sdk"."1.18.0";
   by-version."aws-sdk"."1.18.0" = self.buildNodePackage {
@@ -2379,9 +2377,9 @@
     cpu = [ ];
   };
   by-spec."aws-sdk".">=2.0.0 >=2.2.43 <3.0.0" =
-    self.by-version."aws-sdk"."2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk"."^2.2.43" =
-    self.by-version."aws-sdk"."2.3.0";
+    self.by-version."aws-sdk"."2.3.2";
   by-spec."aws-sdk-apis"."3.x" =
     self.by-version."aws-sdk-apis"."3.1.10";
   by-version."aws-sdk-apis"."3.1.10" = self.buildNodePackage {
@@ -2538,15 +2536,15 @@
     cpu = [ ];
   };
   by-spec."backbone"."*" =
-    self.by-version."backbone"."1.3.2";
-  by-version."backbone"."1.3.2" = self.buildNodePackage {
-    name = "backbone-1.3.2";
-    version = "1.3.2";
+    self.by-version."backbone"."1.3.3";
+  by-version."backbone"."1.3.3" = self.buildNodePackage {
+    name = "backbone-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/backbone/-/backbone-1.3.2.tgz";
-      name = "backbone-1.3.2.tgz";
-      sha1 = "43cdf6b25af3f54a7deb314129e1397ff42d6b83";
+      url = "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz";
+      name = "backbone-1.3.3.tgz";
+      sha1 = "4cc80ea7cb1631ac474889ce40f2f8bc683b2999";
     };
     deps = {
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
@@ -2557,7 +2555,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "backbone" = self.by-version."backbone"."1.3.2";
+  "backbone" = self.by-version."backbone"."1.3.3";
   by-spec."backo2"."1.0.2" =
     self.by-version."backo2"."1.0.2";
   by-version."backo2"."1.0.2" = self.buildNodePackage {
@@ -2654,25 +2652,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."base62"."0.1.1" =
-    self.by-version."base62"."0.1.1";
-  by-version."base62"."0.1.1" = self.buildNodePackage {
-    name = "base62-0.1.1";
-    version = "0.1.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/base62/-/base62-0.1.1.tgz";
-      name = "base62-0.1.1.tgz";
-      sha1 = "7b4174c2f94449753b11c2651c083da841a7b084";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."base62"."^1.1.0" =
     self.by-version."base62"."1.1.0";
   by-version."base62"."1.1.0" = self.buildNodePackage {
@@ -3169,15 +3148,15 @@
     cpu = [ ];
   };
   by-spec."big-integer"."^1.6.7" =
-    self.by-version."big-integer"."1.6.14";
-  by-version."big-integer"."1.6.14" = self.buildNodePackage {
-    name = "big-integer-1.6.14";
-    version = "1.6.14";
+    self.by-version."big-integer"."1.6.15";
+  by-version."big-integer"."1.6.15" = self.buildNodePackage {
+    name = "big-integer-1.6.15";
+    version = "1.6.15";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.14.tgz";
-      name = "big-integer-1.6.14.tgz";
-      sha1 = "8f6f03d7d6cce2917d8d5d81420f41fbaaeecd06";
+      url = "https://registry.npmjs.org/big-integer/-/big-integer-1.6.15.tgz";
+      name = "big-integer-1.6.15.tgz";
+      sha1 = "33d27d3b7388dfcc4b86d3130c10740cec01fb9e";
     };
     deps = {
     };
@@ -3870,7 +3849,7 @@
     };
     deps = {
       "passport-mailchimp-1.0.0" = self.by-version."passport-mailchimp"."1.0.0";
-      "mailchimp-1.1.5" = self.by-version."mailchimp"."1.1.5";
+      "mailchimp-1.1.6" = self.by-version."mailchimp"."1.1.6";
     };
     optionalDependencies = {
     };
@@ -5238,7 +5217,7 @@
       sha1 = "d60d5dcc20cba6dc7e1f299b35d3e1f95dafbae6";
     };
     deps = {
-      "big-integer-1.6.14" = self.by-version."big-integer"."1.6.14";
+      "big-integer-1.6.15" = self.by-version."big-integer"."1.6.15";
     };
     optionalDependencies = {
     };
@@ -5940,15 +5919,15 @@
     cpu = [ ];
   };
   by-spec."bson"."~0.4.18" =
-    self.by-version."bson"."0.4.22";
-  by-version."bson"."0.4.22" = self.buildNodePackage {
-    name = "bson-0.4.22";
-    version = "0.4.22";
+    self.by-version."bson"."0.4.23";
+  by-version."bson"."0.4.23" = self.buildNodePackage {
+    name = "bson-0.4.23";
+    version = "0.4.23";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/bson/-/bson-0.4.22.tgz";
-      name = "bson-0.4.22.tgz";
-      sha1 = "3dee54807286363bdf921c22de54e8d920a052d1";
+      url = "https://registry.npmjs.org/bson/-/bson-0.4.23.tgz";
+      name = "bson-0.4.23.tgz";
+      sha1 = "e65a2e3c7507ffade4109bc7575a76e50f8da915";
     };
     deps = {
     };
@@ -5959,11 +5938,11 @@
     cpu = [ ];
   };
   by-spec."bson"."~0.4.19" =
-    self.by-version."bson"."0.4.22";
+    self.by-version."bson"."0.4.23";
   by-spec."bson"."~0.4.20" =
-    self.by-version."bson"."0.4.22";
+    self.by-version."bson"."0.4.23";
   by-spec."bson"."~0.4.21" =
-    self.by-version."bson"."0.4.22";
+    self.by-version."bson"."0.4.23";
   by-spec."buffer"."^3.0.0" =
     self.by-version."buffer"."3.6.0";
   by-version."buffer"."3.6.0" = self.buildNodePackage {
@@ -7190,25 +7169,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."charenc"."~ 0.0.1" =
-    self.by-version."charenc"."0.0.1";
-  by-version."charenc"."0.0.1" = self.buildNodePackage {
-    name = "charenc-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/charenc/-/charenc-0.0.1.tgz";
-      name = "charenc-0.0.1.tgz";
-      sha1 = "004cff9feaf102382ed12db58dd6f962796d6e88";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."cheerio"."0.19.0" =
     self.by-version."cheerio"."0.19.0";
   by-version."cheerio"."0.19.0" = self.buildNodePackage {
@@ -9331,7 +9291,7 @@
     };
     deps = {
       "bluebird-3.3.4" = self.by-version."bluebird"."3.3.4";
-      "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14";
+      "mongodb-2.1.16" = self.by-version."mongodb"."2.1.16";
     };
     optionalDependencies = {
     };
@@ -10231,15 +10191,15 @@
     cpu = [ ];
   };
   by-spec."core-js"."^2.1.0" =
-    self.by-version."core-js"."2.2.1";
-  by-version."core-js"."2.2.1" = self.buildNodePackage {
-    name = "core-js-2.2.1";
-    version = "2.2.1";
+    self.by-version."core-js"."2.2.2";
+  by-version."core-js"."2.2.2" = self.buildNodePackage {
+    name = "core-js-2.2.2";
+    version = "2.2.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/core-js/-/core-js-2.2.1.tgz";
-      name = "core-js-2.2.1.tgz";
-      sha1 = "e809840c0650ccae87209b4b2f13ed2d2f9e4005";
+      url = "https://registry.npmjs.org/core-js/-/core-js-2.2.2.tgz";
+      name = "core-js-2.2.2.tgz";
+      sha1 = "79a0f3a9495507641a5bf7ce275fa494649180bf";
     };
     deps = {
     };
@@ -10547,25 +10507,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."crypt"."~ 0.0.1" =
-    self.by-version."crypt"."0.0.1";
-  by-version."crypt"."0.0.1" = self.buildNodePackage {
-    name = "crypt-0.0.1";
-    version = "0.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/crypt/-/crypt-0.0.1.tgz";
-      name = "crypt-0.0.1.tgz";
-      sha1 = "5f11b21a6c05ef1b5e79708366da6374ece1e6a2";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."crypt3".">=0.1.5 <1.0.0-0" =
     self.by-version."crypt3"."0.2.0";
   by-version."crypt3"."0.2.0" = self.buildNodePackage {
@@ -11715,7 +11656,7 @@
   };
   by-spec."deep-extend"."~0.4.0" =
     self.by-version."deep-extend"."0.4.1";
-  by-spec."deep-is"."~0.1.2" =
+  by-spec."deep-is"."~0.1.3" =
     self.by-version."deep-is"."0.1.3";
   by-version."deep-is"."0.1.3" = self.buildNodePackage {
     name = "deep-is-0.1.3";
@@ -11734,8 +11675,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."deep-is"."~0.1.3" =
-    self.by-version."deep-is"."0.1.3";
   by-spec."deepmerge"."*" =
     self.by-version."deepmerge"."0.2.10";
   by-version."deepmerge"."0.2.10" = self.buildNodePackage {
@@ -12619,7 +12558,7 @@
       "sorted-union-stream-1.0.2" = self.by-version."sorted-union-stream"."1.0.2";
       "split2-0.2.1" = self.by-version."split2"."0.2.1";
       "stream-collector-1.0.1" = self.by-version."stream-collector"."1.0.1";
-      "tar-stream-1.4.0" = self.by-version."tar-stream"."1.4.0";
+      "tar-stream-1.5.1" = self.by-version."tar-stream"."1.5.1";
       "through2-0.6.5" = self.by-version."through2"."0.6.5";
       "thunky-0.1.0" = self.by-version."thunky"."0.1.0";
       "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
@@ -12823,15 +12762,15 @@
   by-spec."domhandler"."^2.3.0" =
     self.by-version."domhandler"."2.3.0";
   by-spec."domino"."~1.0.19" =
-    self.by-version."domino"."1.0.23";
-  by-version."domino"."1.0.23" = self.buildNodePackage {
-    name = "domino-1.0.23";
-    version = "1.0.23";
+    self.by-version."domino"."1.0.24";
+  by-version."domino"."1.0.24" = self.buildNodePackage {
+    name = "domino-1.0.24";
+    version = "1.0.24";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/domino/-/domino-1.0.23.tgz";
-      name = "domino-1.0.23.tgz";
-      sha1 = "6f251b0ba3e21a8b4bd1ecbaef01b23f963a512b";
+      url = "https://registry.npmjs.org/domino/-/domino-1.0.24.tgz";
+      name = "domino-1.0.24.tgz";
+      sha1 = "a3fab865851197f22943d3a1ec0f507e1ff008e1";
     };
     deps = {
     };
@@ -13664,6 +13603,28 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."enhanced-resolve"."^0.9.1" =
+    self.by-version."enhanced-resolve"."0.9.1";
+  by-version."enhanced-resolve"."0.9.1" = self.buildNodePackage {
+    name = "enhanced-resolve-0.9.1";
+    version = "0.9.1";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
+      name = "enhanced-resolve-0.9.1.tgz";
+      sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
+    };
+    deps = {
+      "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
+      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
+      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."enhanced-resolve"."^2.2.0" =
     self.by-version."enhanced-resolve"."2.2.2";
   by-version."enhanced-resolve"."2.2.2" = self.buildNodePackage {
@@ -13689,26 +13650,6 @@
   };
   by-spec."enhanced-resolve"."~0.9.0" =
     self.by-version."enhanced-resolve"."0.9.1";
-  by-version."enhanced-resolve"."0.9.1" = self.buildNodePackage {
-    name = "enhanced-resolve-0.9.1";
-    version = "0.9.1";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-0.9.1.tgz";
-      name = "enhanced-resolve-0.9.1.tgz";
-      sha1 = "4d6e689b3725f86090927ccc86cd9f1635b89e2e";
-    };
-    deps = {
-      "tapable-0.1.10" = self.by-version."tapable"."0.1.10";
-      "memory-fs-0.2.0" = self.by-version."memory-fs"."0.2.0";
-      "graceful-fs-4.1.3" = self.by-version."graceful-fs"."4.1.3";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."ent"."~2.2.0" =
     self.by-version."ent"."2.2.0";
   by-version."ent"."2.2.0" = self.buildNodePackage {
@@ -13768,27 +13709,6 @@
   };
   by-spec."entities"."~1.1.1" =
     self.by-version."entities"."1.1.1";
-  by-spec."envify"."^3.0.0" =
-    self.by-version."envify"."3.4.0";
-  by-version."envify"."3.4.0" = self.buildNodePackage {
-    name = "envify-3.4.0";
-    version = "3.4.0";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/envify/-/envify-3.4.0.tgz";
-      name = "envify-3.4.0.tgz";
-      sha1 = "a0bed52222529076a02fabf6ce00eef42d7b6734";
-    };
-    deps = {
-      "through-2.3.8" = self.by-version."through"."2.3.8";
-      "jstransform-10.1.0" = self.by-version."jstransform"."10.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."errno"."^0.1.1" =
     self.by-version."errno"."0.1.4";
   by-version."errno"."0.1.4" = self.buildNodePackage {
@@ -14321,31 +14241,7 @@
   };
   by-spec."escape-string-regexp"."^1.0.2" =
     self.by-version."escape-string-regexp"."1.0.5";
-  by-spec."escodegen"."1.7.x" =
-    self.by-version."escodegen"."1.7.1";
-  by-version."escodegen"."1.7.1" = self.buildNodePackage {
-    name = "escodegen-1.7.1";
-    version = "1.7.1";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/escodegen/-/escodegen-1.7.1.tgz";
-      name = "escodegen-1.7.1.tgz";
-      sha1 = "30ecfcf66ca98dc67cd2fd162abeb6eafa8ce6fc";
-    };
-    deps = {
-      "estraverse-1.9.3" = self.by-version."estraverse"."1.9.3";
-      "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
-      "esprima-1.2.5" = self.by-version."esprima"."1.2.5";
-      "optionator-0.5.0" = self.by-version."optionator"."0.5.0";
-    };
-    optionalDependencies = {
-      "source-map-0.2.0" = self.by-version."source-map"."0.2.0";
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."escodegen"."^1.6.1" =
+  by-spec."escodegen"."1.8.x" =
     self.by-version."escodegen"."1.8.0";
   by-version."escodegen"."1.8.0" = self.buildNodePackage {
     name = "escodegen-1.8.0";
@@ -14369,6 +14265,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."escodegen"."^1.6.1" =
+    self.by-version."escodegen"."1.8.0";
   by-spec."escodegen"."^1.8.0" =
     self.by-version."escodegen"."1.8.0";
   by-spec."escodegen"."~1.3.1" =
@@ -14440,7 +14338,7 @@
       "esutils-2.0.2" = self.by-version."esutils"."2.0.2";
       "file-entry-cache-1.2.4" = self.by-version."file-entry-cache"."1.2.4";
       "glob-7.0.3" = self.by-version."glob"."7.0.3";
-      "globals-9.3.0" = self.by-version."globals"."9.3.0";
+      "globals-9.4.0" = self.by-version."globals"."9.4.0";
       "ignore-3.0.14" = self.by-version."ignore"."3.0.14";
       "imurmurhash-0.1.4" = self.by-version."imurmurhash"."0.1.4";
       "inquirer-0.12.0" = self.by-version."inquirer"."0.12.0";
@@ -14511,25 +14409,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima"."^1.2.2" =
-    self.by-version."esprima"."1.2.5";
-  by-version."esprima"."1.2.5" = self.buildNodePackage {
-    name = "esprima-1.2.5";
-    version = "1.2.5";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/esprima/-/esprima-1.2.5.tgz";
-      name = "esprima-1.2.5.tgz";
-      sha1 = "0993502feaf668138325756f30f9a51feeec11e9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."esprima"."^2.5.0" =
     self.by-version."esprima"."2.7.2";
   by-spec."esprima"."^2.6.0" =
@@ -14595,25 +14474,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."esprima-fb"."13001.1001.0-dev-harmony-fb" =
-    self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
-  by-version."esprima-fb"."13001.1001.0-dev-harmony-fb" = self.buildNodePackage {
-    name = "esprima-fb-13001.1001.0-dev-harmony-fb";
-    version = "13001.1001.0-dev-harmony-fb";
-    bin = true;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/esprima-fb/-/esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
-      name = "esprima-fb-13001.1001.0-dev-harmony-fb.tgz";
-      sha1 = "633acdb40d9bd4db8a1c1d68c06a942959fad2b0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."esprima-fb"."^15001.1.0-dev-harmony-fb" =
     self.by-version."esprima-fb"."15001.1.0-dev-harmony-fb";
   by-version."esprima-fb"."15001.1.0-dev-harmony-fb" = self.buildNodePackage {
@@ -16072,7 +15932,7 @@
     };
     deps = {
       "chalk-1.1.3" = self.by-version."chalk"."1.1.3";
-      "time-stamp-1.0.0" = self.by-version."time-stamp"."1.0.0";
+      "time-stamp-1.0.1" = self.by-version."time-stamp"."1.0.1";
     };
     optionalDependencies = {
     };
@@ -16137,25 +15997,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fast-levenshtein"."~1.0.0" =
-    self.by-version."fast-levenshtein"."1.0.7";
-  by-version."fast-levenshtein"."1.0.7" = self.buildNodePackage {
-    name = "fast-levenshtein-1.0.7";
-    version = "1.0.7";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz";
-      name = "fast-levenshtein-1.0.7.tgz";
-      sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."favitest"."^1.0.3" =
     self.by-version."favitest"."1.0.7";
   by-version."favitest"."1.0.7" = self.buildNodePackage {
@@ -16244,7 +16085,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."fbjs"."^0.8.0-alpha.2" =
+  by-spec."fbjs"."^0.8.0" =
     self.by-version."fbjs"."0.8.0";
   by-version."fbjs"."0.8.0" = self.buildNodePackage {
     name = "fbjs-0.8.0";
@@ -17781,7 +17622,7 @@
       sha1 = "f7fc91c3ae1eead07c998bc5d0dd41f2dbebd335";
     };
     deps = {
-      "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2";
+      "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3";
     };
     optionalDependencies = {
     };
@@ -17869,7 +17710,7 @@
     };
     deps = {
       "nan-2.2.1" = self.by-version."nan"."2.2.1";
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
     };
     optionalDependencies = {
     };
@@ -18424,6 +18265,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."glob"."3" =
+    self.by-version."glob"."3.2.11";
+  by-version."glob"."3.2.11" = self.buildNodePackage {
+    name = "glob-3.2.11";
+    version = "3.2.11";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
+      name = "glob-3.2.11.tgz";
+      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
+    };
+    deps = {
+      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
+      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."glob"."3 || 4" =
     self.by-version."glob"."4.5.3";
   by-version."glob"."4.5.3" = self.buildNodePackage {
@@ -18471,25 +18333,6 @@
   };
   by-spec."glob"."3.2.x" =
     self.by-version."glob"."3.2.11";
-  by-version."glob"."3.2.11" = self.buildNodePackage {
-    name = "glob-3.2.11";
-    version = "3.2.11";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz";
-      name = "glob-3.2.11.tgz";
-      sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d";
-    };
-    deps = {
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."glob"."5.x" =
     self.by-version."glob"."5.0.15";
   by-version."glob"."5.0.15" = self.buildNodePackage {
@@ -18790,15 +18633,15 @@
     cpu = [ ];
   };
   by-spec."globals"."^9.2.0" =
-    self.by-version."globals"."9.3.0";
-  by-version."globals"."9.3.0" = self.buildNodePackage {
-    name = "globals-9.3.0";
-    version = "9.3.0";
+    self.by-version."globals"."9.4.0";
+  by-version."globals"."9.4.0" = self.buildNodePackage {
+    name = "globals-9.4.0";
+    version = "9.4.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/globals/-/globals-9.3.0.tgz";
-      name = "globals-9.3.0.tgz";
-      sha1 = "55a541cf8519d66055ed3c892dd7c49c1504783e";
+      url = "https://registry.npmjs.org/globals/-/globals-9.4.0.tgz";
+      name = "globals-9.4.0.tgz";
+      sha1 = "e89906bbd58b40305e5691ef934324e93325b35f";
     };
     deps = {
     };
@@ -19227,15 +19070,15 @@
     cpu = [ ];
   };
   by-spec."grunt".">=0.4.0" =
-    self.by-version."grunt"."1.0.0";
-  by-version."grunt"."1.0.0" = self.buildNodePackage {
-    name = "grunt-1.0.0";
-    version = "1.0.0";
+    self.by-version."grunt"."1.0.1";
+  by-version."grunt"."1.0.1" = self.buildNodePackage {
+    name = "grunt-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/grunt/-/grunt-1.0.0.tgz";
-      name = "grunt-1.0.0.tgz";
-      sha1 = "5fea0f9f40afe65ca1ca61e40031891d325d4b43";
+      url = "https://registry.npmjs.org/grunt/-/grunt-1.0.1.tgz";
+      name = "grunt-1.0.1.tgz";
+      sha1 = "e8778764e944b18f32bb0f10b9078475c9dfb56b";
     };
     deps = {
       "coffee-script-1.10.0" = self.by-version."coffee-script"."1.10.0";
@@ -19262,7 +19105,7 @@
     cpu = [ ];
   };
   by-spec."grunt".">=0.4.x" =
-    self.by-version."grunt"."1.0.0";
+    self.by-version."grunt"."1.0.1";
   by-spec."grunt"."~0.4" =
     self.by-version."grunt"."0.4.5";
   by-version."grunt"."0.4.5" = self.buildNodePackage {
@@ -19326,7 +19169,7 @@
     cpu = [ ];
   };
   "grunt-cli" = self.by-version."grunt-cli"."1.2.0";
-  by-spec."grunt-cli"."1.2.0" =
+  by-spec."grunt-cli"."~1.2.0" =
     self.by-version."grunt-cli"."1.2.0";
   by-spec."grunt-contrib-cssmin"."*" =
     self.by-version."grunt-contrib-cssmin"."1.0.1";
@@ -19368,7 +19211,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."1.0.0"];
+      self.by-version."grunt"."1.0.1"];
     os = [ ];
     cpu = [ ];
   };
@@ -19392,7 +19235,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."1.0.0"];
+      self.by-version."grunt"."1.0.1"];
     os = [ ];
     cpu = [ ];
   };
@@ -19484,7 +19327,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."grunt"."1.0.0"
+      self.by-version."grunt"."1.0.1"
       self.by-version."karma"."0.13.22"];
     os = [ ];
     cpu = [ ];
@@ -19973,15 +19816,15 @@
   by-spec."har-validator"."~2.0.6" =
     self.by-version."har-validator"."2.0.6";
   by-spec."harmony-reflect"."^1.4.2" =
-    self.by-version."harmony-reflect"."1.4.4";
-  by-version."harmony-reflect"."1.4.4" = self.buildNodePackage {
-    name = "harmony-reflect-1.4.4";
-    version = "1.4.4";
+    self.by-version."harmony-reflect"."1.4.5";
+  by-version."harmony-reflect"."1.4.5" = self.buildNodePackage {
+    name = "harmony-reflect-1.4.5";
+    version = "1.4.5";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.4.tgz";
-      name = "harmony-reflect-1.4.4.tgz";
-      sha1 = "7abb109183ba577f4b14f8574e98c8b38f97f9ad";
+      url = "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.4.5.tgz";
+      name = "harmony-reflect-1.4.5.tgz";
+      sha1 = "a762be580997f2958e8dc61169a056b269e53bdc";
     };
     deps = {
     };
@@ -22185,8 +22028,6 @@
   };
   by-spec."ip"."^0.3.0" =
     self.by-version."ip"."0.3.3";
-  by-spec."ip"."^0.3.2" =
-    self.by-version."ip"."0.3.3";
   by-spec."ip"."^1.0.1" =
     self.by-version."ip"."1.1.2";
   by-version."ip"."1.1.2" = self.buildNodePackage {
@@ -22206,6 +22047,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ip"."^1.1.2" =
+    self.by-version."ip"."1.1.2";
   by-spec."ip-regex"."^1.0.0" =
     self.by-version."ip-regex"."1.0.3";
   by-version."ip-regex"."1.0.3" = self.buildNodePackage {
@@ -22343,7 +22186,7 @@
       "winston-2.2.0" = self.by-version."winston"."2.2.0";
       "nconf-0.8.4" = self.by-version."nconf"."0.8.4";
       "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1";
-      "async-2.0.0-rc.2" = self.by-version."async"."2.0.0-rc.2";
+      "async-2.0.0-rc.3" = self.by-version."async"."2.0.0-rc.3";
       "express-5.0.0-alpha.2" = self.by-version."express"."5.0.0-alpha.2";
       "jade-1.11.0" = self.by-version."jade"."1.11.0";
       "passport-0.3.2" = self.by-version."passport"."0.3.2";
@@ -22443,25 +22286,6 @@
   };
   by-spec."is-buffer"."^1.1.0" =
     self.by-version."is-buffer"."1.1.3";
-  by-spec."is-buffer"."~ 1.0.2" =
-    self.by-version."is-buffer"."1.0.2";
-  by-version."is-buffer"."1.0.2" = self.buildNodePackage {
-    name = "is-buffer-1.0.2";
-    version = "1.0.2";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.0.2.tgz";
-      name = "is-buffer-1.0.2.tgz";
-      sha1 = "f5c6c051d73f86f11b4ee14267cc1029fce261d0";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."is-builtin-module"."^1.0.0" =
     self.by-version."is-builtin-module"."1.0.0";
   by-version."is-builtin-module"."1.0.0" = self.buildNodePackage {
@@ -23151,7 +22975,7 @@
       sha1 = "611ae1acf14f5e81f729507472819fe9733558a9";
     };
     deps = {
-      "node-fetch-1.4.1" = self.by-version."node-fetch"."1.4.1";
+      "node-fetch-1.5.0" = self.by-version."node-fetch"."1.5.0";
       "whatwg-fetch-0.11.0" = self.by-version."whatwg-fetch"."0.11.0";
     };
     optionalDependencies = {
@@ -23212,20 +23036,20 @@
   };
   "istanbul" = self.by-version."istanbul"."1.0.0-alpha.2";
   by-spec."istanbul"."^0.4.0" =
-    self.by-version."istanbul"."0.4.2";
-  by-version."istanbul"."0.4.2" = self.buildNodePackage {
-    name = "istanbul-0.4.2";
-    version = "0.4.2";
+    self.by-version."istanbul"."0.4.3";
+  by-version."istanbul"."0.4.3" = self.buildNodePackage {
+    name = "istanbul-0.4.3";
+    version = "0.4.3";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.2.tgz";
-      name = "istanbul-0.4.2.tgz";
-      sha1 = "765e728b9455beddb6daa7b9cec4b9c3c3ede487";
+      url = "https://registry.npmjs.org/istanbul/-/istanbul-0.4.3.tgz";
+      name = "istanbul-0.4.3.tgz";
+      sha1 = "5b714ee0ae493ac5ef204b99f3872bceef73d53a";
     };
     deps = {
       "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
       "async-1.5.2" = self.by-version."async"."1.5.2";
-      "escodegen-1.7.1" = self.by-version."escodegen"."1.7.1";
+      "escodegen-1.8.0" = self.by-version."escodegen"."1.8.0";
       "esprima-2.7.2" = self.by-version."esprima"."2.7.2";
       "fileset-0.2.1" = self.by-version."fileset"."0.2.1";
       "handlebars-4.0.5" = self.by-version."handlebars"."4.0.5";
@@ -24350,28 +24174,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jstransform"."^10.0.1" =
-    self.by-version."jstransform"."10.1.0";
-  by-version."jstransform"."10.1.0" = self.buildNodePackage {
-    name = "jstransform-10.1.0";
-    version = "10.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jstransform/-/jstransform-10.1.0.tgz";
-      name = "jstransform-10.1.0.tgz";
-      sha1 = "b4c49bf63f162c108b0348399a8737c713b0a83a";
-    };
-    deps = {
-      "base62-0.1.1" = self.by-version."base62"."0.1.1";
-      "esprima-fb-13001.1001.0-dev-harmony-fb" = self.by-version."esprima-fb"."13001.1001.0-dev-harmony-fb";
-      "source-map-0.1.31" = self.by-version."source-map"."0.1.31";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."jstransform"."^11.0.0" =
     self.by-version."jstransform"."11.0.3";
   by-version."jstransform"."11.0.3" = self.buildNodePackage {
@@ -24642,7 +24444,7 @@
       "chokidar-1.4.3" = self.by-version."chokidar"."1.4.3";
       "colors-1.1.2" = self.by-version."colors"."1.1.2";
       "connect-3.4.1" = self.by-version."connect"."3.4.1";
-      "core-js-2.2.1" = self.by-version."core-js"."2.2.1";
+      "core-js-2.2.2" = self.by-version."core-js"."2.2.2";
       "di-0.0.1" = self.by-version."di"."0.0.1";
       "dom-serialize-2.2.1" = self.by-version."dom-serialize"."2.2.1";
       "expand-braces-0.1.2" = self.by-version."expand-braces"."0.1.2";
@@ -24705,7 +24507,7 @@
       sha1 = "b0d58b1025d59d5c6620263186f1d58f5d5348c5";
     };
     deps = {
-      "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2";
+      "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3";
       "dateformat-1.0.12" = self.by-version."dateformat"."1.0.12";
       "minimatch-3.0.0" = self.by-version."minimatch"."3.0.0";
       "source-map-0.5.3" = self.by-version."source-map"."0.5.3";
@@ -25542,27 +25344,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."levn"."~0.2.5" =
-    self.by-version."levn"."0.2.5";
-  by-version."levn"."0.2.5" = self.buildNodePackage {
-    name = "levn-0.2.5";
-    version = "0.2.5";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz";
-      name = "levn-0.2.5.tgz";
-      sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054";
-    };
-    deps = {
-      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
-      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."levn"."~0.3.0" =
     self.by-version."levn"."0.3.0";
   by-version."levn"."0.3.0" = self.buildNodePackage {
@@ -26751,7 +26532,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."lodash.keys"."~4.0.5" =
+  by-spec."lodash.keys"."~4.0.6" =
     self.by-version."lodash.keys"."4.0.6";
   by-spec."lodash.memoize"."~3.0.3" =
     self.by-version."lodash.memoize"."3.0.4";
@@ -27159,6 +26940,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."loose-envify"."^1.1.0" =
+    self.by-version."loose-envify"."1.1.0";
   by-spec."loud-rejection"."^1.0.0" =
     self.by-version."loud-rejection"."1.3.0";
   by-version."loud-rejection"."1.3.0" = self.buildNodePackage {
@@ -27550,15 +27333,15 @@
   by-spec."magnet-uri"."~2.0.0" =
     self.by-version."magnet-uri"."2.0.1";
   by-spec."mailchimp".">=1.1.0" =
-    self.by-version."mailchimp"."1.1.5";
-  by-version."mailchimp"."1.1.5" = self.buildNodePackage {
-    name = "mailchimp-1.1.5";
-    version = "1.1.5";
+    self.by-version."mailchimp"."1.1.6";
+  by-version."mailchimp"."1.1.6" = self.buildNodePackage {
+    name = "mailchimp-1.1.6";
+    version = "1.1.6";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.5.tgz";
-      name = "mailchimp-1.1.5.tgz";
-      sha1 = "63d560056179301c41bb6f7cadc584944312909c";
+      url = "https://registry.npmjs.org/mailchimp/-/mailchimp-1.1.6.tgz";
+      name = "mailchimp-1.1.6.tgz";
+      sha1 = "5aa72867e3043f173de6d1ff6965e6ed3ea55b61";
     };
     deps = {
       "request-2.70.0" = self.by-version."request"."2.70.0";
@@ -27772,28 +27555,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."md5"."~2.0.0" =
-    self.by-version."md5"."2.0.0";
-  by-version."md5"."2.0.0" = self.buildNodePackage {
-    name = "md5-2.0.0";
-    version = "2.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/md5/-/md5-2.0.0.tgz";
-      name = "md5-2.0.0.tgz";
-      sha1 = "75e392e0ebd5a9b88dc7cb7a93875137b87c8a33";
-    };
-    deps = {
-      "charenc-0.0.1" = self.by-version."charenc"."0.0.1";
-      "crypt-0.0.1" = self.by-version."crypt"."0.0.1";
-      "is-buffer-1.0.2" = self.by-version."is-buffer"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."mdns-js"."*" =
     self.by-version."mdns-js"."0.5.0";
   by-version."mdns-js"."0.5.0" = self.buildNodePackage {
@@ -28645,6 +28406,27 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."minimatch"."0.2" =
+    self.by-version."minimatch"."0.2.14";
+  by-version."minimatch"."0.2.14" = self.buildNodePackage {
+    name = "minimatch-0.2.14";
+    version = "0.2.14";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
+      name = "minimatch-0.2.14.tgz";
+      sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
+    };
+    deps = {
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."minimatch"."0.3" =
     self.by-version."minimatch"."0.3.0";
   by-version."minimatch"."0.3.0" = self.buildNodePackage {
@@ -28741,25 +28523,6 @@
     self.by-version."minimatch"."3.0.0";
   by-spec."minimatch"."~0.2.11" =
     self.by-version."minimatch"."0.2.14";
-  by-version."minimatch"."0.2.14" = self.buildNodePackage {
-    name = "minimatch-0.2.14";
-    version = "0.2.14";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz";
-      name = "minimatch-0.2.14.tgz";
-      sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a";
-    };
-    deps = {
-      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
-      "sigmund-1.0.1" = self.by-version."sigmund"."1.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."minimatch"."~0.2.12" =
     self.by-version."minimatch"."0.2.14";
   by-spec."minimatch"."~0.2.9" =
@@ -29461,7 +29224,27 @@
     cpu = [ ];
   };
   by-spec."mongodb".">= 1.2.0 <2.2.0" =
-    self.by-version."mongodb"."2.1.14";
+    self.by-version."mongodb"."2.1.16";
+  by-version."mongodb"."2.1.16" = self.buildNodePackage {
+    name = "mongodb-2.1.16";
+    version = "2.1.16";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mongodb/-/mongodb-2.1.16.tgz";
+      name = "mongodb-2.1.16.tgz";
+      sha1 = "8501a7465574ef4b605c46c98cd6bd57fc4968fa";
+    };
+    deps = {
+      "es6-promise-3.0.2" = self.by-version."es6-promise"."3.0.2";
+      "mongodb-core-1.3.16" = self.by-version."mongodb-core"."1.3.16";
+      "readable-stream-1.0.31" = self.by-version."readable-stream"."1.0.31";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."mongodb"."~2.0" =
     self.by-version."mongodb"."2.0.55";
   by-spec."mongodb-core"."1.2.19" =
@@ -29476,7 +29259,7 @@
       sha1 = "fcb35f6b6abc5c3de1f1a4a5db526b9e306f3eb7";
     };
     deps = {
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
     };
     optionalDependencies = {
       "kerberos-0.0.19" = self.by-version."kerberos"."0.0.19";
@@ -29497,7 +29280,7 @@
       sha1 = "f1e6405f03d40846fdb838a702507affa3cb2c39";
     };
     deps = {
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
     };
     optionalDependencies = {
     };
@@ -29518,7 +29301,28 @@
       sha1 = "0a8e8719461ed98f36ed981ae00fa65d8b97781d";
     };
     deps = {
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
+      "require_optional-1.0.0" = self.by-version."require_optional"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mongodb-core"."1.3.16" =
+    self.by-version."mongodb-core"."1.3.16";
+  by-version."mongodb-core"."1.3.16" = self.buildNodePackage {
+    name = "mongodb-core-1.3.16";
+    version = "1.3.16";
+    bin = false;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-1.3.16.tgz";
+      name = "mongodb-core-1.3.16.tgz";
+      sha1 = "6f9905bc7be0c890333a011d0313e5f0e2769a3b";
+    };
+    deps = {
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
       "require_optional-1.0.0" = self.by-version."require_optional"."1.0.0";
     };
     optionalDependencies = {
@@ -29540,7 +29344,7 @@
     };
     deps = {
       "async-1.5.2" = self.by-version."async"."1.5.2";
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
       "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0";
       "kareem-1.0.1" = self.by-version."kareem"."1.0.1";
       "mongodb-2.1.14" = self.by-version."mongodb"."2.1.14";
@@ -29625,7 +29429,7 @@
     };
     deps = {
       "async-0.9.0" = self.by-version."async"."0.9.0";
-      "bson-0.4.22" = self.by-version."bson"."0.4.22";
+      "bson-0.4.23" = self.by-version."bson"."0.4.23";
       "hooks-fixed-1.1.0" = self.by-version."hooks-fixed"."1.1.0";
       "kareem-1.0.1" = self.by-version."kareem"."1.0.1";
       "mongodb-2.0.46" = self.by-version."mongodb"."2.0.46";
@@ -29674,7 +29478,7 @@
       sha1 = "f63dd313c422a3871f5569e36b0d28ca1a224631";
     };
     deps = {
-      "harmony-reflect-1.4.4" = self.by-version."harmony-reflect"."1.4.4";
+      "harmony-reflect-1.4.5" = self.by-version."harmony-reflect"."1.4.5";
       "owl-deepcopy-0.0.4" = self.by-version."owl-deepcopy"."0.0.4";
     };
     optionalDependencies = {
@@ -31150,15 +30954,15 @@
   by-spec."node-expat"."~2.3.8" =
     self.by-version."node-expat"."2.3.13";
   by-spec."node-fetch"."^1.0.1" =
-    self.by-version."node-fetch"."1.4.1";
-  by-version."node-fetch"."1.4.1" = self.buildNodePackage {
-    name = "node-fetch-1.4.1";
-    version = "1.4.1";
+    self.by-version."node-fetch"."1.5.0";
+  by-version."node-fetch"."1.5.0" = self.buildNodePackage {
+    name = "node-fetch-1.5.0";
+    version = "1.5.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.4.1.tgz";
-      name = "node-fetch-1.4.1.tgz";
-      sha1 = "f50a3a98a586c434e9a63984c97127eb33c09145";
+      url = "https://registry.npmjs.org/node-fetch/-/node-fetch-1.5.0.tgz";
+      name = "node-fetch-1.5.0.tgz";
+      sha1 = "c1b82cda9579aa57ee05b838278183c6e997f642";
     };
     deps = {
       "encoding-0.1.12" = self.by-version."encoding"."0.1.12";
@@ -31402,26 +31206,26 @@
     cpu = [ ];
   };
   by-spec."node-pre-gyp"."0.6.x" =
-    self.by-version."node-pre-gyp"."0.6.25";
-  by-version."node-pre-gyp"."0.6.25" = self.buildNodePackage {
-    name = "node-pre-gyp-0.6.25";
-    version = "0.6.25";
+    self.by-version."node-pre-gyp"."0.6.26";
+  by-version."node-pre-gyp"."0.6.26" = self.buildNodePackage {
+    name = "node-pre-gyp-0.6.26";
+    version = "0.6.26";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.25.tgz";
-      name = "node-pre-gyp-0.6.25.tgz";
-      sha1 = "2c6818775e6f1df5e353ba8024f1c0118726545b";
+      url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.6.26.tgz";
+      name = "node-pre-gyp-0.6.26.tgz";
+      sha1 = "d4fae0d69030d60e394169cdae5a4fbcad788630";
     };
     deps = {
+      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
       "nopt-3.0.6" = self.by-version."nopt"."3.0.6";
       "npmlog-2.0.3" = self.by-version."npmlog"."2.0.3";
+      "rc-1.1.6" = self.by-version."rc"."1.1.6";
       "request-2.70.0" = self.by-version."request"."2.70.0";
+      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
       "tar-2.2.1" = self.by-version."tar"."2.2.1";
       "tar-pack-3.1.3" = self.by-version."tar-pack"."3.1.3";
-      "mkdirp-0.5.1" = self.by-version."mkdirp"."0.5.1";
-      "rc-1.1.6" = self.by-version."rc"."1.1.6";
-      "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
     };
     optionalDependencies = {
     };
@@ -31430,9 +31234,9 @@
     cpu = [ ];
   };
   by-spec."node-pre-gyp"."^0.6.25" =
-    self.by-version."node-pre-gyp"."0.6.25";
+    self.by-version."node-pre-gyp"."0.6.26";
   by-spec."node-pre-gyp"."^0.6.5" =
-    self.by-version."node-pre-gyp"."0.6.25";
+    self.by-version."node-pre-gyp"."0.6.26";
   by-spec."node-pre-gyp-github"."^1.1.0" =
     self.by-version."node-pre-gyp-github"."1.1.2";
   by-version."node-pre-gyp-github"."1.1.2" = self.buildNodePackage {
@@ -31457,15 +31261,15 @@
     cpu = [ ];
   };
   by-spec."node-protobuf"."*" =
-    self.by-version."node-protobuf"."1.2.13";
-  by-version."node-protobuf"."1.2.13" = self.buildNodePackage {
-    name = "node-protobuf-1.2.13";
-    version = "1.2.13";
+    self.by-version."node-protobuf"."1.2.14";
+  by-version."node-protobuf"."1.2.14" = self.buildNodePackage {
+    name = "node-protobuf-1.2.14";
+    version = "1.2.14";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.13.tgz";
-      name = "node-protobuf-1.2.13.tgz";
-      sha1 = "744601255c78384fbb1f2523bb3239e91df4f620";
+      url = "https://registry.npmjs.org/node-protobuf/-/node-protobuf-1.2.14.tgz";
+      name = "node-protobuf-1.2.14.tgz";
+      sha1 = "99fced0cd2e6daeba48c664f99b13d1df930d0a0";
     };
     deps = {
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
@@ -31477,7 +31281,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "node-protobuf" = self.by-version."node-protobuf"."1.2.13";
+  "node-protobuf" = self.by-version."node-protobuf"."1.2.14";
   by-spec."node-red"."*" =
     self.by-version."node-red"."0.13.4";
   by-version."node-red"."0.13.4" = self.buildNodePackage {
@@ -31901,7 +31705,7 @@
       "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "faye-websocket-0.10.0" = self.by-version."faye-websocket"."0.10.0";
-      "istanbul-0.4.2" = self.by-version."istanbul"."0.4.2";
+      "istanbul-0.4.3" = self.by-version."istanbul"."0.4.3";
       "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
       "node-xmpp-core-4.2.0" = self.by-version."node-xmpp-core"."4.2.0";
       "request-2.70.0" = self.by-version."request"."2.70.0";
@@ -32594,15 +32398,15 @@
     cpu = [ ];
   };
   by-spec."npm"."*" =
-    self.by-version."npm"."3.8.6";
-  by-version."npm"."3.8.6" = self.buildNodePackage {
-    name = "npm-3.8.6";
-    version = "3.8.6";
+    self.by-version."npm"."3.8.7";
+  by-version."npm"."3.8.7" = self.buildNodePackage {
+    name = "npm-3.8.7";
+    version = "3.8.7";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-3.8.6.tgz";
-      name = "npm-3.8.6.tgz";
-      sha1 = "f9cb7b736e72c3b854895f6c054f830931ab14c6";
+      url = "https://registry.npmjs.org/npm/-/npm-3.8.7.tgz";
+      name = "npm-3.8.7.tgz";
+      sha1 = "dabc1c63f6eef1cb30e3e560966fdd9affe5a1ee";
     };
     deps = {
       "abbrev-1.0.7" = self.by-version."abbrev"."1.0.7";
@@ -32659,7 +32463,7 @@
       "read-package-tree-5.1.2" = self.by-version."read-package-tree"."5.1.2";
       "readable-stream-2.0.6" = self.by-version."readable-stream"."2.0.6";
       "realize-package-specifier-3.0.1" = self.by-version."realize-package-specifier"."3.0.1";
-      "request-2.69.0" = self.by-version."request"."2.69.0";
+      "request-2.70.0" = self.by-version."request"."2.70.0";
       "retry-0.9.0" = self.by-version."retry"."0.9.0";
       "rimraf-2.5.2" = self.by-version."rimraf"."2.5.2";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
@@ -32695,7 +32499,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "npm" = self.by-version."npm"."3.8.6";
+  "npm" = self.by-version."npm"."3.8.7";
   by-spec."npm"."^2.1.12" =
     self.by-version."npm"."2.15.3";
   by-version."npm"."2.15.3" = self.buildNodePackage {
@@ -32766,7 +32570,7 @@
       "sha-2.0.1" = self.by-version."sha"."2.0.1";
       "slide-1.1.6" = self.by-version."slide"."1.1.6";
       "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0";
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+      "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1";
       "strip-ansi-3.0.1" = self.by-version."strip-ansi"."3.0.1";
       "tar-2.2.1" = self.by-version."tar"."2.2.1";
       "text-table-0.2.0" = self.by-version."text-table"."0.2.0";
@@ -32789,7 +32593,7 @@
   by-spec."npm"."^2.10.x" =
     self.by-version."npm"."2.15.3";
   by-spec."npm"."^3.5.1" =
-    self.by-version."npm"."3.8.6";
+    self.by-version."npm"."3.8.7";
   by-spec."npm-cache-filename"."~1.0.2" =
     self.by-version."npm-cache-filename"."1.0.2";
   by-version."npm-cache-filename"."1.0.2" = self.buildNodePackage {
@@ -32832,7 +32636,7 @@
       "json-parse-helpfulerror-1.0.3" = self.by-version."json-parse-helpfulerror"."1.0.3";
       "lodash-3.10.1" = self.by-version."lodash"."3.10.1";
       "node-alias-1.0.4" = self.by-version."node-alias"."1.0.4";
-      "npm-3.8.6" = self.by-version."npm"."3.8.6";
+      "npm-3.8.7" = self.by-version."npm"."3.8.7";
       "npmi-1.0.1" = self.by-version."npmi"."1.0.1";
       "require-dir-0.3.0" = self.by-version."require-dir"."0.3.0";
       "semver-5.1.0" = self.by-version."semver"."5.1.0";
@@ -34088,31 +33892,6 @@
     self.by-version."optimist"."0.6.1";
   by-spec."optimist"."~0.6.1" =
     self.by-version."optimist"."0.6.1";
-  by-spec."optionator"."^0.5.0" =
-    self.by-version."optionator"."0.5.0";
-  by-version."optionator"."0.5.0" = self.buildNodePackage {
-    name = "optionator-0.5.0";
-    version = "0.5.0";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/optionator/-/optionator-0.5.0.tgz";
-      name = "optionator-0.5.0.tgz";
-      sha1 = "b75a8995a2d417df25b6e4e3862f50aa88651368";
-    };
-    deps = {
-      "prelude-ls-1.1.2" = self.by-version."prelude-ls"."1.1.2";
-      "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3";
-      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
-      "type-check-0.3.2" = self.by-version."type-check"."0.3.2";
-      "levn-0.2.5" = self.by-version."levn"."0.2.5";
-      "fast-levenshtein-1.0.7" = self.by-version."fast-levenshtein"."1.0.7";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."optionator"."^0.8.1" =
     self.by-version."optionator"."0.8.1";
   by-version."optionator"."0.8.1" = self.buildNodePackage {
@@ -34892,7 +34671,7 @@
       "connect-busboy-0.0.2" = self.by-version."connect-busboy"."0.0.2";
       "core-js-0.8.4" = self.by-version."core-js"."0.8.4";
       "diff-1.0.8" = self.by-version."diff"."1.0.8";
-      "domino-1.0.23" = self.by-version."domino"."1.0.23";
+      "domino-1.0.24" = self.by-version."domino"."1.0.24";
       "entities-1.1.1" = self.by-version."entities"."1.1.1";
       "express-4.13.4" = self.by-version."express"."4.13.4";
       "express-handlebars-2.0.1" = self.by-version."express-handlebars"."2.0.1";
@@ -36060,21 +35839,21 @@
     cpu = [ ];
   };
   by-spec."phantomjs"."*" =
-    self.by-version."phantomjs"."2.1.3";
-  by-version."phantomjs"."2.1.3" = self.buildNodePackage {
-    name = "phantomjs-2.1.3";
-    version = "2.1.3";
+    self.by-version."phantomjs"."2.1.7";
+  by-version."phantomjs"."2.1.7" = self.buildNodePackage {
+    name = "phantomjs-2.1.7";
+    version = "2.1.7";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.3.tgz";
-      name = "phantomjs-2.1.3.tgz";
-      sha1 = "330c254837c474ec022b70fa1e9b6202309e7556";
+      url = "https://registry.npmjs.org/phantomjs/-/phantomjs-2.1.7.tgz";
+      name = "phantomjs-2.1.7.tgz";
+      sha1 = "c6910f67935c37285b6114329fc2f27d5f3e3134";
     };
     deps = {
-      "adm-zip-0.4.7" = self.by-version."adm-zip"."0.4.7";
+      "extract-zip-1.5.0" = self.by-version."extract-zip"."1.5.0";
       "fs-extra-0.26.7" = self.by-version."fs-extra"."0.26.7";
+      "hasha-2.2.0" = self.by-version."hasha"."2.2.0";
       "kew-0.7.0" = self.by-version."kew"."0.7.0";
-      "md5-2.0.0" = self.by-version."md5"."2.0.0";
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
       "request-2.67.0" = self.by-version."request"."2.67.0";
       "request-progress-2.0.1" = self.by-version."request-progress"."2.0.1";
@@ -36086,7 +35865,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "phantomjs" = self.by-version."phantomjs"."2.1.3";
+  "phantomjs" = self.by-version."phantomjs"."2.1.7";
   by-spec."phantomjs"."1.9.7-15" =
     self.by-version."phantomjs"."1.9.7-15";
   by-version."phantomjs"."1.9.7-15" = self.buildNodePackage {
@@ -36214,7 +35993,7 @@
     };
     deps = {
       "async-0.9.2" = self.by-version."async"."0.9.2";
-      "aws-sdk-2.3.0" = self.by-version."aws-sdk"."2.3.0";
+      "aws-sdk-2.3.2" = self.by-version."aws-sdk"."2.3.2";
       "errs-0.3.2" = self.by-version."errs"."0.3.2";
       "eventemitter2-0.4.14" = self.by-version."eventemitter2"."0.4.14";
       "fast-json-patch-0.5.6" = self.by-version."fast-json-patch"."0.5.6";
@@ -36526,7 +36305,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."prelude-ls"."~1.1.0" =
+  by-spec."prelude-ls"."~1.1.2" =
     self.by-version."prelude-ls"."1.1.2";
   by-version."prelude-ls"."1.1.2" = self.buildNodePackage {
     name = "prelude-ls-1.1.2";
@@ -36545,10 +36324,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."prelude-ls"."~1.1.1" =
-    self.by-version."prelude-ls"."1.1.2";
-  by-spec."prelude-ls"."~1.1.2" =
-    self.by-version."prelude-ls"."1.1.2";
   by-spec."prepend-http"."^1.0.0" =
     self.by-version."prepend-http"."1.0.3";
   by-version."prepend-http"."1.0.3" = self.buildNodePackage {
@@ -38321,19 +38096,20 @@
     cpu = [ ];
   };
   by-spec."react"."*" =
-    self.by-version."react"."15.0.0-rc.2";
-  by-version."react"."15.0.0-rc.2" = self.buildNodePackage {
-    name = "react-15.0.0-rc.2";
-    version = "15.0.0-rc.2";
+    self.by-version."react"."15.0.0";
+  by-version."react"."15.0.0" = self.buildNodePackage {
+    name = "react-15.0.0";
+    version = "15.0.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/react/-/react-15.0.0-rc.2.tgz";
-      name = "react-15.0.0-rc.2.tgz";
-      sha1 = "acfb768af86deb06b5bbb676778d5ec90661faa3";
+      url = "https://registry.npmjs.org/react/-/react-15.0.0.tgz";
+      name = "react-15.0.0.tgz";
+      sha1 = "3c7e16531d630e15c1a50a947f14ba61746af8a7";
     };
     deps = {
-      "envify-3.4.0" = self.by-version."envify"."3.4.0";
       "fbjs-0.8.0" = self.by-version."fbjs"."0.8.0";
+      "loose-envify-1.1.0" = self.by-version."loose-envify"."1.1.0";
+      "object-assign-4.0.1" = self.by-version."object-assign"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -38341,7 +38117,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "react" = self.by-version."react"."15.0.0-rc.2";
+  "react" = self.by-version."react"."15.0.0";
   by-spec."react-tools"."*" =
     self.by-version."react-tools"."0.14.0-alpha3";
   by-version."react-tools"."0.14.0-alpha3" = self.buildNodePackage {
@@ -40192,6 +39968,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."request"."~2.70.0" =
+    self.by-version."request"."2.70.0";
   by-spec."request-progress"."^0.3.1" =
     self.by-version."request-progress"."0.3.1";
   by-version."request-progress"."0.3.1" = self.buildNodePackage {
@@ -40538,15 +40316,15 @@
     cpu = [ ];
   };
   by-spec."rethinkdb"."*" =
-    self.by-version."rethinkdb"."2.2.3";
-  by-version."rethinkdb"."2.2.3" = self.buildNodePackage {
-    name = "rethinkdb-2.2.3";
-    version = "2.2.3";
+    self.by-version."rethinkdb"."2.3.0";
+  by-version."rethinkdb"."2.3.0" = self.buildNodePackage {
+    name = "rethinkdb-2.3.0";
+    version = "2.3.0";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.2.3.tgz";
-      name = "rethinkdb-2.2.3.tgz";
-      sha1 = "26036a6b1055a8dcac803828ee869e1fa84233ba";
+      url = "https://registry.npmjs.org/rethinkdb/-/rethinkdb-2.3.0.tgz";
+      name = "rethinkdb-2.3.0.tgz";
+      sha1 = "101942b27954af48e93c031d040dc76b5d3475cc";
     };
     deps = {
       "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
@@ -40557,7 +40335,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "rethinkdb" = self.by-version."rethinkdb"."2.2.3";
+  "rethinkdb" = self.by-version."rethinkdb"."2.3.0";
   by-spec."retry"."0.6.0" =
     self.by-version."retry"."0.6.0";
   by-version."retry"."0.6.0" = self.buildNodePackage {
@@ -41138,7 +40916,7 @@
     optionalDependencies = {
     };
     peerDependencies = [
-      self.by-version."aws-sdk"."2.3.0"];
+      self.by-version."aws-sdk"."2.3.2"];
     os = [ ];
     cpu = [ ];
   };
@@ -42047,7 +41825,7 @@
       "bindings-1.2.1" = self.by-version."bindings"."1.2.1";
       "debug-2.2.0" = self.by-version."debug"."2.2.0";
       "nan-2.0.9" = self.by-version."nan"."2.0.9";
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
       "node-pre-gyp-github-1.1.2" = self.by-version."node-pre-gyp-github"."1.1.2";
       "optimist-0.6.1" = self.by-version."optimist"."0.6.1";
       "sf-0.1.7" = self.by-version."sf"."0.1.7";
@@ -43121,16 +42899,16 @@
     cpu = [ ];
   };
   "sloc" = self.by-version."sloc"."0.1.10";
-  by-spec."smart-buffer"."^1.0.1" =
-    self.by-version."smart-buffer"."1.0.3";
-  by-version."smart-buffer"."1.0.3" = self.buildNodePackage {
-    name = "smart-buffer-1.0.3";
-    version = "1.0.3";
+  by-spec."smart-buffer"."^1.0.4" =
+    self.by-version."smart-buffer"."1.0.4";
+  by-version."smart-buffer"."1.0.4" = self.buildNodePackage {
+    name = "smart-buffer-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.3.tgz";
-      name = "smart-buffer-1.0.3.tgz";
-      sha1 = "0968621e5e8b849da26a3ed707f044ae39edd8f5";
+      url = "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.0.4.tgz";
+      name = "smart-buffer-1.0.4.tgz";
+      sha1 = "2cc20003c8be2f08082768a84cf2c684cca8a309";
     };
     deps = {
     };
@@ -43661,19 +43439,19 @@
   };
   "sockjs" = self.by-version."sockjs"."0.3.16";
   by-spec."socks"."~1.1.5" =
-    self.by-version."socks"."1.1.8";
-  by-version."socks"."1.1.8" = self.buildNodePackage {
-    name = "socks-1.1.8";
-    version = "1.1.8";
+    self.by-version."socks"."1.1.9";
+  by-version."socks"."1.1.9" = self.buildNodePackage {
+    name = "socks-1.1.9";
+    version = "1.1.9";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/socks/-/socks-1.1.8.tgz";
-      name = "socks-1.1.8.tgz";
-      sha1 = "dd731a23ea237680293b09a07b085a271b558d4b";
+      url = "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz";
+      name = "socks-1.1.9.tgz";
+      sha1 = "628d7e4d04912435445ac0b6e459376cb3e6d691";
     };
     deps = {
-      "ip-0.3.3" = self.by-version."ip"."0.3.3";
-      "smart-buffer-1.0.3" = self.by-version."smart-buffer"."1.0.3";
+      "ip-1.1.2" = self.by-version."ip"."1.1.2";
+      "smart-buffer-1.0.4" = self.by-version."smart-buffer"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -43695,7 +43473,7 @@
     deps = {
       "agent-base-1.0.2" = self.by-version."agent-base"."1.0.2";
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "socks-1.1.8" = self.by-version."socks"."1.1.8";
+      "socks-1.1.9" = self.by-version."socks"."1.1.9";
     };
     optionalDependencies = {
     };
@@ -43840,26 +43618,6 @@
     cpu = [ ];
   };
   "source-map" = self.by-version."source-map"."0.5.3";
-  by-spec."source-map"."0.1.31" =
-    self.by-version."source-map"."0.1.31";
-  by-version."source-map"."0.1.31" = self.buildNodePackage {
-    name = "source-map-0.1.31";
-    version = "0.1.31";
-    bin = false;
-    src = fetchurl {
-      url = "https://registry.npmjs.org/source-map/-/source-map-0.1.31.tgz";
-      name = "source-map-0.1.31.tgz";
-      sha1 = "9f704d0d69d9e138a81badf6ebb4fde33d151c61";
-    };
-    deps = {
-      "amdefine-1.0.0" = self.by-version."amdefine"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."source-map"."0.1.32" =
     self.by-version."source-map"."0.1.32";
   by-version."source-map"."0.1.32" = self.buildNodePackage {
@@ -44098,7 +43856,7 @@
       sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40";
     };
     deps = {
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+      "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -44138,7 +43896,7 @@
     };
     deps = {
       "spdx-exceptions-1.0.4" = self.by-version."spdx-exceptions"."1.0.4";
-      "spdx-license-ids-1.2.0" = self.by-version."spdx-license-ids"."1.2.0";
+      "spdx-license-ids-1.2.1" = self.by-version."spdx-license-ids"."1.2.1";
     };
     optionalDependencies = {
     };
@@ -44147,15 +43905,15 @@
     cpu = [ ];
   };
   by-spec."spdx-license-ids"."^1.0.0" =
-    self.by-version."spdx-license-ids"."1.2.0";
-  by-version."spdx-license-ids"."1.2.0" = self.buildNodePackage {
-    name = "spdx-license-ids-1.2.0";
-    version = "1.2.0";
+    self.by-version."spdx-license-ids"."1.2.1";
+  by-version."spdx-license-ids"."1.2.1" = self.buildNodePackage {
+    name = "spdx-license-ids-1.2.1";
+    version = "1.2.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.0.tgz";
-      name = "spdx-license-ids-1.2.0.tgz";
-      sha1 = "b549dd0f63dcb745a17e2ea3a07402e0e332d1e2";
+      url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.1.tgz";
+      name = "spdx-license-ids-1.2.1.tgz";
+      sha1 = "d07ea17a4d2fd9351f9d94e2ff9cec74180fe8f3";
     };
     deps = {
     };
@@ -44166,9 +43924,9 @@
     cpu = [ ];
   };
   by-spec."spdx-license-ids"."^1.0.2" =
-    self.by-version."spdx-license-ids"."1.2.0";
+    self.by-version."spdx-license-ids"."1.2.1";
   by-spec."spdx-license-ids"."~1.2.0" =
-    self.by-version."spdx-license-ids"."1.2.0";
+    self.by-version."spdx-license-ids"."1.2.1";
   by-spec."spdy"."^1.26.5" =
     self.by-version."spdy"."1.32.5";
   by-version."spdy"."1.32.5" = self.buildNodePackage {
@@ -45847,15 +45605,15 @@
     cpu = [ ];
   };
   by-spec."tar-stream"."^1.0.0" =
-    self.by-version."tar-stream"."1.4.0";
-  by-version."tar-stream"."1.4.0" = self.buildNodePackage {
-    name = "tar-stream-1.4.0";
-    version = "1.4.0";
+    self.by-version."tar-stream"."1.5.1";
+  by-version."tar-stream"."1.5.1" = self.buildNodePackage {
+    name = "tar-stream-1.5.1";
+    version = "1.5.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.4.0.tgz";
-      name = "tar-stream-1.4.0.tgz";
-      sha1 = "19f7fbc0868b3ec283fa87df4ca906d4b16854f2";
+      url = "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.1.tgz";
+      name = "tar-stream-1.5.1.tgz";
+      sha1 = "516c74d1bea3e131cc0b9348929c9a83f0a2ad11";
     };
     deps = {
       "bl-1.1.2" = self.by-version."bl"."1.1.2";
@@ -45943,6 +45701,31 @@
     self.by-version."temp"."0.8.3";
   by-spec."temp"."~0.8.3" =
     self.by-version."temp"."0.8.3";
+  by-spec."tern"."*" =
+    self.by-version."tern"."0.18.0";
+  by-version."tern"."0.18.0" = self.buildNodePackage {
+    name = "tern-0.18.0";
+    version = "0.18.0";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/tern/-/tern-0.18.0.tgz";
+      name = "tern-0.18.0.tgz";
+      sha1 = "c6177fe395c8ffc9c512f0ec7452a7d9c6220fa6";
+    };
+    deps = {
+      "acorn-2.7.0" = self.by-version."acorn"."2.7.0";
+      "enhanced-resolve-0.9.1" = self.by-version."enhanced-resolve"."0.9.1";
+      "glob-3.2.11" = self.by-version."glob"."3.2.11";
+      "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14";
+      "typescript-1.0.1" = self.by-version."typescript"."1.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "tern" = self.by-version."tern"."0.18.0";
   by-spec."text-encoding"."0.5.2" =
     self.by-version."text-encoding"."0.5.2";
   by-version."text-encoding"."0.5.2" = self.buildNodePackage {
@@ -46309,15 +46092,15 @@
     cpu = [ ];
   };
   by-spec."time-stamp"."^1.0.0" =
-    self.by-version."time-stamp"."1.0.0";
-  by-version."time-stamp"."1.0.0" = self.buildNodePackage {
-    name = "time-stamp-1.0.0";
-    version = "1.0.0";
+    self.by-version."time-stamp"."1.0.1";
+  by-version."time-stamp"."1.0.1" = self.buildNodePackage {
+    name = "time-stamp-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.0.tgz";
-      name = "time-stamp-1.0.0.tgz";
-      sha1 = "56b152e07ec2442c23d9ea690944076f38c535a1";
+      url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.0.1.tgz";
+      name = "time-stamp-1.0.1.tgz";
+      sha1 = "9f4bd23559c9365966f3302dbba2b07c6b99b151";
     };
     deps = {
     };
@@ -47136,7 +46919,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."type-check"."~0.3.1" =
+  by-spec."type-check"."~0.3.2" =
     self.by-version."type-check"."0.3.2";
   by-version."type-check"."0.3.2" = self.buildNodePackage {
     name = "type-check-0.3.2";
@@ -47156,8 +46939,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."type-check"."~0.3.2" =
-    self.by-version."type-check"."0.3.2";
   by-spec."type-detect"."0.1.1" =
     self.by-version."type-detect"."0.1.1";
   by-version."type-detect"."0.1.1" = self.buildNodePackage {
@@ -47323,15 +47104,35 @@
     cpu = [ ];
   };
   by-spec."typescript"."*" =
-    self.by-version."typescript"."1.9.0-dev.20160405";
-  by-version."typescript"."1.9.0-dev.20160405" = self.buildNodePackage {
-    name = "typescript-1.9.0-dev.20160405";
-    version = "1.9.0-dev.20160405";
+    self.by-version."typescript"."1.9.0-dev.20160408";
+  by-version."typescript"."1.9.0-dev.20160408" = self.buildNodePackage {
+    name = "typescript-1.9.0-dev.20160408";
+    version = "1.9.0-dev.20160408";
+    bin = true;
+    src = fetchurl {
+      url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160408.tgz";
+      name = "typescript-1.9.0-dev.20160408.tgz";
+      sha1 = "0fab58c2fa44bd7562c9b410a495b29acfce4689";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "typescript" = self.by-version."typescript"."1.9.0-dev.20160408";
+  by-spec."typescript"."=1.0.1" =
+    self.by-version."typescript"."1.0.1";
+  by-version."typescript"."1.0.1" = self.buildNodePackage {
+    name = "typescript-1.0.1";
+    version = "1.0.1";
     bin = true;
     src = fetchurl {
-      url = "https://registry.npmjs.org/typescript/-/typescript-1.9.0-dev.20160405.tgz";
-      name = "typescript-1.9.0-dev.20160405.tgz";
-      sha1 = "72db1600a5b884c528cc389ecb15b6d3cbfd35c5";
+      url = "https://registry.npmjs.org/typescript/-/typescript-1.0.1.tgz";
+      name = "typescript-1.0.1.tgz";
+      sha1 = "e8eacde3084a091d3fe29b60ac5862252662a25a";
     };
     deps = {
     };
@@ -47341,7 +47142,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "typescript" = self.by-version."typescript"."1.9.0-dev.20160405";
   by-spec."typewise"."^1.0.3" =
     self.by-version."typewise"."1.0.3";
   by-version."typewise"."1.0.3" = self.buildNodePackage {
@@ -48744,7 +48544,7 @@
     };
     deps = {
       "nan-2.2.1" = self.by-version."nan"."2.2.1";
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
     };
     optionalDependencies = {
     };
@@ -48764,7 +48564,7 @@
       sha1 = "e85bbcd71a94a827ca42a33f63f7d01f54f1c24d";
     };
     deps = {
-      "node-pre-gyp-0.6.25" = self.by-version."node-pre-gyp"."0.6.25";
+      "node-pre-gyp-0.6.26" = self.by-version."node-pre-gyp"."0.6.26";
       "nan-2.0.9" = self.by-version."nan"."2.0.9";
     };
     optionalDependencies = {
@@ -50719,7 +50519,7 @@
     };
     deps = {
       "sax-1.2.1" = self.by-version."sax"."1.2.1";
-      "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0";
+      "xmlbuilder-8.2.2" = self.by-version."xmlbuilder"."8.2.2";
     };
     optionalDependencies = {
     };
@@ -50761,7 +50561,7 @@
     };
     deps = {
       "sax-0.6.1" = self.by-version."sax"."0.6.1";
-      "xmlbuilder-8.2.0" = self.by-version."xmlbuilder"."8.2.0";
+      "xmlbuilder-8.2.2" = self.by-version."xmlbuilder"."8.2.2";
     };
     optionalDependencies = {
     };
@@ -50899,15 +50699,15 @@
     cpu = [ ];
   };
   by-spec."xmlbuilder".">=1.0.0" =
-    self.by-version."xmlbuilder"."8.2.0";
-  by-version."xmlbuilder"."8.2.0" = self.buildNodePackage {
-    name = "xmlbuilder-8.2.0";
-    version = "8.2.0";
+    self.by-version."xmlbuilder"."8.2.2";
+  by-version."xmlbuilder"."8.2.2" = self.buildNodePackage {
+    name = "xmlbuilder-8.2.2";
+    version = "8.2.2";
     bin = false;
     src = fetchurl {
-      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.0.tgz";
-      name = "xmlbuilder-8.2.0.tgz";
-      sha1 = "abf6e49feedd3296676b69c2de37c364dde1e263";
+      url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-8.2.2.tgz";
+      name = "xmlbuilder-8.2.2.tgz";
+      sha1 = "69248673410b4ba42e1a6136551d2922335aa773";
     };
     deps = {
     };
@@ -50918,7 +50718,7 @@
     cpu = [ ];
   };
   by-spec."xmlbuilder".">=2.4.6" =
-    self.by-version."xmlbuilder"."8.2.0";
+    self.by-version."xmlbuilder"."8.2.2";
   by-spec."xmlbuilder"."^4.1.0" =
     self.by-version."xmlbuilder"."4.2.1";
   by-version."xmlbuilder"."4.2.1" = self.buildNodePackage {
diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json
index 1b05c05c56331..ceb41e2e1ef20 100644
--- a/pkgs/top-level/node-packages.json
+++ b/pkgs/top-level/node-packages.json
@@ -124,9 +124,9 @@
 , "node-red"
 , "node-stringprep"
 , "node-uuid"
-, "node-xmpp"
 , "node-xmpp-client"
 , "node-xmpp-component"
+, "node-xmpp-core"
 , "node-xmpp-joap"
 , "node-xmpp-server"
 , "node-xmpp-serviceadmin"
@@ -166,6 +166,7 @@
 , "stylus"
 , "tar"
 , "temp"
+, "tern"
 , "timezone"
 , "titanium"
 , "typescript"

From e9e5cf98edcdf780b470172bcb482cf128dda026 Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Fri, 8 Apr 2016 15:42:37 +0200
Subject: [PATCH 816/857] lxmenu-data: init at 0.1.5

Provides menus for LXDE, or for e.g. PCManFM if no desktop environment is installed
---
 pkgs/desktops/lxde/core/lxmenu-data.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/desktops/lxde/core/lxmenu-data.nix

diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data.nix
new file mode 100644
index 0000000000000..b75c09d2909de
--- /dev/null
+++ b/pkgs/desktops/lxde/core/lxmenu-data.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchurl, intltool }:
+
+stdenv.mkDerivation rec {
+  name = "lxmenu-data-${version}";
+  version = "0.1.5";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/lxde/${name}.tar.xz";
+    sha256 = "9fe3218d2ef50b91190162f4f923d6524c364849f87bcda8b4ed8eb59b80bab8";
+  };
+
+  buildInputs = [ intltool ];
+
+  meta = {
+    homepage = "http://lxde.org/";
+    license = stdenv.lib.licenses.gpl2;
+    description = "Freedesktop.org desktop menus for LXDE";
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfb1d258ba3a2..458b05181d536 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5308,6 +5308,8 @@ in
 
   lxappearance = callPackage ../applications/misc/lxappearance {};
 
+  lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { };
+
   kona = callPackage ../development/interpreters/kona {};
 
   lolcode = callPackage ../development/interpreters/lolcode { };

From 36b5fd8d4d66a5ce974127f374aebc77fc19da6e Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Fri, 8 Apr 2016 15:52:08 +0200
Subject: [PATCH 817/857] cjdns: 16 -> 17.3

---
 pkgs/tools/networking/cjdns/default.nix | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 906ca5f39dd3b..2ccfbb816fba2 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,17 +1,12 @@
-{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
+{ stdenv, fetchurl, nodejs, which, python27, utillinux }:
 
-let
-  version = "16"; # see ${src}/util/version/Version.h
-  date = "20150509";
-in
+let version = "17.3"; in
 stdenv.mkDerivation {
-  name = "cjdns-${version}-${date}";
+  name = "cjdns-"+version;
 
-  src = fetchFromGitHub {
-    owner = "cjdelisle";
-    repo = "cjdns";
-    rev = "a05ade40dc31caebaf3aa770aac3ab2ecb02d867";
-    sha256 = "07vwsw5d0sdxypl187cyzzdrv0chf4yyjxcymf847afkfr249n29";
+  src = fetchurl {
+    url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
+    sha256 = "00p62y7b89y3piirpj27crprji8nh0zv7zh4mcqhzh6r39jxz4ri";
   };
 
   buildInputs = [ which python27 nodejs ] ++
@@ -35,7 +30,7 @@ stdenv.mkDerivation {
     homepage = https://github.com/cjdelisle/cjdns;
     description = "Encrypted networking for regular people";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ viric ehmry ];
+    maintainers = with maintainers; [ ehmry ];
     platforms = platforms.unix;
   };
 }

From 28232c374687d9ab401ac55e3061bc067d120969 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 8 Apr 2016 22:33:14 +0900
Subject: [PATCH 818/857] flashplayer: fix build on 32-bit platform

---
 .../flashplayer-11/default.nix                | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index 129a71126096b..b624bfe65192e 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -73,8 +73,7 @@ stdenv.mkDerivation rec {
     tar -xvzf *${suffix}.tar.gz
 
     ${ lib.optionalString is-i686 ''
-       tar -xvzf *_sa.*.tar.gz
-       tar -xvzf *_sa_debug.*.tar.gz
+       tar -xvzf *_sa[_.]*.tar.gz
     ''}
 
     popd
@@ -87,7 +86,7 @@ stdenv.mkDerivation rec {
   dontStrip = true;
   dontPatchELF = true;
 
-  outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ];
+  outputs = [ "out" ] ++ lib.optional (is-i686 && !debug) "sa" ++ lib.optional (is-i686 && debug) "saDbg";
 
   installPhase = ''
     mkdir -p $out/lib/mozilla/plugins
@@ -95,22 +94,25 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
 
     ${ lib.optionalString is-i686 ''
-       mkdir -p $sa/bin
-       cp flashplayer $sa/bin/
-
-       patchelf \
-         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-         --set-rpath "$rpath" \
-         $sa/bin/flashplayer
-
-
-       mkdir -p $saDbg/bin
-       cp flashplayerdebugger $saDbg/bin/
-
-       patchelf \
-         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-         --set-rpath "$rpath" \
-         $saDbg/bin/flashplayerdebugger
+       ${ lib.optionalString (!debug) ''
+         mkdir -p $sa/bin
+         cp flashplayer $sa/bin/
+
+         patchelf \
+           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+           --set-rpath "$rpath" \
+           $sa/bin/flashplayer
+       ''}
+
+       ${ lib.optionalString debug ''
+         mkdir -p $saDbg/bin
+         cp flashplayerdebugger $saDbg/bin/
+
+         patchelf \
+           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+           --set-rpath "$rpath" \
+           $saDbg/bin/flashplayerdebugger
+       ''}
     ''}
   '';
 

From 77642ecbf7ea0666e2e5ca855b8225396a44ea2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 8 Apr 2016 15:56:26 +0200
Subject: [PATCH 819/857] rustc: fix build with multiple outputs

---
 pkgs/development/compilers/rustc/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index 516987e696354..177d403b4513e 100644
--- a/pkgs/development/compilers/rustc/generic.nix
+++ b/pkgs/development/compilers/rustc/generic.nix
@@ -169,6 +169,7 @@ with stdenv.lib; stdenv.mkDerivation {
   enableParallelBuilding = false; # missing files during linking, occasionally
 
   outputs = [ "out" "doc" ];
+  setOutputFlags = false;
 
   preCheck = "export TZDIR=${tzdata}/share/zoneinfo";
 

From 33b1dbb991ac07d67128eb674846cf93c6ae825d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 8 Apr 2016 16:10:08 +0200
Subject: [PATCH 820/857] qt54.qttools: fix build

This one particular cmake directory seems not created by the build.
Skimming Hydra's status, this probably never worked since 35f33b438c.
/cc @ttuegel.
---
 pkgs/development/libraries/qt-5/5.4/qttools.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix
index 1472691c52547..16887c4265a81 100644
--- a/pkgs/development/libraries/qt-5/5.4/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qttools.nix
@@ -10,7 +10,6 @@ qtSubmodule {
     fixQtModuleCMakeConfig "Designer"
     fixQtModuleCMakeConfig "Help"
     fixQtModuleCMakeConfig "LinguistTools"
-    fixQtModuleCMakeConfig "UiPlugin"
     fixQtModuleCMakeConfig "UiTools"
   '';
 }

From d45ac41e8740a96d59860dfe7c404041a2ed962b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 8 Apr 2016 17:18:54 +0300
Subject: [PATCH 821/857] flashplayer: cleanup, add comment to maintainers

---
 .../flashplayer-11/default.nix                | 58 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
index b624bfe65192e..d1a00f1bd0440 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -36,6 +36,13 @@
 
 }:
 
+/* When updating this package, test that the following derivations build:
+
+   * flashplayer
+   * flashplayer-standalone
+   * flashplayer-standalone-debugger
+*/
+
 let
   arch =
     if      stdenv.system == "x86_64-linux" then
@@ -55,6 +62,10 @@ let
       else             "_linux.i386"
     else throw "Flash Player is not supported on this platform";
 
+  saname =
+    if debug then "flashplayerdebugger"
+    else          "flashplayer";
+
   is-i686 = (stdenv.system == "i686-linux");
 in
 stdenv.mkDerivation rec {
@@ -66,53 +77,38 @@ stdenv.mkDerivation rec {
     sha256 = "0y4bjkla6ils4crmx61pi31s4gscy8rgiv7xccx1z0g6hba9j73l";
   };
 
-  buildInputs = [ unzip ];
+  nativeBuildInputs = [ unzip ];
+
+  sourceRoot = ".";
 
   postUnpack = ''
-    pushd $sourceRoot
+    cd *${arch}
+
     tar -xvzf *${suffix}.tar.gz
 
-    ${ lib.optionalString is-i686 ''
+    ${lib.optionalString is-i686 ''
        tar -xvzf *_sa[_.]*.tar.gz
     ''}
-
-    popd
-  '';
-
-  setSourceRoot = ''
-    sourceRoot=$(ls -d *${arch})
   '';
 
   dontStrip = true;
   dontPatchELF = true;
 
-  outputs = [ "out" ] ++ lib.optional (is-i686 && !debug) "sa" ++ lib.optional (is-i686 && debug) "saDbg";
+  outputs = [ "out" ] ++ lib.optional is-i686 "sa";
 
   installPhase = ''
     mkdir -p $out/lib/mozilla/plugins
     cp -pv libflashplayer.so $out/lib/mozilla/plugins
+
     patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
 
-    ${ lib.optionalString is-i686 ''
-       ${ lib.optionalString (!debug) ''
-         mkdir -p $sa/bin
-         cp flashplayer $sa/bin/
-
-         patchelf \
-           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-           --set-rpath "$rpath" \
-           $sa/bin/flashplayer
-       ''}
-
-       ${ lib.optionalString debug ''
-         mkdir -p $saDbg/bin
-         cp flashplayerdebugger $saDbg/bin/
-
-         patchelf \
-           --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-           --set-rpath "$rpath" \
-           $saDbg/bin/flashplayerdebugger
-       ''}
+    ${lib.optionalString is-i686 ''
+      install -Dm755 ${saname} $sa/bin/flashplayer
+
+      patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        --set-rpath "$rpath" \
+        $sa/bin/flashplayer
     ''}
   '';
 
@@ -120,7 +116,7 @@ stdenv.mkDerivation rec {
     mozillaPlugin = "/lib/mozilla/plugins";
   };
 
-  rpath = stdenv.lib.makeLibraryPath
+  rpath = lib.makeLibraryPath
     [ zlib alsaLib curl nspr fontconfig freetype expat libX11
       libXext libXrender libXcursor libXt gtk glib pango atk cairo gdk_pixbuf
       libvdpau nss
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dfb1d258ba3a2..8eb73ff9d9097 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12378,7 +12378,7 @@ in
 
   flashplayer-standalone = pkgsi686Linux.flashplayer.sa;
 
-  flashplayer-standalone-debugger = pkgsi686Linux.flashplayer.saDbg;
+  flashplayer-standalone-debugger = (pkgsi686Linux.flashplayer.override { debug = true; }).sa;
 
   fluxbox = callPackage ../applications/window-managers/fluxbox { };
 

From c7379b30dc365af07f222b67e4daac2775164934 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Fri, 8 Apr 2016 16:32:30 +0200
Subject: [PATCH 822/857] u9fs service: switch user with systemd

Drop the broken fsRoot option.
---
 .../services/network-filesystems/u9fs.nix     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/u9fs.nix b/nixos/modules/services/network-filesystems/u9fs.nix
index 648097274641c..8bc37f0f62c37 100644
--- a/nixos/modules/services/network-filesystems/u9fs.nix
+++ b/nixos/modules/services/network-filesystems/u9fs.nix
@@ -27,10 +27,17 @@ in
         '';
       };
 
+      user = mkOption {
+        type = types.str;
+        default = "nobody";
+        description =
+          "User to run u9fs under.";
+      };
+
       extraArgs = mkOption {
         type = types.str;
         default = "";
-        example = "-a none -u nobody";
+        example = "-a none";
         description =
           ''
             Extra arguments to pass on invocation,
@@ -38,13 +45,6 @@ in
           '';
       };
 
-      fsroot = mkOption {
-        type = types.path;
-        default = "/";
-        example = "/srv";
-        description = "File system root to serve to clients.";
-      };
-
     };
 
   };
@@ -63,9 +63,10 @@ in
         reloadIfChanged = true;
         requires = [ "u9fs.socket" ];
         serviceConfig =
-          { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs} ${cfg.fsroot}";
+          { ExecStart = "-${pkgs.u9fs}/bin/u9fs ${cfg.extraArgs}";
             StandardInput = "socket";
             StandardError = "journal";
+            User = cfg.user;
           };
       };
     };

From b6856521fff466f72245ca16d04b2726dbd61636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 8 Apr 2016 16:38:48 +0200
Subject: [PATCH 823/857] texlive: comment on a couple of internal functions

---
 pkgs/tools/typesetting/tex/texlive-new/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/typesetting/tex/texlive-new/default.nix b/pkgs/tools/typesetting/tex/texlive-new/default.nix
index fbf4adde2ae72..a2f0bf706c870 100644
--- a/pkgs/tools/typesetting/tex/texlive-new/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive-new/default.nix
@@ -104,6 +104,7 @@ let
   mkUrlName = { pname, tlType, ... }:
     pname + lib.optionalString (tlType != "run") ".${tlType}";
 
+  # command to unpack a single TL package
   unpackPkg =
     { # url ? null, urlPrefix ? null
       md5, pname, tlType, postUnpack ? "", stripPrefix ? 1, ...
@@ -119,6 +120,7 @@ let
             -C "$out" --anchored --exclude=tlpkg --keep-old-files
         '' + postUnpack;
 
+  # create a derivation that contains unpacked upstream TL packages
   mkPkgs = { pname, tlType, version, pkgList }@args:
       /* TODOs:
           - "historic" isn't mirrored; posted a question at #287

From 46a3a12971246e3e31613cf3f9db6aa4b3b2a48b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 8 Apr 2016 17:39:28 +0200
Subject: [PATCH 824/857] sshuttle: 0.77.2 -> 0.78.0

---
 pkgs/tools/security/sshuttle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 4a8d7518e9c28..4111957476787 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -3,10 +3,10 @@
   
 pythonPackages.buildPythonApplication rec {
   name = "sshuttle-${version}";
-  version = "0.77.2";
+  version = "0.78.0";
 
   src = fetchurl {
-    sha256 = "1fwlhr5r9pl3pns65nn4mxf5ivypmd2a12gv3vpyznfy5f097k10";
+    sha256 = "18hrwi2gyri1n2rq0nghvv7hfhbhh5h67am89524vc1yyx40vn3b";
     url = "https://pypi.python.org/packages/source/s/sshuttle/${name}.tar.gz";
   };
 

From 678e1955b10c7d00f86cb2253f16f9ebaee064c5 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Fri, 8 Apr 2016 19:33:45 +0200
Subject: [PATCH 825/857] manual: delete dangling pointer to real-world NixOS
 configs

At some point we probably want to replace this with a curated list
of configurations or even an upstreamed repository of examples, but
for now this is just noise.

Fixes NixOS/nixpkgs#14522
---
 nixos/doc/manual/installation/installing.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 7e71df28cdb39..4a0b3fee7c182 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -157,10 +157,6 @@ $ nano /mnt/etc/nixos/configuration.nix
     <command>nixos-generate-config</command> will figure out the
     required modules.</para></note>
 
-    <para>Examples of real-world NixOS configuration files can be
-    found at <link
-    xlink:href="https://nixos.org/repos/nix/configurations/trunk/"/>.</para>
-
   </listitem>
 
   <listitem><para>Do the installation:

From 89c619f3f6ecc8b383605a1226a0e2a9fe9f8d99 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 8 Apr 2016 10:53:38 -0700
Subject: [PATCH 826/857] plex: 0.9.15.6.1714 -> 0.9.16.4.1911

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 11f1bc4a988c5..683efb983a043 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -9,9 +9,9 @@ let
     vsnHash = "cece46d";
     sha256 = "0p1rnia18a67h05f7l7smkpry1ldkpdkyvs9fgrqpay3w0jfk9gd";
   } else {
-    version = "0.9.15.6.1714";
-    vsnHash = "7be11e1";
-    sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
+    version = "0.9.16.4.1911";
+    vsnHash = "ee6e505";
+    sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd";
   };
 
 in stdenv.mkDerivation rec {

From bd386538a41f29b9813d3fe57280f94653d6d707 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 8 Apr 2016 10:54:04 -0700
Subject: [PATCH 827/857] plexpass: 0.9.16.3.1840 -> 0.9.16.4.1911

---
 pkgs/servers/plex/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 683efb983a043..ac54e8af9aa0a 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -5,9 +5,9 @@
 
 let
   plexpkg = if enablePlexPass then {
-    version = "0.9.16.3.1840";
-    vsnHash = "cece46d";
-    sha256 = "0p1rnia18a67h05f7l7smkpry1ldkpdkyvs9fgrqpay3w0jfk9gd";
+    version = "0.9.16.4.1911";
+    vsnHash = "ee6e505";
+    sha256 = "0lq0lcynmc09d0whynb0x2zgd39dp7z7k86ndgm2clay3zbzqpfd";
   } else {
     version = "0.9.16.4.1911";
     vsnHash = "ee6e505";

From db9640b03247585a84d4778dbed26d8338dcb7a1 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 8 Apr 2016 10:55:00 -0700
Subject: [PATCH 828/857] plex module: restart on failure

---
 nixos/modules/services/misc/plex.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index 875771dfa37fa..92b352db416c2 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -128,6 +128,7 @@ in
         Group = cfg.group;
         PermissionsStartOnly = "true";
         ExecStart = "/bin/sh -c '${cfg.package}/usr/lib/plexmediaserver/Plex\\ Media\\ Server'";
+        Restart = "on-failure";
       };
       environment = {
         PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR=cfg.dataDir;

From 9fa5c5d46141eedfa5343357a1eac252b44ba534 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Apr 2016 19:51:48 +0200
Subject: [PATCH 829/857] blender: 2.77 -> 2.77a

---
 pkgs/applications/misc/blender/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index 0085da5b468fd..3e7ad83c0a121 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -10,11 +10,11 @@
 with lib;
 
 stdenv.mkDerivation rec {
-  name = "blender-2.77";
+  name = "blender-2.77a";
 
   src = fetchurl {
     url = "http://download.blender.org/source/${name}.tar.gz";
-    sha256 = "0aynm249xgrnm6h5hlp9x40ww0hn391d9ka2mg9mmqrdzhih286n";
+    sha256 = "0rswx2n52wjr4jpvg1a6mir5das2i752brjzigmm8rhayl0glw1p";
   };
 
   buildInputs =

From bd4720a7d6248ca01996fe801e5edfe5ce1804b7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 8 Apr 2016 22:21:47 +0200
Subject: [PATCH 830/857] cudatoolkit: Don't barf on GCC > 4.9

Blender appears to build/run fine with GCC 5.3.
---
 pkgs/development/compilers/cudatoolkit/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 0ab3f52f2bff5..f13826ddb8c03 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -65,6 +65,9 @@ let
         if [ -d "$out"/cuda-samples ]; then
             mv "$out"/cuda-samples "$out"/samples
         fi
+
+        # Change the #error on GCC > 4.9 to a #warning.
+        sed -i $out/include/host_config.h -e 's/#error\(.*unsupported GNU version\)/#warning\1/'
       '';
 
       meta = {

From 4d87926795c4f0db9cc4cf65dfd35a32f892cefb Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:36:03 +0200
Subject: [PATCH 831/857] minidlna: use hostname in DLNA friendly name

---
 nixos/modules/services/networking/minidlna.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index aa28502a12c4d..bbbfe9d72e1a3 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -58,7 +58,7 @@ in
     services.minidlna.config =
       ''
         port=${toString port}
-        friendly_name=NixOS Media Server
+        friendly_name=${config.networking.hostName} MiniDLNA
         db_dir=/var/cache/minidlna
         log_dir=/var/log/minidlna
         inotify=yes

From 72cd570421d4a0f00a006bc2e5fc256692069380 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:37:11 +0200
Subject: [PATCH 832/857] minidlna: use journalctl for logging, systemd for
 runtimedir

---
 nixos/modules/services/networking/minidlna.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/minidlna.nix b/nixos/modules/services/networking/minidlna.nix
index bbbfe9d72e1a3..61d063dbfe0e8 100644
--- a/nixos/modules/services/networking/minidlna.nix
+++ b/nixos/modules/services/networking/minidlna.nix
@@ -60,7 +60,7 @@ in
         port=${toString port}
         friendly_name=${config.networking.hostName} MiniDLNA
         db_dir=/var/cache/minidlna
-        log_dir=/var/log/minidlna
+        log_level=warn
         inotify=yes
         ${concatMapStrings (dir: ''
           media_dir=${dir}
@@ -83,21 +83,18 @@ in
 
         preStart =
           ''
-            mkdir -p /var/cache/minidlna /var/log/minidlna /run/minidlna
-            chown minidlna /var/cache/minidlna /var/log/minidlna /run/minidlna
+            mkdir -p /var/cache/minidlna
+            chown -R minidlna:minidlna /var/cache/minidlna
           '';
 
-        # FIXME: log through the journal rather than
-        # /var/log/minidlna.  The -d flag does that, but also raises
-        # the log level to debug...
         serviceConfig =
           { User = "minidlna";
-            Group = "nogroup";
+            Group = "minidlna";
             PermissionsStartOnly = true;
-            Type = "forking";
+            RuntimeDirectory = "minidlna";
             PIDFile = "/run/minidlna/pid";
             ExecStart =
-              "@${pkgs.minidlna}/sbin/minidlnad minidlnad -P /run/minidlna/pid" +
+              "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" +
               " -f ${pkgs.writeText "minidlna.conf" cfg.config}";
           };
       };

From ed791dbb949a67d1daca2cde7ecd5d7e7fcef02d Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:37:42 +0200
Subject: [PATCH 833/857] minidlna: install manpages

---
 pkgs/tools/networking/minidlna/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix
index c0944bb891ec2..9e8e0c180d7ec 100644
--- a/pkgs/tools/networking/minidlna/default.nix
+++ b/pkgs/tools/networking/minidlna/default.nix
@@ -16,6 +16,12 @@ stdenv.mkDerivation {
 
   buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite gettext ];
 
+  postInstall = ''
+    mkdir -p $out/share/man/man{5,8}
+    cp minidlna.conf.5 $out/share/man/man5
+    cp minidlnad.8 $out/share/man/man8
+  '';
+
   meta = with stdenv.lib; {
     description = "Media server software";
     longDescription = ''

From b080956078b3e7db64bb8f88efe80a1e7576c75c Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:08:52 +0200
Subject: [PATCH 834/857] libinput: 1.2.1 -> 1.2.2

---
 pkgs/development/libraries/libinput/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 6d80bfdccf1ff..d903dfefcca0e 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -15,11 +15,11 @@ in
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "libinput-1.2.1";
+  name = "libinput-1.2.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "1hy1h0a4zx5wj23sah4kms2z0285yl0kcn4fqlrrp1gqax9qrnz2";
+    sha256 = "0rzkp37dnn4qnkx7v3hckx5ryv3lr0vl234pnk6z2vfq40v5pb08";
   };
 
   configureFlags = [

From 9722fa06e996fcc043439cafbf1c62ff3d4424d4 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:11:46 +0200
Subject: [PATCH 835/857] libinput: propagate udev dependency

---
 pkgs/development/libraries/libinput/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index d903dfefcca0e..18dbd2de38bfa 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -30,11 +30,13 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libevdev mtdev udev libwacom ]
+  buildInputs = [ libevdev mtdev libwacom ]
     ++ optionals eventGUISupport [ cairo glib gtk3 ]
     ++ optionals documentationSupport [ doxygen graphviz ]
     ++ optionals testsSupport [ check valgrind ];
 
+  propagatedBuildInputs = [ udev ];
+
   meta = {
     description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver";
     homepage    = http://www.freedesktop.org/wiki/Software/libinput;

From 8fe327a4322baa8279f09eb3a87ffd92dbdc8a18 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Fri, 8 Apr 2016 14:10:57 -0700
Subject: [PATCH 836/857] wraith: init at 1.4.6

---
 .../networking/irc/wraith/default.nix         | 46 ++++++++++++++++++
 .../networking/irc/wraith/dlopen.patch        | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 96 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/wraith/default.nix
 create mode 100644 pkgs/applications/networking/irc/wraith/dlopen.patch

diff --git a/pkgs/applications/networking/irc/wraith/default.nix b/pkgs/applications/networking/irc/wraith/default.nix
new file mode 100644
index 0000000000000..f36bbc0006418
--- /dev/null
+++ b/pkgs/applications/networking/irc/wraith/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, openssl }:
+
+with stdenv;
+with stdenv.lib;
+
+mkDerivation rec {
+  name = "wraith-${version}";
+  version = "1.4.6";
+  src = fetchurl {
+    url = "mirror://sourceforge/wraithbotpack/wraith-v${version}.tar.gz";
+    sha256 = "0vb2hbjmwh040f5yhxvwcfxvgxa0q9zdy9vvddydn8zn782d7wl8";
+  };
+  buildInputs = [ openssl ];
+  patches = [ ./dlopen.patch ];
+  postPatch = ''
+    substituteInPlace src/libssl.cc    --subst-var-by openssl ${openssl}
+    substituteInPlace src/libcrypto.cc --subst-var-by openssl ${openssl}
+  '';
+  configureFlags = "--with-openssl=${openssl}";
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -a wraith $out/bin/wraith
+    ln -s wraith $out/bin/hub
+  '';
+
+  meta = {
+    description = "An IRC channel management bot written purely in C/C++";
+    longDescription = ''
+      Wraith is an IRC channel management bot written purely in C/C++. It has
+      been in development since late 2003. It is based on Eggdrop 1.6.12 but has
+      since evolved into something much different at its core. TCL and loadable
+      modules are currently not supported.
+
+      Maintainer's Notes:
+      Copy the binary out of the store before running it with the -C option to
+      configure it. See https://github.com/wraith/wraith/wiki/GettingStarted .
+
+      The binary will not run when moved onto non-NixOS systems; use patchelf
+      to fix its runtime dependenices.
+    '';
+    homepage = http://wraith.botpack.net/;
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ elitak ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/networking/irc/wraith/dlopen.patch b/pkgs/applications/networking/irc/wraith/dlopen.patch
new file mode 100644
index 0000000000000..bfc854ef9e9c3
--- /dev/null
+++ b/pkgs/applications/networking/irc/wraith/dlopen.patch
@@ -0,0 +1,48 @@
+diff --git a/src/libcrypto.cc b/src/libcrypto.cc
+index 0339258..68746c8 100644
+--- a/src/libcrypto.cc
++++ b/src/libcrypto.cc
+@@ -95,17 +95,9 @@ int load_libcrypto() {
+   }
+ 
+   sdprintf("Loading libcrypto");
++  dlerror(); // Clear Errors
++  libcrypto_handle = dlopen("@openssl@/lib/libcrypto.so", RTLD_LAZY|RTLD_GLOBAL);
+ 
+-  bd::Array<bd::String> libs_list(bd::String("libcrypto.so." SHLIB_VERSION_NUMBER " libcrypto.so libcrypto.so.0.9.8 libcrypto.so.7 libcrypto.so.6").split(' '));
+-
+-  for (size_t i = 0; i < libs_list.length(); ++i) {
+-    dlerror(); // Clear Errors
+-    libcrypto_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY|RTLD_GLOBAL);
+-    if (libcrypto_handle) {
+-      sdprintf("Found libcrypto: %s", bd::String(libs_list[i]).c_str());
+-      break;
+-    }
+-  }
+   if (!libcrypto_handle) {
+     fprintf(stderr, STR("Unable to find libcrypto\n"));
+     return(1);
+diff --git a/src/libssl.cc b/src/libssl.cc
+index b432c7b..8940998 100644
+--- a/src/libssl.cc
++++ b/src/libssl.cc
+@@ -68,17 +68,9 @@ int load_libssl() {
+   }
+ 
+   sdprintf("Loading libssl");
++  dlerror(); // Clear Errors
++  libssl_handle = dlopen("@openssl@/lib/libssl.so", RTLD_LAZY);
+ 
+-  bd::Array<bd::String> libs_list(bd::String("libssl.so." SHLIB_VERSION_NUMBER " libssl.so libssl.so.0.9.8 libssl.so.7 libssl.so.6").split(' '));
+-
+-  for (size_t i = 0; i < libs_list.length(); ++i) {
+-    dlerror(); // Clear Errors
+-    libssl_handle = dlopen(bd::String(libs_list[i]).c_str(), RTLD_LAZY);
+-    if (libssl_handle) {
+-      sdprintf("Found libssl: %s", bd::String(libs_list[i]).c_str());
+-      break;
+-    }
+-  }
+   if (!libssl_handle) {
+     fprintf(stderr, STR("Unable to find libssl\n"));
+     return(1);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e4bc839d0865..022c47a90e442 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16392,6 +16392,8 @@ in
 
   wmutils-core = callPackage ../tools/X11/wmutils-core { };
 
+  wraith = callPackage ../applications/networking/irc/wraith { };
+
   wxmupen64plus = callPackage ../misc/emulators/wxmupen64plus { };
 
   x2x = callPackage ../tools/X11/x2x { };

From af82b8f7a7168719c0d7a07bd74b7124a54480b4 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:09:31 +0200
Subject: [PATCH 837/857] wayland-protocols: init at 1.3

From https://lists.freedesktop.org/archives/wayland-devel/2015-November/025486.html
The purpose of this repository is to decouple Wayland
protocol development from the implementation in weston. wayland-protocols will
have its own releases not coupled with with wayland/weston releases and
will not carry any implementations.
---
 .../libraries/wayland/protocols.nix           | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/wayland/protocols.nix

diff --git a/pkgs/development/libraries/wayland/protocols.nix b/pkgs/development/libraries/wayland/protocols.nix
new file mode 100644
index 0000000000000..0ae9d9d59c8ac
--- /dev/null
+++ b/pkgs/development/libraries/wayland/protocols.nix
@@ -0,0 +1,27 @@
+{ lib, stdenv, fetchurl, pkgconfig
+, wayland
+}:
+
+stdenv.mkDerivation rec {
+  name = "wayland-protocols-${version}";
+  version = "1.3";
+
+  src = fetchurl {
+    url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
+    sha256 = "0byqvrsm6bkvylvzqy8wh5wpszwl5ra1z0yjqzqmw8przlrhdkbb";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ wayland ];
+
+  meta = {
+    description = "Wayland protocol extensions";
+    homepage    = http://wayland.freedesktop.org/;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+
+  passthru.version = version;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5c5f812880e0..f579eeec6e229 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8996,6 +8996,8 @@ in
     graphviz = graphviz-nox;
   };
 
+  wayland-protocols = callPackage ../development/libraries/wayland/protocols.nix { };
+
   webkit = webkitgtk;
 
   wcslib = callPackage ../development/libraries/wcslib { };

From 7f2d418954136e752519d9870289875978a5724b Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:11:08 +0200
Subject: [PATCH 838/857] wayland: 1.9.0 -> 1.10.0

---
 pkgs/development/libraries/wayland/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 0510fde811c69..60e332de0c3d4 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig
-, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto
+, libffi, docbook_xsl, doxygen, graphviz, libxslt, xmlto, libxml2
 , expat ? null # Build wayland-scanner (currently cannot be disabled as of 1.7.0)
 }:
 
@@ -8,18 +8,18 @@ assert expat != null;
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1yhy62vkbq8j8c9zaa6yzvn75cd99kfa8n2zfdwl80x019r711ww";
+    sha256 = "1p307ly1yyqjnzn9dbv78yffql2qszn84qk74lwanl3gma8fgxjb";
   };
 
   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 libxml2 ];
 
   meta = {
     description = "Reference implementation of the wayland protocol";

From c6a4bc4ae5aa2f1f22e71b30a67a50a7b1c11c71 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Fri, 8 Apr 2016 22:13:14 +0200
Subject: [PATCH 839/857] weston: 1.9.0 -> 1.10.0

---
 pkgs/applications/window-managers/weston/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 862e8b0ea01ea..a1d653fb6d0c4 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -1,24 +1,24 @@
 { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb
 , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput
 , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null
-, libwebp ? null, xwayland ? null
+, libwebp ? null, xwayland ? null, wayland-protocols
 # beware of null defaults, as the parameters *are* supplied by callPackage by default
 }:
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1ks8mja6glzy2dkayi535hd6w5c5h021bqk7vzgv182g33rh66ww";
+    sha256 = "1hd5593zz5s3s07vb6linp6akbs62wy2ijh3g7gksafq016h1cp0";
   };
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm
     mtdev libjpeg pam dbus.libs libinput pango libunwind freerdp vaapi libva
-    libwebp
+    libwebp wayland-protocols
   ];
 
   configureFlags = [

From a011083cdaaa08acdc44578272b9a3adcd3f74ac Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 8 Apr 2016 04:13:41 +0200
Subject: [PATCH 840/857] fish: pick up completion files from other packages

Some packages bring their own completions in
/share/fish/vendor_completions.d. Now they are picked up by fish from
every path in NIX_PROFILES.
---
 nixos/modules/programs/fish.nix      | 3 +++
 pkgs/shells/fish/default.nix         | 3 +++
 pkgs/tools/security/pass/default.nix | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index b4259f7ec87dc..7a4b78118ce66 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -101,6 +101,9 @@ in
       end
     '';
 
+    # include programs that bring their own completions
+    environment.pathsToLink = [ "/share/fish/vendor_completions.d" ];
+
     environment.systemPackages = [ pkgs.fish ];
 
     environment.shells = [
diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 521212940672b..63f5dbd05ddb5 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -59,6 +59,9 @@ stdenv.mkDerivation rec {
   '' + ''
     sed -i "s|/sbin /usr/sbin||" \
            "$out/share/fish/functions/__fish_complete_subcommand_root.fish"
+
+    # make fish pick up completions from nix profile
+    echo "set fish_complete_path (echo \$NIX_PROFILES | tr ' ' '\n')\"/share/fish/vendor_completions.d\" \$fish_complete_path" >> $out/share/fish/config.fish
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 56e20726793d6..2f6769b929b87 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   preInstall = ''
     mkdir -p "$out/share/bash-completion/completions"
     mkdir -p "$out/share/zsh/site-functions"
-    mkdir -p "$out/share/fish/completions"
+    mkdir -p "$out/share/fish/vendor_completions.d"
   '';
 
   installFlags = [ "PREFIX=$(out)" ];

From 98d9bbaec2317101f452151b8a8e844b4140e806 Mon Sep 17 00:00:00 2001
From: Brandon Edens <brandonedens@gmail.com>
Date: Fri, 8 Apr 2016 18:53:42 -0700
Subject: [PATCH 841/857] Add DPI option to xserver invocation.

---
 nixos/modules/services/x11/xserver.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 76431f2112439..c3cd550e83856 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -219,6 +219,12 @@ in
         '';
       };
 
+      dpi = mkOption {
+        type = types.nullOr types.int;
+        default = 0;
+        description = "DPI resolution to use for X server.";
+      };
+
       startDbusSession = mkOption {
         type = types.bool;
         default = true;
@@ -513,6 +519,7 @@ in
         "-xkbdir" "${cfg.xkbDir}"
       ] ++ optional (cfg.display != null) ":${toString cfg.display}"
         ++ optional (cfg.tty     != null) "vt${toString cfg.tty}"
+        ++ optional (cfg.dpi     != null) "-dpi ${toString cfg.dpi}"
         ++ optionals (cfg.display != null) [ "-logfile" "/var/log/X.${toString cfg.display}.log" ]
         ++ optional (!cfg.enableTCP) "-nolisten tcp";
 

From f14bf70db4b90e3a1d854d8d23690260fd03292f Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Fri, 8 Apr 2016 22:29:31 -0500
Subject: [PATCH 842/857] awscli: 1.10.1 -> 1.10.18

And awscli dependencies:

botocore: 1.3.23 -> 1.4.9
s3transfer: init at 0.0.1
---
 pkgs/top-level/python-packages.nix | 42 +++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a02c0246e6c4..0a17a54156ee8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1224,11 +1224,11 @@ in modules // {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.10.1";
+    version = "1.10.18";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/awscli/${name}.tar.gz";
-      sha256 = "159c8nfcighlkcbdzck102cp06g7rpgbbvxpb73vjymgqrzqywvb";
+      sha256 = "0vdj7p4cwsbzhanhp5f2c0b0qr2gh76dyanji73avvj4jvdb5d4g";
     };
 
     # No tests included
@@ -1237,6 +1237,7 @@ in modules // {
     propagatedBuildInputs = with self; [
       botocore
       bcdoc
+      s3transfer
       six
       colorama
       docutils
@@ -2505,12 +2506,12 @@ in modules // {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.3.23"; # This version is required by awscli
+    version = "1.4.9"; # This version is required by awscli
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "00iaapmy07zdhm2y23fk9igrskzdkix53j7g45lc5dg9nfyngq6j";
+      sha256 = "07rp24lnpjlk0c889g0d8y2ykc711gi04w715nkm9mv734ndsman";
     };
 
     propagatedBuildInputs =
@@ -19349,6 +19350,39 @@ in modules // {
     };
   };
 
+  s3transfer = buildPythonPackage rec {
+    version = "0.0.1"; # This version is required by awscli
+    name = "s3transfer-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/s3transfer/${name}.tar.gz";
+      sha256 = "0ma31zvv7gy240xgd1zw853lpzkdci6mapzpg3x4vycann6yvf9b";
+    };
+
+    foo = 1;
+
+    propagatedBuildInputs =
+      [ self.botocore
+      ] ++ stdenv.lib.optional (pythonOlder "3") self.futures;
+
+    buildInputs = with self; [ docutils mock nose coverage wheel unittest2 ];
+
+    checkPhase = ''
+      pushd s3transfer/tests
+      nosetests -v unit/ functional/
+      popd
+    '';
+
+    # version on pypi has no tests/ dir
+    doCheck = false;
+
+    meta = {
+      homepage = https://github.com/boto/s3transfer;
+      license = stdenv.lib.licenses.asl20;
+      description = "A library for managing Amazon S3 transfers";
+    };
+  };
+
   seqdiag = buildPythonPackage rec {
     name = "seqdiag-0.9.4";
 

From 8430db7e17ecf2ea71746847ec1549286192a50f Mon Sep 17 00:00:00 2001
From: "Jona Stubbe (CrystalGamma)" <dev@jona-stubbe.de>
Date: Thu, 7 Apr 2016 08:34:41 +0200
Subject: [PATCH 843/857] lombok: init at 1.16.8

---
 lib/maintainers.nix                            |  1 +
 .../libraries/java/lombok/default.nix          | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 3 files changed, 21 insertions(+)
 create mode 100644 pkgs/development/libraries/java/lombok/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index d00e84140a8eb..4684d723465e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -81,6 +81,7 @@
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
+  CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>";
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix
new file mode 100644
index 0000000000000..05ad908b3c361
--- /dev/null
+++ b/pkgs/development/libraries/java/lombok/default.nix
@@ -0,0 +1,18 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "lombok-1.16.8";
+  src = fetchurl {
+    url = "https://projectlombok.org/downloads/${name}.jar";
+    sha256 = "0s7ak6gx1h04da2rdhvc0fk896cwqm2m7g3chqcjpsrkgfdv4cpy";
+  };
+  phases = [ "installPhase" ];
+  installPhase = "mkdir -p $out/share/java; cp $src $out/share/java/lombok.jar";
+  meta = {
+    description = "A library that can write a lot of boilerplate for your Java project";
+    platforms = stdenv.lib.platforms.all;
+    license = stdenv.lib.licenses.mit;
+    homepage = https://projectlombok.org/;
+    maintainers = [ stdenv.lib.maintainers.CrystalGamma ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8eb73ff9d9097..d321178077aa8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9218,6 +9218,8 @@ in
 
   jzmq = callPackage ../development/libraries/java/jzmq { };
 
+  lombok = callPackage ../development/libraries/java/lombok { };
+
   lucene = callPackage ../development/libraries/java/lucene { };
 
   lucenepp = callPackage ../development/libraries/lucene++ {

From 50e8994973405a74f01d4c9e380e8081188c3c22 Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Sat, 9 Apr 2016 06:54:00 -0400
Subject: [PATCH 844/857] spotify: 1.0.26.125.g64dc8bc6-14 ->
 1.0.27.71.g0a26e3b2-9

---
 pkgs/applications/audio/spotify/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index e1eee1cdd8ecb..d8fdd2b9415ed 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,11 +1,11 @@
-{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl_1_0_1, freetype
+{ fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
 , libgcrypt, udev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
 
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "1.0.26.125.g64dc8bc6-15";
+  version = "1.0.27.71.g0a26e3b2-9";
 
   deps = [
     alsaLib
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "01y4jr1r928251mj9kz1i7x93ya0ky4xaibm0q08q3zjsafianz1";
+      sha256 = "1rs08cvn0y1lzazlmzj4sn2iyacadwi6j70n5c7rvfvvs4p61p42";
     };
 
   buildInputs = [ dpkg makeWrapper ];
@@ -68,8 +68,8 @@ stdenv.mkDerivation {
       # Work around Spotify referring to a specific minor version of
       # OpenSSL.
 
-      ln -s ${openssl_1_0_1}/lib/libssl.so $libdir/libssl.so.1.0.0
-      ln -s ${openssl_1_0_1}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
+      ln -s ${openssl}/lib/libssl.so $libdir/libssl.so.1.0.0
+      ln -s ${openssl}/lib/libcrypto.so $libdir/libcrypto.so.1.0.0
       ln -s ${nspr}/lib/libnspr4.so $libdir/libnspr4.so
       ln -s ${nspr}/lib/libplc4.so $libdir/libplc4.so
 

From d023e15cfcb27c1fa52a9312626c03c0bacb40a6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Apr 2016 14:00:30 +0300
Subject: [PATCH 845/857] ffmpeg: enable x265 support

---
 pkgs/development/libraries/ffmpeg/generic.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index c62278729a7f4..2d79fb6a641e4 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, gnutls, libiconv, lame, libass, libogg
 , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr
-, x264, xvidcore, zlib, libopus
+, x264, x265, xvidcore, zlib, libopus
 , openglSupport ? false, mesa ? null
 # Build options
 , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime
@@ -129,6 +129,7 @@ stdenv.mkDerivation rec {
       "--enable-libxvid"
       "--enable-zlib"
       (ifMinVer "2.8" "--enable-libopus")
+      (ifMinVer "2.8" "--enable-libx265")
     # Developer flags
       (enableFeature debugDeveloper "debug")
       (enableFeature optimizationsDeveloper "optimizations")
@@ -142,7 +143,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora
-    libvdpau libvorbis lzma SDL soxr x264 xvidcore zlib libopus
+    libvdpau libvorbis lzma SDL soxr x264 x265 xvidcore zlib libopus
   ] ++ optional openglSupport mesa
     ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM
     ++ optional ((isLinux || isFreeBSD) && !isArm) libva

From cae349102e1949b6e324fbe713bd684ac8975d41 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Apr 2016 14:00:39 +0300
Subject: [PATCH 846/857] ffmpeg: install man pages

---
 pkgs/development/libraries/ffmpeg/generic.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 2d79fb6a641e4..d8c488d2999f1 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -184,6 +184,8 @@ stdenv.mkDerivation rec {
     ];
   };
 
+  installFlags = [ "install-man" ];
+
   passthru = {
     vaapiSupport = if reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm) then true else false;
     inherit vdpauSupport;

From 30e17a9b710143db4502749275befcdc7470b6d0 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sat, 9 Apr 2016 14:20:03 +0200
Subject: [PATCH 847/857] ocamlPackages.cryptokit: 1.9 -> 1.10

---
 pkgs/development/ocaml-modules/cryptokit/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index f56ec3cbed62e..a2cf545e84c58 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -7,11 +7,11 @@ in
 assert stdenv.lib.versionAtLeast ocaml_version "3.12";
 
 stdenv.mkDerivation {
-  name = "cryptokit-1.9";
+  name = "cryptokit-1.10";
 
   src = fetchurl {
-    url = http://forge.ocamlcore.org/frs/download.php/1166/cryptokit-1.9.tar.gz;
-    sha256 = "1jh0jqiwkjy9qplnfcm5r25zdgyk36sxb0c87ks3rjj7khrw1a2n";
+    url = http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz;
+    sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv";
   };
 
   buildInputs = [zlib ocaml findlib ncurses];

From 8b18b352663512ed3daec23bba598e5980810f2d Mon Sep 17 00:00:00 2001
From: Niclas Thall <niclas.thall@gmail.com>
Date: Sat, 9 Apr 2016 14:29:23 +0200
Subject: [PATCH 848/857] ums 5.4.0 -> 6.2.2

---
 pkgs/servers/ums/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index c51aadf0d19cf..6e1e8adb8f748 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "ums-${version}";
-  version = "5.4.0";
+  version = "6.2.2";
   
   src = fetchurl {
     url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
-    sha256 = "0ryp26h7pyqing8pyg0xjrp1wm77wwgya4a7d00wczh885pk16kq";
+    sha256 = "1qa999la9hixy0pdj9phjvr6lwqycgdvm94nc1606vz0ivf95b15";
     name = "${name}.tgz";
   };
 

From 5d15c0f5fd96e2c9838aef6efc43c375ac3fd187 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Fri, 25 Mar 2016 06:00:38 +0000
Subject: [PATCH 849/857] p7zip: 9.38 -> 15.14.1

---
 pkgs/tools/archivers/p7zip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index 6769540d8dfb1..a0f3bcb0ebb9c 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 let
-  version = "9.38";
+  version = "15.14.1";
 in
 stdenv.mkDerivation rec {
   name = "p7zip-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2";
-    sha256 = "0mxribb9a3lz3bifz6002hg7vyy8h9piinypian533hw8qvswfx7";
+    sha256 = "1m15iwglyjpiw82m7dbpykz8s55imch34w20w09l34116vdb97b9";
   };
 
   preConfigure = ''

From 85129e6c60a2b868e2daea5a2d89dee6e1ac4cd2 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sat, 9 Apr 2016 13:20:40 +0300
Subject: [PATCH 850/857] dumptorrent: init at 1.2

---
 pkgs/tools/misc/dumptorrent/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/dumptorrent/default.nix

diff --git a/pkgs/tools/misc/dumptorrent/default.nix b/pkgs/tools/misc/dumptorrent/default.nix
new file mode 100644
index 0000000000000..60a2ed29bbf89
--- /dev/null
+++ b/pkgs/tools/misc/dumptorrent/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+    name = "dumptorrent-${version}";
+    version = "1.2";
+    
+    src = fetchurl {
+      url = "mirror://sourceforge/dumptorrent/dumptorrent-${version}.tar.gz";
+      sha256 = "073h03bmpfdy15qh37lvppayld2747i4acpyk0pm5nf2raiak0zm";
+    };
+
+    installPhase = ''
+      mkdir -p $out/bin
+      cp ./dumptorrent $out/bin
+    '';
+
+    meta = with stdenv.lib; {
+      description = "Dump .torrent file information";
+      homepage = https://sourceforge.net/projects/dumptorrent/;
+      license = licenses.gpl2;
+      maintainers = [ maintainers.zohl ];
+      platforms = platforms.all;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba80b99b9dfe6..d5e007caef360 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1314,6 +1314,8 @@ in
 
   duff = callPackage ../tools/filesystems/duff { };
 
+  dumptorrent = callPackage ../tools/misc/dumptorrent { };
+
   duo-unix = callPackage ../tools/security/duo-unix { };
 
   duplicity = callPackage ../tools/backup/duplicity {

From 2486191f3924eef8dd92ecb1e4732f9a90357df5 Mon Sep 17 00:00:00 2001
From: Florian Steinel <fsteinel-git@github.com.flonet.net>
Date: Wed, 9 Mar 2016 00:57:22 +0100
Subject: [PATCH 851/857] thttpd: 2.26 -> 2.27

from http://www.acme.com/software/thttpd/#releasenotes
 New in version 2.27:
-   Stats syslogs changed from LOG_INFO to LOG_NOTICE.
-   Use memmove() for self-overlapping string copies instead of strcpy().
-   Couple of subroutine name changes for consistency.
---
 pkgs/servers/http/thttpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix
index 706911aeef15b..030aa486daa76 100644
--- a/pkgs/servers/http/thttpd/default.nix
+++ b/pkgs/servers/http/thttpd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "thttpd-${version}";
-  version = "2.26";
+  version = "2.27";
 
   src = fetchurl {
     url = "http://acme.com/software/thttpd/${name}.tar.gz";
-    sha256 = "1idlpnwrd5fpmnfh477h1lzanavx8jxir2d8adax46zy472dg4s6";
+    sha256 = "0ykda5k1zzzag59zbd4bkzj1psavq0xnpy7vpk19rhx7mlvvri5i";
   };
 
   prePatch = ''

From 73bf336934f83dc9e4530810f878b4c73669ccc4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sat, 9 Apr 2016 20:08:26 +0200
Subject: [PATCH 852/857] duc: init at 1.3.3

---
 pkgs/tools/misc/duc/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/duc/default.nix

diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
new file mode 100644
index 0000000000000..b32e58803904a
--- /dev/null
+++ b/pkgs/tools/misc/duc/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, pkgconfig, tokyocabinet, cairo, pango, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "duc-${version}";
+  version = "1.3.3";
+
+  src = fetchurl {
+    url = "http://duc.zevv.nl/release/${name}.tar.gz";
+    sha256 = "09mp8cq6s43sfhvms4mwhx3lw51vkaxgg34fbfbimafyjh4jdx3k";
+  };
+
+  buildInputs = [ pkgconfig tokyocabinet cairo pango ncurses ];
+
+  meta = with stdenv.lib; {
+    homepage = http://duc.zevv.nl/;
+    description = "Collection of tools for inspecting and visualizing disk usage";
+    license = licenses.gplv2;
+
+    platforms = platforms.linux;
+    maintainers = [ maintainers.lethalman ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d844f04ccb4f..7a189133b7386 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1312,6 +1312,8 @@ in
 
   dub = callPackage ../development/tools/build-managers/dub { };
 
+  duc = callPackage ../tools/misc/duc { };
+
   duff = callPackage ../tools/filesystems/duff { };
 
   dumptorrent = callPackage ../tools/misc/dumptorrent { };

From 2601b3299053af6e9479cbe96525abdd3228d869 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 9 Apr 2016 20:28:34 +0200
Subject: [PATCH 853/857] khard: 0.8.1 -> 0.9.0

---
 pkgs/applications/misc/khard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 679dc10291a7c..c6aad7194a2b8 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, python2Packages }:
 
 python2Packages.buildPythonApplication rec {
-  version = "0.8.1";
+  version = "0.9.0";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "13axfrs96isirx0c483545xdmjwwfq1k7yy92xpk7l184v71rgi1";
+    sha256 = "1cj6rlvbk05cfjkl1lnyvq12sb847jjwqy5j8906p2b2x4wq72qi";
   };
 
   propagatedBuildInputs = with python2Packages; [

From aec8daed8685c885f2e8c2701c4a013c607d163d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 9 Apr 2016 21:35:29 +0200
Subject: [PATCH 854/857] duc: fix meta.license

---
 pkgs/tools/misc/duc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index b32e58803904a..e113bd86bac37 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://duc.zevv.nl/;
     description = "Collection of tools for inspecting and visualizing disk usage";
-    license = licenses.gplv2;
+    license = licenses.gpl2;
 
     platforms = platforms.linux;
     maintainers = [ maintainers.lethalman ];

From 60fa61c83041ebad1d32200443f859e6f901eeaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 9 Apr 2016 23:29:23 +0200
Subject: [PATCH 855/857] manual multiple-output: clarify a note

---
 doc/multiple-output.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/multiple-output.xml b/doc/multiple-output.xml
index 00b6614775a07..1821861adf714 100644
--- a/doc/multiple-output.xml
+++ b/doc/multiple-output.xml
@@ -11,7 +11,7 @@
 <section><title>Introduction</title>
   <para>The Nix language allows a derivation to produce multiple outputs, which is similar to what is utilized by other Linux distribution packaging systems.  The outputs reside in separate nix store paths, so they can be mostly handled independently of each other, including passing to build inputs, garbage collection or binary substitution.  The exception is that building from source always produces all the outputs.</para>
   <para>The main motivation is to save disk space by reducing runtime closure sizes; consequently also sizes of substituted binaries get reduced.  Splitting can be used to have more granular runtime dependencies, for example the typical reduction is to split away development-only files, as those are typically not needed during runtime.  As a result, closure sizes of many packages can get reduced to a half or even much less.</para>
-  <note><para>Similarly to other packaging systems, the reduction effects could be instead achieved by building the parts in completely separate derivations.  That would often additionally reduce build-time closures, but it would be much harder to write such derivations, due to build systems assuming all parts are being built at once.</para></note>
+  <note><para>The reduction effects could be instead achieved by building the parts in completely separate derivations.  That would often additionally reduce build-time closures, but it tends to be much harder to write such derivations, as build systems typically assume all parts are being built at once.  This compromise approach of single source package producing multiple binary packages is also utilized often by rpm and deb.</para></note>
 </section>
 
 <section><title>Installing a split package</title>

From fe974894e25ef95a375c7afbfa478afe8264e5fa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 15 Mar 2016 12:55:17 +0000
Subject: [PATCH 856/857] virt-manager: remove sqlalchemy from (transitive)
 dependencies

Is not used according to source code
---
 pkgs/applications/virtualization/virt-manager/default.nix | 2 +-
 pkgs/applications/virtualization/virtinst/default.nix     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index 60599d18922cf..e31ed7e509c5d 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -19,7 +19,7 @@ buildPythonApplication rec {
 
   propagatedBuildInputs =
     [ eventlet greenlet gflags netaddr carrot routes
-      PasteDeploy m2crypto ipy twisted sqlalchemy_migrate_0_7
+      PasteDeploy m2crypto ipy twisted
       distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
       urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3
       libvirt libxml2Python ipaddr vte libosinfo gobjectIntrospection gtk3 mox
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 6064972fe9567..b2c6c33b738db 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -14,6 +14,7 @@ stdenv.mkDerivation rec {
 
   pythonPath = with pythonPackages;
     [ setuptools eventlet greenlet gflags netaddr carrot routes
+      PasteDeploy m2crypto ipy twisted
       PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that

From 2463e0917318581da94e7ba92703b63128c40424 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 10 Apr 2016 01:26:45 +0200
Subject: [PATCH 857/857] virtinst: Fix cherry-pick merge

---
 pkgs/applications/virtualization/virtinst/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index b2c6c33b738db..d3c2e9e806a87 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   pythonPath = with pythonPackages;
     [ setuptools eventlet greenlet gflags netaddr carrot routes
       PasteDeploy m2crypto ipy twisted
-      PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that
       # libxml2Python is a dependency of libvirt.py.